Mercurial > dotfiles
annotate dot_hgrc @ 1065:53dd3a0d6914
feat: switch order of includes/config in ~/.hgrc
author | Zeger Van de Vannet <zeger@vandevan.net> |
---|---|
date | Fri, 27 Sep 2024 09:56:21 +0200 |
parents | c27e3816ab86 |
children | c082bbb10e99 |
rev | line source |
---|---|
1065
53dd3a0d6914
feat: switch order of includes/config in ~/.hgrc
Zeger Van de Vannet <zeger@vandevan.net>
parents:
1048
diff
changeset
|
1 %include ~/.config/mercurial/local.hgrc |
53dd3a0d6914
feat: switch order of includes/config in ~/.hgrc
Zeger Van de Vannet <zeger@vandevan.net>
parents:
1048
diff
changeset
|
2 |
854 | 3 [ui] |
4 # We recommend enabling tweakdefaults to get slight improvements to | |
5 # the UI over time. Make sure to set HGPLAIN in the environment when | |
6 # writing scripts! | |
857
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
7 tweakdefaults = yes |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
8 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
9 # Dump merge conflict markers in files in 3-way format |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
10 merge = internal:merge3 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
11 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
12 # Global ignore file |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
13 ignore = ~/.hgignore |
854 | 14 |
857
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
15 # Show copies in status |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
16 statuscopies = yes |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
17 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
18 # Disable rollback |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
19 rollback = no |
854 | 20 |
857
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
21 # Use curses interface for rebase, histedit |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
22 interface = curses |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
23 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
24 # Use helix as editor |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
25 editor = hx |
854 | 26 |
27 [merge-tools] | |
28 meld.disabled = yes | |
29 vimdiff.disabled = yes | |
30 | |
31 [extensions] | |
32 histedit = | |
33 rebase = | |
34 topic = | |
35 evolve = | |
36 absorb = | |
37 largefiles = | |
857
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
38 # Store http(s) passwords in a keyring |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
39 # Configure schemes via: |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
40 # [auth] |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
41 # schemename.prefix = https://example.com |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
42 # schemename.username = jdoe |
854 | 43 mercurial_keyring = |
44 | |
857
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
45 [commands] |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
46 # Require to pass an explicit revision when pushing |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
47 push.require-revs = yes |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
48 # Show paths relative to cwd |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
49 status.relative = yes |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
50 # Determines what level of checking 'hg resolve --mark' will perform |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
51 resolve.mark-check = abort |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
52 # "noconflict" will allow any update which would not trigger a merge |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
53 update.check = noconflict |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
54 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
55 [paths] |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
56 # Always push current revision unless specified |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
57 default:pushrev = . |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
58 |
854 | 59 [experimental] |
857
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
60 topic-mode = random |
854 | 61 evolution = all |
62 auto-publish = warn | |
63 | |
64 [phases] | |
65 publish = false | |
66 | |
67 [alias] | |
68 st = status -mard | |
69 stat = status -mard | |
70 blame = annotate -cufld | |
71 | |
72 | |
857
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
73 [diff] |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
74 git = yes |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
75 nodates = no |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
76 showfunc = 1 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
77 word-diff = 1 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
78 |
854 | 79 [committemplate] |
80 changeset = {desc}\n\n | |
81 HG: Enter commit message. Lines beginning with 'HG:' are removed. | |
82 HG: {extramsg} | |
83 HG: -- | |
84 HG: user: {author}\n{ifeq(p2rev, "-1", "", | |
85 "HG: branch merge\n") | |
86 }HG: branch: '{branch}'\n{if(topic, | |
87 "HG: topic: '{topic}'\n") }{subrepos % | |
88 "HG: subrepo: {subrepo}\n" }{file_adds % | |
89 "HG: added {file}\n" }{file_mods % | |
90 "HG: changed {file}\n" }{file_dels % | |
91 "HG: removed {file}\n" }{if(files, "", | |
92 "HG: no files changed\n")} | |
93 HG: ------------------------ >8 ------------------------ | |
94 HG: Do not touch the line above. | |
95 HG: Everything below will be removed. | |
96 {diff()} | |
857
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
97 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
98 changeset.commit.normal.normal = {desc}\n\n |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
99 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
100 HG: {extramsg} |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
101 HG: -- |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
102 HG: user: {author}\n{ifeq(p2rev, "-1", "", |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
103 "HG: branch merge\n") |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
104 }HG: branch: '{branch}'\n{if(topic, |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
105 "HG: topic: '{topic}'\n") }{subrepos % |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
106 "HG: subrepo: {subrepo}\n" }{file_adds % |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
107 "HG: added {file}\n" }{file_mods % |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
108 "HG: changed {file}\n" }{file_dels % |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
109 "HG: removed {file}\n" }{if(files, "", |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
110 "HG: no files changed\n")} |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
111 HG: ------------------------ >8 ------------------------ |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
112 HG: Do not touch the line above. |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
113 HG: Everything below will be removed. |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
114 {diff()} |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
115 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
116 [templatealias] |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
117 commitinfo = '{date|shortdate} {pad(label("grep.user", author|person), 20, left=True, truncate=True)} {desc|strip|firstline}' |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
118 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
119 [templates] |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
120 oneline_stack = '{pad("{label("stack.index", "s{stack_index}")}{label("stack.state.{state}", symbol)}", 5, left=True)} {label("stack.state.{state}", pad(state, 8))} {commitinfo}\n' |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
121 oneline = '{label("changeset.{phase}", node|short)} {pad(label("log.branch", fqbn), 25, truncate=True)} {commitinfo}\n' |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
122 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
123 [color] |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
124 mode=auto |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
125 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
126 log.branch=cyan |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
127 log.bookmark=green |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
128 log.topic=yellow |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
129 log.tag=green |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
130 log.activebookmark = green bold underline |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
131 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
132 changeset.public=green |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
133 changeset.secret=blue bold |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
134 changeset.draft=red |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
135 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
136 desc.here=green_background black |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
137 stack.state = red |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
138 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
139 [alias] |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
140 node = parent --template '{node}' |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
141 ls = log --template=oneline --limit=50 --pager=auto |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
142 stack = stack --color=always --template=oneline_stack |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
143 status = status -mard |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
144 st = status -mard |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
145 stat = status -mard |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
146 incoming = incoming --template=oneline |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
147 in = incoming --template=oneline |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
148 outgoing = outgoing --template=oneline |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
149 out = outgoing --template=oneline |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
150 mark = resolve --mark |
1048
c27e3816ab86
fix: import local hg config after general config
Zeger Van de Vannet <zeger@vandevan.net>
parents:
857
diff
changeset
|
151 |
1065
53dd3a0d6914
feat: switch order of includes/config in ~/.hgrc
Zeger Van de Vannet <zeger@vandevan.net>
parents:
1048
diff
changeset
|
152 [rhg] |
53dd3a0d6914
feat: switch order of includes/config in ~/.hgrc
Zeger Van de Vannet <zeger@vandevan.net>
parents:
1048
diff
changeset
|
153 on-unsupported = fallback |
53dd3a0d6914
feat: switch order of includes/config in ~/.hgrc
Zeger Van de Vannet <zeger@vandevan.net>
parents:
1048
diff
changeset
|
154 fallback-executable = /usr/bin/hg |
53dd3a0d6914
feat: switch order of includes/config in ~/.hgrc
Zeger Van de Vannet <zeger@vandevan.net>
parents:
1048
diff
changeset
|
155 allowed-extensions = rebase, absorb, evolve, topic |
53dd3a0d6914
feat: switch order of includes/config in ~/.hgrc
Zeger Van de Vannet <zeger@vandevan.net>
parents:
1048
diff
changeset
|
156 |