Mercurial > dotfiles
annotate hgrc/hgrc @ 414:72365ec18f54
Merge changes
author | Ludovic Chabant <ludovic@chabant.com> |
---|---|
date | Thu, 18 Jan 2018 16:27:32 -0800 |
parents | eee03a585ab3 |
children | 7d83a5eab234 |
rev | line source |
---|---|
20 | 1 [ui] |
2 username = Ludovic Chabant <ludovic@chabant.com> | |
3 editor = vim | |
36
8d4bf339f159
Don't commit sub-repositories by default.
Ludovic Chabant <ludovic@chabant.com>
parents:
30
diff
changeset
|
4 commitsubrepos = False |
20 | 5 |
6 [diff] | |
7 git=True | |
8 | |
9 [extensions] | |
10 color = | |
37
49e2c3db57d3
More extensions. Added optional local hgrc.
Ludovic Chabant <ludovic@chabant.com>
parents:
36
diff
changeset
|
11 purge = |
49e2c3db57d3
More extensions. Added optional local hgrc.
Ludovic Chabant <ludovic@chabant.com>
parents:
36
diff
changeset
|
12 fetch = |
198
5a898e1ffbe3
Add shelve extension for Mercurial.
Ludovic Chabant <ludovic@chabant.com>
parents:
128
diff
changeset
|
13 shelve = |
105
c129a719560f
Added rebase extension.
Ludovic Chabant <ludovic@chabant.com>
parents:
72
diff
changeset
|
14 rebase = |
205 | 15 shelve = |
26
dbf00b8d9f04
Some new extensions for Mercurial.
Ludovic Chabant <ludovic@chabant.com>
parents:
20
diff
changeset
|
16 convert = |
20 | 17 extdiff = |
37
49e2c3db57d3
More extensions. Added optional local hgrc.
Ludovic Chabant <ludovic@chabant.com>
parents:
36
diff
changeset
|
18 schemes = |
128
3d9d58ad20e8
Added `histedit` extension to Mercurial.
Ludovic Chabant <ludovic@chabant.com>
parents:
113
diff
changeset
|
19 histedit = |
20 | 20 graphlog = |
37
49e2c3db57d3
More extensions. Added optional local hgrc.
Ludovic Chabant <ludovic@chabant.com>
parents:
36
diff
changeset
|
21 progress = |
49e2c3db57d3
More extensions. Added optional local hgrc.
Ludovic Chabant <ludovic@chabant.com>
parents:
36
diff
changeset
|
22 parentrevspec = |
20 | 23 |
24 [alias] | |
301
92f460133b0c
Use Steve Losh's templates from some correct place. Add Jordi's aliases.
Ludovic Chabant <ludovic@chabant.com>
parents:
261
diff
changeset
|
25 dlog = log --style=$DOTFILESPATH/lib/hg/mercurial-cli-templates/map-cmdline.dlog |
92f460133b0c
Use Steve Losh's templates from some correct place. Add Jordi's aliases.
Ludovic Chabant <ludovic@chabant.com>
parents:
261
diff
changeset
|
26 slog = log --limit 10 --style=$DOTFILESPATH/lib/hg/mercurial-cli-templates/map-cmdline.slog |
92f460133b0c
Use Steve Losh's templates from some correct place. Add Jordi's aliases.
Ludovic Chabant <ludovic@chabant.com>
parents:
261
diff
changeset
|
27 nlog = log --limit 10 --style=$DOTFILESPATH/lib/hg/mercurial-cli-templates/map-cmdline.nlog |
92f460133b0c
Use Steve Losh's templates from some correct place. Add Jordi's aliases.
Ludovic Chabant <ludovic@chabant.com>
parents:
261
diff
changeset
|
28 sglog = glog --limit 10 --style=$DOTFILESPATH/lib/hg/mercurial-cli-templates/map-cmdline.sglog |
111
92a93c9a9ad4
Fixed GitHub schemes. Better log templates.
Ludovic Chabant <ludovic@chabant.com>
parents:
105
diff
changeset
|
29 clog = glog --limit 10 --template "{rev} {branches} {bookmarks} {tags} {node|short} {date|shortdate} {author|user}\n{desc}\n\n" |
301
92f460133b0c
Use Steve Losh's templates from some correct place. Add Jordi's aliases.
Ludovic Chabant <ludovic@chabant.com>
parents:
261
diff
changeset
|
30 wip = glog --style=$DOTFILESPATH/hgrc/wip.style --rev wip |
92f460133b0c
Use Steve Losh's templates from some correct place. Add Jordi's aliases.
Ludovic Chabant <ludovic@chabant.com>
parents:
261
diff
changeset
|
31 |
92f460133b0c
Use Steve Losh's templates from some correct place. Add Jordi's aliases.
Ludovic Chabant <ludovic@chabant.com>
parents:
261
diff
changeset
|
32 [revsetalias] |
92f460133b0c
Use Steve Losh's templates from some correct place. Add Jordi's aliases.
Ludovic Chabant <ludovic@chabant.com>
parents:
261
diff
changeset
|
33 wip = (parents(not public()) or not public() or . or head()) and (not obsolete() or unstable()^ and not closed()) |
20 | 34 |
37
49e2c3db57d3
More extensions. Added optional local hgrc.
Ludovic Chabant <ludovic@chabant.com>
parents:
36
diff
changeset
|
35 [progress] |
49e2c3db57d3
More extensions. Added optional local hgrc.
Ludovic Chabant <ludovic@chabant.com>
parents:
36
diff
changeset
|
36 delay = 1 |
49e2c3db57d3
More extensions. Added optional local hgrc.
Ludovic Chabant <ludovic@chabant.com>
parents:
36
diff
changeset
|
37 |
49e2c3db57d3
More extensions. Added optional local hgrc.
Ludovic Chabant <ludovic@chabant.com>
parents:
36
diff
changeset
|
38 [schemes] |
49e2c3db57d3
More extensions. Added optional local hgrc.
Ludovic Chabant <ludovic@chabant.com>
parents:
36
diff
changeset
|
39 bb+ssh = ssh://hg@bitbucket.org/ |
44
263d5383be8a
Added schemes for my stuff.
Ludovic Chabant <ludovic@chabant.com>
parents:
37
diff
changeset
|
40 bb+me = ssh://hg@bitbucket.org/ludovicchabant/ |
111
92a93c9a9ad4
Fixed GitHub schemes. Better log templates.
Ludovic Chabant <ludovic@chabant.com>
parents:
105
diff
changeset
|
41 gh+ssh = git+ssh://git@github.com:{1}/{2}.git |
92a93c9a9ad4
Fixed GitHub schemes. Better log templates.
Ludovic Chabant <ludovic@chabant.com>
parents:
105
diff
changeset
|
42 gh+me = git+ssh://git@github.com:ludovicchabant/{1}.git |
37
49e2c3db57d3
More extensions. Added optional local hgrc.
Ludovic Chabant <ludovic@chabant.com>
parents:
36
diff
changeset
|
43 |
20 | 44 [extdiff] |
45 cmd.sbsdiff = diff | |
46 opts.sbsdiff = -N -b --side-by-side --width=90 | |
47 | |
37
49e2c3db57d3
More extensions. Added optional local hgrc.
Ludovic Chabant <ludovic@chabant.com>
parents:
36
diff
changeset
|
48 # OS-specific settings |
30
8b67136af5b7
Now generating .hgrc for locating hg-git.
Ludovic Chabant <ludovic@chabant.com>
parents:
26
diff
changeset
|
49 %include hgrc-${OS} |
20 | 50 |
37
49e2c3db57d3
More extensions. Added optional local hgrc.
Ludovic Chabant <ludovic@chabant.com>
parents:
36
diff
changeset
|
51 # Local settings (if any) |
49e2c3db57d3
More extensions. Added optional local hgrc.
Ludovic Chabant <ludovic@chabant.com>
parents:
36
diff
changeset
|
52 %include hgrc-local |
49e2c3db57d3
More extensions. Added optional local hgrc.
Ludovic Chabant <ludovic@chabant.com>
parents:
36
diff
changeset
|
53 |