Mon, 12 Jun 2017 18:20:55 -0400
Simplify directory setup
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
1 | [ui] |
598
1698d432a2eb
add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents:
597
diff
changeset
|
2 | username = Meredith Howard <mhoward@roomag.org> |
1698d432a2eb
add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents:
597
diff
changeset
|
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 |
599 | 24 | draft = log -r 'not public()' |
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
25 | |
79 | 26 | [merge-tools] |
27 | vimdiff.executable = vim | |
598
1698d432a2eb
add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents:
597
diff
changeset
|
28 | vimdiff.args = -d $base $local $output $other +close +close |
1698d432a2eb
add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents:
597
diff
changeset
|
29 | vimdiff.check = changed, conflicts |
79 | 30 | |
222 | 31 | [diff] |
598
1698d432a2eb
add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents:
597
diff
changeset
|
32 | git = true |
222 | 33 | showfunc = true |
34 | ||
598
1698d432a2eb
add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents:
597
diff
changeset
|
35 | [schemes] |
1698d432a2eb
add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents:
597
diff
changeset
|
36 | gh = git://github.com/ |
1698d432a2eb
add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents:
597
diff
changeset
|
37 | gh+ssh = git+ssh://github.com/ |
1698d432a2eb
add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents:
597
diff
changeset
|
38 | |
597
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
39 | [color] |
598
1698d432a2eb
add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents:
597
diff
changeset
|
40 | diff.hunk = cyan |
1698d432a2eb
add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents:
597
diff
changeset
|
41 | log.changeset = magenta |
1698d432a2eb
add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents:
597
diff
changeset
|
42 | logcust.date = green |
1698d432a2eb
add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents:
597
diff
changeset
|
43 | logcust.user = cyan |
597
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
44 | logcust.decorate = yellow |
598
1698d432a2eb
add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents:
597
diff
changeset
|
45 | changeset.draft = dim |
1698d432a2eb
add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents:
597
diff
changeset
|
46 | changeset.secret = dim underline |
597
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
47 | |
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
48 | [templatealias] |
bcc7823e8991
customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents:
591
diff
changeset
|
49 | 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
|
50 | 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
|
51 | |
219
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
52 | [committemplate] |
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
53 | changeset = {desc}\n\n |
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
54 | HG: {extramsg} |
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
55 | HG: user: {author}\n{ifeq(p2rev, "-1", "", |
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
56 | "HG: branch merge\n") |
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
57 | }HG: branch '{branch}'\n{if(currentbookmark, |
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
58 | "HG: bookmark '{currentbookmark}'\n") }{subrepos % |
600
0e927f9c141a
Sadly, this is hg >= 4.2 only
Meredith Howard <mhoward@roomag.org>
parents:
599
diff
changeset
|
59 | "HG: subrepo {subrepo}\n" } |
0e927f9c141a
Sadly, this is hg >= 4.2 only
Meredith Howard <mhoward@roomag.org>
parents:
599
diff
changeset
|
60 | {splitlines(diff()) % 'HG: {line}\n'} |
79 | 61 | |
591
2ee456c483b0
switch to a file just for extra extensions via script
Meredith Howard <mhoward@roomag.org>
parents:
506
diff
changeset
|
62 | %include ~/.hgext/hgrc |
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
63 | %include ~/.hgrc.local |