Sat, 10 Jun 2017 15:55:24 -0700
customize log color and format, simplify committemplate
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
1 | [ui] |
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
2 | username = Meredith Howard <mhoward@roomag.org> |
79 | 3 | merge = vimdiff |
597
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
4 | logtemplate = "{phaseset} -{label('logcust.decorate', decorate)} {desc|strip|firstline} {label('logcust.date', "({date|age})")} {label('logcust.user' , "<{author|person}>")}\n" |
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
5 | |
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
6 | [extensions] |
209 | 7 | color = |
8 | graphlog = | |
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
9 | pager = |
209 | 10 | progress = |
11 | churn = | |
12 | rebase = | |
13 | record = | |
14 | shelve = | |
15 | histedit = | |
254 | 16 | schemes = |
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
17 | |
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
18 | [pager] |
506 | 19 | pager = LESS='FSRXi' less |
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
20 | |
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
21 | [alias] |
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
22 | fetch = pull --rebase |
443
e731ef81637c
support hg in git-ctags, deduplicate hg helper stuff
Meredith Howard <mhoward@roomag.org>
parents:
355
diff
changeset
|
23 | ctags = !~/bin/git-ctags |
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
24 | |
79 | 25 | [merge-tools] |
26 | vimdiff.executable = vim | |
27 | vimdiff.args = -d $base $local $output $other +close +close | |
28 | vimdiff.check = changed, conflicts | |
29 | ||
222 | 30 | [diff] |
31 | git = true | |
32 | showfunc = true | |
33 | ||
597
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
34 | [color] |
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
35 | diff.hunk = cyan |
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
36 | log.changeset = magenta |
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
37 | logcust.date = green |
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
38 | logcust.user = cyan |
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
39 | logcust.decorate = yellow |
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
40 | changeset.draft = dim |
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
41 | changeset.secret = dim underline |
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
42 | |
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
43 | [templatealias] |
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
44 | phaseset = "{label("changeset.{phase}", rev)}:{label('log.changeset', node|short)}" |
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
45 | decorate = "{if(branches, " ({branches})")}{if(tags, " <{tags}>")}{if(bookmarks, " [{bookmarks}]")}" |
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
46 | |
219
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
47 | [committemplate] |
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
48 | changeset = {desc}\n\n |
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
49 | HG: {extramsg} |
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
50 | HG: user: {author}\n{ifeq(p2rev, "-1", "", |
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
51 | "HG: branch merge\n") |
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
52 | }HG: branch '{branch}'\n{if(currentbookmark, |
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
53 | "HG: bookmark '{currentbookmark}'\n") }{subrepos % |
597
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
54 | "HG: subrepo {subrepo}\n" }{if(files, |
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
55 | "HG: ------------------------ >8 ------------------------ |
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
56 | HG: Do not touch the line above. |
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
57 | HG: Everything below will be removed. |
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
58 | {diff()}", "HG: no files changed")} |
79 | 59 | |
591
2ee456c483b0
switch to a file just for extra extensions via script
Meredith Howard <mhoward@roomag.org>
parents:
506
diff
changeset
|
60 | %include ~/.hgext/hgrc |
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
61 | %include ~/.hgrc.local |