X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=hgrc;h=4a540474918680d0413cdb294741d50232a3f55a;hb=89f35ec9b36aa9288182916db92cd4ee5a4826d0;hp=0b581560f8959dafc32ed27dcefa816d5b2bb896;hpb=35eca44edd8165fe4059f1308734b360a3f3b2e6;p=config%2Fdotfiles.git

diff --git a/hgrc b/hgrc
old mode 100755
new mode 100644
index 0b58156..4a54047
--- a/hgrc
+++ b/hgrc
@@ -3,19 +3,36 @@
 
 [ui]
 username = Simon Ruderich <simon@ruderich.com>
+ignore = ~/.hgignore
+# Use Apple's FileMerge for merge conflicts.
+merge = opendiff-merge
+
+# Use git diffs with support for renames, binaries, access rights, etc.
+[diff]
+git = True
 
-# Loads the listed extensions.
 [extensions]
-# convert other vcs to mercurial:
+# Convert other vcs to mercurial.
 hgext.convert =
-# simplify pull and merge processes:
+# Simplify pull and merge processes.
 hgext.fetch =
-# patch stack support:
+# Enable hg view.
+hgext.hgk =
+# Patch stack support.
 hgext.mq =
-# partial commit utility:
+# Partial commit utility.
 hgext.record =
+# Allows cherry-picking and rebasing.
+hgext.transplant =
+
+# Necessary for hg view.
+[hgk]
+path = /opt/local/share/mercurial/contrib/hgk
 
-# Hooks.
 [hooks]
 # Precommit hook which runs tests if they exist.
 precommit = precommit-runtests
+# Prevent "hg pull" if MQ patches are applied.
+prechangegroup.mq-no-pull = ! hg qtop > /dev/null 2>&1
+# Prevent "hg push" if MQ patches are applied.
+preoutgoing.mq-no-push = ! hg qtop > /dev/null 2>&1