.hgrc

Wed, 06 Feb 2019 21:03:11 -0600

author
Meredith Howard <mhoward@roomag.org>
date
Wed, 06 Feb 2019 21:03:11 -0600
changeset 725
6ff8e3f73482
parent 671
9008240db028
child 783
22ea15db4e3d
permissions
-rw-r--r--

switch from vundle to plug

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
557d2468f900 Update hg extensions
Meredith Howard <mhoward@roomag.org>
parents: 198
diff changeset
7 color =
557d2468f900 Update hg extensions
Meredith Howard <mhoward@roomag.org>
parents: 198
diff changeset
8 graphlog =
8
ba72a71f23e6 Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
9 pager =
209
557d2468f900 Update hg extensions
Meredith Howard <mhoward@roomag.org>
parents: 198
diff changeset
10 progress =
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
671
9008240db028 match draft order to other logs
Meredith Howard <mhoward@roomag.org>
parents: 633
diff changeset
23 draft = log -r 'reverse(not public())'
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
612
7b075a4427d8 mergetools
Meredith Howard <mhoward@roomag.org>
parents: 600
diff changeset
27 vimdiff.args = -d -c 'hid|hid' $base $local $output $other
598
1698d432a2eb add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents: 597
diff changeset
28 vimdiff.check = changed, conflicts
79
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]
598
1698d432a2eb add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents: 597
diff changeset
31 git = true
222
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
598
1698d432a2eb add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents: 597
diff changeset
34 [schemes]
1698d432a2eb add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents: 597
diff changeset
35 gh = git://github.com/
1698d432a2eb add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents: 597
diff changeset
36 gh+ssh = git+ssh://github.com/
1698d432a2eb add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents: 597
diff changeset
37
597
bcc7823e8991 customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents: 591
diff changeset
38 [color]
598
1698d432a2eb add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents: 597
diff changeset
39 diff.hunk = cyan
1698d432a2eb add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents: 597
diff changeset
40 log.changeset = magenta
1698d432a2eb add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents: 597
diff changeset
41 logcust.date = green
1698d432a2eb add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents: 597
diff changeset
42 logcust.user = cyan
597
bcc7823e8991 customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents: 591
diff changeset
43 logcust.decorate = yellow
598
1698d432a2eb add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents: 597
diff changeset
44 changeset.draft = dim
1698d432a2eb add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents: 597
diff changeset
45 changeset.secret = dim underline
597
bcc7823e8991 customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents: 591
diff changeset
46
bcc7823e8991 customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents: 591
diff changeset
47 [templatealias]
bcc7823e8991 customize log color and format, simplify committemplate
Meredith Howard <mhoward@roomag.org>
parents: 591
diff changeset
48 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
49 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
50
219
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
51 [committemplate]
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
52 changeset = {desc}\n\n
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
53 HG: {extramsg}
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
54 HG: user: {author}\n{ifeq(p2rev, "-1", "",
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
55 "HG: branch merge\n")
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
56 }HG: branch '{branch}'\n{if(currentbookmark,
9ab4c7db4b3a Add diffs to commit template
Meredith Howard <mhoward@roomag.org>
parents: 209
diff changeset
57 "HG: bookmark '{currentbookmark}'\n") }{subrepos %
600
0e927f9c141a Sadly, this is hg >= 4.2 only
Meredith Howard <mhoward@roomag.org>
parents: 599
diff changeset
58 "HG: subrepo {subrepo}\n" }
0e927f9c141a Sadly, this is hg >= 4.2 only
Meredith Howard <mhoward@roomag.org>
parents: 599
diff changeset
59 {splitlines(diff()) % 'HG: {line}\n'}
79
4635b3f5bc23 Easier vimdiff defaults
Meredith Howard <mhoward@roomag.org>
parents: 8
diff changeset
60
591
2ee456c483b0 switch to a file just for extra extensions via script
Meredith Howard <mhoward@roomag.org>
parents: 506
diff changeset
61 %include ~/.hgext/hgrc
8
ba72a71f23e6 Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
62 %include ~/.hgrc.local

mercurial