X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=hgrc;h=fb4cff68e9b91095c1b03b733b5e12b16741fdb2;hb=8251bdb225ed90edb82ed444f55e8ae1fe50e6ac;hp=25860a77f8cd37b44a388ce764ff7f2eb365d29b;hpb=05048fade2bb0f0f5a0ca656a76269849e25dab7;p=config%2Fdotfiles.git diff --git a/hgrc b/hgrc index 25860a7..fb4cff6 100644 --- a/hgrc +++ b/hgrc @@ -2,7 +2,7 @@ [ui] -username = Simon Ruderich +username = Simon Ruderich ignore = ~/.hgignore # Use Apple's FileMerge for merge conflicts. merge = opendiff-merge @@ -16,12 +16,18 @@ 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] @@ -30,3 +36,13 @@ 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