X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=hgrc;h=fb4cff68e9b91095c1b03b733b5e12b16741fdb2;hb=cddeac1b36a80263970103d684a390f249d90dee;hp=79c2086da04b8a33c4a6894f121c9d0c3abbfb5f;hpb=96ed5be590e78a88ec31837dd39c993a8a623ca0;p=config%2Fdotfiles.git

diff --git a/hgrc b/hgrc
index 79c2086..fb4cff6 100644
--- a/hgrc
+++ b/hgrc
@@ -2,8 +2,10 @@
 
 
 [ui]
-username = Simon Ruderich <simon@ruderich.com>
+username = Simon Ruderich <simon@ruderich.org>
 ignore = ~/.hgignore
+# Use Apple's FileMerge for merge conflicts.
+merge = opendiff-merge
 
 # Use git diffs with support for renames, binaries, access rights, etc.
 [diff]
@@ -14,11 +16,33 @@ git = True
 hgext.convert =
 # Simplify pull and merge processes.
 hgext.fetch =
+# Log output similar to hg view but as ASCII.
+hgext.graphlog =
+# Enable hg view.
+hgext.hgk =
 # Patch stack support.
 hgext.mq =
+# Use a pager for all output.
+hgext.pager =
 # 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]
 # 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
+
+# Use colordiff and less as pager so that output from diff is colored and
+# everything is easily readable in a terminal.
+[pager]
+pager = colordiff | less
+ignore = record, qrecord