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