.hgrc

Thu, 28 Jan 2016 23:06:19 -0500

author
Meredith Howard <mhoward@roomag.org>
date
Thu, 28 Jan 2016 23:06:19 -0500
changeset 249
5bba2e094584
parent 222
1dc0597fe712
child 254
bb7fdde50da2
permissions
-rw-r--r--

Move helper scripts into bin with common names

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 =
557d2468f900 Update hg extensions
Meredith Howard <mhoward@roomag.org>
parents: 198
diff changeset
15 mq =
8
ba72a71f23e6 Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
16 flow = $HOME/.hgext/hgflow.py
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]
ba72a71f23e6 Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
19 pager = LESS='FSRX' less
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
198
a4b45bcb4ba9 add ctags helper and alias
Meredith Howard <mhoward@roomag.org>
parents: 80
diff changeset
23 ctags = !~/.hg_helpers/ctags
8
ba72a71f23e6 Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
24
79
4635b3f5bc23 Easier vimdiff defaults
Meredith Howard <mhoward@roomag.org>
parents: 8
diff changeset
25 [merge-tools]
4635b3f5bc23 Easier vimdiff defaults
Meredith Howard <mhoward@roomag.org>
parents: 8
diff changeset
26 vimdiff.executable = vim
4635b3f5bc23 Easier vimdiff defaults
Meredith Howard <mhoward@roomag.org>
parents: 8
diff changeset
27 vimdiff.args = -d $base $local $output $other +close +close
4635b3f5bc23 Easier vimdiff defaults
Meredith Howard <mhoward@roomag.org>
parents: 8
diff changeset
28 vimdiff.check = changed, conflicts
4635b3f5bc23 Easier vimdiff defaults
Meredith Howard <mhoward@roomag.org>
parents: 8
diff changeset
29
222
1dc0597fe712 Nicer diffs
Meredith Howard <mhoward@roomag.org>
parents: 219
diff changeset
30 [diff]
1dc0597fe712 Nicer diffs
Meredith Howard <mhoward@roomag.org>
parents: 219
diff changeset
31 git = true
1dc0597fe712 Nicer diffs
Meredith Howard <mhoward@roomag.org>
parents: 219
diff changeset
32 showfunc = true
1dc0597fe712 Nicer diffs
Meredith Howard <mhoward@roomag.org>
parents: 219
diff changeset
33
219
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
34 [committemplate]
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
35 changeset = {desc}\n\n
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
36 HG: {extramsg}
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
37 HG: user: {author}\n{ifeq(p2rev, "-1", "",
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
38 "HG: branch merge\n")
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
39 }HG: branch '{branch}'\n{if(currentbookmark,
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
40 "HG: bookmark '{currentbookmark}'\n") }{subrepos %
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
41 "HG: subrepo {subrepo}\n" }
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
42 {splitlines(diff()) % 'HG: {line}\n'}
79
4635b3f5bc23 Easier vimdiff defaults
Meredith Howard <mhoward@roomag.org>
parents: 8
diff changeset
43
8
ba72a71f23e6 Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
44 %include ~/.hgrc.local

mercurial