diff .hgrc @ 271:79a64ef88a6b

Merge
author Augie Fackler <durin42@gmail.com>
date Mon, 12 Dec 2011 11:47:34 -0600
parents 393535e99b8a
children be933a11b72c
line wrap: on
line diff
--- a/.hgrc
+++ b/.hgrc
@@ -23,6 +23,7 @@ hg_remotebranches=
 ll=log --graph --style compact --limit 6 -r 'sort((::. or bookmark() or heads(upstream())), "-rev")'
 upstream-bookmarks = log -r 'bookmark() and upstream()' --template '{bookmarks}\n'
 utip = log -r 'limit(heads(upstream()), 1)'
+egrep = !$HG locate -0 '$2' $3 $4 $5 $6 $7 $8 $9 | xargs -0 egrep -H '$1'
 
 wc-out = log -r 'ancestors(.) and not upstream()'
 wc-email = email -r 'ancestors(.) and not upstream()'
@@ -62,9 +63,3 @@ hgcrew = http://hg.intevation.org/mercur
 hgsubv = ssh://hg@bitbucket.org/durin42/hgsubversion/
 hggit = ssh://hg@bitbucket.org/durin42/hg-git/
 histedit = ssh://hg@bitbucket.org/durin42/histedit/
-
-[hooks]
-# 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