Mercurial > dotfiles

annotate .hgrc @ 370:1e4a6dcc043d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgrc: clean up machine-specific settings handling HGRCPATH ends up overriding machine-wide settings, which isn't what I want. Recent hg is nice enough to silently ignore includes of nonexistent files, so just use %include now.
author Augie Fackler <raf@durin42.com>
date Fri, 25 Sep 2015 14:42:23 -0400
parents 8b2a2f63e799
children 7d59b638f711
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")'
360
412a0d3c7d87 hg: add bookmarked obsolete changes to upstream-bookmarks
Augie Fackler <raf@durin42.com>
parents: 350
diff changeset
23 upstream-bookmarks = log -r 'bookmark() and (upstream() or obsolete())' --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()'
342
f95ae07fb55a hgrc: add havepatch alias for looking for a patch matching a string
Augie Fackler <raf@durin42.com>
parents: 340
diff changeset
29 havepatch = log -r 'grep("$1")'
244
3fd758a51947 hgrc: two useful aliases for working copy history
Augie Fackler <durin42@gmail.com>
parents: 243
diff changeset
30
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
31 [ui]
275
37babeba4a4a hgrc: update email address
Augie Fackler <raf@durin42.com>
parents: 274
diff changeset
32 username = Augie Fackler <raf@durin42.com>
26
895bcf0db86a Global ignores for hg.
Augie Fackler <durin42@gmail.com>
parents: 23
diff changeset
33 ignore = ~/.hgglobalignore
245
74bc570bff86 hgrc: enable new http support if available
Augie Fackler <durin42@gmail.com>
parents: 244
diff changeset
34 usehttp2=true
338
3f3d52956ff7 hgrc: use detailed merge markers by default
Augie Fackler <raf@durin42.com>
parents: 335
diff changeset
35 mergemarkers = detailed
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
36
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
37 [defaults]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
38 annotate = -nu
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
39 serve = -v
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
40
365
26560465f5f6 hgrc: enable experimental graph-group-branches knob
Augie Fackler <raf@durin42.com>
parents: 362
diff changeset
41 [experimental]
26560465f5f6 hgrc: enable experimental graph-group-branches knob
Augie Fackler <raf@durin42.com>
parents: 362
diff changeset
42 graph-group-branches = yes
26560465f5f6 hgrc: enable experimental graph-group-branches knob
Augie Fackler <raf@durin42.com>
parents: 362
diff changeset
43
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
44 [diff]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
45 git=1
350
b55a7fe4dfab hgrc: drop obsolete stuff from [alias], enable showfunc in [diff]
Augie Fackler <raf@durin42.com>
parents: 348
diff changeset
46 showfunc = 1
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
47
205
226d1ac6acb6 hgrc: enable track.current for bookmarks
Augie Fackler <durin42@gmail.com>
parents: 187
diff changeset
48 [bookmarks]
226d1ac6acb6 hgrc: enable track.current for bookmarks
Augie Fackler <durin42@gmail.com>
parents: 187
diff changeset
49 track.current = 1
226d1ac6acb6 hgrc: enable track.current for bookmarks
Augie Fackler <durin42@gmail.com>
parents: 187
diff changeset
50
367
9e17f111c3d9 hgrc: add defaultrev setting for histedit that uses my new canmutate set
Augie Fackler <raf@durin42.com>
parents: 366
diff changeset
51 [histedit]
9e17f111c3d9 hgrc: add defaultrev setting for histedit that uses my new canmutate set
Augie Fackler <raf@durin42.com>
parents: 366
diff changeset
52 defaultrev = only(.) and canmutate
9e17f111c3d9 hgrc: add defaultrev setting for histedit that uses my new canmutate set
Augie Fackler <raf@durin42.com>
parents: 366
diff changeset
53
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
54 [web]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
55 port=7000
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
56 allow_archive = bz2 zip
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
57
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
58 [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
59 status.ignored = magenta bold
187
68304b1d2878 hgrc: no black on black for qseries
Augie Fackler <durin42@gmail.com>
parents: 186
diff changeset
60 qseries.unapplied = magenta bold
319
c4f8ba83bce4 hgrc: disable publishing mode locally
Augie Fackler <raf@durin42.com>
parents: 315
diff changeset
61
c4f8ba83bce4 hgrc: disable publishing mode locally
Augie Fackler <raf@durin42.com>
parents: 315
diff changeset
62 [phases]
c4f8ba83bce4 hgrc: disable publishing mode locally
Augie Fackler <raf@durin42.com>
parents: 315
diff changeset
63 publish=false
340
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
64
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
65 # Config tricks from mpm for smartlog
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
66 [alias]
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
67 sl = log -Gr smart -Tsl
346
c94f73838566 hgrc: add si for a more compact incoming format
Augie Fackler <raf@durin42.com>
parents: 342
diff changeset
68 si = incoming -GTsl
348
cd4af92d4751 hgrc: add sl. alias for sl when I have too many patches
Augie Fackler <raf@durin42.com>
parents: 346
diff changeset
69 sl. = log -Gr 'smart and ::.' -Tsl
340
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 [templates]
362
6dd0f2587d74 hgrc: swap remotebookmark entries in sl with topics
Augie Fackler <raf@durin42.com>
parents: 361
diff changeset
72 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}"))}{label("sl.topic", if(topics," {topics}"))}\n{label(ifcontains(rev, revset('.'), 'desc.here'),desc|firstline)}'
340
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
73
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
74 [color]
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
75 sl.book = magenta bold
362
6dd0f2587d74 hgrc: swap remotebookmark entries in sl with topics
Augie Fackler <raf@durin42.com>
parents: 361
diff changeset
76 sl.topic = yellow bold
340
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
77 changeset.draft = magenta
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
78 changeset.secret = red
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
79 desc.here = inverse
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
80
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
81 [revsetalias]
366
dcd78275075f hgrc: rework "smart" revset to exploit upstream() from remotebranches
Augie Fackler <raf@durin42.com>
parents: 365
diff changeset
82 canmutate = not (public() or upstream())
369
8b2a2f63e799 hg: hide closed branches from 'hg sl'
Augie Fackler <raf@durin42.com>
parents: 367
diff changeset
83 smart = (parents(canmutate) or canmutate or . or (head() - closed())) and (not obsolete() or unstable()^)
370
1e4a6dcc043d hgrc: clean up machine-specific settings handling
Augie Fackler <raf@durin42.com>
parents: 369
diff changeset
84
1e4a6dcc043d hgrc: clean up machine-specific settings handling
Augie Fackler <raf@durin42.com>
parents: 369
diff changeset
85 %include $HOME/.hgrc-machine