.hgrc

Fri, 05 May 2017 17:48:00 -0400

author
Meredith Howard <mhoward@roomag.org>
date
Fri, 05 May 2017 17:48:00 -0400
changeset 565
b559ab3fd0ce
parent 506
2a6899f40b2e
child 591
2ee456c483b0
permissions
-rw-r--r--

disable email obfu

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
4635b3f5bc23 Easier vimdiff defaults
Meredith Howard <mhoward@roomag.org>
parents: 8
diff changeset
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
557d2468f900 Update hg extensions
Meredith Howard <mhoward@roomag.org>
parents: 198
diff changeset
6 color =
557d2468f900 Update hg extensions
Meredith Howard <mhoward@roomag.org>
parents: 198
diff changeset
7 graphlog =
8
ba72a71f23e6 Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
8 pager =
209
557d2468f900 Update hg extensions
Meredith Howard <mhoward@roomag.org>
parents: 198
diff changeset
9 progress =
557d2468f900 Update hg extensions
Meredith Howard <mhoward@roomag.org>
parents: 198
diff changeset
10 churn =
557d2468f900 Update hg extensions
Meredith Howard <mhoward@roomag.org>
parents: 198
diff changeset
11 rebase =
557d2468f900 Update hg extensions
Meredith Howard <mhoward@roomag.org>
parents: 198
diff changeset
12 record =
557d2468f900 Update hg extensions
Meredith Howard <mhoward@roomag.org>
parents: 198
diff changeset
13 shelve =
557d2468f900 Update hg extensions
Meredith Howard <mhoward@roomag.org>
parents: 198
diff changeset
14 histedit =
254
bb7fdde50da2 add schemes extension
Meredith Howard <mhoward@roomag.org>
parents: 222
diff changeset
15 schemes =
8
ba72a71f23e6 Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
16
ba72a71f23e6 Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
17 [pager]
506
2a6899f40b2e smartcase please
Meredith Howard <mhoward@roomag.org>
parents: 443
diff changeset
18 pager = LESS='FSRXi' less
8
ba72a71f23e6 Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
19
ba72a71f23e6 Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
20 [alias]
ba72a71f23e6 Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
21 fetch = pull --rebase
443
e731ef81637c support hg in git-ctags, deduplicate hg helper stuff
Meredith Howard <mhoward@roomag.org>
parents: 355
diff changeset
22 ctags = !~/bin/git-ctags
8
ba72a71f23e6 Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
23
79
4635b3f5bc23 Easier vimdiff defaults
Meredith Howard <mhoward@roomag.org>
parents: 8
diff changeset
24 [merge-tools]
4635b3f5bc23 Easier vimdiff defaults
Meredith Howard <mhoward@roomag.org>
parents: 8
diff changeset
25 vimdiff.executable = vim
4635b3f5bc23 Easier vimdiff defaults
Meredith Howard <mhoward@roomag.org>
parents: 8
diff changeset
26 vimdiff.args = -d $base $local $output $other +close +close
4635b3f5bc23 Easier vimdiff defaults
Meredith Howard <mhoward@roomag.org>
parents: 8
diff changeset
27 vimdiff.check = changed, conflicts
4635b3f5bc23 Easier vimdiff defaults
Meredith Howard <mhoward@roomag.org>
parents: 8
diff changeset
28
222
1dc0597fe712 Nicer diffs
Meredith Howard <mhoward@roomag.org>
parents: 219
diff changeset
29 [diff]
1dc0597fe712 Nicer diffs
Meredith Howard <mhoward@roomag.org>
parents: 219
diff changeset
30 git = true
1dc0597fe712 Nicer diffs
Meredith Howard <mhoward@roomag.org>
parents: 219
diff changeset
31 showfunc = true
1dc0597fe712 Nicer diffs
Meredith Howard <mhoward@roomag.org>
parents: 219
diff changeset
32
219
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
33 [committemplate]
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
34 changeset = {desc}\n\n
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
35 HG: {extramsg}
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
36 HG: user: {author}\n{ifeq(p2rev, "-1", "",
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
37 "HG: branch merge\n")
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
38 }HG: branch '{branch}'\n{if(currentbookmark,
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
39 "HG: bookmark '{currentbookmark}'\n") }{subrepos %
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
40 "HG: subrepo {subrepo}\n" }
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
41 {splitlines(diff()) % 'HG: {line}\n'}
79
4635b3f5bc23 Easier vimdiff defaults
Meredith Howard <mhoward@roomag.org>
parents: 8
diff changeset
42
8
ba72a71f23e6 Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
43 %include ~/.hgrc.local

mercurial