Mercurial > dotfiles

annotate .hgrc @ 468:bec91aeefddc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg: switch from out-of-tree remotebranches to in-tree remotenames I've finally got the functionality I need in core!
author Augie Fackler <raf@durin42.com>
date Thu, 04 Oct 2018 22:32:53 -0400
parents 84f79f34bd63
children 838039231429
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]
451
1828e3af6340 hgrc: enable show extension
Augie Fackler <raf@durin42.com>
parents: 450
diff changeset
2 show=
405
bb7120cdd8ac hgrc: enable share extension
Augie Fackler <raf@durin42.com>
parents: 400
diff changeset
3 share=
408
8571fe484690 hg: enable gpg extension
Augie Fackler <raf@durin42.com>
parents: 405
diff changeset
4 gpg=
21
b465892f75e4 Start using bookmarks.
Augie Fackler <durin42@gmail.com>
parents: 20
diff changeset
5 hgext.bookmarks=
9
a6581f7a5b1a Enable the color extension for hg.
Augie Fackler <durin42@gmail.com>
parents: 2
diff changeset
6 hgext.color=
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
7 hgext.convert=
36
74e6d193f4a8 enable highlight
Augie Fackler <durin42@gmail.com>
parents: 26
diff changeset
8 hgext.highlight=
315
fe07e9bdae61 hgrc: histedit is now included with hg
Augie Fackler <raf@durin42.com>
parents: 308
diff changeset
9 hgext.histedit=
15
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
10 hgext.mq=
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
11 hgext.parentrevspec=
15
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
12 hgext.patchbomb=
315
fe07e9bdae61 hgrc: histedit is now included with hg
Augie Fackler <raf@durin42.com>
parents: 308
diff changeset
13 hgext.progress=
15
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
14 hgext.purge=
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
15 hgext.rebase=
15
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
16 hgext.record=
170
98000a1107bf hg: enable schemes extension
Augie Fackler <durin42@gmail.com>
parents: 145
diff changeset
17 hgext.schemes=
326
bfb70ab95398 hg: enable shelve extension
Augie Fackler <raf@durin42.com>
parents: 319
diff changeset
18 hgext.shelve=
456
258e6e7a72fb hg: enable the show extension
Augie Fackler <raf@durin42.com>
parents: 451
diff changeset
19 show=
315
fe07e9bdae61 hgrc: histedit is now included with hg
Augie Fackler <raf@durin42.com>
parents: 308
diff changeset
20 hgext.transplant=
468
bec91aeefddc hg: switch from out-of-tree remotebranches to in-tree remotenames
Augie Fackler <raf@durin42.com>
parents: 464
diff changeset
21 remotenames=
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
22
23
e1caf3e773a8 Need an alias to do log of a named branch
Augie Fackler <durin42@gmail.com>
parents: 21
diff changeset
23 [alias]
251
c7de7cfb5b2b hg ll: switch to clever revset for more useful information
Augie Fackler <durin42@gmail.com>
parents: 250
diff changeset
24 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
25 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
26 utip = log -r 'limit(heads(upstream()), 1)'
387
cf3b1ba01e69 hg egrep: ensure we're in the repo root before running grep
Augie Fackler <raf@durin42.com>
parents: 386
diff changeset
27 egrep = !$HG locate -0 '$2' $3 $4 $5 $6 $7 $8 $9 | (cd $(hg root) ; xargs -0 egrep -H '$1')
394
2f05f081d9c1 hgrc: fix crecord alias
Augie Fackler <raf@durin42.com>
parents: 387
diff changeset
28 crecord = !$HG commit --interactive --config ui.interface=curses $@
23
e1caf3e773a8 Need an alias to do log of a named branch
Augie Fackler <durin42@gmail.com>
parents: 21
diff changeset
29
244
3fd758a51947 hgrc: two useful aliases for working copy history
Augie Fackler <durin42@gmail.com>
parents: 243
diff changeset
30 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
31 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
32 havepatch = log -r 'grep("$1")'
244
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]
275
37babeba4a4a hgrc: update email address
Augie Fackler <raf@durin42.com>
parents: 274
diff changeset
35 username = Augie Fackler <raf@durin42.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
338
3f3d52956ff7 hgrc: use detailed merge markers by default
Augie Fackler <raf@durin42.com>
parents: 335
diff changeset
38 mergemarkers = detailed
431
87a66e293d27 hgrc: set ui.interface to text to avoid any use of curses
Augie Fackler <raf@durin42.com>
parents: 408
diff changeset
39 interface = text
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
40
464
84f79f34bd63 pager: try harder to not confuse emacs
Augie Fackler <raf@durin42.com>
parents: 459
diff changeset
41 [pager]
84f79f34bd63 pager: try harder to not confuse emacs
Augie Fackler <raf@durin42.com>
parents: 459
diff changeset
42 # -d means "don't whine about dumb terminals", since that warning from
84f79f34bd63 pager: try harder to not confuse emacs
Augie Fackler <raf@durin42.com>
parents: 459
diff changeset
43 # less can confuse emacs tramp-mode.
84f79f34bd63 pager: try harder to not confuse emacs
Augie Fackler <raf@durin42.com>
parents: 459
diff changeset
44 pager = less -FRX -d
84f79f34bd63 pager: try harder to not confuse emacs
Augie Fackler <raf@durin42.com>
parents: 459
diff changeset
45
376
fe18716866e9 hgrc: disable vimdiff as a merge tool forever
Augie Fackler <raf@durin42.com>
parents: 375
diff changeset
46 [merge-tools]
386
40c0bc5ff266 hg: really end vimdiff's reign of terror
Augie Fackler <raf@durin42.com>
parents: 378
diff changeset
47 vimdiff.disabled = yes
40c0bc5ff266 hg: really end vimdiff's reign of terror
Augie Fackler <raf@durin42.com>
parents: 378
diff changeset
48 gvimdiff.disabled = yes
376
fe18716866e9 hgrc: disable vimdiff as a merge tool forever
Augie Fackler <raf@durin42.com>
parents: 375
diff changeset
49
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
50 [defaults]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
51 annotate = -nu
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
52 serve = -v
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
53
365
26560465f5f6 hgrc: enable experimental graph-group-branches knob
Augie Fackler <raf@durin42.com>
parents: 362
diff changeset
54 [experimental]
26560465f5f6 hgrc: enable experimental graph-group-branches knob
Augie Fackler <raf@durin42.com>
parents: 362
diff changeset
55 graph-group-branches = yes
375
81ca70aa5281 hgrc: enable experimental support for rebase skipping obsolete changes
Augie Fackler <raf@durin42.com>
parents: 374
diff changeset
56 rebaseskipobsolete = yes
459
e6ab23541401 hg: enable experimental updatecheck behavior
Augie Fackler <raf@durin42.com>
parents: 458
diff changeset
57 updatecheck = yes
457
86d743ba35ea hg: enable experimental worddiff highlighting
Augie Fackler <raf@durin42.com>
parents: 456
diff changeset
58 worddiff = yes
458
7f604a33d4af hg: enable experimental xdiff support
Augie Fackler <raf@durin42.com>
parents: 457
diff changeset
59 xdiff = 1
365
26560465f5f6 hgrc: enable experimental graph-group-branches knob
Augie Fackler <raf@durin42.com>
parents: 362
diff changeset
60
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
61 [diff]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
62 git=1
350
b55a7fe4dfab hgrc: drop obsolete stuff from [alias], enable showfunc in [diff]
Augie Fackler <raf@durin42.com>
parents: 348
diff changeset
63 showfunc = 1
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
64
205
226d1ac6acb6 hgrc: enable track.current for bookmarks
Augie Fackler <durin42@gmail.com>
parents: 187
diff changeset
65 [bookmarks]
226d1ac6acb6 hgrc: enable track.current for bookmarks
Augie Fackler <durin42@gmail.com>
parents: 187
diff changeset
66 track.current = 1
226d1ac6acb6 hgrc: enable track.current for bookmarks
Augie Fackler <durin42@gmail.com>
parents: 187
diff changeset
67
367
9e17f111c3d9 hgrc: add defaultrev setting for histedit that uses my new canmutate set
Augie Fackler <raf@durin42.com>
parents: 366
diff changeset
68 [histedit]
9e17f111c3d9 hgrc: add defaultrev setting for histedit that uses my new canmutate set
Augie Fackler <raf@durin42.com>
parents: 366
diff changeset
69 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
70
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
71 [web]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
72 port=7000
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
73 allow_archive = bz2 zip
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
74
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
75 [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
76 status.ignored = magenta bold
187
68304b1d2878 hgrc: no black on black for qseries
Augie Fackler <durin42@gmail.com>
parents: 186
diff changeset
77 qseries.unapplied = magenta bold
319
c4f8ba83bce4 hgrc: disable publishing mode locally
Augie Fackler <raf@durin42.com>
parents: 315
diff changeset
78
c4f8ba83bce4 hgrc: disable publishing mode locally
Augie Fackler <raf@durin42.com>
parents: 315
diff changeset
79 [phases]
c4f8ba83bce4 hgrc: disable publishing mode locally
Augie Fackler <raf@durin42.com>
parents: 315
diff changeset
80 publish=false
340
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
81
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
82 # Config tricks from mpm for smartlog
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
83 [alias]
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
84 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
85 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
86 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
87
399
1a85ad164ae7 hg: refactor sl template to use templatealias for readability
Augie Fackler <raf@durin42.com>
parents: 394
diff changeset
88 [templatealias]
1a85ad164ae7 hg: refactor sl template to use templatealias for readability
Augie Fackler <raf@durin42.com>
parents: 394
diff changeset
89 sl_branch = '{ifeq(branch,"default","","{label(black_background, branch)} ")}'
400
879df95a0578 hg: add an indicator of ellipsis nodes to sl output
Augie Fackler <raf@durin42.com>
parents: 399
diff changeset
90 sl_node = '{label("log.changeset changeset.{phase}", shortest(node))}{if(ellipsis, "...")}'
399
1a85ad164ae7 hg: refactor sl template to use templatealias for readability
Augie Fackler <raf@durin42.com>
parents: 394
diff changeset
91 sl_user = '{label("grep.user", author|user)}'
468
bec91aeefddc hg: switch from out-of-tree remotebranches to in-tree remotenames
Augie Fackler <raf@durin42.com>
parents: 464
diff changeset
92 sl_tags = '{label("tags.normal", if(tags," {tags}"))} {label("tags.normal", if(remotenames, " {remotenames}"))}'
399
1a85ad164ae7 hg: refactor sl template to use templatealias for readability
Augie Fackler <raf@durin42.com>
parents: 394
diff changeset
93 sl_book = '{label("sl.book", if(bookmarks," {bookmarks}"))}'
1a85ad164ae7 hg: refactor sl template to use templatealias for readability
Augie Fackler <raf@durin42.com>
parents: 394
diff changeset
94 sl_topic = '{label("sl.topic", if(topics," {topics}"))}'
1a85ad164ae7 hg: refactor sl template to use templatealias for readability
Augie Fackler <raf@durin42.com>
parents: 394
diff changeset
95 sl_desc = '{label(ifcontains(rev, revset('.'), 'desc.here'),desc|firstline)}'
1a85ad164ae7 hg: refactor sl template to use templatealias for readability
Augie Fackler <raf@durin42.com>
parents: 394
diff changeset
96
340
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
97 [templates]
399
1a85ad164ae7 hg: refactor sl template to use templatealias for readability
Augie Fackler <raf@durin42.com>
parents: 394
diff changeset
98 sl = '{sl_branch}{sl_node} {sl_user}{sl_tags}{sl_book}{sl_topic}\n{sl_desc}'
340
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
99
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
100 [color]
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
101 sl.book = magenta bold
362
6dd0f2587d74 hgrc: swap remotebookmark entries in sl with topics
Augie Fackler <raf@durin42.com>
parents: 361
diff changeset
102 sl.topic = yellow bold
340
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
103 changeset.draft = magenta
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
104 changeset.secret = red
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
105 desc.here = inverse
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
106
1b4b235482c5 hgrc: new smartlog templates and aliases from mpm
Augie Fackler <raf@durin42.com>
parents: 338
diff changeset
107 [revsetalias]
468
bec91aeefddc hg: switch from out-of-tree remotebranches to in-tree remotenames
Augie Fackler <raf@durin42.com>
parents: 464
diff changeset
108 upstream = ::remotenames()
bec91aeefddc hg: switch from out-of-tree remotebranches to in-tree remotenames
Augie Fackler <raf@durin42.com>
parents: 464
diff changeset
109 canmutate = not (public() or upstream) - obsolete()
450
8b6bc53652f7 hgrc: replace unstable() with orphan()
Augie Fackler <raf@durin42.com>
parents: 431
diff changeset
110 smart = ((parents(canmutate) or canmutate or (head() - closed())) and (not obsolete() or orphan()^)) or .
370
1e4a6dcc043d hgrc: clean up machine-specific settings handling
Augie Fackler <raf@durin42.com>
parents: 369
diff changeset
111
371
7d59b638f711 hgrc: also include private-config hgrc that has smtp settings etc
Augie Fackler <raf@durin42.com>
parents: 370
diff changeset
112 %include .private/hgrc
370
1e4a6dcc043d hgrc: clean up machine-specific settings handling
Augie Fackler <raf@durin42.com>
parents: 369
diff changeset
113 %include $HOME/.hgrc-machine