comparison .hgrc @ 271:79a64ef88a6b

Merge
author Augie Fackler <durin42@gmail.com>
date Mon, 12 Dec 2011 11:47:34 -0600
parents 393535e99b8a
children be933a11b72c
comparison
equal deleted inserted replaced
270:1e2125a577da 271:79a64ef88a6b
21 21
22 [alias] 22 [alias]
23 ll=log --graph --style compact --limit 6 -r 'sort((::. or bookmark() or heads(upstream())), "-rev")' 23 ll=log --graph --style compact --limit 6 -r 'sort((::. or bookmark() or heads(upstream())), "-rev")'
24 upstream-bookmarks = log -r 'bookmark() and upstream()' --template '{bookmarks}\n' 24 upstream-bookmarks = log -r 'bookmark() and upstream()' --template '{bookmarks}\n'
25 utip = log -r 'limit(heads(upstream()), 1)' 25 utip = log -r 'limit(heads(upstream()), 1)'
26 egrep = !$HG locate -0 '$2' $3 $4 $5 $6 $7 $8 $9 | xargs -0 egrep -H '$1'
26 27
27 wc-out = log -r 'ancestors(.) and not upstream()' 28 wc-out = log -r 'ancestors(.) and not upstream()'
28 wc-email = email -r 'ancestors(.) and not upstream()' 29 wc-email = email -r 'ancestors(.) and not upstream()'
29 30
30 [ui] 31 [ui]
60 [paths] 61 [paths]
61 hgcrew = http://hg.intevation.org/mercurial/crew 62 hgcrew = http://hg.intevation.org/mercurial/crew
62 hgsubv = ssh://hg@bitbucket.org/durin42/hgsubversion/ 63 hgsubv = ssh://hg@bitbucket.org/durin42/hgsubversion/
63 hggit = ssh://hg@bitbucket.org/durin42/hg-git/ 64 hggit = ssh://hg@bitbucket.org/durin42/hg-git/
64 histedit = ssh://hg@bitbucket.org/durin42/histedit/ 65 histedit = ssh://hg@bitbucket.org/durin42/histedit/
65
66 [hooks]
67 # Prevent "hg pull" if MQ patches are applied.
68 #prechangegroup.mq-no-pull = ! hg qtop > /dev/null 2>&1
69 # Prevent "hg push" if MQ patches are applied.
70 #preoutgoing.mq-no-push = ! hg qtop > /dev/null 2>&1