annotate .hgrc @ 254:b14e669b98bf

vcs_current_branch: use 'hg parents --template' instead of just 'hg parents'
author Augie Fackler <durin42@gmail.com>
date Thu, 05 May 2011 11:00:37 -0500
parents 5698bf7ae5b9
children a5ec16bba8a9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
1 [extensions]
21
b465892f75e4 Start using bookmarks.
Augie Fackler <durin42@gmail.com>
parents: 20
diff changeset
2 hgext.bookmarks=
9
a6581f7a5b1a Enable the color extension for hg.
Augie Fackler <durin42@gmail.com>
parents: 2
diff changeset
3 hgext.color=
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
4 hgext.convert=
15
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
5 hgext.graphlog=
36
74e6d193f4a8 enable highlight
Augie Fackler <durin42@gmail.com>
parents: 26
diff changeset
6 hgext.highlight=
15
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
7 hgext.hgk=
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
8 hgext.mq=
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
9 hgext.parentrevspec=
15
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
10 hgext.patchbomb=
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
11 hgext.purge=
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
12 hgext.rebase=
15
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
13 hgext.record=
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
14 hgext.transplant=
170
98000a1107bf hg: enable schemes extension
Augie Fackler <durin42@gmail.com>
parents: 145
diff changeset
15 hgext.schemes=
186
802472e96f27 hgrc: enable progress bars
Augie Fackler <durin42@gmail.com>
parents: 170
diff changeset
16 hgext.progress=
40
94604a37503a Load hggit.
Augie Fackler <durin42@gmail.com>
parents: 36
diff changeset
17 hggit=
112
57cbf4b59097 This works better for old versions of hggit.
Augie Fackler <durin42@gmail.com>
parents: 100
diff changeset
18 hgsubversion=
226
f8a4c55ad070 hgrc: update reference to histedit
Augie Fackler <durin42@gmail.com>
parents: 205
diff changeset
19 hg_histedit=
246
74e330570ecb hg: always enable remotebranches extension
Augie Fackler <durin42@gmail.com>
parents: 245
diff changeset
20 hg_remotebranches=
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
21
87
b958738c16f3 Fix an oops in the .hgrc.
Augie Fackler <durin42@gmail.com>
parents: 86
diff changeset
22 [merge-tools]
b958738c16f3 Fix an oops in the .hgrc.
Augie Fackler <durin42@gmail.com>
parents: 86
diff changeset
23 filemerge.executable = opendiff-w
b958738c16f3 Fix an oops in the .hgrc.
Augie Fackler <durin42@gmail.com>
parents: 86
diff changeset
24 filemerge.args = $local $other -ancestor $base -merge $output
b958738c16f3 Fix an oops in the .hgrc.
Augie Fackler <durin42@gmail.com>
parents: 86
diff changeset
25
23
e1caf3e773a8 Need an alias to do log of a named branch
Augie Fackler <durin42@gmail.com>
parents: 21
diff changeset
26 [alias]
251
c7de7cfb5b2b hg ll: switch to clever revset for more useful information
Augie Fackler <durin42@gmail.com>
parents: 250
diff changeset
27 ll=log --graph --style compact --limit 6 -r 'sort((::. or bookmark() or heads(upstream())), "-rev")'
243
5fdca3153e75 hgrc: upstream bookmarks alias
Augie Fackler <durin42@gmail.com>
parents: 239
diff changeset
28 upstream-bookmarks = log -r 'bookmark() and upstream()' --template '{bookmarks}\n'
250
3a5ce01ccea1 hgrc: add utip alias for finding upstream tip
Augie Fackler <durin42@gmail.com>
parents: 247
diff changeset
29 utip = log -r 'limit(heads(upstream()), 1)'
23
e1caf3e773a8 Need an alias to do log of a named branch
Augie Fackler <durin42@gmail.com>
parents: 21
diff changeset
30
244
3fd758a51947 hgrc: two useful aliases for working copy history
Augie Fackler <durin42@gmail.com>
parents: 243
diff changeset
31 wc-out = log -r 'ancestors(.) and not upstream()'
3fd758a51947 hgrc: two useful aliases for working copy history
Augie Fackler <durin42@gmail.com>
parents: 243
diff changeset
32 wc-email = email -r 'ancestors(.) and not upstream()'
3fd758a51947 hgrc: two useful aliases for working copy history
Augie Fackler <durin42@gmail.com>
parents: 243
diff changeset
33
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
34 [ui]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
35 username = Augie Fackler <durin42@gmail.com>
26
895bcf0db86a Global ignores for hg.
Augie Fackler <durin42@gmail.com>
parents: 23
diff changeset
36 ignore = ~/.hgglobalignore
245
74bc570bff86 hgrc: enable new http support if available
Augie Fackler <durin42@gmail.com>
parents: 244
diff changeset
37 usehttp2=true
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
38
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
39 [defaults]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
40 qimport = --git
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
41 qrefresh = --git
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
42 annotate = -nu
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
43 heads = --style default
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
44 serve = -v
2
cc09fbf53d4d Add --graph to default for out/in/log and remove the no-longer-needed glog pref.
Augie Fackler <durin42@gmail.com>
parents: 1
diff changeset
45 outgoing = --graph
86
68f53fa09e99 Moving all clojure stuff to a more self-contained area.
Augie Fackler <durin42@gmail.com>
parents: 78
diff changeset
46 # --graph is breaking incoming, need to investigate
68f53fa09e99 Moving all clojure stuff to a more self-contained area.
Augie Fackler <durin42@gmail.com>
parents: 78
diff changeset
47 # incoming = --graph
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
48 diff = -p
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
49
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
50 [diff]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
51 git=1
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
52
205
226d1ac6acb6 hgrc: enable track.current for bookmarks
Augie Fackler <durin42@gmail.com>
parents: 187
diff changeset
53 [bookmarks]
226d1ac6acb6 hgrc: enable track.current for bookmarks
Augie Fackler <durin42@gmail.com>
parents: 187
diff changeset
54 track.current = 1
226d1ac6acb6 hgrc: enable track.current for bookmarks
Augie Fackler <durin42@gmail.com>
parents: 187
diff changeset
55
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
56 [web]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
57 port=7000
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
58 allow_archive = bz2 zip
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
59
20
a7d20c040af0 Don't use black for ignored files since I have a black terminal background.
Augie Fackler <durin42@gmail.com>
parents: 15
diff changeset
60 [color]
a7d20c040af0 Don't use black for ignored files since I have a black terminal background.
Augie Fackler <durin42@gmail.com>
parents: 15
diff changeset
61 status.ignored = magenta bold
187
68304b1d2878 hgrc: no black on black for qseries
Augie Fackler <durin42@gmail.com>
parents: 186
diff changeset
62 qseries.unapplied = magenta bold
20
a7d20c040af0 Don't use black for ignored files since I have a black terminal background.
Augie Fackler <durin42@gmail.com>
parents: 15
diff changeset
63
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
64 [paths]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
65 hgcrew = http://hg.intevation.org/mercurial/crew
48
bc63fd9e6d64 Edit some paths in .hgrc
Augie Fackler <durin42@gmail.com>
parents: 45
diff changeset
66 hgsubv = ssh://hg@bitbucket.org/durin42/hgsubversion/
145
a585b0d2b828 Fix this path.
Augie Fackler <durin42@gmail.com>
parents: 112
diff changeset
67 hggit = ssh://hg@bitbucket.org/durin42/hg-git/
72
d23dde77450a add histedit to paths
Augie Fackler <durin42@gmail.com>
parents: 71
diff changeset
68 histedit = ssh://hg@bitbucket.org/durin42/histedit/
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
69
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
70 [hooks]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
71 # Prevent "hg pull" if MQ patches are applied.
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
72 #prechangegroup.mq-no-pull = ! hg qtop > /dev/null 2>&1
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
73 # Prevent "hg push" if MQ patches are applied.
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
74 #preoutgoing.mq-no-push = ! hg qtop > /dev/null 2>&1