Mercurial > dotfiles
annotate .hgrc @ 261:a5ec16bba8a9
hgrc: move opendiff support to another file to stop breaking merge on linux
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Mon, 16 Aug 2010 12:30:39 -0500 |
parents | 5698bf7ae5b9 |
children | 09c0d4ed07f3 |
rev | line source |
---|---|
0 | 1 [extensions] |
21 | 2 hgext.bookmarks= |
9
a6581f7a5b1a
Enable the color extension for hg.
Augie Fackler <durin42@gmail.com>
parents:
2
diff
changeset
|
3 hgext.color= |
0 | 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 | 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 | 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 | 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 | 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 | 21 |
23
e1caf3e773a8
Need an alias to do log of a named branch
Augie Fackler <durin42@gmail.com>
parents:
21
diff
changeset
|
22 [alias] |
251
c7de7cfb5b2b
hg ll: switch to clever revset for more useful information
Augie Fackler <durin42@gmail.com>
parents:
250
diff
changeset
|
23 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
|
24 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
|
25 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
|
26 |
244
3fd758a51947
hgrc: two useful aliases for working copy history
Augie Fackler <durin42@gmail.com>
parents:
243
diff
changeset
|
27 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
|
28 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
|
29 |
0 | 30 [ui] |
31 username = Augie Fackler <durin42@gmail.com> | |
26 | 32 ignore = ~/.hgglobalignore |
245
74bc570bff86
hgrc: enable new http support if available
Augie Fackler <durin42@gmail.com>
parents:
244
diff
changeset
|
33 usehttp2=true |
0 | 34 |
35 [defaults] | |
36 qimport = --git | |
37 qrefresh = --git | |
38 annotate = -nu | |
39 heads = --style default | |
40 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
|
41 outgoing = --graph |
86
68f53fa09e99
Moving all clojure stuff to a more self-contained area.
Augie Fackler <durin42@gmail.com>
parents:
78
diff
changeset
|
42 # --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
|
43 # incoming = --graph |
0 | 44 diff = -p |
45 | |
46 [diff] | |
47 git=1 | |
48 | |
205
226d1ac6acb6
hgrc: enable track.current for bookmarks
Augie Fackler <durin42@gmail.com>
parents:
187
diff
changeset
|
49 [bookmarks] |
226d1ac6acb6
hgrc: enable track.current for bookmarks
Augie Fackler <durin42@gmail.com>
parents:
187
diff
changeset
|
50 track.current = 1 |
226d1ac6acb6
hgrc: enable track.current for bookmarks
Augie Fackler <durin42@gmail.com>
parents:
187
diff
changeset
|
51 |
0 | 52 [web] |
53 port=7000 | |
54 allow_archive = bz2 zip | |
55 | |
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
|
56 [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
|
57 status.ignored = magenta bold |
187
68304b1d2878
hgrc: no black on black for qseries
Augie Fackler <durin42@gmail.com>
parents:
186
diff
changeset
|
58 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
|
59 |
0 | 60 [paths] |
61 hgcrew = http://hg.intevation.org/mercurial/crew | |
48 | 62 hgsubv = ssh://hg@bitbucket.org/durin42/hgsubversion/ |
145 | 63 hggit = ssh://hg@bitbucket.org/durin42/hg-git/ |
72 | 64 histedit = ssh://hg@bitbucket.org/durin42/histedit/ |
0 | 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 |