Mercurial > dotfiles
annotate dot_hgrc @ 1080:69ab3fcec57a draft
feat: highlight nodes based on stack state
author | Zeger Van de Vannet <zeger@vandevan.net> |
---|---|
date | Fri, 21 Feb 2025 10:34:21 +0100 |
parents | 841ee6509f68 |
children |
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 = | |
1073
841ee6509f68
feat: enable hggit globally, remove largefiles globally
Zeger Van de Vannet <zeger@vandevan.net>
parents:
1072
diff
changeset
|
37 hggit = |
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 | |
1066
9e85515dbe4f
feat: indicate orphaned and hidden nodes in oneline log
Zeger Van de Vannet <zeger@vandevan.net>
parents:
1065
diff
changeset
|
71 fs = diff -c . --stat |
854 | 72 |
73 | |
857
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
74 [diff] |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
75 git = yes |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
76 nodates = no |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
77 showfunc = 1 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
78 word-diff = 1 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
79 |
854 | 80 [committemplate] |
81 changeset = {desc}\n\n | |
82 HG: Enter commit message. Lines beginning with 'HG:' are removed. | |
83 HG: {extramsg} | |
84 HG: -- | |
85 HG: user: {author}\n{ifeq(p2rev, "-1", "", | |
86 "HG: branch merge\n") | |
87 }HG: branch: '{branch}'\n{if(topic, | |
88 "HG: topic: '{topic}'\n") }{subrepos % | |
89 "HG: subrepo: {subrepo}\n" }{file_adds % | |
90 "HG: added {file}\n" }{file_mods % | |
91 "HG: changed {file}\n" }{file_dels % | |
92 "HG: removed {file}\n" }{if(files, "", | |
93 "HG: no files changed\n")} | |
94 HG: ------------------------ >8 ------------------------ | |
95 HG: Do not touch the line above. | |
96 HG: Everything below will be removed. | |
97 {diff()} | |
857
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
98 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
99 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
|
100 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
|
101 HG: {extramsg} |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
102 HG: -- |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
103 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
|
104 "HG: branch merge\n") |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
105 }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
|
106 "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
|
107 "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
|
108 "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
|
109 "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
|
110 "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
|
111 "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
|
112 HG: ------------------------ >8 ------------------------ |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
113 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
|
114 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
|
115 {diff()} |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
116 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
117 [templatealias] |
1066
9e85515dbe4f
feat: indicate orphaned and hidden nodes in oneline log
Zeger Van de Vannet <zeger@vandevan.net>
parents:
1065
diff
changeset
|
118 commitinfo = '{date|shortdate} {pad(label("grep.user", author|person), 25, left=True, truncate=True)} {desc|strip|firstline}' |
1080
69ab3fcec57a
feat: highlight nodes based on stack state
Zeger Van de Vannet <zeger@vandevan.net>
parents:
1073
diff
changeset
|
119 stack_state = '{ifcontains("current", state, ifeq(state, "current", state, sub("current ?", "", state)), state)}' |
69ab3fcec57a
feat: highlight nodes based on stack state
Zeger Van de Vannet <zeger@vandevan.net>
parents:
1073
diff
changeset
|
120 stack_label = '{ifcontains("current", state, "current", ifcontains("content divergent", state, "orphan", ifcontains("orphan", state, "orphan", state)))}' |
857
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
121 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
122 [templates] |
1080
69ab3fcec57a
feat: highlight nodes based on stack state
Zeger Van de Vannet <zeger@vandevan.net>
parents:
1073
diff
changeset
|
123 oneline_stack = '{pad("{label("stack.index", "s{stack_index}")}{label("stack.state.{state}", symbol)}", 5, left=True)} {label("stack.state.{stack_label}", "{pad(stack_state, 8)} {node|short}")} {commitinfo}\n' |
1066
9e85515dbe4f
feat: indicate orphaned and hidden nodes in oneline log
Zeger Van de Vannet <zeger@vandevan.net>
parents:
1065
diff
changeset
|
124 oneline = '{ifcontains(graphnode, "x*", graphnode, ' ')} {label("changeset.{phase}", node|short)} {pad(label("log.branch", fqbn), 30, truncate=True)} {pad(commitinfo, termwidth - 50, truncate=True)}\n' |
857
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 [color] |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
127 mode=auto |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
128 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
129 log.branch=cyan |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
130 log.bookmark=green |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
131 log.topic=yellow |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
132 log.tag=green |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
133 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
|
134 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
135 changeset.public=green |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
136 changeset.secret=blue bold |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
137 changeset.draft=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 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
|
140 stack.state = red |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
141 |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
142 [alias] |
1071
b2854e8f8d5d
feat: add hash to hg stack output
Zeger Van de Vannet <zeger@vandevan.net>
parents:
1066
diff
changeset
|
143 stack = stack --color=always --template=oneline_stack |
857
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
144 node = parent --template '{node}' |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
145 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
|
146 status = status -mard |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
147 st = status -mard |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
148 stat = status -mard |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
149 incoming = incoming --template=oneline |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
150 in = incoming --template=oneline |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
151 outgoing = outgoing --template=oneline |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
152 out = outgoing --template=oneline |
bdd538139b08
feat: enable some hgrc options and add templates
Zeger Van de Vannet <zeger@vandevan.net>
parents:
855
diff
changeset
|
153 mark = resolve --mark |
1080
69ab3fcec57a
feat: highlight nodes based on stack state
Zeger Van de Vannet <zeger@vandevan.net>
parents:
1073
diff
changeset
|
154 pushall = !hg --config commands.push.require-revs=no push |
1048
c27e3816ab86
fix: import local hg config after general config
Zeger Van de Vannet <zeger@vandevan.net>
parents:
857
diff
changeset
|
155 |
1065
53dd3a0d6914
feat: switch order of includes/config in ~/.hgrc
Zeger Van de Vannet <zeger@vandevan.net>
parents:
1048
diff
changeset
|
156 [rhg] |
53dd3a0d6914
feat: switch order of includes/config in ~/.hgrc
Zeger Van de Vannet <zeger@vandevan.net>
parents:
1048
diff
changeset
|
157 on-unsupported = fallback |
53dd3a0d6914
feat: switch order of includes/config in ~/.hgrc
Zeger Van de Vannet <zeger@vandevan.net>
parents:
1048
diff
changeset
|
158 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
|
159 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
|
160 |