Mercurial > dotfiles

annotate .hgrc @ 340:1b4b235482c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgrc: new smartlog templates and aliases from mpm
author Augie Fackler <raf@durin42.com>
date Mon, 21 Jul 2014 14:19:43 -0400
parents 3f3d52956ff7
children f95ae07fb55a
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=
36
74e6d193f4a8 enable highlight
Augie Fackler <durin42@gmail.com>
parents: 26
diff changeset
5 hgext.highlight=
315
fe07e9bdae61 hgrc: histedit is now included with hg
Augie Fackler <raf@durin42.com>
parents: 308
diff changeset
6 hgext.histedit=
15
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
7 hgext.mq=
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
8 hgext.parentrevspec=
15
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
9 hgext.patchbomb=
315
fe07e9bdae61 hgrc: histedit is now included with hg
Augie Fackler <raf@durin42.com>
parents: 308
diff changeset
10 hgext.progress=
15
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=
170
98000a1107bf hg: enable schemes extension
Augie Fackler <durin42@gmail.com>
parents: 145
diff changeset
14 hgext.schemes=
326
bfb70ab95398 hg: enable shelve extension
Augie Fackler <raf@durin42.com>
parents: 319
diff changeset
15 hgext.shelve=
315
fe07e9bdae61 hgrc: histedit is now included with hg
Augie Fackler <raf@durin42.com>
parents: 308
diff changeset
16 hgext.transplant=
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=
246
74e330570ecb hg: always enable remotebranches extension
Augie Fackler <durin42@gmail.com>
parents: 245
diff changeset
19 hg_remotebranches=
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
20
23
e1caf3e773a8 Need an alias to do log of a named branch
Augie Fackler <durin42@gmail.com>
parents: 21
diff changeset
21 [alias]
251
c7de7cfb5b2b hg ll: switch to clever revset for more useful information
Augie Fackler <durin42@gmail.com>
parents: 250
diff changeset
22 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
23 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
24 utip = log -r 'limit(heads(upstream()), 1)'
265
09c0d4ed07f3 hg: new egrep alias
Augie Fackler <durin42@gmail.com>
parents: 261
diff changeset
25 egrep = !$HG locate -0 '$2' $3 $4 $5 $6 $7 $8 $9 | xargs -0 egrep -H '$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
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
30 [ui]
275
37babeba4a4a hgrc: update email address
Augie Fackler <raf@durin42.com>
parents: 274
diff changeset
31 username = Augie Fackler <raf@durin42.com>
26
895bcf0db86a Global ignores for hg.
Augie Fackler <durin42@gmail.com>
parents: 23
diff changeset
32 ignore = ~/.hgglobalignore
245
74bc570bff86 hgrc: enable new http support if available
Augie Fackler <durin42@gmail.com>
parents: 244
diff changeset
33 usehttp2=true
338
3f3d52956ff7 hgrc: use detailed merge markers by default
Augie Fackler <raf@durin42.com>
parents: 335
diff changeset
34 mergemarkers = detailed
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
35
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
36 [defaults]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
37 qimport = --git
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
38 qrefresh = --git
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
39 annotate = -nu
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
40 heads = --style default
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
41 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
42 outgoing = --graph
86
68f53fa09e99 Moving all clojure stuff to a more self-contained area.
Augie Fackler <durin42@gmail.com>
parents: 78
diff changeset
43 # --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
44 # incoming = --graph
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
45 diff = -p
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
46
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
47 [diff]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
48 git=1
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
49
205
226d1ac6acb6 hgrc: enable track.current for bookmarks
Augie Fackler <durin42@gmail.com>
parents: 187
diff changeset
50 [bookmarks]
226d1ac6acb6 hgrc: enable track.current for bookmarks
Augie Fackler <durin42@gmail.com>
parents: 187
diff changeset
51 track.current = 1
226d1ac6acb6 hgrc: enable track.current for bookmarks
Augie Fackler <durin42@gmail.com>
parents: 187
diff changeset
52
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
53 [web]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
54 port=7000
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
55 allow_archive = bz2 zip
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
56
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
57 [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
58 status.ignored = magenta bold
187
68304b1d2878 hgrc: no black on black for qseries
Augie Fackler <durin42@gmail.com>
parents: 186
diff changeset
59 qseries.unapplied = magenta bold
319
c4f8ba83bce4 hgrc: disable publishing mode locally
Augie Fackler <raf@durin42.com>
parents: 315
diff changeset
60
c4f8ba83bce4 hgrc: disable publishing mode locally
Augie Fackler <raf@durin42.com>
parents: 315
diff changeset
61 [phases]
c4f8ba83bce4 hgrc: disable publishing mode locally
Augie Fackler <raf@durin42.com>
parents: 315
diff changeset
62 publish=false
340
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
63
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
64 # Config tricks from mpm for smartlog
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
65 [alias]
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
66 sl = log -Gr smart -Tsl
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
67
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
68 [templates]
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
69 sl = '{ifeq(branch,"default","","{label(black_background, branch)} ")}{label("log.changeset changeset.{phase}", shortest(node))} {label("grep.user", author|user)}{label("tags.normal", if(tags," {tags}"))} {label("sl.book", if(bookmarks," {bookmarks}"))}\n{label(ifcontains(rev, revset('.'), 'desc.here'),desc|firstline)}'
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
70
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
71 [color]
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
72 sl.book = magenta bold
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
73 changeset.draft = magenta
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
74 changeset.secret = red
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
75 desc.here = inverse
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
76
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
77 [revsetalias]
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
78 smart = (parents(not public()) or not public() or . or head()) and (not obsolete() or unstable()^)