Wed, 18 May 2016 23:58:26 -0400
pointless maps
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 |
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
4 | |
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
5 | [extensions] |
209 | 6 | color = |
7 | graphlog = | |
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
8 | pager = |
209 | 9 | progress = |
10 | churn = | |
11 | rebase = | |
12 | record = | |
13 | shelve = | |
14 | histedit = | |
15 | mq = | |
254 | 16 | schemes = |
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
17 | flow = $HOME/.hgext/hgflow.py |
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
18 | |
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
19 | [pager] |
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
20 | pager = LESS='FSRX' less |
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
21 | |
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
22 | [alias] |
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
23 | fetch = pull --rebase |
198
a4b45bcb4ba9
add ctags helper and alias
Meredith Howard <mhoward@roomag.org>
parents:
80
diff
changeset
|
24 | ctags = !~/.hg_helpers/ctags |
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 | |
28 | vimdiff.args = -d $base $local $output $other +close +close | |
29 | vimdiff.check = changed, conflicts | |
30 | ||
222 | 31 | [diff] |
32 | git = true | |
33 | showfunc = true | |
34 | ||
219
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
35 | [committemplate] |
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
36 | changeset = {desc}\n\n |
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
37 | HG: {extramsg} |
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
38 | HG: user: {author}\n{ifeq(p2rev, "-1", "", |
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
39 | "HG: branch merge\n") |
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
40 | }HG: branch '{branch}'\n{if(currentbookmark, |
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
41 | "HG: bookmark '{currentbookmark}'\n") }{subrepos % |
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
42 | "HG: subrepo {subrepo}\n" } |
9ab4c7db4b3a
Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents:
209
diff
changeset
|
43 | {splitlines(diff()) % 'HG: {line}\n'} |
79 | 44 | |
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
45 | %include ~/.hgrc.local |