Show More
The requested changes are too big and content was truncated. Show full diff
@@ -1,2583 +1,2582 | |||
|
1 | 1 | # configitems.py - centralized declaration of configuration option |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2017 Pierre-Yves David <pierre-yves.david@octobus.net> |
|
4 | 4 | # |
|
5 | 5 | # This software may be used and distributed according to the terms of the |
|
6 | 6 | # GNU General Public License version 2 or any later version. |
|
7 | 7 | |
|
8 | 8 | from __future__ import absolute_import |
|
9 | 9 | |
|
10 | 10 | import functools |
|
11 | 11 | import re |
|
12 | 12 | |
|
13 | 13 | from . import ( |
|
14 | 14 | encoding, |
|
15 | 15 | error, |
|
16 | 16 | ) |
|
17 | 17 | |
|
18 | 18 | |
|
19 | 19 | def loadconfigtable(ui, extname, configtable): |
|
20 | 20 | """update config item known to the ui with the extension ones""" |
|
21 | 21 | for section, items in sorted(configtable.items()): |
|
22 | 22 | knownitems = ui._knownconfig.setdefault(section, itemregister()) |
|
23 | 23 | knownkeys = set(knownitems) |
|
24 | 24 | newkeys = set(items) |
|
25 | 25 | for key in sorted(knownkeys & newkeys): |
|
26 | 26 | msg = b"extension '%s' overwrite config item '%s.%s'" |
|
27 | 27 | msg %= (extname, section, key) |
|
28 | 28 | ui.develwarn(msg, config=b'warn-config') |
|
29 | 29 | |
|
30 | 30 | knownitems.update(items) |
|
31 | 31 | |
|
32 | 32 | |
|
33 | 33 | class configitem(object): |
|
34 | 34 | """represent a known config item |
|
35 | 35 | |
|
36 | 36 | :section: the official config section where to find this item, |
|
37 | 37 | :name: the official name within the section, |
|
38 | 38 | :default: default value for this item, |
|
39 | 39 | :alias: optional list of tuples as alternatives, |
|
40 | 40 | :generic: this is a generic definition, match name using regular expression. |
|
41 | 41 | """ |
|
42 | 42 | |
|
43 | 43 | def __init__( |
|
44 | 44 | self, |
|
45 | 45 | section, |
|
46 | 46 | name, |
|
47 | 47 | default=None, |
|
48 | 48 | alias=(), |
|
49 | 49 | generic=False, |
|
50 | 50 | priority=0, |
|
51 | 51 | experimental=False, |
|
52 | 52 | ): |
|
53 | 53 | self.section = section |
|
54 | 54 | self.name = name |
|
55 | 55 | self.default = default |
|
56 | 56 | self.alias = list(alias) |
|
57 | 57 | self.generic = generic |
|
58 | 58 | self.priority = priority |
|
59 | 59 | self.experimental = experimental |
|
60 | 60 | self._re = None |
|
61 | 61 | if generic: |
|
62 | 62 | self._re = re.compile(self.name) |
|
63 | 63 | |
|
64 | 64 | |
|
65 | 65 | class itemregister(dict): |
|
66 | 66 | """A specialized dictionary that can handle wild-card selection""" |
|
67 | 67 | |
|
68 | 68 | def __init__(self): |
|
69 | 69 | super(itemregister, self).__init__() |
|
70 | 70 | self._generics = set() |
|
71 | 71 | |
|
72 | 72 | def update(self, other): |
|
73 | 73 | super(itemregister, self).update(other) |
|
74 | 74 | self._generics.update(other._generics) |
|
75 | 75 | |
|
76 | 76 | def __setitem__(self, key, item): |
|
77 | 77 | super(itemregister, self).__setitem__(key, item) |
|
78 | 78 | if item.generic: |
|
79 | 79 | self._generics.add(item) |
|
80 | 80 | |
|
81 | 81 | def get(self, key): |
|
82 | 82 | baseitem = super(itemregister, self).get(key) |
|
83 | 83 | if baseitem is not None and not baseitem.generic: |
|
84 | 84 | return baseitem |
|
85 | 85 | |
|
86 | 86 | # search for a matching generic item |
|
87 | 87 | generics = sorted(self._generics, key=(lambda x: (x.priority, x.name))) |
|
88 | 88 | for item in generics: |
|
89 | 89 | # we use 'match' instead of 'search' to make the matching simpler |
|
90 | 90 | # for people unfamiliar with regular expression. Having the match |
|
91 | 91 | # rooted to the start of the string will produce less surprising |
|
92 | 92 | # result for user writing simple regex for sub-attribute. |
|
93 | 93 | # |
|
94 | 94 | # For example using "color\..*" match produces an unsurprising |
|
95 | 95 | # result, while using search could suddenly match apparently |
|
96 | 96 | # unrelated configuration that happens to contains "color." |
|
97 | 97 | # anywhere. This is a tradeoff where we favor requiring ".*" on |
|
98 | 98 | # some match to avoid the need to prefix most pattern with "^". |
|
99 | 99 | # The "^" seems more error prone. |
|
100 | 100 | if item._re.match(key): |
|
101 | 101 | return item |
|
102 | 102 | |
|
103 | 103 | return None |
|
104 | 104 | |
|
105 | 105 | |
|
106 | 106 | coreitems = {} |
|
107 | 107 | |
|
108 | 108 | |
|
109 | 109 | def _register(configtable, *args, **kwargs): |
|
110 | 110 | item = configitem(*args, **kwargs) |
|
111 | 111 | section = configtable.setdefault(item.section, itemregister()) |
|
112 | 112 | if item.name in section: |
|
113 | 113 | msg = b"duplicated config item registration for '%s.%s'" |
|
114 | 114 | raise error.ProgrammingError(msg % (item.section, item.name)) |
|
115 | 115 | section[item.name] = item |
|
116 | 116 | |
|
117 | 117 | |
|
118 | 118 | # special value for case where the default is derived from other values |
|
119 | 119 | dynamicdefault = object() |
|
120 | 120 | |
|
121 | 121 | # Registering actual config items |
|
122 | 122 | |
|
123 | 123 | |
|
124 | 124 | def getitemregister(configtable): |
|
125 | 125 | f = functools.partial(_register, configtable) |
|
126 | 126 | # export pseudo enum as configitem.* |
|
127 | 127 | f.dynamicdefault = dynamicdefault |
|
128 | 128 | return f |
|
129 | 129 | |
|
130 | 130 | |
|
131 | 131 | coreconfigitem = getitemregister(coreitems) |
|
132 | 132 | |
|
133 | 133 | |
|
134 | 134 | def _registerdiffopts(section, configprefix=b''): |
|
135 | 135 | coreconfigitem( |
|
136 | 136 | section, |
|
137 | 137 | configprefix + b'nodates', |
|
138 | 138 | default=False, |
|
139 | 139 | ) |
|
140 | 140 | coreconfigitem( |
|
141 | 141 | section, |
|
142 | 142 | configprefix + b'showfunc', |
|
143 | 143 | default=False, |
|
144 | 144 | ) |
|
145 | 145 | coreconfigitem( |
|
146 | 146 | section, |
|
147 | 147 | configprefix + b'unified', |
|
148 | 148 | default=None, |
|
149 | 149 | ) |
|
150 | 150 | coreconfigitem( |
|
151 | 151 | section, |
|
152 | 152 | configprefix + b'git', |
|
153 | 153 | default=False, |
|
154 | 154 | ) |
|
155 | 155 | coreconfigitem( |
|
156 | 156 | section, |
|
157 | 157 | configprefix + b'ignorews', |
|
158 | 158 | default=False, |
|
159 | 159 | ) |
|
160 | 160 | coreconfigitem( |
|
161 | 161 | section, |
|
162 | 162 | configprefix + b'ignorewsamount', |
|
163 | 163 | default=False, |
|
164 | 164 | ) |
|
165 | 165 | coreconfigitem( |
|
166 | 166 | section, |
|
167 | 167 | configprefix + b'ignoreblanklines', |
|
168 | 168 | default=False, |
|
169 | 169 | ) |
|
170 | 170 | coreconfigitem( |
|
171 | 171 | section, |
|
172 | 172 | configprefix + b'ignorewseol', |
|
173 | 173 | default=False, |
|
174 | 174 | ) |
|
175 | 175 | coreconfigitem( |
|
176 | 176 | section, |
|
177 | 177 | configprefix + b'nobinary', |
|
178 | 178 | default=False, |
|
179 | 179 | ) |
|
180 | 180 | coreconfigitem( |
|
181 | 181 | section, |
|
182 | 182 | configprefix + b'noprefix', |
|
183 | 183 | default=False, |
|
184 | 184 | ) |
|
185 | 185 | coreconfigitem( |
|
186 | 186 | section, |
|
187 | 187 | configprefix + b'word-diff', |
|
188 | 188 | default=False, |
|
189 | 189 | ) |
|
190 | 190 | |
|
191 | 191 | |
|
192 | 192 | coreconfigitem( |
|
193 | 193 | b'alias', |
|
194 | 194 | b'.*', |
|
195 | 195 | default=dynamicdefault, |
|
196 | 196 | generic=True, |
|
197 | 197 | ) |
|
198 | 198 | coreconfigitem( |
|
199 | 199 | b'auth', |
|
200 | 200 | b'cookiefile', |
|
201 | 201 | default=None, |
|
202 | 202 | ) |
|
203 | 203 | _registerdiffopts(section=b'annotate') |
|
204 | 204 | # bookmarks.pushing: internal hack for discovery |
|
205 | 205 | coreconfigitem( |
|
206 | 206 | b'bookmarks', |
|
207 | 207 | b'pushing', |
|
208 | 208 | default=list, |
|
209 | 209 | ) |
|
210 | 210 | # bundle.mainreporoot: internal hack for bundlerepo |
|
211 | 211 | coreconfigitem( |
|
212 | 212 | b'bundle', |
|
213 | 213 | b'mainreporoot', |
|
214 | 214 | default=b'', |
|
215 | 215 | ) |
|
216 | 216 | coreconfigitem( |
|
217 | 217 | b'censor', |
|
218 | 218 | b'policy', |
|
219 | 219 | default=b'abort', |
|
220 | 220 | experimental=True, |
|
221 | 221 | ) |
|
222 | 222 | coreconfigitem( |
|
223 | 223 | b'chgserver', |
|
224 | 224 | b'idletimeout', |
|
225 | 225 | default=3600, |
|
226 | 226 | ) |
|
227 | 227 | coreconfigitem( |
|
228 | 228 | b'chgserver', |
|
229 | 229 | b'skiphash', |
|
230 | 230 | default=False, |
|
231 | 231 | ) |
|
232 | 232 | coreconfigitem( |
|
233 | 233 | b'cmdserver', |
|
234 | 234 | b'log', |
|
235 | 235 | default=None, |
|
236 | 236 | ) |
|
237 | 237 | coreconfigitem( |
|
238 | 238 | b'cmdserver', |
|
239 | 239 | b'max-log-files', |
|
240 | 240 | default=7, |
|
241 | 241 | ) |
|
242 | 242 | coreconfigitem( |
|
243 | 243 | b'cmdserver', |
|
244 | 244 | b'max-log-size', |
|
245 | 245 | default=b'1 MB', |
|
246 | 246 | ) |
|
247 | 247 | coreconfigitem( |
|
248 | 248 | b'cmdserver', |
|
249 | 249 | b'max-repo-cache', |
|
250 | 250 | default=0, |
|
251 | 251 | experimental=True, |
|
252 | 252 | ) |
|
253 | 253 | coreconfigitem( |
|
254 | 254 | b'cmdserver', |
|
255 | 255 | b'message-encodings', |
|
256 | 256 | default=list, |
|
257 | 257 | ) |
|
258 | 258 | coreconfigitem( |
|
259 | 259 | b'cmdserver', |
|
260 | 260 | b'track-log', |
|
261 | 261 | default=lambda: [b'chgserver', b'cmdserver', b'repocache'], |
|
262 | 262 | ) |
|
263 | 263 | coreconfigitem( |
|
264 | 264 | b'cmdserver', |
|
265 | 265 | b'shutdown-on-interrupt', |
|
266 | 266 | default=True, |
|
267 | 267 | ) |
|
268 | 268 | coreconfigitem( |
|
269 | 269 | b'color', |
|
270 | 270 | b'.*', |
|
271 | 271 | default=None, |
|
272 | 272 | generic=True, |
|
273 | 273 | ) |
|
274 | 274 | coreconfigitem( |
|
275 | 275 | b'color', |
|
276 | 276 | b'mode', |
|
277 | 277 | default=b'auto', |
|
278 | 278 | ) |
|
279 | 279 | coreconfigitem( |
|
280 | 280 | b'color', |
|
281 | 281 | b'pagermode', |
|
282 | 282 | default=dynamicdefault, |
|
283 | 283 | ) |
|
284 | 284 | coreconfigitem( |
|
285 | 285 | b'command-templates', |
|
286 | 286 | b'graphnode', |
|
287 | 287 | default=None, |
|
288 | 288 | alias=[(b'ui', b'graphnodetemplate')], |
|
289 | 289 | ) |
|
290 | 290 | coreconfigitem( |
|
291 | 291 | b'command-templates', |
|
292 | 292 | b'log', |
|
293 | 293 | default=None, |
|
294 | 294 | alias=[(b'ui', b'logtemplate')], |
|
295 | 295 | ) |
|
296 | 296 | coreconfigitem( |
|
297 | 297 | b'command-templates', |
|
298 | 298 | b'mergemarker', |
|
299 | 299 | default=( |
|
300 | 300 | b'{node|short} ' |
|
301 | 301 | b'{ifeq(tags, "tip", "", ' |
|
302 | 302 | b'ifeq(tags, "", "", "{tags} "))}' |
|
303 | 303 | b'{if(bookmarks, "{bookmarks} ")}' |
|
304 | 304 | b'{ifeq(branch, "default", "", "{branch} ")}' |
|
305 | 305 | b'- {author|user}: {desc|firstline}' |
|
306 | 306 | ), |
|
307 | 307 | alias=[(b'ui', b'mergemarkertemplate')], |
|
308 | 308 | ) |
|
309 | 309 | coreconfigitem( |
|
310 | 310 | b'command-templates', |
|
311 | 311 | b'pre-merge-tool-output', |
|
312 | 312 | default=None, |
|
313 | 313 | alias=[(b'ui', b'pre-merge-tool-output-template')], |
|
314 | 314 | ) |
|
315 | 315 | coreconfigitem( |
|
316 | 316 | b'command-templates', |
|
317 | 317 | b'oneline-summary', |
|
318 | 318 | default=None, |
|
319 | 319 | ) |
|
320 | 320 | coreconfigitem( |
|
321 | 321 | b'command-templates', |
|
322 | 322 | b'oneline-summary.*', |
|
323 | 323 | default=dynamicdefault, |
|
324 | 324 | generic=True, |
|
325 | 325 | ) |
|
326 | 326 | _registerdiffopts(section=b'commands', configprefix=b'commit.interactive.') |
|
327 | 327 | coreconfigitem( |
|
328 | 328 | b'commands', |
|
329 | 329 | b'commit.post-status', |
|
330 | 330 | default=False, |
|
331 | 331 | ) |
|
332 | 332 | coreconfigitem( |
|
333 | 333 | b'commands', |
|
334 | 334 | b'grep.all-files', |
|
335 | 335 | default=False, |
|
336 | 336 | experimental=True, |
|
337 | 337 | ) |
|
338 | 338 | coreconfigitem( |
|
339 | 339 | b'commands', |
|
340 | 340 | b'merge.require-rev', |
|
341 | 341 | default=False, |
|
342 | 342 | ) |
|
343 | 343 | coreconfigitem( |
|
344 | 344 | b'commands', |
|
345 | 345 | b'push.require-revs', |
|
346 | 346 | default=False, |
|
347 | 347 | ) |
|
348 | 348 | coreconfigitem( |
|
349 | 349 | b'commands', |
|
350 | 350 | b'resolve.confirm', |
|
351 | 351 | default=False, |
|
352 | 352 | ) |
|
353 | 353 | coreconfigitem( |
|
354 | 354 | b'commands', |
|
355 | 355 | b'resolve.explicit-re-merge', |
|
356 | 356 | default=False, |
|
357 | 357 | ) |
|
358 | 358 | coreconfigitem( |
|
359 | 359 | b'commands', |
|
360 | 360 | b'resolve.mark-check', |
|
361 | 361 | default=b'none', |
|
362 | 362 | ) |
|
363 | 363 | _registerdiffopts(section=b'commands', configprefix=b'revert.interactive.') |
|
364 | 364 | coreconfigitem( |
|
365 | 365 | b'commands', |
|
366 | 366 | b'show.aliasprefix', |
|
367 | 367 | default=list, |
|
368 | 368 | ) |
|
369 | 369 | coreconfigitem( |
|
370 | 370 | b'commands', |
|
371 | 371 | b'status.relative', |
|
372 | 372 | default=False, |
|
373 | 373 | ) |
|
374 | 374 | coreconfigitem( |
|
375 | 375 | b'commands', |
|
376 | 376 | b'status.skipstates', |
|
377 | 377 | default=[], |
|
378 | 378 | experimental=True, |
|
379 | 379 | ) |
|
380 | 380 | coreconfigitem( |
|
381 | 381 | b'commands', |
|
382 | 382 | b'status.terse', |
|
383 | 383 | default=b'', |
|
384 | 384 | ) |
|
385 | 385 | coreconfigitem( |
|
386 | 386 | b'commands', |
|
387 | 387 | b'status.verbose', |
|
388 | 388 | default=False, |
|
389 | 389 | ) |
|
390 | 390 | coreconfigitem( |
|
391 | 391 | b'commands', |
|
392 | 392 | b'update.check', |
|
393 | 393 | default=None, |
|
394 | 394 | ) |
|
395 | 395 | coreconfigitem( |
|
396 | 396 | b'commands', |
|
397 | 397 | b'update.requiredest', |
|
398 | 398 | default=False, |
|
399 | 399 | ) |
|
400 | 400 | coreconfigitem( |
|
401 | 401 | b'committemplate', |
|
402 | 402 | b'.*', |
|
403 | 403 | default=None, |
|
404 | 404 | generic=True, |
|
405 | 405 | ) |
|
406 | 406 | coreconfigitem( |
|
407 | 407 | b'convert', |
|
408 | 408 | b'bzr.saverev', |
|
409 | 409 | default=True, |
|
410 | 410 | ) |
|
411 | 411 | coreconfigitem( |
|
412 | 412 | b'convert', |
|
413 | 413 | b'cvsps.cache', |
|
414 | 414 | default=True, |
|
415 | 415 | ) |
|
416 | 416 | coreconfigitem( |
|
417 | 417 | b'convert', |
|
418 | 418 | b'cvsps.fuzz', |
|
419 | 419 | default=60, |
|
420 | 420 | ) |
|
421 | 421 | coreconfigitem( |
|
422 | 422 | b'convert', |
|
423 | 423 | b'cvsps.logencoding', |
|
424 | 424 | default=None, |
|
425 | 425 | ) |
|
426 | 426 | coreconfigitem( |
|
427 | 427 | b'convert', |
|
428 | 428 | b'cvsps.mergefrom', |
|
429 | 429 | default=None, |
|
430 | 430 | ) |
|
431 | 431 | coreconfigitem( |
|
432 | 432 | b'convert', |
|
433 | 433 | b'cvsps.mergeto', |
|
434 | 434 | default=None, |
|
435 | 435 | ) |
|
436 | 436 | coreconfigitem( |
|
437 | 437 | b'convert', |
|
438 | 438 | b'git.committeractions', |
|
439 | 439 | default=lambda: [b'messagedifferent'], |
|
440 | 440 | ) |
|
441 | 441 | coreconfigitem( |
|
442 | 442 | b'convert', |
|
443 | 443 | b'git.extrakeys', |
|
444 | 444 | default=list, |
|
445 | 445 | ) |
|
446 | 446 | coreconfigitem( |
|
447 | 447 | b'convert', |
|
448 | 448 | b'git.findcopiesharder', |
|
449 | 449 | default=False, |
|
450 | 450 | ) |
|
451 | 451 | coreconfigitem( |
|
452 | 452 | b'convert', |
|
453 | 453 | b'git.remoteprefix', |
|
454 | 454 | default=b'remote', |
|
455 | 455 | ) |
|
456 | 456 | coreconfigitem( |
|
457 | 457 | b'convert', |
|
458 | 458 | b'git.renamelimit', |
|
459 | 459 | default=400, |
|
460 | 460 | ) |
|
461 | 461 | coreconfigitem( |
|
462 | 462 | b'convert', |
|
463 | 463 | b'git.saverev', |
|
464 | 464 | default=True, |
|
465 | 465 | ) |
|
466 | 466 | coreconfigitem( |
|
467 | 467 | b'convert', |
|
468 | 468 | b'git.similarity', |
|
469 | 469 | default=50, |
|
470 | 470 | ) |
|
471 | 471 | coreconfigitem( |
|
472 | 472 | b'convert', |
|
473 | 473 | b'git.skipsubmodules', |
|
474 | 474 | default=False, |
|
475 | 475 | ) |
|
476 | 476 | coreconfigitem( |
|
477 | 477 | b'convert', |
|
478 | 478 | b'hg.clonebranches', |
|
479 | 479 | default=False, |
|
480 | 480 | ) |
|
481 | 481 | coreconfigitem( |
|
482 | 482 | b'convert', |
|
483 | 483 | b'hg.ignoreerrors', |
|
484 | 484 | default=False, |
|
485 | 485 | ) |
|
486 | 486 | coreconfigitem( |
|
487 | 487 | b'convert', |
|
488 | 488 | b'hg.preserve-hash', |
|
489 | 489 | default=False, |
|
490 | 490 | ) |
|
491 | 491 | coreconfigitem( |
|
492 | 492 | b'convert', |
|
493 | 493 | b'hg.revs', |
|
494 | 494 | default=None, |
|
495 | 495 | ) |
|
496 | 496 | coreconfigitem( |
|
497 | 497 | b'convert', |
|
498 | 498 | b'hg.saverev', |
|
499 | 499 | default=False, |
|
500 | 500 | ) |
|
501 | 501 | coreconfigitem( |
|
502 | 502 | b'convert', |
|
503 | 503 | b'hg.sourcename', |
|
504 | 504 | default=None, |
|
505 | 505 | ) |
|
506 | 506 | coreconfigitem( |
|
507 | 507 | b'convert', |
|
508 | 508 | b'hg.startrev', |
|
509 | 509 | default=None, |
|
510 | 510 | ) |
|
511 | 511 | coreconfigitem( |
|
512 | 512 | b'convert', |
|
513 | 513 | b'hg.tagsbranch', |
|
514 | 514 | default=b'default', |
|
515 | 515 | ) |
|
516 | 516 | coreconfigitem( |
|
517 | 517 | b'convert', |
|
518 | 518 | b'hg.usebranchnames', |
|
519 | 519 | default=True, |
|
520 | 520 | ) |
|
521 | 521 | coreconfigitem( |
|
522 | 522 | b'convert', |
|
523 | 523 | b'ignoreancestorcheck', |
|
524 | 524 | default=False, |
|
525 | 525 | experimental=True, |
|
526 | 526 | ) |
|
527 | 527 | coreconfigitem( |
|
528 | 528 | b'convert', |
|
529 | 529 | b'localtimezone', |
|
530 | 530 | default=False, |
|
531 | 531 | ) |
|
532 | 532 | coreconfigitem( |
|
533 | 533 | b'convert', |
|
534 | 534 | b'p4.encoding', |
|
535 | 535 | default=dynamicdefault, |
|
536 | 536 | ) |
|
537 | 537 | coreconfigitem( |
|
538 | 538 | b'convert', |
|
539 | 539 | b'p4.startrev', |
|
540 | 540 | default=0, |
|
541 | 541 | ) |
|
542 | 542 | coreconfigitem( |
|
543 | 543 | b'convert', |
|
544 | 544 | b'skiptags', |
|
545 | 545 | default=False, |
|
546 | 546 | ) |
|
547 | 547 | coreconfigitem( |
|
548 | 548 | b'convert', |
|
549 | 549 | b'svn.debugsvnlog', |
|
550 | 550 | default=True, |
|
551 | 551 | ) |
|
552 | 552 | coreconfigitem( |
|
553 | 553 | b'convert', |
|
554 | 554 | b'svn.trunk', |
|
555 | 555 | default=None, |
|
556 | 556 | ) |
|
557 | 557 | coreconfigitem( |
|
558 | 558 | b'convert', |
|
559 | 559 | b'svn.tags', |
|
560 | 560 | default=None, |
|
561 | 561 | ) |
|
562 | 562 | coreconfigitem( |
|
563 | 563 | b'convert', |
|
564 | 564 | b'svn.branches', |
|
565 | 565 | default=None, |
|
566 | 566 | ) |
|
567 | 567 | coreconfigitem( |
|
568 | 568 | b'convert', |
|
569 | 569 | b'svn.startrev', |
|
570 | 570 | default=0, |
|
571 | 571 | ) |
|
572 | 572 | coreconfigitem( |
|
573 | 573 | b'debug', |
|
574 | 574 | b'dirstate.delaywrite', |
|
575 | 575 | default=0, |
|
576 | 576 | ) |
|
577 | 577 | coreconfigitem( |
|
578 | 578 | b'defaults', |
|
579 | 579 | b'.*', |
|
580 | 580 | default=None, |
|
581 | 581 | generic=True, |
|
582 | 582 | ) |
|
583 | 583 | coreconfigitem( |
|
584 | 584 | b'devel', |
|
585 | 585 | b'all-warnings', |
|
586 | 586 | default=False, |
|
587 | 587 | ) |
|
588 | 588 | coreconfigitem( |
|
589 | 589 | b'devel', |
|
590 | 590 | b'bundle2.debug', |
|
591 | 591 | default=False, |
|
592 | 592 | ) |
|
593 | 593 | coreconfigitem( |
|
594 | 594 | b'devel', |
|
595 | 595 | b'bundle.delta', |
|
596 | 596 | default=b'', |
|
597 | 597 | ) |
|
598 | 598 | coreconfigitem( |
|
599 | 599 | b'devel', |
|
600 | 600 | b'cache-vfs', |
|
601 | 601 | default=None, |
|
602 | 602 | ) |
|
603 | 603 | coreconfigitem( |
|
604 | 604 | b'devel', |
|
605 | 605 | b'check-locks', |
|
606 | 606 | default=False, |
|
607 | 607 | ) |
|
608 | 608 | coreconfigitem( |
|
609 | 609 | b'devel', |
|
610 | 610 | b'check-relroot', |
|
611 | 611 | default=False, |
|
612 | 612 | ) |
|
613 | 613 | coreconfigitem( |
|
614 | 614 | b'devel', |
|
615 | 615 | b'default-date', |
|
616 | 616 | default=None, |
|
617 | 617 | ) |
|
618 | 618 | coreconfigitem( |
|
619 | 619 | b'devel', |
|
620 | 620 | b'deprec-warn', |
|
621 | 621 | default=False, |
|
622 | 622 | ) |
|
623 | 623 | coreconfigitem( |
|
624 | 624 | b'devel', |
|
625 | 625 | b'disableloaddefaultcerts', |
|
626 | 626 | default=False, |
|
627 | 627 | ) |
|
628 | 628 | coreconfigitem( |
|
629 | 629 | b'devel', |
|
630 | 630 | b'warn-empty-changegroup', |
|
631 | 631 | default=False, |
|
632 | 632 | ) |
|
633 | 633 | coreconfigitem( |
|
634 | 634 | b'devel', |
|
635 | 635 | b'legacy.exchange', |
|
636 | 636 | default=list, |
|
637 | 637 | ) |
|
638 | 638 | # When True, revlogs use a special reference version of the nodemap, that is not |
|
639 | 639 | # performant but is "known" to behave properly. |
|
640 | 640 | coreconfigitem( |
|
641 | 641 | b'devel', |
|
642 | 642 | b'persistent-nodemap', |
|
643 | 643 | default=False, |
|
644 | 644 | ) |
|
645 | 645 | coreconfigitem( |
|
646 | 646 | b'devel', |
|
647 | 647 | b'servercafile', |
|
648 | 648 | default=b'', |
|
649 | 649 | ) |
|
650 | 650 | coreconfigitem( |
|
651 | 651 | b'devel', |
|
652 | 652 | b'serverexactprotocol', |
|
653 | 653 | default=b'', |
|
654 | 654 | ) |
|
655 | 655 | coreconfigitem( |
|
656 | 656 | b'devel', |
|
657 | 657 | b'serverrequirecert', |
|
658 | 658 | default=False, |
|
659 | 659 | ) |
|
660 | 660 | coreconfigitem( |
|
661 | 661 | b'devel', |
|
662 | 662 | b'strip-obsmarkers', |
|
663 | 663 | default=True, |
|
664 | 664 | ) |
|
665 | 665 | coreconfigitem( |
|
666 | 666 | b'devel', |
|
667 | 667 | b'warn-config', |
|
668 | 668 | default=None, |
|
669 | 669 | ) |
|
670 | 670 | coreconfigitem( |
|
671 | 671 | b'devel', |
|
672 | 672 | b'warn-config-default', |
|
673 | 673 | default=None, |
|
674 | 674 | ) |
|
675 | 675 | coreconfigitem( |
|
676 | 676 | b'devel', |
|
677 | 677 | b'user.obsmarker', |
|
678 | 678 | default=None, |
|
679 | 679 | ) |
|
680 | 680 | coreconfigitem( |
|
681 | 681 | b'devel', |
|
682 | 682 | b'warn-config-unknown', |
|
683 | 683 | default=None, |
|
684 | 684 | ) |
|
685 | 685 | coreconfigitem( |
|
686 | 686 | b'devel', |
|
687 | 687 | b'debug.copies', |
|
688 | 688 | default=False, |
|
689 | 689 | ) |
|
690 | 690 | coreconfigitem( |
|
691 | 691 | b'devel', |
|
692 | 692 | b'debug.extensions', |
|
693 | 693 | default=False, |
|
694 | 694 | ) |
|
695 | 695 | coreconfigitem( |
|
696 | 696 | b'devel', |
|
697 | 697 | b'debug.repo-filters', |
|
698 | 698 | default=False, |
|
699 | 699 | ) |
|
700 | 700 | coreconfigitem( |
|
701 | 701 | b'devel', |
|
702 | 702 | b'debug.peer-request', |
|
703 | 703 | default=False, |
|
704 | 704 | ) |
|
705 | 705 | # If discovery.exchange-heads is False, the discovery will not start with |
|
706 | 706 | # remote head fetching and local head querying. |
|
707 | 707 | coreconfigitem( |
|
708 | 708 | b'devel', |
|
709 | 709 | b'discovery.exchange-heads', |
|
710 | 710 | default=True, |
|
711 | 711 | ) |
|
712 | 712 | # If discovery.grow-sample is False, the sample size used in set discovery will |
|
713 | 713 | # not be increased through the process |
|
714 | 714 | coreconfigitem( |
|
715 | 715 | b'devel', |
|
716 | 716 | b'discovery.grow-sample', |
|
717 | 717 | default=True, |
|
718 | 718 | ) |
|
719 | 719 | # discovery.grow-sample.rate control the rate at which the sample grow |
|
720 | 720 | coreconfigitem( |
|
721 | 721 | b'devel', |
|
722 | 722 | b'discovery.grow-sample.rate', |
|
723 | 723 | default=1.05, |
|
724 | 724 | ) |
|
725 | 725 | # If discovery.randomize is False, random sampling during discovery are |
|
726 | 726 | # deterministic. It is meant for integration tests. |
|
727 | 727 | coreconfigitem( |
|
728 | 728 | b'devel', |
|
729 | 729 | b'discovery.randomize', |
|
730 | 730 | default=True, |
|
731 | 731 | ) |
|
732 | 732 | _registerdiffopts(section=b'diff') |
|
733 | 733 | coreconfigitem( |
|
734 | 734 | b'email', |
|
735 | 735 | b'bcc', |
|
736 | 736 | default=None, |
|
737 | 737 | ) |
|
738 | 738 | coreconfigitem( |
|
739 | 739 | b'email', |
|
740 | 740 | b'cc', |
|
741 | 741 | default=None, |
|
742 | 742 | ) |
|
743 | 743 | coreconfigitem( |
|
744 | 744 | b'email', |
|
745 | 745 | b'charsets', |
|
746 | 746 | default=list, |
|
747 | 747 | ) |
|
748 | 748 | coreconfigitem( |
|
749 | 749 | b'email', |
|
750 | 750 | b'from', |
|
751 | 751 | default=None, |
|
752 | 752 | ) |
|
753 | 753 | coreconfigitem( |
|
754 | 754 | b'email', |
|
755 | 755 | b'method', |
|
756 | 756 | default=b'smtp', |
|
757 | 757 | ) |
|
758 | 758 | coreconfigitem( |
|
759 | 759 | b'email', |
|
760 | 760 | b'reply-to', |
|
761 | 761 | default=None, |
|
762 | 762 | ) |
|
763 | 763 | coreconfigitem( |
|
764 | 764 | b'email', |
|
765 | 765 | b'to', |
|
766 | 766 | default=None, |
|
767 | 767 | ) |
|
768 | 768 | coreconfigitem( |
|
769 | 769 | b'experimental', |
|
770 | 770 | b'archivemetatemplate', |
|
771 | 771 | default=dynamicdefault, |
|
772 | 772 | ) |
|
773 | 773 | coreconfigitem( |
|
774 | 774 | b'experimental', |
|
775 | 775 | b'auto-publish', |
|
776 | 776 | default=b'publish', |
|
777 | 777 | ) |
|
778 | 778 | coreconfigitem( |
|
779 | 779 | b'experimental', |
|
780 | 780 | b'bundle-phases', |
|
781 | 781 | default=False, |
|
782 | 782 | ) |
|
783 | 783 | coreconfigitem( |
|
784 | 784 | b'experimental', |
|
785 | 785 | b'bundle2-advertise', |
|
786 | 786 | default=True, |
|
787 | 787 | ) |
|
788 | 788 | coreconfigitem( |
|
789 | 789 | b'experimental', |
|
790 | 790 | b'bundle2-output-capture', |
|
791 | 791 | default=False, |
|
792 | 792 | ) |
|
793 | 793 | coreconfigitem( |
|
794 | 794 | b'experimental', |
|
795 | 795 | b'bundle2.pushback', |
|
796 | 796 | default=False, |
|
797 | 797 | ) |
|
798 | 798 | coreconfigitem( |
|
799 | 799 | b'experimental', |
|
800 | 800 | b'bundle2lazylocking', |
|
801 | 801 | default=False, |
|
802 | 802 | ) |
|
803 | 803 | coreconfigitem( |
|
804 | 804 | b'experimental', |
|
805 | 805 | b'bundlecomplevel', |
|
806 | 806 | default=None, |
|
807 | 807 | ) |
|
808 | 808 | coreconfigitem( |
|
809 | 809 | b'experimental', |
|
810 | 810 | b'bundlecomplevel.bzip2', |
|
811 | 811 | default=None, |
|
812 | 812 | ) |
|
813 | 813 | coreconfigitem( |
|
814 | 814 | b'experimental', |
|
815 | 815 | b'bundlecomplevel.gzip', |
|
816 | 816 | default=None, |
|
817 | 817 | ) |
|
818 | 818 | coreconfigitem( |
|
819 | 819 | b'experimental', |
|
820 | 820 | b'bundlecomplevel.none', |
|
821 | 821 | default=None, |
|
822 | 822 | ) |
|
823 | 823 | coreconfigitem( |
|
824 | 824 | b'experimental', |
|
825 | 825 | b'bundlecomplevel.zstd', |
|
826 | 826 | default=None, |
|
827 | 827 | ) |
|
828 | 828 | coreconfigitem( |
|
829 | 829 | b'experimental', |
|
830 | 830 | b'changegroup3', |
|
831 | 831 | default=False, |
|
832 | 832 | ) |
|
833 | 833 | coreconfigitem( |
|
834 | 834 | b'experimental', |
|
835 | 835 | b'cleanup-as-archived', |
|
836 | 836 | default=False, |
|
837 | 837 | ) |
|
838 | 838 | coreconfigitem( |
|
839 | 839 | b'experimental', |
|
840 | 840 | b'clientcompressionengines', |
|
841 | 841 | default=list, |
|
842 | 842 | ) |
|
843 | 843 | coreconfigitem( |
|
844 | 844 | b'experimental', |
|
845 | 845 | b'copytrace', |
|
846 | 846 | default=b'on', |
|
847 | 847 | ) |
|
848 | 848 | coreconfigitem( |
|
849 | 849 | b'experimental', |
|
850 | 850 | b'copytrace.movecandidateslimit', |
|
851 | 851 | default=100, |
|
852 | 852 | ) |
|
853 | 853 | coreconfigitem( |
|
854 | 854 | b'experimental', |
|
855 | 855 | b'copytrace.sourcecommitlimit', |
|
856 | 856 | default=100, |
|
857 | 857 | ) |
|
858 | 858 | coreconfigitem( |
|
859 | 859 | b'experimental', |
|
860 | 860 | b'copies.read-from', |
|
861 | 861 | default=b"filelog-only", |
|
862 | 862 | ) |
|
863 | 863 | coreconfigitem( |
|
864 | 864 | b'experimental', |
|
865 | 865 | b'copies.write-to', |
|
866 | 866 | default=b'filelog-only', |
|
867 | 867 | ) |
|
868 | 868 | coreconfigitem( |
|
869 | 869 | b'experimental', |
|
870 | 870 | b'crecordtest', |
|
871 | 871 | default=None, |
|
872 | 872 | ) |
|
873 | 873 | coreconfigitem( |
|
874 | 874 | b'experimental', |
|
875 | 875 | b'directaccess', |
|
876 | 876 | default=False, |
|
877 | 877 | ) |
|
878 | 878 | coreconfigitem( |
|
879 | 879 | b'experimental', |
|
880 | 880 | b'directaccess.revnums', |
|
881 | 881 | default=False, |
|
882 | 882 | ) |
|
883 | 883 | coreconfigitem( |
|
884 | 884 | b'experimental', |
|
885 | 885 | b'editortmpinhg', |
|
886 | 886 | default=False, |
|
887 | 887 | ) |
|
888 | 888 | coreconfigitem( |
|
889 | 889 | b'experimental', |
|
890 | 890 | b'evolution', |
|
891 | 891 | default=list, |
|
892 | 892 | ) |
|
893 | 893 | coreconfigitem( |
|
894 | 894 | b'experimental', |
|
895 | 895 | b'evolution.allowdivergence', |
|
896 | 896 | default=False, |
|
897 | 897 | alias=[(b'experimental', b'allowdivergence')], |
|
898 | 898 | ) |
|
899 | 899 | coreconfigitem( |
|
900 | 900 | b'experimental', |
|
901 | 901 | b'evolution.allowunstable', |
|
902 | 902 | default=None, |
|
903 | 903 | ) |
|
904 | 904 | coreconfigitem( |
|
905 | 905 | b'experimental', |
|
906 | 906 | b'evolution.createmarkers', |
|
907 | 907 | default=None, |
|
908 | 908 | ) |
|
909 | 909 | coreconfigitem( |
|
910 | 910 | b'experimental', |
|
911 | 911 | b'evolution.effect-flags', |
|
912 | 912 | default=True, |
|
913 | 913 | alias=[(b'experimental', b'effect-flags')], |
|
914 | 914 | ) |
|
915 | 915 | coreconfigitem( |
|
916 | 916 | b'experimental', |
|
917 | 917 | b'evolution.exchange', |
|
918 | 918 | default=None, |
|
919 | 919 | ) |
|
920 | 920 | coreconfigitem( |
|
921 | 921 | b'experimental', |
|
922 | 922 | b'evolution.bundle-obsmarker', |
|
923 | 923 | default=False, |
|
924 | 924 | ) |
|
925 | 925 | coreconfigitem( |
|
926 | 926 | b'experimental', |
|
927 | 927 | b'evolution.bundle-obsmarker:mandatory', |
|
928 | 928 | default=True, |
|
929 | 929 | ) |
|
930 | 930 | coreconfigitem( |
|
931 | 931 | b'experimental', |
|
932 | 932 | b'log.topo', |
|
933 | 933 | default=False, |
|
934 | 934 | ) |
|
935 | 935 | coreconfigitem( |
|
936 | 936 | b'experimental', |
|
937 | 937 | b'evolution.report-instabilities', |
|
938 | 938 | default=True, |
|
939 | 939 | ) |
|
940 | 940 | coreconfigitem( |
|
941 | 941 | b'experimental', |
|
942 | 942 | b'evolution.track-operation', |
|
943 | 943 | default=True, |
|
944 | 944 | ) |
|
945 | 945 | # repo-level config to exclude a revset visibility |
|
946 | 946 | # |
|
947 | 947 | # The target use case is to use `share` to expose different subset of the same |
|
948 | 948 | # repository, especially server side. See also `server.view`. |
|
949 | 949 | coreconfigitem( |
|
950 | 950 | b'experimental', |
|
951 | 951 | b'extra-filter-revs', |
|
952 | 952 | default=None, |
|
953 | 953 | ) |
|
954 | 954 | coreconfigitem( |
|
955 | 955 | b'experimental', |
|
956 | 956 | b'maxdeltachainspan', |
|
957 | 957 | default=-1, |
|
958 | 958 | ) |
|
959 | 959 | # tracks files which were undeleted (merge might delete them but we explicitly |
|
960 | 960 | # kept/undeleted them) and creates new filenodes for them |
|
961 | 961 | coreconfigitem( |
|
962 | 962 | b'experimental', |
|
963 | 963 | b'merge-track-salvaged', |
|
964 | 964 | default=False, |
|
965 | 965 | ) |
|
966 | 966 | coreconfigitem( |
|
967 | 967 | b'experimental', |
|
968 | 968 | b'mergetempdirprefix', |
|
969 | 969 | default=None, |
|
970 | 970 | ) |
|
971 | 971 | coreconfigitem( |
|
972 | 972 | b'experimental', |
|
973 | 973 | b'mmapindexthreshold', |
|
974 | 974 | default=None, |
|
975 | 975 | ) |
|
976 | 976 | coreconfigitem( |
|
977 | 977 | b'experimental', |
|
978 | 978 | b'narrow', |
|
979 | 979 | default=False, |
|
980 | 980 | ) |
|
981 | 981 | coreconfigitem( |
|
982 | 982 | b'experimental', |
|
983 | 983 | b'nonnormalparanoidcheck', |
|
984 | 984 | default=False, |
|
985 | 985 | ) |
|
986 | 986 | coreconfigitem( |
|
987 | 987 | b'experimental', |
|
988 | 988 | b'exportableenviron', |
|
989 | 989 | default=list, |
|
990 | 990 | ) |
|
991 | 991 | coreconfigitem( |
|
992 | 992 | b'experimental', |
|
993 | 993 | b'extendedheader.index', |
|
994 | 994 | default=None, |
|
995 | 995 | ) |
|
996 | 996 | coreconfigitem( |
|
997 | 997 | b'experimental', |
|
998 | 998 | b'extendedheader.similarity', |
|
999 | 999 | default=False, |
|
1000 | 1000 | ) |
|
1001 | 1001 | coreconfigitem( |
|
1002 | 1002 | b'experimental', |
|
1003 | 1003 | b'graphshorten', |
|
1004 | 1004 | default=False, |
|
1005 | 1005 | ) |
|
1006 | 1006 | coreconfigitem( |
|
1007 | 1007 | b'experimental', |
|
1008 | 1008 | b'graphstyle.parent', |
|
1009 | 1009 | default=dynamicdefault, |
|
1010 | 1010 | ) |
|
1011 | 1011 | coreconfigitem( |
|
1012 | 1012 | b'experimental', |
|
1013 | 1013 | b'graphstyle.missing', |
|
1014 | 1014 | default=dynamicdefault, |
|
1015 | 1015 | ) |
|
1016 | 1016 | coreconfigitem( |
|
1017 | 1017 | b'experimental', |
|
1018 | 1018 | b'graphstyle.grandparent', |
|
1019 | 1019 | default=dynamicdefault, |
|
1020 | 1020 | ) |
|
1021 | 1021 | coreconfigitem( |
|
1022 | 1022 | b'experimental', |
|
1023 | 1023 | b'hook-track-tags', |
|
1024 | 1024 | default=False, |
|
1025 | 1025 | ) |
|
1026 | 1026 | coreconfigitem( |
|
1027 | 1027 | b'experimental', |
|
1028 | 1028 | b'httppeer.advertise-v2', |
|
1029 | 1029 | default=False, |
|
1030 | 1030 | ) |
|
1031 | 1031 | coreconfigitem( |
|
1032 | 1032 | b'experimental', |
|
1033 | 1033 | b'httppeer.v2-encoder-order', |
|
1034 | 1034 | default=None, |
|
1035 | 1035 | ) |
|
1036 | 1036 | coreconfigitem( |
|
1037 | 1037 | b'experimental', |
|
1038 | 1038 | b'httppostargs', |
|
1039 | 1039 | default=False, |
|
1040 | 1040 | ) |
|
1041 | 1041 | coreconfigitem(b'experimental', b'nointerrupt', default=False) |
|
1042 | 1042 | coreconfigitem(b'experimental', b'nointerrupt-interactiveonly', default=True) |
|
1043 | 1043 | |
|
1044 | 1044 | coreconfigitem( |
|
1045 | 1045 | b'experimental', |
|
1046 | 1046 | b'obsmarkers-exchange-debug', |
|
1047 | 1047 | default=False, |
|
1048 | 1048 | ) |
|
1049 | 1049 | coreconfigitem( |
|
1050 | 1050 | b'experimental', |
|
1051 | 1051 | b'remotenames', |
|
1052 | 1052 | default=False, |
|
1053 | 1053 | ) |
|
1054 | 1054 | coreconfigitem( |
|
1055 | 1055 | b'experimental', |
|
1056 | 1056 | b'removeemptydirs', |
|
1057 | 1057 | default=True, |
|
1058 | 1058 | ) |
|
1059 | 1059 | coreconfigitem( |
|
1060 | 1060 | b'experimental', |
|
1061 | 1061 | b'revert.interactive.select-to-keep', |
|
1062 | 1062 | default=False, |
|
1063 | 1063 | ) |
|
1064 | 1064 | coreconfigitem( |
|
1065 | 1065 | b'experimental', |
|
1066 | 1066 | b'revisions.prefixhexnode', |
|
1067 | 1067 | default=False, |
|
1068 | 1068 | ) |
|
1069 | 1069 | coreconfigitem( |
|
1070 | 1070 | b'experimental', |
|
1071 | 1071 | b'revlogv2', |
|
1072 | 1072 | default=None, |
|
1073 | 1073 | ) |
|
1074 | 1074 | coreconfigitem( |
|
1075 | 1075 | b'experimental', |
|
1076 | 1076 | b'revisions.disambiguatewithin', |
|
1077 | 1077 | default=None, |
|
1078 | 1078 | ) |
|
1079 | 1079 | coreconfigitem( |
|
1080 | 1080 | b'experimental', |
|
1081 | 1081 | b'rust.index', |
|
1082 | 1082 | default=False, |
|
1083 | 1083 | ) |
|
1084 | 1084 | coreconfigitem( |
|
1085 | 1085 | b'experimental', |
|
1086 | 1086 | b'server.filesdata.recommended-batch-size', |
|
1087 | 1087 | default=50000, |
|
1088 | 1088 | ) |
|
1089 | 1089 | coreconfigitem( |
|
1090 | 1090 | b'experimental', |
|
1091 | 1091 | b'server.manifestdata.recommended-batch-size', |
|
1092 | 1092 | default=100000, |
|
1093 | 1093 | ) |
|
1094 | 1094 | coreconfigitem( |
|
1095 | 1095 | b'experimental', |
|
1096 | 1096 | b'server.stream-narrow-clones', |
|
1097 | 1097 | default=False, |
|
1098 | 1098 | ) |
|
1099 | 1099 | coreconfigitem( |
|
1100 | 1100 | b'experimental', |
|
1101 | 1101 | b'single-head-per-branch', |
|
1102 | 1102 | default=False, |
|
1103 | 1103 | ) |
|
1104 | 1104 | coreconfigitem( |
|
1105 | 1105 | b'experimental', |
|
1106 | 1106 | b'single-head-per-branch:account-closed-heads', |
|
1107 | 1107 | default=False, |
|
1108 | 1108 | ) |
|
1109 | 1109 | coreconfigitem( |
|
1110 | 1110 | b'experimental', |
|
1111 | 1111 | b'single-head-per-branch:public-changes-only', |
|
1112 | 1112 | default=False, |
|
1113 | 1113 | ) |
|
1114 | 1114 | coreconfigitem( |
|
1115 | 1115 | b'experimental', |
|
1116 | 1116 | b'sshserver.support-v2', |
|
1117 | 1117 | default=False, |
|
1118 | 1118 | ) |
|
1119 | 1119 | coreconfigitem( |
|
1120 | 1120 | b'experimental', |
|
1121 | 1121 | b'sparse-read', |
|
1122 | 1122 | default=False, |
|
1123 | 1123 | ) |
|
1124 | 1124 | coreconfigitem( |
|
1125 | 1125 | b'experimental', |
|
1126 | 1126 | b'sparse-read.density-threshold', |
|
1127 | 1127 | default=0.50, |
|
1128 | 1128 | ) |
|
1129 | 1129 | coreconfigitem( |
|
1130 | 1130 | b'experimental', |
|
1131 | 1131 | b'sparse-read.min-gap-size', |
|
1132 | 1132 | default=b'65K', |
|
1133 | 1133 | ) |
|
1134 | 1134 | coreconfigitem( |
|
1135 | 1135 | b'experimental', |
|
1136 | 1136 | b'treemanifest', |
|
1137 | 1137 | default=False, |
|
1138 | 1138 | ) |
|
1139 | 1139 | coreconfigitem( |
|
1140 | 1140 | b'experimental', |
|
1141 | 1141 | b'update.atomic-file', |
|
1142 | 1142 | default=False, |
|
1143 | 1143 | ) |
|
1144 | 1144 | coreconfigitem( |
|
1145 | 1145 | b'experimental', |
|
1146 | 1146 | b'sshpeer.advertise-v2', |
|
1147 | 1147 | default=False, |
|
1148 | 1148 | ) |
|
1149 | 1149 | coreconfigitem( |
|
1150 | 1150 | b'experimental', |
|
1151 | 1151 | b'web.apiserver', |
|
1152 | 1152 | default=False, |
|
1153 | 1153 | ) |
|
1154 | 1154 | coreconfigitem( |
|
1155 | 1155 | b'experimental', |
|
1156 | 1156 | b'web.api.http-v2', |
|
1157 | 1157 | default=False, |
|
1158 | 1158 | ) |
|
1159 | 1159 | coreconfigitem( |
|
1160 | 1160 | b'experimental', |
|
1161 | 1161 | b'web.api.debugreflect', |
|
1162 | 1162 | default=False, |
|
1163 | 1163 | ) |
|
1164 | 1164 | coreconfigitem( |
|
1165 | 1165 | b'experimental', |
|
1166 | 1166 | b'worker.wdir-get-thread-safe', |
|
1167 | 1167 | default=False, |
|
1168 | 1168 | ) |
|
1169 | 1169 | coreconfigitem( |
|
1170 | 1170 | b'experimental', |
|
1171 | 1171 | b'worker.repository-upgrade', |
|
1172 | 1172 | default=False, |
|
1173 | 1173 | ) |
|
1174 | 1174 | coreconfigitem( |
|
1175 | 1175 | b'experimental', |
|
1176 | 1176 | b'xdiff', |
|
1177 | 1177 | default=False, |
|
1178 | 1178 | ) |
|
1179 | 1179 | coreconfigitem( |
|
1180 | 1180 | b'extensions', |
|
1181 | 1181 | b'.*', |
|
1182 | 1182 | default=None, |
|
1183 | 1183 | generic=True, |
|
1184 | 1184 | ) |
|
1185 | 1185 | coreconfigitem( |
|
1186 | 1186 | b'extdata', |
|
1187 | 1187 | b'.*', |
|
1188 | 1188 | default=None, |
|
1189 | 1189 | generic=True, |
|
1190 | 1190 | ) |
|
1191 | 1191 | coreconfigitem( |
|
1192 | 1192 | b'format', |
|
1193 | 1193 | b'bookmarks-in-store', |
|
1194 | 1194 | default=False, |
|
1195 | 1195 | ) |
|
1196 | 1196 | coreconfigitem( |
|
1197 | 1197 | b'format', |
|
1198 | 1198 | b'chunkcachesize', |
|
1199 | 1199 | default=None, |
|
1200 | 1200 | experimental=True, |
|
1201 | 1201 | ) |
|
1202 | 1202 | coreconfigitem( |
|
1203 | 1203 | b'format', |
|
1204 | 1204 | b'dotencode', |
|
1205 | 1205 | default=True, |
|
1206 | 1206 | ) |
|
1207 | 1207 | coreconfigitem( |
|
1208 | 1208 | b'format', |
|
1209 | 1209 | b'generaldelta', |
|
1210 | 1210 | default=False, |
|
1211 | 1211 | experimental=True, |
|
1212 | 1212 | ) |
|
1213 | 1213 | coreconfigitem( |
|
1214 | 1214 | b'format', |
|
1215 | 1215 | b'manifestcachesize', |
|
1216 | 1216 | default=None, |
|
1217 | 1217 | experimental=True, |
|
1218 | 1218 | ) |
|
1219 | 1219 | coreconfigitem( |
|
1220 | 1220 | b'format', |
|
1221 | 1221 | b'maxchainlen', |
|
1222 | 1222 | default=dynamicdefault, |
|
1223 | 1223 | experimental=True, |
|
1224 | 1224 | ) |
|
1225 | 1225 | coreconfigitem( |
|
1226 | 1226 | b'format', |
|
1227 | 1227 | b'obsstore-version', |
|
1228 | 1228 | default=None, |
|
1229 | 1229 | ) |
|
1230 | 1230 | coreconfigitem( |
|
1231 | 1231 | b'format', |
|
1232 | 1232 | b'sparse-revlog', |
|
1233 | 1233 | default=True, |
|
1234 | 1234 | ) |
|
1235 | 1235 | coreconfigitem( |
|
1236 | 1236 | b'format', |
|
1237 | 1237 | b'revlog-compression', |
|
1238 | 1238 | default=lambda: [b'zlib'], |
|
1239 | 1239 | alias=[(b'experimental', b'format.compression')], |
|
1240 | 1240 | ) |
|
1241 | 1241 | coreconfigitem( |
|
1242 | 1242 | b'format', |
|
1243 | 1243 | b'usefncache', |
|
1244 | 1244 | default=True, |
|
1245 | 1245 | ) |
|
1246 | 1246 | coreconfigitem( |
|
1247 | 1247 | b'format', |
|
1248 | 1248 | b'usegeneraldelta', |
|
1249 | 1249 | default=True, |
|
1250 | 1250 | ) |
|
1251 | 1251 | coreconfigitem( |
|
1252 | 1252 | b'format', |
|
1253 | 1253 | b'usestore', |
|
1254 | 1254 | default=True, |
|
1255 | 1255 | ) |
|
1256 | 1256 | coreconfigitem( |
|
1257 | 1257 | b'format', |
|
1258 | 1258 | b'use-persistent-nodemap', |
|
1259 | 1259 | default=False, |
|
1260 | 1260 | ) |
|
1261 | 1261 | coreconfigitem( |
|
1262 | 1262 | b'format', |
|
1263 | 1263 | b'exp-use-copies-side-data-changeset', |
|
1264 | 1264 | default=False, |
|
1265 | 1265 | experimental=True, |
|
1266 | 1266 | ) |
|
1267 | 1267 | coreconfigitem( |
|
1268 | 1268 | b'format', |
|
1269 | 1269 | b'exp-use-side-data', |
|
1270 | 1270 | default=False, |
|
1271 | 1271 | experimental=True, |
|
1272 | 1272 | ) |
|
1273 | 1273 | coreconfigitem( |
|
1274 | 1274 | b'format', |
|
1275 |
b'e |
|
|
1275 | b'use-share-safe', | |
|
1276 | 1276 | default=False, |
|
1277 | experimental=True, | |
|
1278 | 1277 | ) |
|
1279 | 1278 | coreconfigitem( |
|
1280 | 1279 | b'format', |
|
1281 | 1280 | b'internal-phase', |
|
1282 | 1281 | default=False, |
|
1283 | 1282 | experimental=True, |
|
1284 | 1283 | ) |
|
1285 | 1284 | coreconfigitem( |
|
1286 | 1285 | b'fsmonitor', |
|
1287 | 1286 | b'warn_when_unused', |
|
1288 | 1287 | default=True, |
|
1289 | 1288 | ) |
|
1290 | 1289 | coreconfigitem( |
|
1291 | 1290 | b'fsmonitor', |
|
1292 | 1291 | b'warn_update_file_count', |
|
1293 | 1292 | default=50000, |
|
1294 | 1293 | ) |
|
1295 | 1294 | coreconfigitem( |
|
1296 | 1295 | b'fsmonitor', |
|
1297 | 1296 | b'warn_update_file_count_rust', |
|
1298 | 1297 | default=400000, |
|
1299 | 1298 | ) |
|
1300 | 1299 | coreconfigitem( |
|
1301 | 1300 | b'help', |
|
1302 | 1301 | br'hidden-command\..*', |
|
1303 | 1302 | default=False, |
|
1304 | 1303 | generic=True, |
|
1305 | 1304 | ) |
|
1306 | 1305 | coreconfigitem( |
|
1307 | 1306 | b'help', |
|
1308 | 1307 | br'hidden-topic\..*', |
|
1309 | 1308 | default=False, |
|
1310 | 1309 | generic=True, |
|
1311 | 1310 | ) |
|
1312 | 1311 | coreconfigitem( |
|
1313 | 1312 | b'hooks', |
|
1314 | 1313 | b'.*', |
|
1315 | 1314 | default=dynamicdefault, |
|
1316 | 1315 | generic=True, |
|
1317 | 1316 | ) |
|
1318 | 1317 | coreconfigitem( |
|
1319 | 1318 | b'hgweb-paths', |
|
1320 | 1319 | b'.*', |
|
1321 | 1320 | default=list, |
|
1322 | 1321 | generic=True, |
|
1323 | 1322 | ) |
|
1324 | 1323 | coreconfigitem( |
|
1325 | 1324 | b'hostfingerprints', |
|
1326 | 1325 | b'.*', |
|
1327 | 1326 | default=list, |
|
1328 | 1327 | generic=True, |
|
1329 | 1328 | ) |
|
1330 | 1329 | coreconfigitem( |
|
1331 | 1330 | b'hostsecurity', |
|
1332 | 1331 | b'ciphers', |
|
1333 | 1332 | default=None, |
|
1334 | 1333 | ) |
|
1335 | 1334 | coreconfigitem( |
|
1336 | 1335 | b'hostsecurity', |
|
1337 | 1336 | b'minimumprotocol', |
|
1338 | 1337 | default=dynamicdefault, |
|
1339 | 1338 | ) |
|
1340 | 1339 | coreconfigitem( |
|
1341 | 1340 | b'hostsecurity', |
|
1342 | 1341 | b'.*:minimumprotocol$', |
|
1343 | 1342 | default=dynamicdefault, |
|
1344 | 1343 | generic=True, |
|
1345 | 1344 | ) |
|
1346 | 1345 | coreconfigitem( |
|
1347 | 1346 | b'hostsecurity', |
|
1348 | 1347 | b'.*:ciphers$', |
|
1349 | 1348 | default=dynamicdefault, |
|
1350 | 1349 | generic=True, |
|
1351 | 1350 | ) |
|
1352 | 1351 | coreconfigitem( |
|
1353 | 1352 | b'hostsecurity', |
|
1354 | 1353 | b'.*:fingerprints$', |
|
1355 | 1354 | default=list, |
|
1356 | 1355 | generic=True, |
|
1357 | 1356 | ) |
|
1358 | 1357 | coreconfigitem( |
|
1359 | 1358 | b'hostsecurity', |
|
1360 | 1359 | b'.*:verifycertsfile$', |
|
1361 | 1360 | default=None, |
|
1362 | 1361 | generic=True, |
|
1363 | 1362 | ) |
|
1364 | 1363 | |
|
1365 | 1364 | coreconfigitem( |
|
1366 | 1365 | b'http_proxy', |
|
1367 | 1366 | b'always', |
|
1368 | 1367 | default=False, |
|
1369 | 1368 | ) |
|
1370 | 1369 | coreconfigitem( |
|
1371 | 1370 | b'http_proxy', |
|
1372 | 1371 | b'host', |
|
1373 | 1372 | default=None, |
|
1374 | 1373 | ) |
|
1375 | 1374 | coreconfigitem( |
|
1376 | 1375 | b'http_proxy', |
|
1377 | 1376 | b'no', |
|
1378 | 1377 | default=list, |
|
1379 | 1378 | ) |
|
1380 | 1379 | coreconfigitem( |
|
1381 | 1380 | b'http_proxy', |
|
1382 | 1381 | b'passwd', |
|
1383 | 1382 | default=None, |
|
1384 | 1383 | ) |
|
1385 | 1384 | coreconfigitem( |
|
1386 | 1385 | b'http_proxy', |
|
1387 | 1386 | b'user', |
|
1388 | 1387 | default=None, |
|
1389 | 1388 | ) |
|
1390 | 1389 | |
|
1391 | 1390 | coreconfigitem( |
|
1392 | 1391 | b'http', |
|
1393 | 1392 | b'timeout', |
|
1394 | 1393 | default=None, |
|
1395 | 1394 | ) |
|
1396 | 1395 | |
|
1397 | 1396 | coreconfigitem( |
|
1398 | 1397 | b'logtoprocess', |
|
1399 | 1398 | b'commandexception', |
|
1400 | 1399 | default=None, |
|
1401 | 1400 | ) |
|
1402 | 1401 | coreconfigitem( |
|
1403 | 1402 | b'logtoprocess', |
|
1404 | 1403 | b'commandfinish', |
|
1405 | 1404 | default=None, |
|
1406 | 1405 | ) |
|
1407 | 1406 | coreconfigitem( |
|
1408 | 1407 | b'logtoprocess', |
|
1409 | 1408 | b'command', |
|
1410 | 1409 | default=None, |
|
1411 | 1410 | ) |
|
1412 | 1411 | coreconfigitem( |
|
1413 | 1412 | b'logtoprocess', |
|
1414 | 1413 | b'develwarn', |
|
1415 | 1414 | default=None, |
|
1416 | 1415 | ) |
|
1417 | 1416 | coreconfigitem( |
|
1418 | 1417 | b'logtoprocess', |
|
1419 | 1418 | b'uiblocked', |
|
1420 | 1419 | default=None, |
|
1421 | 1420 | ) |
|
1422 | 1421 | coreconfigitem( |
|
1423 | 1422 | b'merge', |
|
1424 | 1423 | b'checkunknown', |
|
1425 | 1424 | default=b'abort', |
|
1426 | 1425 | ) |
|
1427 | 1426 | coreconfigitem( |
|
1428 | 1427 | b'merge', |
|
1429 | 1428 | b'checkignored', |
|
1430 | 1429 | default=b'abort', |
|
1431 | 1430 | ) |
|
1432 | 1431 | coreconfigitem( |
|
1433 | 1432 | b'experimental', |
|
1434 | 1433 | b'merge.checkpathconflicts', |
|
1435 | 1434 | default=False, |
|
1436 | 1435 | ) |
|
1437 | 1436 | coreconfigitem( |
|
1438 | 1437 | b'merge', |
|
1439 | 1438 | b'followcopies', |
|
1440 | 1439 | default=True, |
|
1441 | 1440 | ) |
|
1442 | 1441 | coreconfigitem( |
|
1443 | 1442 | b'merge', |
|
1444 | 1443 | b'on-failure', |
|
1445 | 1444 | default=b'continue', |
|
1446 | 1445 | ) |
|
1447 | 1446 | coreconfigitem( |
|
1448 | 1447 | b'merge', |
|
1449 | 1448 | b'preferancestor', |
|
1450 | 1449 | default=lambda: [b'*'], |
|
1451 | 1450 | experimental=True, |
|
1452 | 1451 | ) |
|
1453 | 1452 | coreconfigitem( |
|
1454 | 1453 | b'merge', |
|
1455 | 1454 | b'strict-capability-check', |
|
1456 | 1455 | default=False, |
|
1457 | 1456 | ) |
|
1458 | 1457 | coreconfigitem( |
|
1459 | 1458 | b'merge-tools', |
|
1460 | 1459 | b'.*', |
|
1461 | 1460 | default=None, |
|
1462 | 1461 | generic=True, |
|
1463 | 1462 | ) |
|
1464 | 1463 | coreconfigitem( |
|
1465 | 1464 | b'merge-tools', |
|
1466 | 1465 | br'.*\.args$', |
|
1467 | 1466 | default=b"$local $base $other", |
|
1468 | 1467 | generic=True, |
|
1469 | 1468 | priority=-1, |
|
1470 | 1469 | ) |
|
1471 | 1470 | coreconfigitem( |
|
1472 | 1471 | b'merge-tools', |
|
1473 | 1472 | br'.*\.binary$', |
|
1474 | 1473 | default=False, |
|
1475 | 1474 | generic=True, |
|
1476 | 1475 | priority=-1, |
|
1477 | 1476 | ) |
|
1478 | 1477 | coreconfigitem( |
|
1479 | 1478 | b'merge-tools', |
|
1480 | 1479 | br'.*\.check$', |
|
1481 | 1480 | default=list, |
|
1482 | 1481 | generic=True, |
|
1483 | 1482 | priority=-1, |
|
1484 | 1483 | ) |
|
1485 | 1484 | coreconfigitem( |
|
1486 | 1485 | b'merge-tools', |
|
1487 | 1486 | br'.*\.checkchanged$', |
|
1488 | 1487 | default=False, |
|
1489 | 1488 | generic=True, |
|
1490 | 1489 | priority=-1, |
|
1491 | 1490 | ) |
|
1492 | 1491 | coreconfigitem( |
|
1493 | 1492 | b'merge-tools', |
|
1494 | 1493 | br'.*\.executable$', |
|
1495 | 1494 | default=dynamicdefault, |
|
1496 | 1495 | generic=True, |
|
1497 | 1496 | priority=-1, |
|
1498 | 1497 | ) |
|
1499 | 1498 | coreconfigitem( |
|
1500 | 1499 | b'merge-tools', |
|
1501 | 1500 | br'.*\.fixeol$', |
|
1502 | 1501 | default=False, |
|
1503 | 1502 | generic=True, |
|
1504 | 1503 | priority=-1, |
|
1505 | 1504 | ) |
|
1506 | 1505 | coreconfigitem( |
|
1507 | 1506 | b'merge-tools', |
|
1508 | 1507 | br'.*\.gui$', |
|
1509 | 1508 | default=False, |
|
1510 | 1509 | generic=True, |
|
1511 | 1510 | priority=-1, |
|
1512 | 1511 | ) |
|
1513 | 1512 | coreconfigitem( |
|
1514 | 1513 | b'merge-tools', |
|
1515 | 1514 | br'.*\.mergemarkers$', |
|
1516 | 1515 | default=b'basic', |
|
1517 | 1516 | generic=True, |
|
1518 | 1517 | priority=-1, |
|
1519 | 1518 | ) |
|
1520 | 1519 | coreconfigitem( |
|
1521 | 1520 | b'merge-tools', |
|
1522 | 1521 | br'.*\.mergemarkertemplate$', |
|
1523 | 1522 | default=dynamicdefault, # take from command-templates.mergemarker |
|
1524 | 1523 | generic=True, |
|
1525 | 1524 | priority=-1, |
|
1526 | 1525 | ) |
|
1527 | 1526 | coreconfigitem( |
|
1528 | 1527 | b'merge-tools', |
|
1529 | 1528 | br'.*\.priority$', |
|
1530 | 1529 | default=0, |
|
1531 | 1530 | generic=True, |
|
1532 | 1531 | priority=-1, |
|
1533 | 1532 | ) |
|
1534 | 1533 | coreconfigitem( |
|
1535 | 1534 | b'merge-tools', |
|
1536 | 1535 | br'.*\.premerge$', |
|
1537 | 1536 | default=dynamicdefault, |
|
1538 | 1537 | generic=True, |
|
1539 | 1538 | priority=-1, |
|
1540 | 1539 | ) |
|
1541 | 1540 | coreconfigitem( |
|
1542 | 1541 | b'merge-tools', |
|
1543 | 1542 | br'.*\.symlink$', |
|
1544 | 1543 | default=False, |
|
1545 | 1544 | generic=True, |
|
1546 | 1545 | priority=-1, |
|
1547 | 1546 | ) |
|
1548 | 1547 | coreconfigitem( |
|
1549 | 1548 | b'pager', |
|
1550 | 1549 | b'attend-.*', |
|
1551 | 1550 | default=dynamicdefault, |
|
1552 | 1551 | generic=True, |
|
1553 | 1552 | ) |
|
1554 | 1553 | coreconfigitem( |
|
1555 | 1554 | b'pager', |
|
1556 | 1555 | b'ignore', |
|
1557 | 1556 | default=list, |
|
1558 | 1557 | ) |
|
1559 | 1558 | coreconfigitem( |
|
1560 | 1559 | b'pager', |
|
1561 | 1560 | b'pager', |
|
1562 | 1561 | default=dynamicdefault, |
|
1563 | 1562 | ) |
|
1564 | 1563 | coreconfigitem( |
|
1565 | 1564 | b'patch', |
|
1566 | 1565 | b'eol', |
|
1567 | 1566 | default=b'strict', |
|
1568 | 1567 | ) |
|
1569 | 1568 | coreconfigitem( |
|
1570 | 1569 | b'patch', |
|
1571 | 1570 | b'fuzz', |
|
1572 | 1571 | default=2, |
|
1573 | 1572 | ) |
|
1574 | 1573 | coreconfigitem( |
|
1575 | 1574 | b'paths', |
|
1576 | 1575 | b'default', |
|
1577 | 1576 | default=None, |
|
1578 | 1577 | ) |
|
1579 | 1578 | coreconfigitem( |
|
1580 | 1579 | b'paths', |
|
1581 | 1580 | b'default-push', |
|
1582 | 1581 | default=None, |
|
1583 | 1582 | ) |
|
1584 | 1583 | coreconfigitem( |
|
1585 | 1584 | b'paths', |
|
1586 | 1585 | b'.*', |
|
1587 | 1586 | default=None, |
|
1588 | 1587 | generic=True, |
|
1589 | 1588 | ) |
|
1590 | 1589 | coreconfigitem( |
|
1591 | 1590 | b'phases', |
|
1592 | 1591 | b'checksubrepos', |
|
1593 | 1592 | default=b'follow', |
|
1594 | 1593 | ) |
|
1595 | 1594 | coreconfigitem( |
|
1596 | 1595 | b'phases', |
|
1597 | 1596 | b'new-commit', |
|
1598 | 1597 | default=b'draft', |
|
1599 | 1598 | ) |
|
1600 | 1599 | coreconfigitem( |
|
1601 | 1600 | b'phases', |
|
1602 | 1601 | b'publish', |
|
1603 | 1602 | default=True, |
|
1604 | 1603 | ) |
|
1605 | 1604 | coreconfigitem( |
|
1606 | 1605 | b'profiling', |
|
1607 | 1606 | b'enabled', |
|
1608 | 1607 | default=False, |
|
1609 | 1608 | ) |
|
1610 | 1609 | coreconfigitem( |
|
1611 | 1610 | b'profiling', |
|
1612 | 1611 | b'format', |
|
1613 | 1612 | default=b'text', |
|
1614 | 1613 | ) |
|
1615 | 1614 | coreconfigitem( |
|
1616 | 1615 | b'profiling', |
|
1617 | 1616 | b'freq', |
|
1618 | 1617 | default=1000, |
|
1619 | 1618 | ) |
|
1620 | 1619 | coreconfigitem( |
|
1621 | 1620 | b'profiling', |
|
1622 | 1621 | b'limit', |
|
1623 | 1622 | default=30, |
|
1624 | 1623 | ) |
|
1625 | 1624 | coreconfigitem( |
|
1626 | 1625 | b'profiling', |
|
1627 | 1626 | b'nested', |
|
1628 | 1627 | default=0, |
|
1629 | 1628 | ) |
|
1630 | 1629 | coreconfigitem( |
|
1631 | 1630 | b'profiling', |
|
1632 | 1631 | b'output', |
|
1633 | 1632 | default=None, |
|
1634 | 1633 | ) |
|
1635 | 1634 | coreconfigitem( |
|
1636 | 1635 | b'profiling', |
|
1637 | 1636 | b'showmax', |
|
1638 | 1637 | default=0.999, |
|
1639 | 1638 | ) |
|
1640 | 1639 | coreconfigitem( |
|
1641 | 1640 | b'profiling', |
|
1642 | 1641 | b'showmin', |
|
1643 | 1642 | default=dynamicdefault, |
|
1644 | 1643 | ) |
|
1645 | 1644 | coreconfigitem( |
|
1646 | 1645 | b'profiling', |
|
1647 | 1646 | b'showtime', |
|
1648 | 1647 | default=True, |
|
1649 | 1648 | ) |
|
1650 | 1649 | coreconfigitem( |
|
1651 | 1650 | b'profiling', |
|
1652 | 1651 | b'sort', |
|
1653 | 1652 | default=b'inlinetime', |
|
1654 | 1653 | ) |
|
1655 | 1654 | coreconfigitem( |
|
1656 | 1655 | b'profiling', |
|
1657 | 1656 | b'statformat', |
|
1658 | 1657 | default=b'hotpath', |
|
1659 | 1658 | ) |
|
1660 | 1659 | coreconfigitem( |
|
1661 | 1660 | b'profiling', |
|
1662 | 1661 | b'time-track', |
|
1663 | 1662 | default=dynamicdefault, |
|
1664 | 1663 | ) |
|
1665 | 1664 | coreconfigitem( |
|
1666 | 1665 | b'profiling', |
|
1667 | 1666 | b'type', |
|
1668 | 1667 | default=b'stat', |
|
1669 | 1668 | ) |
|
1670 | 1669 | coreconfigitem( |
|
1671 | 1670 | b'progress', |
|
1672 | 1671 | b'assume-tty', |
|
1673 | 1672 | default=False, |
|
1674 | 1673 | ) |
|
1675 | 1674 | coreconfigitem( |
|
1676 | 1675 | b'progress', |
|
1677 | 1676 | b'changedelay', |
|
1678 | 1677 | default=1, |
|
1679 | 1678 | ) |
|
1680 | 1679 | coreconfigitem( |
|
1681 | 1680 | b'progress', |
|
1682 | 1681 | b'clear-complete', |
|
1683 | 1682 | default=True, |
|
1684 | 1683 | ) |
|
1685 | 1684 | coreconfigitem( |
|
1686 | 1685 | b'progress', |
|
1687 | 1686 | b'debug', |
|
1688 | 1687 | default=False, |
|
1689 | 1688 | ) |
|
1690 | 1689 | coreconfigitem( |
|
1691 | 1690 | b'progress', |
|
1692 | 1691 | b'delay', |
|
1693 | 1692 | default=3, |
|
1694 | 1693 | ) |
|
1695 | 1694 | coreconfigitem( |
|
1696 | 1695 | b'progress', |
|
1697 | 1696 | b'disable', |
|
1698 | 1697 | default=False, |
|
1699 | 1698 | ) |
|
1700 | 1699 | coreconfigitem( |
|
1701 | 1700 | b'progress', |
|
1702 | 1701 | b'estimateinterval', |
|
1703 | 1702 | default=60.0, |
|
1704 | 1703 | ) |
|
1705 | 1704 | coreconfigitem( |
|
1706 | 1705 | b'progress', |
|
1707 | 1706 | b'format', |
|
1708 | 1707 | default=lambda: [b'topic', b'bar', b'number', b'estimate'], |
|
1709 | 1708 | ) |
|
1710 | 1709 | coreconfigitem( |
|
1711 | 1710 | b'progress', |
|
1712 | 1711 | b'refresh', |
|
1713 | 1712 | default=0.1, |
|
1714 | 1713 | ) |
|
1715 | 1714 | coreconfigitem( |
|
1716 | 1715 | b'progress', |
|
1717 | 1716 | b'width', |
|
1718 | 1717 | default=dynamicdefault, |
|
1719 | 1718 | ) |
|
1720 | 1719 | coreconfigitem( |
|
1721 | 1720 | b'pull', |
|
1722 | 1721 | b'confirm', |
|
1723 | 1722 | default=False, |
|
1724 | 1723 | ) |
|
1725 | 1724 | coreconfigitem( |
|
1726 | 1725 | b'push', |
|
1727 | 1726 | b'pushvars.server', |
|
1728 | 1727 | default=False, |
|
1729 | 1728 | ) |
|
1730 | 1729 | coreconfigitem( |
|
1731 | 1730 | b'rewrite', |
|
1732 | 1731 | b'backup-bundle', |
|
1733 | 1732 | default=True, |
|
1734 | 1733 | alias=[(b'ui', b'history-editing-backup')], |
|
1735 | 1734 | ) |
|
1736 | 1735 | coreconfigitem( |
|
1737 | 1736 | b'rewrite', |
|
1738 | 1737 | b'update-timestamp', |
|
1739 | 1738 | default=False, |
|
1740 | 1739 | ) |
|
1741 | 1740 | coreconfigitem( |
|
1742 | 1741 | b'rewrite', |
|
1743 | 1742 | b'empty-successor', |
|
1744 | 1743 | default=b'skip', |
|
1745 | 1744 | experimental=True, |
|
1746 | 1745 | ) |
|
1747 | 1746 | coreconfigitem( |
|
1748 | 1747 | b'storage', |
|
1749 | 1748 | b'new-repo-backend', |
|
1750 | 1749 | default=b'revlogv1', |
|
1751 | 1750 | experimental=True, |
|
1752 | 1751 | ) |
|
1753 | 1752 | coreconfigitem( |
|
1754 | 1753 | b'storage', |
|
1755 | 1754 | b'revlog.optimize-delta-parent-choice', |
|
1756 | 1755 | default=True, |
|
1757 | 1756 | alias=[(b'format', b'aggressivemergedeltas')], |
|
1758 | 1757 | ) |
|
1759 | 1758 | # experimental as long as rust is experimental (or a C version is implemented) |
|
1760 | 1759 | coreconfigitem( |
|
1761 | 1760 | b'storage', |
|
1762 | 1761 | b'revlog.persistent-nodemap.mmap', |
|
1763 | 1762 | default=True, |
|
1764 | 1763 | ) |
|
1765 | 1764 | # experimental as long as format.use-persistent-nodemap is. |
|
1766 | 1765 | coreconfigitem( |
|
1767 | 1766 | b'storage', |
|
1768 | 1767 | b'revlog.persistent-nodemap.slow-path', |
|
1769 | 1768 | default=b"abort", |
|
1770 | 1769 | ) |
|
1771 | 1770 | |
|
1772 | 1771 | coreconfigitem( |
|
1773 | 1772 | b'storage', |
|
1774 | 1773 | b'revlog.reuse-external-delta', |
|
1775 | 1774 | default=True, |
|
1776 | 1775 | ) |
|
1777 | 1776 | coreconfigitem( |
|
1778 | 1777 | b'storage', |
|
1779 | 1778 | b'revlog.reuse-external-delta-parent', |
|
1780 | 1779 | default=None, |
|
1781 | 1780 | ) |
|
1782 | 1781 | coreconfigitem( |
|
1783 | 1782 | b'storage', |
|
1784 | 1783 | b'revlog.zlib.level', |
|
1785 | 1784 | default=None, |
|
1786 | 1785 | ) |
|
1787 | 1786 | coreconfigitem( |
|
1788 | 1787 | b'storage', |
|
1789 | 1788 | b'revlog.zstd.level', |
|
1790 | 1789 | default=None, |
|
1791 | 1790 | ) |
|
1792 | 1791 | coreconfigitem( |
|
1793 | 1792 | b'server', |
|
1794 | 1793 | b'bookmarks-pushkey-compat', |
|
1795 | 1794 | default=True, |
|
1796 | 1795 | ) |
|
1797 | 1796 | coreconfigitem( |
|
1798 | 1797 | b'server', |
|
1799 | 1798 | b'bundle1', |
|
1800 | 1799 | default=True, |
|
1801 | 1800 | ) |
|
1802 | 1801 | coreconfigitem( |
|
1803 | 1802 | b'server', |
|
1804 | 1803 | b'bundle1gd', |
|
1805 | 1804 | default=None, |
|
1806 | 1805 | ) |
|
1807 | 1806 | coreconfigitem( |
|
1808 | 1807 | b'server', |
|
1809 | 1808 | b'bundle1.pull', |
|
1810 | 1809 | default=None, |
|
1811 | 1810 | ) |
|
1812 | 1811 | coreconfigitem( |
|
1813 | 1812 | b'server', |
|
1814 | 1813 | b'bundle1gd.pull', |
|
1815 | 1814 | default=None, |
|
1816 | 1815 | ) |
|
1817 | 1816 | coreconfigitem( |
|
1818 | 1817 | b'server', |
|
1819 | 1818 | b'bundle1.push', |
|
1820 | 1819 | default=None, |
|
1821 | 1820 | ) |
|
1822 | 1821 | coreconfigitem( |
|
1823 | 1822 | b'server', |
|
1824 | 1823 | b'bundle1gd.push', |
|
1825 | 1824 | default=None, |
|
1826 | 1825 | ) |
|
1827 | 1826 | coreconfigitem( |
|
1828 | 1827 | b'server', |
|
1829 | 1828 | b'bundle2.stream', |
|
1830 | 1829 | default=True, |
|
1831 | 1830 | alias=[(b'experimental', b'bundle2.stream')], |
|
1832 | 1831 | ) |
|
1833 | 1832 | coreconfigitem( |
|
1834 | 1833 | b'server', |
|
1835 | 1834 | b'compressionengines', |
|
1836 | 1835 | default=list, |
|
1837 | 1836 | ) |
|
1838 | 1837 | coreconfigitem( |
|
1839 | 1838 | b'server', |
|
1840 | 1839 | b'concurrent-push-mode', |
|
1841 | 1840 | default=b'check-related', |
|
1842 | 1841 | ) |
|
1843 | 1842 | coreconfigitem( |
|
1844 | 1843 | b'server', |
|
1845 | 1844 | b'disablefullbundle', |
|
1846 | 1845 | default=False, |
|
1847 | 1846 | ) |
|
1848 | 1847 | coreconfigitem( |
|
1849 | 1848 | b'server', |
|
1850 | 1849 | b'maxhttpheaderlen', |
|
1851 | 1850 | default=1024, |
|
1852 | 1851 | ) |
|
1853 | 1852 | coreconfigitem( |
|
1854 | 1853 | b'server', |
|
1855 | 1854 | b'pullbundle', |
|
1856 | 1855 | default=False, |
|
1857 | 1856 | ) |
|
1858 | 1857 | coreconfigitem( |
|
1859 | 1858 | b'server', |
|
1860 | 1859 | b'preferuncompressed', |
|
1861 | 1860 | default=False, |
|
1862 | 1861 | ) |
|
1863 | 1862 | coreconfigitem( |
|
1864 | 1863 | b'server', |
|
1865 | 1864 | b'streamunbundle', |
|
1866 | 1865 | default=False, |
|
1867 | 1866 | ) |
|
1868 | 1867 | coreconfigitem( |
|
1869 | 1868 | b'server', |
|
1870 | 1869 | b'uncompressed', |
|
1871 | 1870 | default=True, |
|
1872 | 1871 | ) |
|
1873 | 1872 | coreconfigitem( |
|
1874 | 1873 | b'server', |
|
1875 | 1874 | b'uncompressedallowsecret', |
|
1876 | 1875 | default=False, |
|
1877 | 1876 | ) |
|
1878 | 1877 | coreconfigitem( |
|
1879 | 1878 | b'server', |
|
1880 | 1879 | b'view', |
|
1881 | 1880 | default=b'served', |
|
1882 | 1881 | ) |
|
1883 | 1882 | coreconfigitem( |
|
1884 | 1883 | b'server', |
|
1885 | 1884 | b'validate', |
|
1886 | 1885 | default=False, |
|
1887 | 1886 | ) |
|
1888 | 1887 | coreconfigitem( |
|
1889 | 1888 | b'server', |
|
1890 | 1889 | b'zliblevel', |
|
1891 | 1890 | default=-1, |
|
1892 | 1891 | ) |
|
1893 | 1892 | coreconfigitem( |
|
1894 | 1893 | b'server', |
|
1895 | 1894 | b'zstdlevel', |
|
1896 | 1895 | default=3, |
|
1897 | 1896 | ) |
|
1898 | 1897 | coreconfigitem( |
|
1899 | 1898 | b'share', |
|
1900 | 1899 | b'pool', |
|
1901 | 1900 | default=None, |
|
1902 | 1901 | ) |
|
1903 | 1902 | coreconfigitem( |
|
1904 | 1903 | b'share', |
|
1905 | 1904 | b'poolnaming', |
|
1906 | 1905 | default=b'identity', |
|
1907 | 1906 | ) |
|
1908 | 1907 | coreconfigitem( |
|
1909 | 1908 | b'share', |
|
1910 | 1909 | b'safe-mismatch.source-not-safe', |
|
1911 | 1910 | default=b'abort', |
|
1912 | 1911 | ) |
|
1913 | 1912 | coreconfigitem( |
|
1914 | 1913 | b'share', |
|
1915 | 1914 | b'safe-mismatch.source-safe', |
|
1916 | 1915 | default=b'abort', |
|
1917 | 1916 | ) |
|
1918 | 1917 | coreconfigitem( |
|
1919 | 1918 | b'share', |
|
1920 | 1919 | b'safe-mismatch.source-not-safe.warn', |
|
1921 | 1920 | default=True, |
|
1922 | 1921 | ) |
|
1923 | 1922 | coreconfigitem( |
|
1924 | 1923 | b'share', |
|
1925 | 1924 | b'safe-mismatch.source-safe.warn', |
|
1926 | 1925 | default=True, |
|
1927 | 1926 | ) |
|
1928 | 1927 | coreconfigitem( |
|
1929 | 1928 | b'shelve', |
|
1930 | 1929 | b'maxbackups', |
|
1931 | 1930 | default=10, |
|
1932 | 1931 | ) |
|
1933 | 1932 | coreconfigitem( |
|
1934 | 1933 | b'smtp', |
|
1935 | 1934 | b'host', |
|
1936 | 1935 | default=None, |
|
1937 | 1936 | ) |
|
1938 | 1937 | coreconfigitem( |
|
1939 | 1938 | b'smtp', |
|
1940 | 1939 | b'local_hostname', |
|
1941 | 1940 | default=None, |
|
1942 | 1941 | ) |
|
1943 | 1942 | coreconfigitem( |
|
1944 | 1943 | b'smtp', |
|
1945 | 1944 | b'password', |
|
1946 | 1945 | default=None, |
|
1947 | 1946 | ) |
|
1948 | 1947 | coreconfigitem( |
|
1949 | 1948 | b'smtp', |
|
1950 | 1949 | b'port', |
|
1951 | 1950 | default=dynamicdefault, |
|
1952 | 1951 | ) |
|
1953 | 1952 | coreconfigitem( |
|
1954 | 1953 | b'smtp', |
|
1955 | 1954 | b'tls', |
|
1956 | 1955 | default=b'none', |
|
1957 | 1956 | ) |
|
1958 | 1957 | coreconfigitem( |
|
1959 | 1958 | b'smtp', |
|
1960 | 1959 | b'username', |
|
1961 | 1960 | default=None, |
|
1962 | 1961 | ) |
|
1963 | 1962 | coreconfigitem( |
|
1964 | 1963 | b'sparse', |
|
1965 | 1964 | b'missingwarning', |
|
1966 | 1965 | default=True, |
|
1967 | 1966 | experimental=True, |
|
1968 | 1967 | ) |
|
1969 | 1968 | coreconfigitem( |
|
1970 | 1969 | b'subrepos', |
|
1971 | 1970 | b'allowed', |
|
1972 | 1971 | default=dynamicdefault, # to make backporting simpler |
|
1973 | 1972 | ) |
|
1974 | 1973 | coreconfigitem( |
|
1975 | 1974 | b'subrepos', |
|
1976 | 1975 | b'hg:allowed', |
|
1977 | 1976 | default=dynamicdefault, |
|
1978 | 1977 | ) |
|
1979 | 1978 | coreconfigitem( |
|
1980 | 1979 | b'subrepos', |
|
1981 | 1980 | b'git:allowed', |
|
1982 | 1981 | default=dynamicdefault, |
|
1983 | 1982 | ) |
|
1984 | 1983 | coreconfigitem( |
|
1985 | 1984 | b'subrepos', |
|
1986 | 1985 | b'svn:allowed', |
|
1987 | 1986 | default=dynamicdefault, |
|
1988 | 1987 | ) |
|
1989 | 1988 | coreconfigitem( |
|
1990 | 1989 | b'templates', |
|
1991 | 1990 | b'.*', |
|
1992 | 1991 | default=None, |
|
1993 | 1992 | generic=True, |
|
1994 | 1993 | ) |
|
1995 | 1994 | coreconfigitem( |
|
1996 | 1995 | b'templateconfig', |
|
1997 | 1996 | b'.*', |
|
1998 | 1997 | default=dynamicdefault, |
|
1999 | 1998 | generic=True, |
|
2000 | 1999 | ) |
|
2001 | 2000 | coreconfigitem( |
|
2002 | 2001 | b'trusted', |
|
2003 | 2002 | b'groups', |
|
2004 | 2003 | default=list, |
|
2005 | 2004 | ) |
|
2006 | 2005 | coreconfigitem( |
|
2007 | 2006 | b'trusted', |
|
2008 | 2007 | b'users', |
|
2009 | 2008 | default=list, |
|
2010 | 2009 | ) |
|
2011 | 2010 | coreconfigitem( |
|
2012 | 2011 | b'ui', |
|
2013 | 2012 | b'_usedassubrepo', |
|
2014 | 2013 | default=False, |
|
2015 | 2014 | ) |
|
2016 | 2015 | coreconfigitem( |
|
2017 | 2016 | b'ui', |
|
2018 | 2017 | b'allowemptycommit', |
|
2019 | 2018 | default=False, |
|
2020 | 2019 | ) |
|
2021 | 2020 | coreconfigitem( |
|
2022 | 2021 | b'ui', |
|
2023 | 2022 | b'archivemeta', |
|
2024 | 2023 | default=True, |
|
2025 | 2024 | ) |
|
2026 | 2025 | coreconfigitem( |
|
2027 | 2026 | b'ui', |
|
2028 | 2027 | b'askusername', |
|
2029 | 2028 | default=False, |
|
2030 | 2029 | ) |
|
2031 | 2030 | coreconfigitem( |
|
2032 | 2031 | b'ui', |
|
2033 | 2032 | b'available-memory', |
|
2034 | 2033 | default=None, |
|
2035 | 2034 | ) |
|
2036 | 2035 | |
|
2037 | 2036 | coreconfigitem( |
|
2038 | 2037 | b'ui', |
|
2039 | 2038 | b'clonebundlefallback', |
|
2040 | 2039 | default=False, |
|
2041 | 2040 | ) |
|
2042 | 2041 | coreconfigitem( |
|
2043 | 2042 | b'ui', |
|
2044 | 2043 | b'clonebundleprefers', |
|
2045 | 2044 | default=list, |
|
2046 | 2045 | ) |
|
2047 | 2046 | coreconfigitem( |
|
2048 | 2047 | b'ui', |
|
2049 | 2048 | b'clonebundles', |
|
2050 | 2049 | default=True, |
|
2051 | 2050 | ) |
|
2052 | 2051 | coreconfigitem( |
|
2053 | 2052 | b'ui', |
|
2054 | 2053 | b'color', |
|
2055 | 2054 | default=b'auto', |
|
2056 | 2055 | ) |
|
2057 | 2056 | coreconfigitem( |
|
2058 | 2057 | b'ui', |
|
2059 | 2058 | b'commitsubrepos', |
|
2060 | 2059 | default=False, |
|
2061 | 2060 | ) |
|
2062 | 2061 | coreconfigitem( |
|
2063 | 2062 | b'ui', |
|
2064 | 2063 | b'debug', |
|
2065 | 2064 | default=False, |
|
2066 | 2065 | ) |
|
2067 | 2066 | coreconfigitem( |
|
2068 | 2067 | b'ui', |
|
2069 | 2068 | b'debugger', |
|
2070 | 2069 | default=None, |
|
2071 | 2070 | ) |
|
2072 | 2071 | coreconfigitem( |
|
2073 | 2072 | b'ui', |
|
2074 | 2073 | b'editor', |
|
2075 | 2074 | default=dynamicdefault, |
|
2076 | 2075 | ) |
|
2077 | 2076 | coreconfigitem( |
|
2078 | 2077 | b'ui', |
|
2079 | 2078 | b'detailed-exit-code', |
|
2080 | 2079 | default=False, |
|
2081 | 2080 | experimental=True, |
|
2082 | 2081 | ) |
|
2083 | 2082 | coreconfigitem( |
|
2084 | 2083 | b'ui', |
|
2085 | 2084 | b'fallbackencoding', |
|
2086 | 2085 | default=None, |
|
2087 | 2086 | ) |
|
2088 | 2087 | coreconfigitem( |
|
2089 | 2088 | b'ui', |
|
2090 | 2089 | b'forcecwd', |
|
2091 | 2090 | default=None, |
|
2092 | 2091 | ) |
|
2093 | 2092 | coreconfigitem( |
|
2094 | 2093 | b'ui', |
|
2095 | 2094 | b'forcemerge', |
|
2096 | 2095 | default=None, |
|
2097 | 2096 | ) |
|
2098 | 2097 | coreconfigitem( |
|
2099 | 2098 | b'ui', |
|
2100 | 2099 | b'formatdebug', |
|
2101 | 2100 | default=False, |
|
2102 | 2101 | ) |
|
2103 | 2102 | coreconfigitem( |
|
2104 | 2103 | b'ui', |
|
2105 | 2104 | b'formatjson', |
|
2106 | 2105 | default=False, |
|
2107 | 2106 | ) |
|
2108 | 2107 | coreconfigitem( |
|
2109 | 2108 | b'ui', |
|
2110 | 2109 | b'formatted', |
|
2111 | 2110 | default=None, |
|
2112 | 2111 | ) |
|
2113 | 2112 | coreconfigitem( |
|
2114 | 2113 | b'ui', |
|
2115 | 2114 | b'interactive', |
|
2116 | 2115 | default=None, |
|
2117 | 2116 | ) |
|
2118 | 2117 | coreconfigitem( |
|
2119 | 2118 | b'ui', |
|
2120 | 2119 | b'interface', |
|
2121 | 2120 | default=None, |
|
2122 | 2121 | ) |
|
2123 | 2122 | coreconfigitem( |
|
2124 | 2123 | b'ui', |
|
2125 | 2124 | b'interface.chunkselector', |
|
2126 | 2125 | default=None, |
|
2127 | 2126 | ) |
|
2128 | 2127 | coreconfigitem( |
|
2129 | 2128 | b'ui', |
|
2130 | 2129 | b'large-file-limit', |
|
2131 | 2130 | default=10000000, |
|
2132 | 2131 | ) |
|
2133 | 2132 | coreconfigitem( |
|
2134 | 2133 | b'ui', |
|
2135 | 2134 | b'logblockedtimes', |
|
2136 | 2135 | default=False, |
|
2137 | 2136 | ) |
|
2138 | 2137 | coreconfigitem( |
|
2139 | 2138 | b'ui', |
|
2140 | 2139 | b'merge', |
|
2141 | 2140 | default=None, |
|
2142 | 2141 | ) |
|
2143 | 2142 | coreconfigitem( |
|
2144 | 2143 | b'ui', |
|
2145 | 2144 | b'mergemarkers', |
|
2146 | 2145 | default=b'basic', |
|
2147 | 2146 | ) |
|
2148 | 2147 | coreconfigitem( |
|
2149 | 2148 | b'ui', |
|
2150 | 2149 | b'message-output', |
|
2151 | 2150 | default=b'stdio', |
|
2152 | 2151 | ) |
|
2153 | 2152 | coreconfigitem( |
|
2154 | 2153 | b'ui', |
|
2155 | 2154 | b'nontty', |
|
2156 | 2155 | default=False, |
|
2157 | 2156 | ) |
|
2158 | 2157 | coreconfigitem( |
|
2159 | 2158 | b'ui', |
|
2160 | 2159 | b'origbackuppath', |
|
2161 | 2160 | default=None, |
|
2162 | 2161 | ) |
|
2163 | 2162 | coreconfigitem( |
|
2164 | 2163 | b'ui', |
|
2165 | 2164 | b'paginate', |
|
2166 | 2165 | default=True, |
|
2167 | 2166 | ) |
|
2168 | 2167 | coreconfigitem( |
|
2169 | 2168 | b'ui', |
|
2170 | 2169 | b'patch', |
|
2171 | 2170 | default=None, |
|
2172 | 2171 | ) |
|
2173 | 2172 | coreconfigitem( |
|
2174 | 2173 | b'ui', |
|
2175 | 2174 | b'portablefilenames', |
|
2176 | 2175 | default=b'warn', |
|
2177 | 2176 | ) |
|
2178 | 2177 | coreconfigitem( |
|
2179 | 2178 | b'ui', |
|
2180 | 2179 | b'promptecho', |
|
2181 | 2180 | default=False, |
|
2182 | 2181 | ) |
|
2183 | 2182 | coreconfigitem( |
|
2184 | 2183 | b'ui', |
|
2185 | 2184 | b'quiet', |
|
2186 | 2185 | default=False, |
|
2187 | 2186 | ) |
|
2188 | 2187 | coreconfigitem( |
|
2189 | 2188 | b'ui', |
|
2190 | 2189 | b'quietbookmarkmove', |
|
2191 | 2190 | default=False, |
|
2192 | 2191 | ) |
|
2193 | 2192 | coreconfigitem( |
|
2194 | 2193 | b'ui', |
|
2195 | 2194 | b'relative-paths', |
|
2196 | 2195 | default=b'legacy', |
|
2197 | 2196 | ) |
|
2198 | 2197 | coreconfigitem( |
|
2199 | 2198 | b'ui', |
|
2200 | 2199 | b'remotecmd', |
|
2201 | 2200 | default=b'hg', |
|
2202 | 2201 | ) |
|
2203 | 2202 | coreconfigitem( |
|
2204 | 2203 | b'ui', |
|
2205 | 2204 | b'report_untrusted', |
|
2206 | 2205 | default=True, |
|
2207 | 2206 | ) |
|
2208 | 2207 | coreconfigitem( |
|
2209 | 2208 | b'ui', |
|
2210 | 2209 | b'rollback', |
|
2211 | 2210 | default=True, |
|
2212 | 2211 | ) |
|
2213 | 2212 | coreconfigitem( |
|
2214 | 2213 | b'ui', |
|
2215 | 2214 | b'signal-safe-lock', |
|
2216 | 2215 | default=True, |
|
2217 | 2216 | ) |
|
2218 | 2217 | coreconfigitem( |
|
2219 | 2218 | b'ui', |
|
2220 | 2219 | b'slash', |
|
2221 | 2220 | default=False, |
|
2222 | 2221 | ) |
|
2223 | 2222 | coreconfigitem( |
|
2224 | 2223 | b'ui', |
|
2225 | 2224 | b'ssh', |
|
2226 | 2225 | default=b'ssh', |
|
2227 | 2226 | ) |
|
2228 | 2227 | coreconfigitem( |
|
2229 | 2228 | b'ui', |
|
2230 | 2229 | b'ssherrorhint', |
|
2231 | 2230 | default=None, |
|
2232 | 2231 | ) |
|
2233 | 2232 | coreconfigitem( |
|
2234 | 2233 | b'ui', |
|
2235 | 2234 | b'statuscopies', |
|
2236 | 2235 | default=False, |
|
2237 | 2236 | ) |
|
2238 | 2237 | coreconfigitem( |
|
2239 | 2238 | b'ui', |
|
2240 | 2239 | b'strict', |
|
2241 | 2240 | default=False, |
|
2242 | 2241 | ) |
|
2243 | 2242 | coreconfigitem( |
|
2244 | 2243 | b'ui', |
|
2245 | 2244 | b'style', |
|
2246 | 2245 | default=b'', |
|
2247 | 2246 | ) |
|
2248 | 2247 | coreconfigitem( |
|
2249 | 2248 | b'ui', |
|
2250 | 2249 | b'supportcontact', |
|
2251 | 2250 | default=None, |
|
2252 | 2251 | ) |
|
2253 | 2252 | coreconfigitem( |
|
2254 | 2253 | b'ui', |
|
2255 | 2254 | b'textwidth', |
|
2256 | 2255 | default=78, |
|
2257 | 2256 | ) |
|
2258 | 2257 | coreconfigitem( |
|
2259 | 2258 | b'ui', |
|
2260 | 2259 | b'timeout', |
|
2261 | 2260 | default=b'600', |
|
2262 | 2261 | ) |
|
2263 | 2262 | coreconfigitem( |
|
2264 | 2263 | b'ui', |
|
2265 | 2264 | b'timeout.warn', |
|
2266 | 2265 | default=0, |
|
2267 | 2266 | ) |
|
2268 | 2267 | coreconfigitem( |
|
2269 | 2268 | b'ui', |
|
2270 | 2269 | b'timestamp-output', |
|
2271 | 2270 | default=False, |
|
2272 | 2271 | ) |
|
2273 | 2272 | coreconfigitem( |
|
2274 | 2273 | b'ui', |
|
2275 | 2274 | b'traceback', |
|
2276 | 2275 | default=False, |
|
2277 | 2276 | ) |
|
2278 | 2277 | coreconfigitem( |
|
2279 | 2278 | b'ui', |
|
2280 | 2279 | b'tweakdefaults', |
|
2281 | 2280 | default=False, |
|
2282 | 2281 | ) |
|
2283 | 2282 | coreconfigitem(b'ui', b'username', alias=[(b'ui', b'user')]) |
|
2284 | 2283 | coreconfigitem( |
|
2285 | 2284 | b'ui', |
|
2286 | 2285 | b'verbose', |
|
2287 | 2286 | default=False, |
|
2288 | 2287 | ) |
|
2289 | 2288 | coreconfigitem( |
|
2290 | 2289 | b'verify', |
|
2291 | 2290 | b'skipflags', |
|
2292 | 2291 | default=None, |
|
2293 | 2292 | ) |
|
2294 | 2293 | coreconfigitem( |
|
2295 | 2294 | b'web', |
|
2296 | 2295 | b'allowbz2', |
|
2297 | 2296 | default=False, |
|
2298 | 2297 | ) |
|
2299 | 2298 | coreconfigitem( |
|
2300 | 2299 | b'web', |
|
2301 | 2300 | b'allowgz', |
|
2302 | 2301 | default=False, |
|
2303 | 2302 | ) |
|
2304 | 2303 | coreconfigitem( |
|
2305 | 2304 | b'web', |
|
2306 | 2305 | b'allow-pull', |
|
2307 | 2306 | alias=[(b'web', b'allowpull')], |
|
2308 | 2307 | default=True, |
|
2309 | 2308 | ) |
|
2310 | 2309 | coreconfigitem( |
|
2311 | 2310 | b'web', |
|
2312 | 2311 | b'allow-push', |
|
2313 | 2312 | alias=[(b'web', b'allow_push')], |
|
2314 | 2313 | default=list, |
|
2315 | 2314 | ) |
|
2316 | 2315 | coreconfigitem( |
|
2317 | 2316 | b'web', |
|
2318 | 2317 | b'allowzip', |
|
2319 | 2318 | default=False, |
|
2320 | 2319 | ) |
|
2321 | 2320 | coreconfigitem( |
|
2322 | 2321 | b'web', |
|
2323 | 2322 | b'archivesubrepos', |
|
2324 | 2323 | default=False, |
|
2325 | 2324 | ) |
|
2326 | 2325 | coreconfigitem( |
|
2327 | 2326 | b'web', |
|
2328 | 2327 | b'cache', |
|
2329 | 2328 | default=True, |
|
2330 | 2329 | ) |
|
2331 | 2330 | coreconfigitem( |
|
2332 | 2331 | b'web', |
|
2333 | 2332 | b'comparisoncontext', |
|
2334 | 2333 | default=5, |
|
2335 | 2334 | ) |
|
2336 | 2335 | coreconfigitem( |
|
2337 | 2336 | b'web', |
|
2338 | 2337 | b'contact', |
|
2339 | 2338 | default=None, |
|
2340 | 2339 | ) |
|
2341 | 2340 | coreconfigitem( |
|
2342 | 2341 | b'web', |
|
2343 | 2342 | b'deny_push', |
|
2344 | 2343 | default=list, |
|
2345 | 2344 | ) |
|
2346 | 2345 | coreconfigitem( |
|
2347 | 2346 | b'web', |
|
2348 | 2347 | b'guessmime', |
|
2349 | 2348 | default=False, |
|
2350 | 2349 | ) |
|
2351 | 2350 | coreconfigitem( |
|
2352 | 2351 | b'web', |
|
2353 | 2352 | b'hidden', |
|
2354 | 2353 | default=False, |
|
2355 | 2354 | ) |
|
2356 | 2355 | coreconfigitem( |
|
2357 | 2356 | b'web', |
|
2358 | 2357 | b'labels', |
|
2359 | 2358 | default=list, |
|
2360 | 2359 | ) |
|
2361 | 2360 | coreconfigitem( |
|
2362 | 2361 | b'web', |
|
2363 | 2362 | b'logoimg', |
|
2364 | 2363 | default=b'hglogo.png', |
|
2365 | 2364 | ) |
|
2366 | 2365 | coreconfigitem( |
|
2367 | 2366 | b'web', |
|
2368 | 2367 | b'logourl', |
|
2369 | 2368 | default=b'https://mercurial-scm.org/', |
|
2370 | 2369 | ) |
|
2371 | 2370 | coreconfigitem( |
|
2372 | 2371 | b'web', |
|
2373 | 2372 | b'accesslog', |
|
2374 | 2373 | default=b'-', |
|
2375 | 2374 | ) |
|
2376 | 2375 | coreconfigitem( |
|
2377 | 2376 | b'web', |
|
2378 | 2377 | b'address', |
|
2379 | 2378 | default=b'', |
|
2380 | 2379 | ) |
|
2381 | 2380 | coreconfigitem( |
|
2382 | 2381 | b'web', |
|
2383 | 2382 | b'allow-archive', |
|
2384 | 2383 | alias=[(b'web', b'allow_archive')], |
|
2385 | 2384 | default=list, |
|
2386 | 2385 | ) |
|
2387 | 2386 | coreconfigitem( |
|
2388 | 2387 | b'web', |
|
2389 | 2388 | b'allow_read', |
|
2390 | 2389 | default=list, |
|
2391 | 2390 | ) |
|
2392 | 2391 | coreconfigitem( |
|
2393 | 2392 | b'web', |
|
2394 | 2393 | b'baseurl', |
|
2395 | 2394 | default=None, |
|
2396 | 2395 | ) |
|
2397 | 2396 | coreconfigitem( |
|
2398 | 2397 | b'web', |
|
2399 | 2398 | b'cacerts', |
|
2400 | 2399 | default=None, |
|
2401 | 2400 | ) |
|
2402 | 2401 | coreconfigitem( |
|
2403 | 2402 | b'web', |
|
2404 | 2403 | b'certificate', |
|
2405 | 2404 | default=None, |
|
2406 | 2405 | ) |
|
2407 | 2406 | coreconfigitem( |
|
2408 | 2407 | b'web', |
|
2409 | 2408 | b'collapse', |
|
2410 | 2409 | default=False, |
|
2411 | 2410 | ) |
|
2412 | 2411 | coreconfigitem( |
|
2413 | 2412 | b'web', |
|
2414 | 2413 | b'csp', |
|
2415 | 2414 | default=None, |
|
2416 | 2415 | ) |
|
2417 | 2416 | coreconfigitem( |
|
2418 | 2417 | b'web', |
|
2419 | 2418 | b'deny_read', |
|
2420 | 2419 | default=list, |
|
2421 | 2420 | ) |
|
2422 | 2421 | coreconfigitem( |
|
2423 | 2422 | b'web', |
|
2424 | 2423 | b'descend', |
|
2425 | 2424 | default=True, |
|
2426 | 2425 | ) |
|
2427 | 2426 | coreconfigitem( |
|
2428 | 2427 | b'web', |
|
2429 | 2428 | b'description', |
|
2430 | 2429 | default=b"", |
|
2431 | 2430 | ) |
|
2432 | 2431 | coreconfigitem( |
|
2433 | 2432 | b'web', |
|
2434 | 2433 | b'encoding', |
|
2435 | 2434 | default=lambda: encoding.encoding, |
|
2436 | 2435 | ) |
|
2437 | 2436 | coreconfigitem( |
|
2438 | 2437 | b'web', |
|
2439 | 2438 | b'errorlog', |
|
2440 | 2439 | default=b'-', |
|
2441 | 2440 | ) |
|
2442 | 2441 | coreconfigitem( |
|
2443 | 2442 | b'web', |
|
2444 | 2443 | b'ipv6', |
|
2445 | 2444 | default=False, |
|
2446 | 2445 | ) |
|
2447 | 2446 | coreconfigitem( |
|
2448 | 2447 | b'web', |
|
2449 | 2448 | b'maxchanges', |
|
2450 | 2449 | default=10, |
|
2451 | 2450 | ) |
|
2452 | 2451 | coreconfigitem( |
|
2453 | 2452 | b'web', |
|
2454 | 2453 | b'maxfiles', |
|
2455 | 2454 | default=10, |
|
2456 | 2455 | ) |
|
2457 | 2456 | coreconfigitem( |
|
2458 | 2457 | b'web', |
|
2459 | 2458 | b'maxshortchanges', |
|
2460 | 2459 | default=60, |
|
2461 | 2460 | ) |
|
2462 | 2461 | coreconfigitem( |
|
2463 | 2462 | b'web', |
|
2464 | 2463 | b'motd', |
|
2465 | 2464 | default=b'', |
|
2466 | 2465 | ) |
|
2467 | 2466 | coreconfigitem( |
|
2468 | 2467 | b'web', |
|
2469 | 2468 | b'name', |
|
2470 | 2469 | default=dynamicdefault, |
|
2471 | 2470 | ) |
|
2472 | 2471 | coreconfigitem( |
|
2473 | 2472 | b'web', |
|
2474 | 2473 | b'port', |
|
2475 | 2474 | default=8000, |
|
2476 | 2475 | ) |
|
2477 | 2476 | coreconfigitem( |
|
2478 | 2477 | b'web', |
|
2479 | 2478 | b'prefix', |
|
2480 | 2479 | default=b'', |
|
2481 | 2480 | ) |
|
2482 | 2481 | coreconfigitem( |
|
2483 | 2482 | b'web', |
|
2484 | 2483 | b'push_ssl', |
|
2485 | 2484 | default=True, |
|
2486 | 2485 | ) |
|
2487 | 2486 | coreconfigitem( |
|
2488 | 2487 | b'web', |
|
2489 | 2488 | b'refreshinterval', |
|
2490 | 2489 | default=20, |
|
2491 | 2490 | ) |
|
2492 | 2491 | coreconfigitem( |
|
2493 | 2492 | b'web', |
|
2494 | 2493 | b'server-header', |
|
2495 | 2494 | default=None, |
|
2496 | 2495 | ) |
|
2497 | 2496 | coreconfigitem( |
|
2498 | 2497 | b'web', |
|
2499 | 2498 | b'static', |
|
2500 | 2499 | default=None, |
|
2501 | 2500 | ) |
|
2502 | 2501 | coreconfigitem( |
|
2503 | 2502 | b'web', |
|
2504 | 2503 | b'staticurl', |
|
2505 | 2504 | default=None, |
|
2506 | 2505 | ) |
|
2507 | 2506 | coreconfigitem( |
|
2508 | 2507 | b'web', |
|
2509 | 2508 | b'stripes', |
|
2510 | 2509 | default=1, |
|
2511 | 2510 | ) |
|
2512 | 2511 | coreconfigitem( |
|
2513 | 2512 | b'web', |
|
2514 | 2513 | b'style', |
|
2515 | 2514 | default=b'paper', |
|
2516 | 2515 | ) |
|
2517 | 2516 | coreconfigitem( |
|
2518 | 2517 | b'web', |
|
2519 | 2518 | b'templates', |
|
2520 | 2519 | default=None, |
|
2521 | 2520 | ) |
|
2522 | 2521 | coreconfigitem( |
|
2523 | 2522 | b'web', |
|
2524 | 2523 | b'view', |
|
2525 | 2524 | default=b'served', |
|
2526 | 2525 | experimental=True, |
|
2527 | 2526 | ) |
|
2528 | 2527 | coreconfigitem( |
|
2529 | 2528 | b'worker', |
|
2530 | 2529 | b'backgroundclose', |
|
2531 | 2530 | default=dynamicdefault, |
|
2532 | 2531 | ) |
|
2533 | 2532 | # Windows defaults to a limit of 512 open files. A buffer of 128 |
|
2534 | 2533 | # should give us enough headway. |
|
2535 | 2534 | coreconfigitem( |
|
2536 | 2535 | b'worker', |
|
2537 | 2536 | b'backgroundclosemaxqueue', |
|
2538 | 2537 | default=384, |
|
2539 | 2538 | ) |
|
2540 | 2539 | coreconfigitem( |
|
2541 | 2540 | b'worker', |
|
2542 | 2541 | b'backgroundcloseminfilecount', |
|
2543 | 2542 | default=2048, |
|
2544 | 2543 | ) |
|
2545 | 2544 | coreconfigitem( |
|
2546 | 2545 | b'worker', |
|
2547 | 2546 | b'backgroundclosethreadcount', |
|
2548 | 2547 | default=4, |
|
2549 | 2548 | ) |
|
2550 | 2549 | coreconfigitem( |
|
2551 | 2550 | b'worker', |
|
2552 | 2551 | b'enabled', |
|
2553 | 2552 | default=True, |
|
2554 | 2553 | ) |
|
2555 | 2554 | coreconfigitem( |
|
2556 | 2555 | b'worker', |
|
2557 | 2556 | b'numcpus', |
|
2558 | 2557 | default=None, |
|
2559 | 2558 | ) |
|
2560 | 2559 | |
|
2561 | 2560 | # Rebase related configuration moved to core because other extension are doing |
|
2562 | 2561 | # strange things. For example, shelve import the extensions to reuse some bit |
|
2563 | 2562 | # without formally loading it. |
|
2564 | 2563 | coreconfigitem( |
|
2565 | 2564 | b'commands', |
|
2566 | 2565 | b'rebase.requiredest', |
|
2567 | 2566 | default=False, |
|
2568 | 2567 | ) |
|
2569 | 2568 | coreconfigitem( |
|
2570 | 2569 | b'experimental', |
|
2571 | 2570 | b'rebaseskipobsolete', |
|
2572 | 2571 | default=True, |
|
2573 | 2572 | ) |
|
2574 | 2573 | coreconfigitem( |
|
2575 | 2574 | b'rebase', |
|
2576 | 2575 | b'singletransaction', |
|
2577 | 2576 | default=False, |
|
2578 | 2577 | ) |
|
2579 | 2578 | coreconfigitem( |
|
2580 | 2579 | b'rebase', |
|
2581 | 2580 | b'experimental.inmemory', |
|
2582 | 2581 | default=False, |
|
2583 | 2582 | ) |
@@ -1,3031 +1,3037 | |||
|
1 | 1 | The Mercurial system uses a set of configuration files to control |
|
2 | 2 | aspects of its behavior. |
|
3 | 3 | |
|
4 | 4 | Troubleshooting |
|
5 | 5 | =============== |
|
6 | 6 | |
|
7 | 7 | If you're having problems with your configuration, |
|
8 | 8 | :hg:`config --debug` can help you understand what is introducing |
|
9 | 9 | a setting into your environment. |
|
10 | 10 | |
|
11 | 11 | See :hg:`help config.syntax` and :hg:`help config.files` |
|
12 | 12 | for information about how and where to override things. |
|
13 | 13 | |
|
14 | 14 | Structure |
|
15 | 15 | ========= |
|
16 | 16 | |
|
17 | 17 | The configuration files use a simple ini-file format. A configuration |
|
18 | 18 | file consists of sections, led by a ``[section]`` header and followed |
|
19 | 19 | by ``name = value`` entries:: |
|
20 | 20 | |
|
21 | 21 | [ui] |
|
22 | 22 | username = Firstname Lastname <firstname.lastname@example.net> |
|
23 | 23 | verbose = True |
|
24 | 24 | |
|
25 | 25 | The above entries will be referred to as ``ui.username`` and |
|
26 | 26 | ``ui.verbose``, respectively. See :hg:`help config.syntax`. |
|
27 | 27 | |
|
28 | 28 | Files |
|
29 | 29 | ===== |
|
30 | 30 | |
|
31 | 31 | Mercurial reads configuration data from several files, if they exist. |
|
32 | 32 | These files do not exist by default and you will have to create the |
|
33 | 33 | appropriate configuration files yourself: |
|
34 | 34 | |
|
35 | 35 | Local configuration is put into the per-repository ``<repo>/.hg/hgrc`` file. |
|
36 | 36 | |
|
37 | 37 | Global configuration like the username setting is typically put into: |
|
38 | 38 | |
|
39 | 39 | .. container:: windows |
|
40 | 40 | |
|
41 | 41 | - ``%USERPROFILE%\mercurial.ini`` (on Windows) |
|
42 | 42 | |
|
43 | 43 | .. container:: unix.plan9 |
|
44 | 44 | |
|
45 | 45 | - ``$HOME/.hgrc`` (on Unix, Plan9) |
|
46 | 46 | |
|
47 | 47 | The names of these files depend on the system on which Mercurial is |
|
48 | 48 | installed. ``*.rc`` files from a single directory are read in |
|
49 | 49 | alphabetical order, later ones overriding earlier ones. Where multiple |
|
50 | 50 | paths are given below, settings from earlier paths override later |
|
51 | 51 | ones. |
|
52 | 52 | |
|
53 | 53 | .. container:: verbose.unix |
|
54 | 54 | |
|
55 | 55 | On Unix, the following files are consulted: |
|
56 | 56 | |
|
57 | 57 | - ``<repo>/.hg/hgrc-not-shared`` (per-repository) |
|
58 | 58 | - ``<repo>/.hg/hgrc`` (per-repository) |
|
59 | 59 | - ``$HOME/.hgrc`` (per-user) |
|
60 | 60 | - ``${XDG_CONFIG_HOME:-$HOME/.config}/hg/hgrc`` (per-user) |
|
61 | 61 | - ``<install-root>/etc/mercurial/hgrc`` (per-installation) |
|
62 | 62 | - ``<install-root>/etc/mercurial/hgrc.d/*.rc`` (per-installation) |
|
63 | 63 | - ``/etc/mercurial/hgrc`` (per-system) |
|
64 | 64 | - ``/etc/mercurial/hgrc.d/*.rc`` (per-system) |
|
65 | 65 | - ``<internal>/*.rc`` (defaults) |
|
66 | 66 | |
|
67 | 67 | .. container:: verbose.windows |
|
68 | 68 | |
|
69 | 69 | On Windows, the following files are consulted: |
|
70 | 70 | |
|
71 | 71 | - ``<repo>/.hg/hgrc-not-shared`` (per-repository) |
|
72 | 72 | - ``<repo>/.hg/hgrc`` (per-repository) |
|
73 | 73 | - ``%USERPROFILE%\.hgrc`` (per-user) |
|
74 | 74 | - ``%USERPROFILE%\Mercurial.ini`` (per-user) |
|
75 | 75 | - ``%HOME%\.hgrc`` (per-user) |
|
76 | 76 | - ``%HOME%\Mercurial.ini`` (per-user) |
|
77 | 77 | - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-system) |
|
78 | 78 | - ``<install-dir>\hgrc.d\*.rc`` (per-installation) |
|
79 | 79 | - ``<install-dir>\Mercurial.ini`` (per-installation) |
|
80 | 80 | - ``%PROGRAMDATA%\Mercurial\hgrc`` (per-system) |
|
81 | 81 | - ``%PROGRAMDATA%\Mercurial\Mercurial.ini`` (per-system) |
|
82 | 82 | - ``%PROGRAMDATA%\Mercurial\hgrc.d\*.rc`` (per-system) |
|
83 | 83 | - ``<internal>/*.rc`` (defaults) |
|
84 | 84 | |
|
85 | 85 | .. note:: |
|
86 | 86 | |
|
87 | 87 | The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial`` |
|
88 | 88 | is used when running 32-bit Python on 64-bit Windows. |
|
89 | 89 | |
|
90 | 90 | .. container:: verbose.plan9 |
|
91 | 91 | |
|
92 | 92 | On Plan9, the following files are consulted: |
|
93 | 93 | |
|
94 | 94 | - ``<repo>/.hg/hgrc-not-shared`` (per-repository) |
|
95 | 95 | - ``<repo>/.hg/hgrc`` (per-repository) |
|
96 | 96 | - ``$home/lib/hgrc`` (per-user) |
|
97 | 97 | - ``<install-root>/lib/mercurial/hgrc`` (per-installation) |
|
98 | 98 | - ``<install-root>/lib/mercurial/hgrc.d/*.rc`` (per-installation) |
|
99 | 99 | - ``/lib/mercurial/hgrc`` (per-system) |
|
100 | 100 | - ``/lib/mercurial/hgrc.d/*.rc`` (per-system) |
|
101 | 101 | - ``<internal>/*.rc`` (defaults) |
|
102 | 102 | |
|
103 | 103 | Per-repository configuration options only apply in a |
|
104 | 104 | particular repository. This file is not version-controlled, and |
|
105 | 105 | will not get transferred during a "clone" operation. Options in |
|
106 | 106 | this file override options in all other configuration files. |
|
107 | 107 | |
|
108 | 108 | .. container:: unix.plan9 |
|
109 | 109 | |
|
110 | 110 | On Plan 9 and Unix, most of this file will be ignored if it doesn't |
|
111 | 111 | belong to a trusted user or to a trusted group. See |
|
112 | 112 | :hg:`help config.trusted` for more details. |
|
113 | 113 | |
|
114 | 114 | Per-user configuration file(s) are for the user running Mercurial. Options |
|
115 | 115 | in these files apply to all Mercurial commands executed by this user in any |
|
116 | 116 | directory. Options in these files override per-system and per-installation |
|
117 | 117 | options. |
|
118 | 118 | |
|
119 | 119 | Per-installation configuration files are searched for in the |
|
120 | 120 | directory where Mercurial is installed. ``<install-root>`` is the |
|
121 | 121 | parent directory of the **hg** executable (or symlink) being run. |
|
122 | 122 | |
|
123 | 123 | .. container:: unix.plan9 |
|
124 | 124 | |
|
125 | 125 | For example, if installed in ``/shared/tools/bin/hg``, Mercurial |
|
126 | 126 | will look in ``/shared/tools/etc/mercurial/hgrc``. Options in these |
|
127 | 127 | files apply to all Mercurial commands executed by any user in any |
|
128 | 128 | directory. |
|
129 | 129 | |
|
130 | 130 | Per-installation configuration files are for the system on |
|
131 | 131 | which Mercurial is running. Options in these files apply to all |
|
132 | 132 | Mercurial commands executed by any user in any directory. Registry |
|
133 | 133 | keys contain PATH-like strings, every part of which must reference |
|
134 | 134 | a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will |
|
135 | 135 | be read. Mercurial checks each of these locations in the specified |
|
136 | 136 | order until one or more configuration files are detected. |
|
137 | 137 | |
|
138 | 138 | Per-system configuration files are for the system on which Mercurial |
|
139 | 139 | is running. Options in these files apply to all Mercurial commands |
|
140 | 140 | executed by any user in any directory. Options in these files |
|
141 | 141 | override per-installation options. |
|
142 | 142 | |
|
143 | 143 | Mercurial comes with some default configuration. The default configuration |
|
144 | 144 | files are installed with Mercurial and will be overwritten on upgrades. Default |
|
145 | 145 | configuration files should never be edited by users or administrators but can |
|
146 | 146 | be overridden in other configuration files. So far the directory only contains |
|
147 | 147 | merge tool configuration but packagers can also put other default configuration |
|
148 | 148 | there. |
|
149 | 149 | |
|
150 | 150 | .. container:: verbose |
|
151 | 151 | |
|
152 | 152 | On versions 5.7 and later, if share-safe functionality is enabled, |
|
153 | 153 | shares will read config file of share source too. |
|
154 | 154 | `<share-source/.hg/hgrc>` is read before reading `<repo/.hg/hgrc>`. |
|
155 | 155 | |
|
156 | 156 | For configs which should not be shared, `<repo/.hg/hgrc-not-shared>` |
|
157 | 157 | should be used. |
|
158 | 158 | |
|
159 | 159 | Syntax |
|
160 | 160 | ====== |
|
161 | 161 | |
|
162 | 162 | A configuration file consists of sections, led by a ``[section]`` header |
|
163 | 163 | and followed by ``name = value`` entries (sometimes called |
|
164 | 164 | ``configuration keys``):: |
|
165 | 165 | |
|
166 | 166 | [spam] |
|
167 | 167 | eggs=ham |
|
168 | 168 | green= |
|
169 | 169 | eggs |
|
170 | 170 | |
|
171 | 171 | Each line contains one entry. If the lines that follow are indented, |
|
172 | 172 | they are treated as continuations of that entry. Leading whitespace is |
|
173 | 173 | removed from values. Empty lines are skipped. Lines beginning with |
|
174 | 174 | ``#`` or ``;`` are ignored and may be used to provide comments. |
|
175 | 175 | |
|
176 | 176 | Configuration keys can be set multiple times, in which case Mercurial |
|
177 | 177 | will use the value that was configured last. As an example:: |
|
178 | 178 | |
|
179 | 179 | [spam] |
|
180 | 180 | eggs=large |
|
181 | 181 | ham=serrano |
|
182 | 182 | eggs=small |
|
183 | 183 | |
|
184 | 184 | This would set the configuration key named ``eggs`` to ``small``. |
|
185 | 185 | |
|
186 | 186 | It is also possible to define a section multiple times. A section can |
|
187 | 187 | be redefined on the same and/or on different configuration files. For |
|
188 | 188 | example:: |
|
189 | 189 | |
|
190 | 190 | [foo] |
|
191 | 191 | eggs=large |
|
192 | 192 | ham=serrano |
|
193 | 193 | eggs=small |
|
194 | 194 | |
|
195 | 195 | [bar] |
|
196 | 196 | eggs=ham |
|
197 | 197 | green= |
|
198 | 198 | eggs |
|
199 | 199 | |
|
200 | 200 | [foo] |
|
201 | 201 | ham=prosciutto |
|
202 | 202 | eggs=medium |
|
203 | 203 | bread=toasted |
|
204 | 204 | |
|
205 | 205 | This would set the ``eggs``, ``ham``, and ``bread`` configuration keys |
|
206 | 206 | of the ``foo`` section to ``medium``, ``prosciutto``, and ``toasted``, |
|
207 | 207 | respectively. As you can see there only thing that matters is the last |
|
208 | 208 | value that was set for each of the configuration keys. |
|
209 | 209 | |
|
210 | 210 | If a configuration key is set multiple times in different |
|
211 | 211 | configuration files the final value will depend on the order in which |
|
212 | 212 | the different configuration files are read, with settings from earlier |
|
213 | 213 | paths overriding later ones as described on the ``Files`` section |
|
214 | 214 | above. |
|
215 | 215 | |
|
216 | 216 | A line of the form ``%include file`` will include ``file`` into the |
|
217 | 217 | current configuration file. The inclusion is recursive, which means |
|
218 | 218 | that included files can include other files. Filenames are relative to |
|
219 | 219 | the configuration file in which the ``%include`` directive is found. |
|
220 | 220 | Environment variables and ``~user`` constructs are expanded in |
|
221 | 221 | ``file``. This lets you do something like:: |
|
222 | 222 | |
|
223 | 223 | %include ~/.hgrc.d/$HOST.rc |
|
224 | 224 | |
|
225 | 225 | to include a different configuration file on each computer you use. |
|
226 | 226 | |
|
227 | 227 | A line with ``%unset name`` will remove ``name`` from the current |
|
228 | 228 | section, if it has been set previously. |
|
229 | 229 | |
|
230 | 230 | The values are either free-form text strings, lists of text strings, |
|
231 | 231 | or Boolean values. Boolean values can be set to true using any of "1", |
|
232 | 232 | "yes", "true", or "on" and to false using "0", "no", "false", or "off" |
|
233 | 233 | (all case insensitive). |
|
234 | 234 | |
|
235 | 235 | List values are separated by whitespace or comma, except when values are |
|
236 | 236 | placed in double quotation marks:: |
|
237 | 237 | |
|
238 | 238 | allow_read = "John Doe, PhD", brian, betty |
|
239 | 239 | |
|
240 | 240 | Quotation marks can be escaped by prefixing them with a backslash. Only |
|
241 | 241 | quotation marks at the beginning of a word is counted as a quotation |
|
242 | 242 | (e.g., ``foo"bar baz`` is the list of ``foo"bar`` and ``baz``). |
|
243 | 243 | |
|
244 | 244 | Sections |
|
245 | 245 | ======== |
|
246 | 246 | |
|
247 | 247 | This section describes the different sections that may appear in a |
|
248 | 248 | Mercurial configuration file, the purpose of each section, its possible |
|
249 | 249 | keys, and their possible values. |
|
250 | 250 | |
|
251 | 251 | ``alias`` |
|
252 | 252 | --------- |
|
253 | 253 | |
|
254 | 254 | Defines command aliases. |
|
255 | 255 | |
|
256 | 256 | Aliases allow you to define your own commands in terms of other |
|
257 | 257 | commands (or aliases), optionally including arguments. Positional |
|
258 | 258 | arguments in the form of ``$1``, ``$2``, etc. in the alias definition |
|
259 | 259 | are expanded by Mercurial before execution. Positional arguments not |
|
260 | 260 | already used by ``$N`` in the definition are put at the end of the |
|
261 | 261 | command to be executed. |
|
262 | 262 | |
|
263 | 263 | Alias definitions consist of lines of the form:: |
|
264 | 264 | |
|
265 | 265 | <alias> = <command> [<argument>]... |
|
266 | 266 | |
|
267 | 267 | For example, this definition:: |
|
268 | 268 | |
|
269 | 269 | latest = log --limit 5 |
|
270 | 270 | |
|
271 | 271 | creates a new command ``latest`` that shows only the five most recent |
|
272 | 272 | changesets. You can define subsequent aliases using earlier ones:: |
|
273 | 273 | |
|
274 | 274 | stable5 = latest -b stable |
|
275 | 275 | |
|
276 | 276 | .. note:: |
|
277 | 277 | |
|
278 | 278 | It is possible to create aliases with the same names as |
|
279 | 279 | existing commands, which will then override the original |
|
280 | 280 | definitions. This is almost always a bad idea! |
|
281 | 281 | |
|
282 | 282 | An alias can start with an exclamation point (``!``) to make it a |
|
283 | 283 | shell alias. A shell alias is executed with the shell and will let you |
|
284 | 284 | run arbitrary commands. As an example, :: |
|
285 | 285 | |
|
286 | 286 | echo = !echo $@ |
|
287 | 287 | |
|
288 | 288 | will let you do ``hg echo foo`` to have ``foo`` printed in your |
|
289 | 289 | terminal. A better example might be:: |
|
290 | 290 | |
|
291 | 291 | purge = !$HG status --no-status --unknown -0 re: | xargs -0 rm -f |
|
292 | 292 | |
|
293 | 293 | which will make ``hg purge`` delete all unknown files in the |
|
294 | 294 | repository in the same manner as the purge extension. |
|
295 | 295 | |
|
296 | 296 | Positional arguments like ``$1``, ``$2``, etc. in the alias definition |
|
297 | 297 | expand to the command arguments. Unmatched arguments are |
|
298 | 298 | removed. ``$0`` expands to the alias name and ``$@`` expands to all |
|
299 | 299 | arguments separated by a space. ``"$@"`` (with quotes) expands to all |
|
300 | 300 | arguments quoted individually and separated by a space. These expansions |
|
301 | 301 | happen before the command is passed to the shell. |
|
302 | 302 | |
|
303 | 303 | Shell aliases are executed in an environment where ``$HG`` expands to |
|
304 | 304 | the path of the Mercurial that was used to execute the alias. This is |
|
305 | 305 | useful when you want to call further Mercurial commands in a shell |
|
306 | 306 | alias, as was done above for the purge alias. In addition, |
|
307 | 307 | ``$HG_ARGS`` expands to the arguments given to Mercurial. In the ``hg |
|
308 | 308 | echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``. |
|
309 | 309 | |
|
310 | 310 | .. note:: |
|
311 | 311 | |
|
312 | 312 | Some global configuration options such as ``-R`` are |
|
313 | 313 | processed before shell aliases and will thus not be passed to |
|
314 | 314 | aliases. |
|
315 | 315 | |
|
316 | 316 | |
|
317 | 317 | ``annotate`` |
|
318 | 318 | ------------ |
|
319 | 319 | |
|
320 | 320 | Settings used when displaying file annotations. All values are |
|
321 | 321 | Booleans and default to False. See :hg:`help config.diff` for |
|
322 | 322 | related options for the diff command. |
|
323 | 323 | |
|
324 | 324 | ``ignorews`` |
|
325 | 325 | Ignore white space when comparing lines. |
|
326 | 326 | |
|
327 | 327 | ``ignorewseol`` |
|
328 | 328 | Ignore white space at the end of a line when comparing lines. |
|
329 | 329 | |
|
330 | 330 | ``ignorewsamount`` |
|
331 | 331 | Ignore changes in the amount of white space. |
|
332 | 332 | |
|
333 | 333 | ``ignoreblanklines`` |
|
334 | 334 | Ignore changes whose lines are all blank. |
|
335 | 335 | |
|
336 | 336 | |
|
337 | 337 | ``auth`` |
|
338 | 338 | -------- |
|
339 | 339 | |
|
340 | 340 | Authentication credentials and other authentication-like configuration |
|
341 | 341 | for HTTP connections. This section allows you to store usernames and |
|
342 | 342 | passwords for use when logging *into* HTTP servers. See |
|
343 | 343 | :hg:`help config.web` if you want to configure *who* can login to |
|
344 | 344 | your HTTP server. |
|
345 | 345 | |
|
346 | 346 | The following options apply to all hosts. |
|
347 | 347 | |
|
348 | 348 | ``cookiefile`` |
|
349 | 349 | Path to a file containing HTTP cookie lines. Cookies matching a |
|
350 | 350 | host will be sent automatically. |
|
351 | 351 | |
|
352 | 352 | The file format uses the Mozilla cookies.txt format, which defines cookies |
|
353 | 353 | on their own lines. Each line contains 7 fields delimited by the tab |
|
354 | 354 | character (domain, is_domain_cookie, path, is_secure, expires, name, |
|
355 | 355 | value). For more info, do an Internet search for "Netscape cookies.txt |
|
356 | 356 | format." |
|
357 | 357 | |
|
358 | 358 | Note: the cookies parser does not handle port numbers on domains. You |
|
359 | 359 | will need to remove ports from the domain for the cookie to be recognized. |
|
360 | 360 | This could result in a cookie being disclosed to an unwanted server. |
|
361 | 361 | |
|
362 | 362 | The cookies file is read-only. |
|
363 | 363 | |
|
364 | 364 | Other options in this section are grouped by name and have the following |
|
365 | 365 | format:: |
|
366 | 366 | |
|
367 | 367 | <name>.<argument> = <value> |
|
368 | 368 | |
|
369 | 369 | where ``<name>`` is used to group arguments into authentication |
|
370 | 370 | entries. Example:: |
|
371 | 371 | |
|
372 | 372 | foo.prefix = hg.intevation.de/mercurial |
|
373 | 373 | foo.username = foo |
|
374 | 374 | foo.password = bar |
|
375 | 375 | foo.schemes = http https |
|
376 | 376 | |
|
377 | 377 | bar.prefix = secure.example.org |
|
378 | 378 | bar.key = path/to/file.key |
|
379 | 379 | bar.cert = path/to/file.cert |
|
380 | 380 | bar.schemes = https |
|
381 | 381 | |
|
382 | 382 | Supported arguments: |
|
383 | 383 | |
|
384 | 384 | ``prefix`` |
|
385 | 385 | Either ``*`` or a URI prefix with or without the scheme part. |
|
386 | 386 | The authentication entry with the longest matching prefix is used |
|
387 | 387 | (where ``*`` matches everything and counts as a match of length |
|
388 | 388 | 1). If the prefix doesn't include a scheme, the match is performed |
|
389 | 389 | against the URI with its scheme stripped as well, and the schemes |
|
390 | 390 | argument, q.v., is then subsequently consulted. |
|
391 | 391 | |
|
392 | 392 | ``username`` |
|
393 | 393 | Optional. Username to authenticate with. If not given, and the |
|
394 | 394 | remote site requires basic or digest authentication, the user will |
|
395 | 395 | be prompted for it. Environment variables are expanded in the |
|
396 | 396 | username letting you do ``foo.username = $USER``. If the URI |
|
397 | 397 | includes a username, only ``[auth]`` entries with a matching |
|
398 | 398 | username or without a username will be considered. |
|
399 | 399 | |
|
400 | 400 | ``password`` |
|
401 | 401 | Optional. Password to authenticate with. If not given, and the |
|
402 | 402 | remote site requires basic or digest authentication, the user |
|
403 | 403 | will be prompted for it. |
|
404 | 404 | |
|
405 | 405 | ``key`` |
|
406 | 406 | Optional. PEM encoded client certificate key file. Environment |
|
407 | 407 | variables are expanded in the filename. |
|
408 | 408 | |
|
409 | 409 | ``cert`` |
|
410 | 410 | Optional. PEM encoded client certificate chain file. Environment |
|
411 | 411 | variables are expanded in the filename. |
|
412 | 412 | |
|
413 | 413 | ``schemes`` |
|
414 | 414 | Optional. Space separated list of URI schemes to use this |
|
415 | 415 | authentication entry with. Only used if the prefix doesn't include |
|
416 | 416 | a scheme. Supported schemes are http and https. They will match |
|
417 | 417 | static-http and static-https respectively, as well. |
|
418 | 418 | (default: https) |
|
419 | 419 | |
|
420 | 420 | If no suitable authentication entry is found, the user is prompted |
|
421 | 421 | for credentials as usual if required by the remote. |
|
422 | 422 | |
|
423 | 423 | ``cmdserver`` |
|
424 | 424 | ------------- |
|
425 | 425 | |
|
426 | 426 | Controls command server settings. (ADVANCED) |
|
427 | 427 | |
|
428 | 428 | ``message-encodings`` |
|
429 | 429 | List of encodings for the ``m`` (message) channel. The first encoding |
|
430 | 430 | supported by the server will be selected and advertised in the hello |
|
431 | 431 | message. This is useful only when ``ui.message-output`` is set to |
|
432 | 432 | ``channel``. Supported encodings are ``cbor``. |
|
433 | 433 | |
|
434 | 434 | ``shutdown-on-interrupt`` |
|
435 | 435 | If set to false, the server's main loop will continue running after |
|
436 | 436 | SIGINT received. ``runcommand`` requests can still be interrupted by |
|
437 | 437 | SIGINT. Close the write end of the pipe to shut down the server |
|
438 | 438 | process gracefully. |
|
439 | 439 | (default: True) |
|
440 | 440 | |
|
441 | 441 | ``color`` |
|
442 | 442 | --------- |
|
443 | 443 | |
|
444 | 444 | Configure the Mercurial color mode. For details about how to define your custom |
|
445 | 445 | effect and style see :hg:`help color`. |
|
446 | 446 | |
|
447 | 447 | ``mode`` |
|
448 | 448 | String: control the method used to output color. One of ``auto``, ``ansi``, |
|
449 | 449 | ``win32``, ``terminfo`` or ``debug``. In auto mode, Mercurial will |
|
450 | 450 | use ANSI mode by default (or win32 mode prior to Windows 10) if it detects a |
|
451 | 451 | terminal. Any invalid value will disable color. |
|
452 | 452 | |
|
453 | 453 | ``pagermode`` |
|
454 | 454 | String: optional override of ``color.mode`` used with pager. |
|
455 | 455 | |
|
456 | 456 | On some systems, terminfo mode may cause problems when using |
|
457 | 457 | color with ``less -R`` as a pager program. less with the -R option |
|
458 | 458 | will only display ECMA-48 color codes, and terminfo mode may sometimes |
|
459 | 459 | emit codes that less doesn't understand. You can work around this by |
|
460 | 460 | either using ansi mode (or auto mode), or by using less -r (which will |
|
461 | 461 | pass through all terminal control codes, not just color control |
|
462 | 462 | codes). |
|
463 | 463 | |
|
464 | 464 | On some systems (such as MSYS in Windows), the terminal may support |
|
465 | 465 | a different color mode than the pager program. |
|
466 | 466 | |
|
467 | 467 | ``commands`` |
|
468 | 468 | ------------ |
|
469 | 469 | |
|
470 | 470 | ``commit.post-status`` |
|
471 | 471 | Show status of files in the working directory after successful commit. |
|
472 | 472 | (default: False) |
|
473 | 473 | |
|
474 | 474 | ``merge.require-rev`` |
|
475 | 475 | Require that the revision to merge the current commit with be specified on |
|
476 | 476 | the command line. If this is enabled and a revision is not specified, the |
|
477 | 477 | command aborts. |
|
478 | 478 | (default: False) |
|
479 | 479 | |
|
480 | 480 | ``push.require-revs`` |
|
481 | 481 | Require revisions to push be specified using one or more mechanisms such as |
|
482 | 482 | specifying them positionally on the command line, using ``-r``, ``-b``, |
|
483 | 483 | and/or ``-B`` on the command line, or using ``paths.<path>:pushrev`` in the |
|
484 | 484 | configuration. If this is enabled and revisions are not specified, the |
|
485 | 485 | command aborts. |
|
486 | 486 | (default: False) |
|
487 | 487 | |
|
488 | 488 | ``resolve.confirm`` |
|
489 | 489 | Confirm before performing action if no filename is passed. |
|
490 | 490 | (default: False) |
|
491 | 491 | |
|
492 | 492 | ``resolve.explicit-re-merge`` |
|
493 | 493 | Require uses of ``hg resolve`` to specify which action it should perform, |
|
494 | 494 | instead of re-merging files by default. |
|
495 | 495 | (default: False) |
|
496 | 496 | |
|
497 | 497 | ``resolve.mark-check`` |
|
498 | 498 | Determines what level of checking :hg:`resolve --mark` will perform before |
|
499 | 499 | marking files as resolved. Valid values are ``none`, ``warn``, and |
|
500 | 500 | ``abort``. ``warn`` will output a warning listing the file(s) that still |
|
501 | 501 | have conflict markers in them, but will still mark everything resolved. |
|
502 | 502 | ``abort`` will output the same warning but will not mark things as resolved. |
|
503 | 503 | If --all is passed and this is set to ``abort``, only a warning will be |
|
504 | 504 | shown (an error will not be raised). |
|
505 | 505 | (default: ``none``) |
|
506 | 506 | |
|
507 | 507 | ``status.relative`` |
|
508 | 508 | Make paths in :hg:`status` output relative to the current directory. |
|
509 | 509 | (default: False) |
|
510 | 510 | |
|
511 | 511 | ``status.terse`` |
|
512 | 512 | Default value for the --terse flag, which condenses status output. |
|
513 | 513 | (default: empty) |
|
514 | 514 | |
|
515 | 515 | ``update.check`` |
|
516 | 516 | Determines what level of checking :hg:`update` will perform before moving |
|
517 | 517 | to a destination revision. Valid values are ``abort``, ``none``, |
|
518 | 518 | ``linear``, and ``noconflict``. ``abort`` always fails if the working |
|
519 | 519 | directory has uncommitted changes. ``none`` performs no checking, and may |
|
520 | 520 | result in a merge with uncommitted changes. ``linear`` allows any update |
|
521 | 521 | as long as it follows a straight line in the revision history, and may |
|
522 | 522 | trigger a merge with uncommitted changes. ``noconflict`` will allow any |
|
523 | 523 | update which would not trigger a merge with uncommitted changes, if any |
|
524 | 524 | are present. |
|
525 | 525 | (default: ``linear``) |
|
526 | 526 | |
|
527 | 527 | ``update.requiredest`` |
|
528 | 528 | Require that the user pass a destination when running :hg:`update`. |
|
529 | 529 | For example, :hg:`update .::` will be allowed, but a plain :hg:`update` |
|
530 | 530 | will be disallowed. |
|
531 | 531 | (default: False) |
|
532 | 532 | |
|
533 | 533 | ``committemplate`` |
|
534 | 534 | ------------------ |
|
535 | 535 | |
|
536 | 536 | ``changeset`` |
|
537 | 537 | String: configuration in this section is used as the template to |
|
538 | 538 | customize the text shown in the editor when committing. |
|
539 | 539 | |
|
540 | 540 | In addition to pre-defined template keywords, commit log specific one |
|
541 | 541 | below can be used for customization: |
|
542 | 542 | |
|
543 | 543 | ``extramsg`` |
|
544 | 544 | String: Extra message (typically 'Leave message empty to abort |
|
545 | 545 | commit.'). This may be changed by some commands or extensions. |
|
546 | 546 | |
|
547 | 547 | For example, the template configuration below shows as same text as |
|
548 | 548 | one shown by default:: |
|
549 | 549 | |
|
550 | 550 | [committemplate] |
|
551 | 551 | changeset = {desc}\n\n |
|
552 | 552 | HG: Enter commit message. Lines beginning with 'HG:' are removed. |
|
553 | 553 | HG: {extramsg} |
|
554 | 554 | HG: -- |
|
555 | 555 | HG: user: {author}\n{ifeq(p2rev, "-1", "", |
|
556 | 556 | "HG: branch merge\n") |
|
557 | 557 | }HG: branch '{branch}'\n{if(activebookmark, |
|
558 | 558 | "HG: bookmark '{activebookmark}'\n") }{subrepos % |
|
559 | 559 | "HG: subrepo {subrepo}\n" }{file_adds % |
|
560 | 560 | "HG: added {file}\n" }{file_mods % |
|
561 | 561 | "HG: changed {file}\n" }{file_dels % |
|
562 | 562 | "HG: removed {file}\n" }{if(files, "", |
|
563 | 563 | "HG: no files changed\n")} |
|
564 | 564 | |
|
565 | 565 | ``diff()`` |
|
566 | 566 | String: show the diff (see :hg:`help templates` for detail) |
|
567 | 567 | |
|
568 | 568 | Sometimes it is helpful to show the diff of the changeset in the editor without |
|
569 | 569 | having to prefix 'HG: ' to each line so that highlighting works correctly. For |
|
570 | 570 | this, Mercurial provides a special string which will ignore everything below |
|
571 | 571 | it:: |
|
572 | 572 | |
|
573 | 573 | HG: ------------------------ >8 ------------------------ |
|
574 | 574 | |
|
575 | 575 | For example, the template configuration below will show the diff below the |
|
576 | 576 | extra message:: |
|
577 | 577 | |
|
578 | 578 | [committemplate] |
|
579 | 579 | changeset = {desc}\n\n |
|
580 | 580 | HG: Enter commit message. Lines beginning with 'HG:' are removed. |
|
581 | 581 | HG: {extramsg} |
|
582 | 582 | HG: ------------------------ >8 ------------------------ |
|
583 | 583 | HG: Do not touch the line above. |
|
584 | 584 | HG: Everything below will be removed. |
|
585 | 585 | {diff()} |
|
586 | 586 | |
|
587 | 587 | .. note:: |
|
588 | 588 | |
|
589 | 589 | For some problematic encodings (see :hg:`help win32mbcs` for |
|
590 | 590 | detail), this customization should be configured carefully, to |
|
591 | 591 | avoid showing broken characters. |
|
592 | 592 | |
|
593 | 593 | For example, if a multibyte character ending with backslash (0x5c) is |
|
594 | 594 | followed by the ASCII character 'n' in the customized template, |
|
595 | 595 | the sequence of backslash and 'n' is treated as line-feed unexpectedly |
|
596 | 596 | (and the multibyte character is broken, too). |
|
597 | 597 | |
|
598 | 598 | Customized template is used for commands below (``--edit`` may be |
|
599 | 599 | required): |
|
600 | 600 | |
|
601 | 601 | - :hg:`backout` |
|
602 | 602 | - :hg:`commit` |
|
603 | 603 | - :hg:`fetch` (for merge commit only) |
|
604 | 604 | - :hg:`graft` |
|
605 | 605 | - :hg:`histedit` |
|
606 | 606 | - :hg:`import` |
|
607 | 607 | - :hg:`qfold`, :hg:`qnew` and :hg:`qrefresh` |
|
608 | 608 | - :hg:`rebase` |
|
609 | 609 | - :hg:`shelve` |
|
610 | 610 | - :hg:`sign` |
|
611 | 611 | - :hg:`tag` |
|
612 | 612 | - :hg:`transplant` |
|
613 | 613 | |
|
614 | 614 | Configuring items below instead of ``changeset`` allows showing |
|
615 | 615 | customized message only for specific actions, or showing different |
|
616 | 616 | messages for each action. |
|
617 | 617 | |
|
618 | 618 | - ``changeset.backout`` for :hg:`backout` |
|
619 | 619 | - ``changeset.commit.amend.merge`` for :hg:`commit --amend` on merges |
|
620 | 620 | - ``changeset.commit.amend.normal`` for :hg:`commit --amend` on other |
|
621 | 621 | - ``changeset.commit.normal.merge`` for :hg:`commit` on merges |
|
622 | 622 | - ``changeset.commit.normal.normal`` for :hg:`commit` on other |
|
623 | 623 | - ``changeset.fetch`` for :hg:`fetch` (impling merge commit) |
|
624 | 624 | - ``changeset.gpg.sign`` for :hg:`sign` |
|
625 | 625 | - ``changeset.graft`` for :hg:`graft` |
|
626 | 626 | - ``changeset.histedit.edit`` for ``edit`` of :hg:`histedit` |
|
627 | 627 | - ``changeset.histedit.fold`` for ``fold`` of :hg:`histedit` |
|
628 | 628 | - ``changeset.histedit.mess`` for ``mess`` of :hg:`histedit` |
|
629 | 629 | - ``changeset.histedit.pick`` for ``pick`` of :hg:`histedit` |
|
630 | 630 | - ``changeset.import.bypass`` for :hg:`import --bypass` |
|
631 | 631 | - ``changeset.import.normal.merge`` for :hg:`import` on merges |
|
632 | 632 | - ``changeset.import.normal.normal`` for :hg:`import` on other |
|
633 | 633 | - ``changeset.mq.qnew`` for :hg:`qnew` |
|
634 | 634 | - ``changeset.mq.qfold`` for :hg:`qfold` |
|
635 | 635 | - ``changeset.mq.qrefresh`` for :hg:`qrefresh` |
|
636 | 636 | - ``changeset.rebase.collapse`` for :hg:`rebase --collapse` |
|
637 | 637 | - ``changeset.rebase.merge`` for :hg:`rebase` on merges |
|
638 | 638 | - ``changeset.rebase.normal`` for :hg:`rebase` on other |
|
639 | 639 | - ``changeset.shelve.shelve`` for :hg:`shelve` |
|
640 | 640 | - ``changeset.tag.add`` for :hg:`tag` without ``--remove`` |
|
641 | 641 | - ``changeset.tag.remove`` for :hg:`tag --remove` |
|
642 | 642 | - ``changeset.transplant.merge`` for :hg:`transplant` on merges |
|
643 | 643 | - ``changeset.transplant.normal`` for :hg:`transplant` on other |
|
644 | 644 | |
|
645 | 645 | These dot-separated lists of names are treated as hierarchical ones. |
|
646 | 646 | For example, ``changeset.tag.remove`` customizes the commit message |
|
647 | 647 | only for :hg:`tag --remove`, but ``changeset.tag`` customizes the |
|
648 | 648 | commit message for :hg:`tag` regardless of ``--remove`` option. |
|
649 | 649 | |
|
650 | 650 | When the external editor is invoked for a commit, the corresponding |
|
651 | 651 | dot-separated list of names without the ``changeset.`` prefix |
|
652 | 652 | (e.g. ``commit.normal.normal``) is in the ``HGEDITFORM`` environment |
|
653 | 653 | variable. |
|
654 | 654 | |
|
655 | 655 | In this section, items other than ``changeset`` can be referred from |
|
656 | 656 | others. For example, the configuration to list committed files up |
|
657 | 657 | below can be referred as ``{listupfiles}``:: |
|
658 | 658 | |
|
659 | 659 | [committemplate] |
|
660 | 660 | listupfiles = {file_adds % |
|
661 | 661 | "HG: added {file}\n" }{file_mods % |
|
662 | 662 | "HG: changed {file}\n" }{file_dels % |
|
663 | 663 | "HG: removed {file}\n" }{if(files, "", |
|
664 | 664 | "HG: no files changed\n")} |
|
665 | 665 | |
|
666 | 666 | ``decode/encode`` |
|
667 | 667 | ----------------- |
|
668 | 668 | |
|
669 | 669 | Filters for transforming files on checkout/checkin. This would |
|
670 | 670 | typically be used for newline processing or other |
|
671 | 671 | localization/canonicalization of files. |
|
672 | 672 | |
|
673 | 673 | Filters consist of a filter pattern followed by a filter command. |
|
674 | 674 | Filter patterns are globs by default, rooted at the repository root. |
|
675 | 675 | For example, to match any file ending in ``.txt`` in the root |
|
676 | 676 | directory only, use the pattern ``*.txt``. To match any file ending |
|
677 | 677 | in ``.c`` anywhere in the repository, use the pattern ``**.c``. |
|
678 | 678 | For each file only the first matching filter applies. |
|
679 | 679 | |
|
680 | 680 | The filter command can start with a specifier, either ``pipe:`` or |
|
681 | 681 | ``tempfile:``. If no specifier is given, ``pipe:`` is used by default. |
|
682 | 682 | |
|
683 | 683 | A ``pipe:`` command must accept data on stdin and return the transformed |
|
684 | 684 | data on stdout. |
|
685 | 685 | |
|
686 | 686 | Pipe example:: |
|
687 | 687 | |
|
688 | 688 | [encode] |
|
689 | 689 | # uncompress gzip files on checkin to improve delta compression |
|
690 | 690 | # note: not necessarily a good idea, just an example |
|
691 | 691 | *.gz = pipe: gunzip |
|
692 | 692 | |
|
693 | 693 | [decode] |
|
694 | 694 | # recompress gzip files when writing them to the working dir (we |
|
695 | 695 | # can safely omit "pipe:", because it's the default) |
|
696 | 696 | *.gz = gzip |
|
697 | 697 | |
|
698 | 698 | A ``tempfile:`` command is a template. The string ``INFILE`` is replaced |
|
699 | 699 | with the name of a temporary file that contains the data to be |
|
700 | 700 | filtered by the command. The string ``OUTFILE`` is replaced with the name |
|
701 | 701 | of an empty temporary file, where the filtered data must be written by |
|
702 | 702 | the command. |
|
703 | 703 | |
|
704 | 704 | .. container:: windows |
|
705 | 705 | |
|
706 | 706 | .. note:: |
|
707 | 707 | |
|
708 | 708 | The tempfile mechanism is recommended for Windows systems, |
|
709 | 709 | where the standard shell I/O redirection operators often have |
|
710 | 710 | strange effects and may corrupt the contents of your files. |
|
711 | 711 | |
|
712 | 712 | This filter mechanism is used internally by the ``eol`` extension to |
|
713 | 713 | translate line ending characters between Windows (CRLF) and Unix (LF) |
|
714 | 714 | format. We suggest you use the ``eol`` extension for convenience. |
|
715 | 715 | |
|
716 | 716 | |
|
717 | 717 | ``defaults`` |
|
718 | 718 | ------------ |
|
719 | 719 | |
|
720 | 720 | (defaults are deprecated. Don't use them. Use aliases instead.) |
|
721 | 721 | |
|
722 | 722 | Use the ``[defaults]`` section to define command defaults, i.e. the |
|
723 | 723 | default options/arguments to pass to the specified commands. |
|
724 | 724 | |
|
725 | 725 | The following example makes :hg:`log` run in verbose mode, and |
|
726 | 726 | :hg:`status` show only the modified files, by default:: |
|
727 | 727 | |
|
728 | 728 | [defaults] |
|
729 | 729 | log = -v |
|
730 | 730 | status = -m |
|
731 | 731 | |
|
732 | 732 | The actual commands, instead of their aliases, must be used when |
|
733 | 733 | defining command defaults. The command defaults will also be applied |
|
734 | 734 | to the aliases of the commands defined. |
|
735 | 735 | |
|
736 | 736 | |
|
737 | 737 | ``diff`` |
|
738 | 738 | -------- |
|
739 | 739 | |
|
740 | 740 | Settings used when displaying diffs. Everything except for ``unified`` |
|
741 | 741 | is a Boolean and defaults to False. See :hg:`help config.annotate` |
|
742 | 742 | for related options for the annotate command. |
|
743 | 743 | |
|
744 | 744 | ``git`` |
|
745 | 745 | Use git extended diff format. |
|
746 | 746 | |
|
747 | 747 | ``nobinary`` |
|
748 | 748 | Omit git binary patches. |
|
749 | 749 | |
|
750 | 750 | ``nodates`` |
|
751 | 751 | Don't include dates in diff headers. |
|
752 | 752 | |
|
753 | 753 | ``noprefix`` |
|
754 | 754 | Omit 'a/' and 'b/' prefixes from filenames. Ignored in plain mode. |
|
755 | 755 | |
|
756 | 756 | ``showfunc`` |
|
757 | 757 | Show which function each change is in. |
|
758 | 758 | |
|
759 | 759 | ``ignorews`` |
|
760 | 760 | Ignore white space when comparing lines. |
|
761 | 761 | |
|
762 | 762 | ``ignorewsamount`` |
|
763 | 763 | Ignore changes in the amount of white space. |
|
764 | 764 | |
|
765 | 765 | ``ignoreblanklines`` |
|
766 | 766 | Ignore changes whose lines are all blank. |
|
767 | 767 | |
|
768 | 768 | ``unified`` |
|
769 | 769 | Number of lines of context to show. |
|
770 | 770 | |
|
771 | 771 | ``word-diff`` |
|
772 | 772 | Highlight changed words. |
|
773 | 773 | |
|
774 | 774 | ``email`` |
|
775 | 775 | --------- |
|
776 | 776 | |
|
777 | 777 | Settings for extensions that send email messages. |
|
778 | 778 | |
|
779 | 779 | ``from`` |
|
780 | 780 | Optional. Email address to use in "From" header and SMTP envelope |
|
781 | 781 | of outgoing messages. |
|
782 | 782 | |
|
783 | 783 | ``to`` |
|
784 | 784 | Optional. Comma-separated list of recipients' email addresses. |
|
785 | 785 | |
|
786 | 786 | ``cc`` |
|
787 | 787 | Optional. Comma-separated list of carbon copy recipients' |
|
788 | 788 | email addresses. |
|
789 | 789 | |
|
790 | 790 | ``bcc`` |
|
791 | 791 | Optional. Comma-separated list of blind carbon copy recipients' |
|
792 | 792 | email addresses. |
|
793 | 793 | |
|
794 | 794 | ``method`` |
|
795 | 795 | Optional. Method to use to send email messages. If value is ``smtp`` |
|
796 | 796 | (default), use SMTP (see the ``[smtp]`` section for configuration). |
|
797 | 797 | Otherwise, use as name of program to run that acts like sendmail |
|
798 | 798 | (takes ``-f`` option for sender, list of recipients on command line, |
|
799 | 799 | message on stdin). Normally, setting this to ``sendmail`` or |
|
800 | 800 | ``/usr/sbin/sendmail`` is enough to use sendmail to send messages. |
|
801 | 801 | |
|
802 | 802 | ``charsets`` |
|
803 | 803 | Optional. Comma-separated list of character sets considered |
|
804 | 804 | convenient for recipients. Addresses, headers, and parts not |
|
805 | 805 | containing patches of outgoing messages will be encoded in the |
|
806 | 806 | first character set to which conversion from local encoding |
|
807 | 807 | (``$HGENCODING``, ``ui.fallbackencoding``) succeeds. If correct |
|
808 | 808 | conversion fails, the text in question is sent as is. |
|
809 | 809 | (default: '') |
|
810 | 810 | |
|
811 | 811 | Order of outgoing email character sets: |
|
812 | 812 | |
|
813 | 813 | 1. ``us-ascii``: always first, regardless of settings |
|
814 | 814 | 2. ``email.charsets``: in order given by user |
|
815 | 815 | 3. ``ui.fallbackencoding``: if not in email.charsets |
|
816 | 816 | 4. ``$HGENCODING``: if not in email.charsets |
|
817 | 817 | 5. ``utf-8``: always last, regardless of settings |
|
818 | 818 | |
|
819 | 819 | Email example:: |
|
820 | 820 | |
|
821 | 821 | [email] |
|
822 | 822 | from = Joseph User <joe.user@example.com> |
|
823 | 823 | method = /usr/sbin/sendmail |
|
824 | 824 | # charsets for western Europeans |
|
825 | 825 | # us-ascii, utf-8 omitted, as they are tried first and last |
|
826 | 826 | charsets = iso-8859-1, iso-8859-15, windows-1252 |
|
827 | 827 | |
|
828 | 828 | |
|
829 | 829 | ``extensions`` |
|
830 | 830 | -------------- |
|
831 | 831 | |
|
832 | 832 | Mercurial has an extension mechanism for adding new features. To |
|
833 | 833 | enable an extension, create an entry for it in this section. |
|
834 | 834 | |
|
835 | 835 | If you know that the extension is already in Python's search path, |
|
836 | 836 | you can give the name of the module, followed by ``=``, with nothing |
|
837 | 837 | after the ``=``. |
|
838 | 838 | |
|
839 | 839 | Otherwise, give a name that you choose, followed by ``=``, followed by |
|
840 | 840 | the path to the ``.py`` file (including the file name extension) that |
|
841 | 841 | defines the extension. |
|
842 | 842 | |
|
843 | 843 | To explicitly disable an extension that is enabled in an hgrc of |
|
844 | 844 | broader scope, prepend its path with ``!``, as in ``foo = !/ext/path`` |
|
845 | 845 | or ``foo = !`` when path is not supplied. |
|
846 | 846 | |
|
847 | 847 | Example for ``~/.hgrc``:: |
|
848 | 848 | |
|
849 | 849 | [extensions] |
|
850 | 850 | # (the churn extension will get loaded from Mercurial's path) |
|
851 | 851 | churn = |
|
852 | 852 | # (this extension will get loaded from the file specified) |
|
853 | 853 | myfeature = ~/.hgext/myfeature.py |
|
854 | 854 | |
|
855 | 855 | |
|
856 | 856 | ``format`` |
|
857 | 857 | ---------- |
|
858 | 858 | |
|
859 | 859 | Configuration that controls the repository format. Newer format options are more |
|
860 | 860 | powerful, but incompatible with some older versions of Mercurial. Format options |
|
861 | 861 | are considered at repository initialization only. You need to make a new clone |
|
862 | 862 | for config changes to be taken into account. |
|
863 | 863 | |
|
864 | 864 | For more details about repository format and version compatibility, see |
|
865 | 865 | https://www.mercurial-scm.org/wiki/MissingRequirement |
|
866 | 866 | |
|
867 | 867 | ``usegeneraldelta`` |
|
868 | 868 | Enable or disable the "generaldelta" repository format which improves |
|
869 | 869 | repository compression by allowing "revlog" to store deltas against |
|
870 | 870 | arbitrary revisions instead of the previously stored one. This provides |
|
871 | 871 | significant improvement for repositories with branches. |
|
872 | 872 | |
|
873 | 873 | Repositories with this on-disk format require Mercurial version 1.9. |
|
874 | 874 | |
|
875 | 875 | Enabled by default. |
|
876 | 876 | |
|
877 | 877 | ``dotencode`` |
|
878 | 878 | Enable or disable the "dotencode" repository format which enhances |
|
879 | 879 | the "fncache" repository format (which has to be enabled to use |
|
880 | 880 | dotencode) to avoid issues with filenames starting with "._" on |
|
881 | 881 | Mac OS X and spaces on Windows. |
|
882 | 882 | |
|
883 | 883 | Repositories with this on-disk format require Mercurial version 1.7. |
|
884 | 884 | |
|
885 | 885 | Enabled by default. |
|
886 | 886 | |
|
887 | 887 | ``usefncache`` |
|
888 | 888 | Enable or disable the "fncache" repository format which enhances |
|
889 | 889 | the "store" repository format (which has to be enabled to use |
|
890 | 890 | fncache) to allow longer filenames and avoids using Windows |
|
891 | 891 | reserved names, e.g. "nul". |
|
892 | 892 | |
|
893 | 893 | Repositories with this on-disk format require Mercurial version 1.1. |
|
894 | 894 | |
|
895 | 895 | Enabled by default. |
|
896 | 896 | |
|
897 | 897 | ``use-persistent-nodemap`` |
|
898 | 898 | Enable or disable the "persistent-nodemap" feature which improves |
|
899 | 899 | performance if the rust extensions are available. |
|
900 | 900 | |
|
901 | 901 | The "persistence-nodemap" persist the "node -> rev" on disk removing the |
|
902 | 902 | need to dynamically build that mapping for each Mercurial invocation. This |
|
903 | 903 | significantly reduce the startup cost of various local and server-side |
|
904 | 904 | operation for larger repository. |
|
905 | 905 | |
|
906 | 906 | The performance improving version of this feature is currently only |
|
907 | 907 | implemented in Rust, so people not using a version of Mercurial compiled |
|
908 | 908 | with the Rust part might actually suffer some slowdown. For this reason, |
|
909 | 909 | Such version will by default refuse to access such repositories. That |
|
910 | 910 | behavior can be controlled by configuration. Check |
|
911 | 911 | :hg:`help config.storage.revlog.persistent-nodemap.slowpath` for details. |
|
912 | 912 | |
|
913 | 913 | Repository with this on-disk format require Mercurial version 5.4 or above. |
|
914 | 914 | |
|
915 | 915 | Disabled by default. |
|
916 | 916 | |
|
917 | ``use-share-safe`` | |
|
918 | Enable or disable the "share-safe" functionality, which enables shares | |
|
919 | to read requirements and configuration of its source repository. | |
|
920 | ||
|
921 | Disabled by default. | |
|
922 | ||
|
917 | 923 | ``usestore`` |
|
918 | 924 | Enable or disable the "store" repository format which improves |
|
919 | 925 | compatibility with systems that fold case or otherwise mangle |
|
920 | 926 | filenames. Disabling this option will allow you to store longer filenames |
|
921 | 927 | in some situations at the expense of compatibility. |
|
922 | 928 | |
|
923 | 929 | Repositories with this on-disk format require Mercurial version 0.9.4. |
|
924 | 930 | |
|
925 | 931 | Enabled by default. |
|
926 | 932 | |
|
927 | 933 | ``sparse-revlog`` |
|
928 | 934 | Enable or disable the ``sparse-revlog`` delta strategy. This format improves |
|
929 | 935 | delta re-use inside revlog. For very branchy repositories, it results in a |
|
930 | 936 | smaller store. For repositories with many revisions, it also helps |
|
931 | 937 | performance (by using shortened delta chains.) |
|
932 | 938 | |
|
933 | 939 | Repositories with this on-disk format require Mercurial version 4.7 |
|
934 | 940 | |
|
935 | 941 | Enabled by default. |
|
936 | 942 | |
|
937 | 943 | ``revlog-compression`` |
|
938 | 944 | Compression algorithm used by revlog. Supported values are `zlib` and |
|
939 | 945 | `zstd`. The `zlib` engine is the historical default of Mercurial. `zstd` is |
|
940 | 946 | a newer format that is usually a net win over `zlib`, operating faster at |
|
941 | 947 | better compression rates. Use `zstd` to reduce CPU usage. Multiple values |
|
942 | 948 | can be specified, the first available one will be used. |
|
943 | 949 | |
|
944 | 950 | On some systems, the Mercurial installation may lack `zstd` support. |
|
945 | 951 | |
|
946 | 952 | Default is `zlib`. |
|
947 | 953 | |
|
948 | 954 | ``bookmarks-in-store`` |
|
949 | 955 | Store bookmarks in .hg/store/. This means that bookmarks are shared when |
|
950 | 956 | using `hg share` regardless of the `-B` option. |
|
951 | 957 | |
|
952 | 958 | Repositories with this on-disk format require Mercurial version 5.1. |
|
953 | 959 | |
|
954 | 960 | Disabled by default. |
|
955 | 961 | |
|
956 | 962 | |
|
957 | 963 | ``graph`` |
|
958 | 964 | --------- |
|
959 | 965 | |
|
960 | 966 | Web graph view configuration. This section let you change graph |
|
961 | 967 | elements display properties by branches, for instance to make the |
|
962 | 968 | ``default`` branch stand out. |
|
963 | 969 | |
|
964 | 970 | Each line has the following format:: |
|
965 | 971 | |
|
966 | 972 | <branch>.<argument> = <value> |
|
967 | 973 | |
|
968 | 974 | where ``<branch>`` is the name of the branch being |
|
969 | 975 | customized. Example:: |
|
970 | 976 | |
|
971 | 977 | [graph] |
|
972 | 978 | # 2px width |
|
973 | 979 | default.width = 2 |
|
974 | 980 | # red color |
|
975 | 981 | default.color = FF0000 |
|
976 | 982 | |
|
977 | 983 | Supported arguments: |
|
978 | 984 | |
|
979 | 985 | ``width`` |
|
980 | 986 | Set branch edges width in pixels. |
|
981 | 987 | |
|
982 | 988 | ``color`` |
|
983 | 989 | Set branch edges color in hexadecimal RGB notation. |
|
984 | 990 | |
|
985 | 991 | ``hooks`` |
|
986 | 992 | --------- |
|
987 | 993 | |
|
988 | 994 | Commands or Python functions that get automatically executed by |
|
989 | 995 | various actions such as starting or finishing a commit. Multiple |
|
990 | 996 | hooks can be run for the same action by appending a suffix to the |
|
991 | 997 | action. Overriding a site-wide hook can be done by changing its |
|
992 | 998 | value or setting it to an empty string. Hooks can be prioritized |
|
993 | 999 | by adding a prefix of ``priority.`` to the hook name on a new line |
|
994 | 1000 | and setting the priority. The default priority is 0. |
|
995 | 1001 | |
|
996 | 1002 | Example ``.hg/hgrc``:: |
|
997 | 1003 | |
|
998 | 1004 | [hooks] |
|
999 | 1005 | # update working directory after adding changesets |
|
1000 | 1006 | changegroup.update = hg update |
|
1001 | 1007 | # do not use the site-wide hook |
|
1002 | 1008 | incoming = |
|
1003 | 1009 | incoming.email = /my/email/hook |
|
1004 | 1010 | incoming.autobuild = /my/build/hook |
|
1005 | 1011 | # force autobuild hook to run before other incoming hooks |
|
1006 | 1012 | priority.incoming.autobuild = 1 |
|
1007 | 1013 | |
|
1008 | 1014 | Most hooks are run with environment variables set that give useful |
|
1009 | 1015 | additional information. For each hook below, the environment variables |
|
1010 | 1016 | it is passed are listed with names in the form ``$HG_foo``. The |
|
1011 | 1017 | ``$HG_HOOKTYPE`` and ``$HG_HOOKNAME`` variables are set for all hooks. |
|
1012 | 1018 | They contain the type of hook which triggered the run and the full name |
|
1013 | 1019 | of the hook in the config, respectively. In the example above, this will |
|
1014 | 1020 | be ``$HG_HOOKTYPE=incoming`` and ``$HG_HOOKNAME=incoming.email``. |
|
1015 | 1021 | |
|
1016 | 1022 | .. container:: windows |
|
1017 | 1023 | |
|
1018 | 1024 | Some basic Unix syntax can be enabled for portability, including ``$VAR`` |
|
1019 | 1025 | and ``${VAR}`` style variables. A ``~`` followed by ``\`` or ``/`` will |
|
1020 | 1026 | be expanded to ``%USERPROFILE%`` to simulate a subset of tilde expansion |
|
1021 | 1027 | on Unix. To use a literal ``$`` or ``~``, it must be escaped with a back |
|
1022 | 1028 | slash or inside of a strong quote. Strong quotes will be replaced by |
|
1023 | 1029 | double quotes after processing. |
|
1024 | 1030 | |
|
1025 | 1031 | This feature is enabled by adding a prefix of ``tonative.`` to the hook |
|
1026 | 1032 | name on a new line, and setting it to ``True``. For example:: |
|
1027 | 1033 | |
|
1028 | 1034 | [hooks] |
|
1029 | 1035 | incoming.autobuild = /my/build/hook |
|
1030 | 1036 | # enable translation to cmd.exe syntax for autobuild hook |
|
1031 | 1037 | tonative.incoming.autobuild = True |
|
1032 | 1038 | |
|
1033 | 1039 | ``changegroup`` |
|
1034 | 1040 | Run after a changegroup has been added via push, pull or unbundle. The ID of |
|
1035 | 1041 | the first new changeset is in ``$HG_NODE`` and last is in ``$HG_NODE_LAST``. |
|
1036 | 1042 | The URL from which changes came is in ``$HG_URL``. |
|
1037 | 1043 | |
|
1038 | 1044 | ``commit`` |
|
1039 | 1045 | Run after a changeset has been created in the local repository. The ID |
|
1040 | 1046 | of the newly created changeset is in ``$HG_NODE``. Parent changeset |
|
1041 | 1047 | IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``. |
|
1042 | 1048 | |
|
1043 | 1049 | ``incoming`` |
|
1044 | 1050 | Run after a changeset has been pulled, pushed, or unbundled into |
|
1045 | 1051 | the local repository. The ID of the newly arrived changeset is in |
|
1046 | 1052 | ``$HG_NODE``. The URL that was source of the changes is in ``$HG_URL``. |
|
1047 | 1053 | |
|
1048 | 1054 | ``outgoing`` |
|
1049 | 1055 | Run after sending changes from the local repository to another. The ID of |
|
1050 | 1056 | first changeset sent is in ``$HG_NODE``. The source of operation is in |
|
1051 | 1057 | ``$HG_SOURCE``. Also see :hg:`help config.hooks.preoutgoing`. |
|
1052 | 1058 | |
|
1053 | 1059 | ``post-<command>`` |
|
1054 | 1060 | Run after successful invocations of the associated command. The |
|
1055 | 1061 | contents of the command line are passed as ``$HG_ARGS`` and the result |
|
1056 | 1062 | code in ``$HG_RESULT``. Parsed command line arguments are passed as |
|
1057 | 1063 | ``$HG_PATS`` and ``$HG_OPTS``. These contain string representations of |
|
1058 | 1064 | the python data internally passed to <command>. ``$HG_OPTS`` is a |
|
1059 | 1065 | dictionary of options (with unspecified options set to their defaults). |
|
1060 | 1066 | ``$HG_PATS`` is a list of arguments. Hook failure is ignored. |
|
1061 | 1067 | |
|
1062 | 1068 | ``fail-<command>`` |
|
1063 | 1069 | Run after a failed invocation of an associated command. The contents |
|
1064 | 1070 | of the command line are passed as ``$HG_ARGS``. Parsed command line |
|
1065 | 1071 | arguments are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain |
|
1066 | 1072 | string representations of the python data internally passed to |
|
1067 | 1073 | <command>. ``$HG_OPTS`` is a dictionary of options (with unspecified |
|
1068 | 1074 | options set to their defaults). ``$HG_PATS`` is a list of arguments. |
|
1069 | 1075 | Hook failure is ignored. |
|
1070 | 1076 | |
|
1071 | 1077 | ``pre-<command>`` |
|
1072 | 1078 | Run before executing the associated command. The contents of the |
|
1073 | 1079 | command line are passed as ``$HG_ARGS``. Parsed command line arguments |
|
1074 | 1080 | are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string |
|
1075 | 1081 | representations of the data internally passed to <command>. ``$HG_OPTS`` |
|
1076 | 1082 | is a dictionary of options (with unspecified options set to their |
|
1077 | 1083 | defaults). ``$HG_PATS`` is a list of arguments. If the hook returns |
|
1078 | 1084 | failure, the command doesn't execute and Mercurial returns the failure |
|
1079 | 1085 | code. |
|
1080 | 1086 | |
|
1081 | 1087 | ``prechangegroup`` |
|
1082 | 1088 | Run before a changegroup is added via push, pull or unbundle. Exit |
|
1083 | 1089 | status 0 allows the changegroup to proceed. A non-zero status will |
|
1084 | 1090 | cause the push, pull or unbundle to fail. The URL from which changes |
|
1085 | 1091 | will come is in ``$HG_URL``. |
|
1086 | 1092 | |
|
1087 | 1093 | ``precommit`` |
|
1088 | 1094 | Run before starting a local commit. Exit status 0 allows the |
|
1089 | 1095 | commit to proceed. A non-zero status will cause the commit to fail. |
|
1090 | 1096 | Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``. |
|
1091 | 1097 | |
|
1092 | 1098 | ``prelistkeys`` |
|
1093 | 1099 | Run before listing pushkeys (like bookmarks) in the |
|
1094 | 1100 | repository. A non-zero status will cause failure. The key namespace is |
|
1095 | 1101 | in ``$HG_NAMESPACE``. |
|
1096 | 1102 | |
|
1097 | 1103 | ``preoutgoing`` |
|
1098 | 1104 | Run before collecting changes to send from the local repository to |
|
1099 | 1105 | another. A non-zero status will cause failure. This lets you prevent |
|
1100 | 1106 | pull over HTTP or SSH. It can also prevent propagating commits (via |
|
1101 | 1107 | local pull, push (outbound) or bundle commands), but not completely, |
|
1102 | 1108 | since you can just copy files instead. The source of operation is in |
|
1103 | 1109 | ``$HG_SOURCE``. If "serve", the operation is happening on behalf of a remote |
|
1104 | 1110 | SSH or HTTP repository. If "push", "pull" or "bundle", the operation |
|
1105 | 1111 | is happening on behalf of a repository on same system. |
|
1106 | 1112 | |
|
1107 | 1113 | ``prepushkey`` |
|
1108 | 1114 | Run before a pushkey (like a bookmark) is added to the |
|
1109 | 1115 | repository. A non-zero status will cause the key to be rejected. The |
|
1110 | 1116 | key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``, |
|
1111 | 1117 | the old value (if any) is in ``$HG_OLD``, and the new value is in |
|
1112 | 1118 | ``$HG_NEW``. |
|
1113 | 1119 | |
|
1114 | 1120 | ``pretag`` |
|
1115 | 1121 | Run before creating a tag. Exit status 0 allows the tag to be |
|
1116 | 1122 | created. A non-zero status will cause the tag to fail. The ID of the |
|
1117 | 1123 | changeset to tag is in ``$HG_NODE``. The name of tag is in ``$HG_TAG``. The |
|
1118 | 1124 | tag is local if ``$HG_LOCAL=1``, or in the repository if ``$HG_LOCAL=0``. |
|
1119 | 1125 | |
|
1120 | 1126 | ``pretxnopen`` |
|
1121 | 1127 | Run before any new repository transaction is open. The reason for the |
|
1122 | 1128 | transaction will be in ``$HG_TXNNAME``, and a unique identifier for the |
|
1123 | 1129 | transaction will be in ``HG_TXNID``. A non-zero status will prevent the |
|
1124 | 1130 | transaction from being opened. |
|
1125 | 1131 | |
|
1126 | 1132 | ``pretxnclose`` |
|
1127 | 1133 | Run right before the transaction is actually finalized. Any repository change |
|
1128 | 1134 | will be visible to the hook program. This lets you validate the transaction |
|
1129 | 1135 | content or change it. Exit status 0 allows the commit to proceed. A non-zero |
|
1130 | 1136 | status will cause the transaction to be rolled back. The reason for the |
|
1131 | 1137 | transaction opening will be in ``$HG_TXNNAME``, and a unique identifier for |
|
1132 | 1138 | the transaction will be in ``HG_TXNID``. The rest of the available data will |
|
1133 | 1139 | vary according the transaction type. New changesets will add ``$HG_NODE`` |
|
1134 | 1140 | (the ID of the first added changeset), ``$HG_NODE_LAST`` (the ID of the last |
|
1135 | 1141 | added changeset), ``$HG_URL`` and ``$HG_SOURCE`` variables. Bookmark and |
|
1136 | 1142 | phase changes will set ``HG_BOOKMARK_MOVED`` and ``HG_PHASES_MOVED`` to ``1`` |
|
1137 | 1143 | respectively, etc. |
|
1138 | 1144 | |
|
1139 | 1145 | ``pretxnclose-bookmark`` |
|
1140 | 1146 | Run right before a bookmark change is actually finalized. Any repository |
|
1141 | 1147 | change will be visible to the hook program. This lets you validate the |
|
1142 | 1148 | transaction content or change it. Exit status 0 allows the commit to |
|
1143 | 1149 | proceed. A non-zero status will cause the transaction to be rolled back. |
|
1144 | 1150 | The name of the bookmark will be available in ``$HG_BOOKMARK``, the new |
|
1145 | 1151 | bookmark location will be available in ``$HG_NODE`` while the previous |
|
1146 | 1152 | location will be available in ``$HG_OLDNODE``. In case of a bookmark |
|
1147 | 1153 | creation ``$HG_OLDNODE`` will be empty. In case of deletion ``$HG_NODE`` |
|
1148 | 1154 | will be empty. |
|
1149 | 1155 | In addition, the reason for the transaction opening will be in |
|
1150 | 1156 | ``$HG_TXNNAME``, and a unique identifier for the transaction will be in |
|
1151 | 1157 | ``HG_TXNID``. |
|
1152 | 1158 | |
|
1153 | 1159 | ``pretxnclose-phase`` |
|
1154 | 1160 | Run right before a phase change is actually finalized. Any repository change |
|
1155 | 1161 | will be visible to the hook program. This lets you validate the transaction |
|
1156 | 1162 | content or change it. Exit status 0 allows the commit to proceed. A non-zero |
|
1157 | 1163 | status will cause the transaction to be rolled back. The hook is called |
|
1158 | 1164 | multiple times, once for each revision affected by a phase change. |
|
1159 | 1165 | The affected node is available in ``$HG_NODE``, the phase in ``$HG_PHASE`` |
|
1160 | 1166 | while the previous ``$HG_OLDPHASE``. In case of new node, ``$HG_OLDPHASE`` |
|
1161 | 1167 | will be empty. In addition, the reason for the transaction opening will be in |
|
1162 | 1168 | ``$HG_TXNNAME``, and a unique identifier for the transaction will be in |
|
1163 | 1169 | ``HG_TXNID``. The hook is also run for newly added revisions. In this case |
|
1164 | 1170 | the ``$HG_OLDPHASE`` entry will be empty. |
|
1165 | 1171 | |
|
1166 | 1172 | ``txnclose`` |
|
1167 | 1173 | Run after any repository transaction has been committed. At this |
|
1168 | 1174 | point, the transaction can no longer be rolled back. The hook will run |
|
1169 | 1175 | after the lock is released. See :hg:`help config.hooks.pretxnclose` for |
|
1170 | 1176 | details about available variables. |
|
1171 | 1177 | |
|
1172 | 1178 | ``txnclose-bookmark`` |
|
1173 | 1179 | Run after any bookmark change has been committed. At this point, the |
|
1174 | 1180 | transaction can no longer be rolled back. The hook will run after the lock |
|
1175 | 1181 | is released. See :hg:`help config.hooks.pretxnclose-bookmark` for details |
|
1176 | 1182 | about available variables. |
|
1177 | 1183 | |
|
1178 | 1184 | ``txnclose-phase`` |
|
1179 | 1185 | Run after any phase change has been committed. At this point, the |
|
1180 | 1186 | transaction can no longer be rolled back. The hook will run after the lock |
|
1181 | 1187 | is released. See :hg:`help config.hooks.pretxnclose-phase` for details about |
|
1182 | 1188 | available variables. |
|
1183 | 1189 | |
|
1184 | 1190 | ``txnabort`` |
|
1185 | 1191 | Run when a transaction is aborted. See :hg:`help config.hooks.pretxnclose` |
|
1186 | 1192 | for details about available variables. |
|
1187 | 1193 | |
|
1188 | 1194 | ``pretxnchangegroup`` |
|
1189 | 1195 | Run after a changegroup has been added via push, pull or unbundle, but before |
|
1190 | 1196 | the transaction has been committed. The changegroup is visible to the hook |
|
1191 | 1197 | program. This allows validation of incoming changes before accepting them. |
|
1192 | 1198 | The ID of the first new changeset is in ``$HG_NODE`` and last is in |
|
1193 | 1199 | ``$HG_NODE_LAST``. Exit status 0 allows the transaction to commit. A non-zero |
|
1194 | 1200 | status will cause the transaction to be rolled back, and the push, pull or |
|
1195 | 1201 | unbundle will fail. The URL that was the source of changes is in ``$HG_URL``. |
|
1196 | 1202 | |
|
1197 | 1203 | ``pretxncommit`` |
|
1198 | 1204 | Run after a changeset has been created, but before the transaction is |
|
1199 | 1205 | committed. The changeset is visible to the hook program. This allows |
|
1200 | 1206 | validation of the commit message and changes. Exit status 0 allows the |
|
1201 | 1207 | commit to proceed. A non-zero status will cause the transaction to |
|
1202 | 1208 | be rolled back. The ID of the new changeset is in ``$HG_NODE``. The parent |
|
1203 | 1209 | changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``. |
|
1204 | 1210 | |
|
1205 | 1211 | ``preupdate`` |
|
1206 | 1212 | Run before updating the working directory. Exit status 0 allows |
|
1207 | 1213 | the update to proceed. A non-zero status will prevent the update. |
|
1208 | 1214 | The changeset ID of first new parent is in ``$HG_PARENT1``. If updating to a |
|
1209 | 1215 | merge, the ID of second new parent is in ``$HG_PARENT2``. |
|
1210 | 1216 | |
|
1211 | 1217 | ``listkeys`` |
|
1212 | 1218 | Run after listing pushkeys (like bookmarks) in the repository. The |
|
1213 | 1219 | key namespace is in ``$HG_NAMESPACE``. ``$HG_VALUES`` is a |
|
1214 | 1220 | dictionary containing the keys and values. |
|
1215 | 1221 | |
|
1216 | 1222 | ``pushkey`` |
|
1217 | 1223 | Run after a pushkey (like a bookmark) is added to the |
|
1218 | 1224 | repository. The key namespace is in ``$HG_NAMESPACE``, the key is in |
|
1219 | 1225 | ``$HG_KEY``, the old value (if any) is in ``$HG_OLD``, and the new |
|
1220 | 1226 | value is in ``$HG_NEW``. |
|
1221 | 1227 | |
|
1222 | 1228 | ``tag`` |
|
1223 | 1229 | Run after a tag is created. The ID of the tagged changeset is in ``$HG_NODE``. |
|
1224 | 1230 | The name of tag is in ``$HG_TAG``. The tag is local if ``$HG_LOCAL=1``, or in |
|
1225 | 1231 | the repository if ``$HG_LOCAL=0``. |
|
1226 | 1232 | |
|
1227 | 1233 | ``update`` |
|
1228 | 1234 | Run after updating the working directory. The changeset ID of first |
|
1229 | 1235 | new parent is in ``$HG_PARENT1``. If updating to a merge, the ID of second new |
|
1230 | 1236 | parent is in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the |
|
1231 | 1237 | update failed (e.g. because conflicts were not resolved), ``$HG_ERROR=1``. |
|
1232 | 1238 | |
|
1233 | 1239 | .. note:: |
|
1234 | 1240 | |
|
1235 | 1241 | It is generally better to use standard hooks rather than the |
|
1236 | 1242 | generic pre- and post- command hooks, as they are guaranteed to be |
|
1237 | 1243 | called in the appropriate contexts for influencing transactions. |
|
1238 | 1244 | Also, hooks like "commit" will be called in all contexts that |
|
1239 | 1245 | generate a commit (e.g. tag) and not just the commit command. |
|
1240 | 1246 | |
|
1241 | 1247 | .. note:: |
|
1242 | 1248 | |
|
1243 | 1249 | Environment variables with empty values may not be passed to |
|
1244 | 1250 | hooks on platforms such as Windows. As an example, ``$HG_PARENT2`` |
|
1245 | 1251 | will have an empty value under Unix-like platforms for non-merge |
|
1246 | 1252 | changesets, while it will not be available at all under Windows. |
|
1247 | 1253 | |
|
1248 | 1254 | The syntax for Python hooks is as follows:: |
|
1249 | 1255 | |
|
1250 | 1256 | hookname = python:modulename.submodule.callable |
|
1251 | 1257 | hookname = python:/path/to/python/module.py:callable |
|
1252 | 1258 | |
|
1253 | 1259 | Python hooks are run within the Mercurial process. Each hook is |
|
1254 | 1260 | called with at least three keyword arguments: a ui object (keyword |
|
1255 | 1261 | ``ui``), a repository object (keyword ``repo``), and a ``hooktype`` |
|
1256 | 1262 | keyword that tells what kind of hook is used. Arguments listed as |
|
1257 | 1263 | environment variables above are passed as keyword arguments, with no |
|
1258 | 1264 | ``HG_`` prefix, and names in lower case. |
|
1259 | 1265 | |
|
1260 | 1266 | If a Python hook returns a "true" value or raises an exception, this |
|
1261 | 1267 | is treated as a failure. |
|
1262 | 1268 | |
|
1263 | 1269 | |
|
1264 | 1270 | ``hostfingerprints`` |
|
1265 | 1271 | -------------------- |
|
1266 | 1272 | |
|
1267 | 1273 | (Deprecated. Use ``[hostsecurity]``'s ``fingerprints`` options instead.) |
|
1268 | 1274 | |
|
1269 | 1275 | Fingerprints of the certificates of known HTTPS servers. |
|
1270 | 1276 | |
|
1271 | 1277 | A HTTPS connection to a server with a fingerprint configured here will |
|
1272 | 1278 | only succeed if the servers certificate matches the fingerprint. |
|
1273 | 1279 | This is very similar to how ssh known hosts works. |
|
1274 | 1280 | |
|
1275 | 1281 | The fingerprint is the SHA-1 hash value of the DER encoded certificate. |
|
1276 | 1282 | Multiple values can be specified (separated by spaces or commas). This can |
|
1277 | 1283 | be used to define both old and new fingerprints while a host transitions |
|
1278 | 1284 | to a new certificate. |
|
1279 | 1285 | |
|
1280 | 1286 | The CA chain and web.cacerts is not used for servers with a fingerprint. |
|
1281 | 1287 | |
|
1282 | 1288 | For example:: |
|
1283 | 1289 | |
|
1284 | 1290 | [hostfingerprints] |
|
1285 | 1291 | hg.intevation.de = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33 |
|
1286 | 1292 | hg.intevation.org = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33 |
|
1287 | 1293 | |
|
1288 | 1294 | ``hostsecurity`` |
|
1289 | 1295 | ---------------- |
|
1290 | 1296 | |
|
1291 | 1297 | Used to specify global and per-host security settings for connecting to |
|
1292 | 1298 | other machines. |
|
1293 | 1299 | |
|
1294 | 1300 | The following options control default behavior for all hosts. |
|
1295 | 1301 | |
|
1296 | 1302 | ``ciphers`` |
|
1297 | 1303 | Defines the cryptographic ciphers to use for connections. |
|
1298 | 1304 | |
|
1299 | 1305 | Value must be a valid OpenSSL Cipher List Format as documented at |
|
1300 | 1306 | https://www.openssl.org/docs/manmaster/apps/ciphers.html#CIPHER-LIST-FORMAT. |
|
1301 | 1307 | |
|
1302 | 1308 | This setting is for advanced users only. Setting to incorrect values |
|
1303 | 1309 | can significantly lower connection security or decrease performance. |
|
1304 | 1310 | You have been warned. |
|
1305 | 1311 | |
|
1306 | 1312 | This option requires Python 2.7. |
|
1307 | 1313 | |
|
1308 | 1314 | ``minimumprotocol`` |
|
1309 | 1315 | Defines the minimum channel encryption protocol to use. |
|
1310 | 1316 | |
|
1311 | 1317 | By default, the highest version of TLS supported by both client and server |
|
1312 | 1318 | is used. |
|
1313 | 1319 | |
|
1314 | 1320 | Allowed values are: ``tls1.0``, ``tls1.1``, ``tls1.2``. |
|
1315 | 1321 | |
|
1316 | 1322 | When running on an old Python version, only ``tls1.0`` is allowed since |
|
1317 | 1323 | old versions of Python only support up to TLS 1.0. |
|
1318 | 1324 | |
|
1319 | 1325 | When running a Python that supports modern TLS versions, the default is |
|
1320 | 1326 | ``tls1.1``. ``tls1.0`` can still be used to allow TLS 1.0. However, this |
|
1321 | 1327 | weakens security and should only be used as a feature of last resort if |
|
1322 | 1328 | a server does not support TLS 1.1+. |
|
1323 | 1329 | |
|
1324 | 1330 | Options in the ``[hostsecurity]`` section can have the form |
|
1325 | 1331 | ``hostname``:``setting``. This allows multiple settings to be defined on a |
|
1326 | 1332 | per-host basis. |
|
1327 | 1333 | |
|
1328 | 1334 | The following per-host settings can be defined. |
|
1329 | 1335 | |
|
1330 | 1336 | ``ciphers`` |
|
1331 | 1337 | This behaves like ``ciphers`` as described above except it only applies |
|
1332 | 1338 | to the host on which it is defined. |
|
1333 | 1339 | |
|
1334 | 1340 | ``fingerprints`` |
|
1335 | 1341 | A list of hashes of the DER encoded peer/remote certificate. Values have |
|
1336 | 1342 | the form ``algorithm``:``fingerprint``. e.g. |
|
1337 | 1343 | ``sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2``. |
|
1338 | 1344 | In addition, colons (``:``) can appear in the fingerprint part. |
|
1339 | 1345 | |
|
1340 | 1346 | The following algorithms/prefixes are supported: ``sha1``, ``sha256``, |
|
1341 | 1347 | ``sha512``. |
|
1342 | 1348 | |
|
1343 | 1349 | Use of ``sha256`` or ``sha512`` is preferred. |
|
1344 | 1350 | |
|
1345 | 1351 | If a fingerprint is specified, the CA chain is not validated for this |
|
1346 | 1352 | host and Mercurial will require the remote certificate to match one |
|
1347 | 1353 | of the fingerprints specified. This means if the server updates its |
|
1348 | 1354 | certificate, Mercurial will abort until a new fingerprint is defined. |
|
1349 | 1355 | This can provide stronger security than traditional CA-based validation |
|
1350 | 1356 | at the expense of convenience. |
|
1351 | 1357 | |
|
1352 | 1358 | This option takes precedence over ``verifycertsfile``. |
|
1353 | 1359 | |
|
1354 | 1360 | ``minimumprotocol`` |
|
1355 | 1361 | This behaves like ``minimumprotocol`` as described above except it |
|
1356 | 1362 | only applies to the host on which it is defined. |
|
1357 | 1363 | |
|
1358 | 1364 | ``verifycertsfile`` |
|
1359 | 1365 | Path to file a containing a list of PEM encoded certificates used to |
|
1360 | 1366 | verify the server certificate. Environment variables and ``~user`` |
|
1361 | 1367 | constructs are expanded in the filename. |
|
1362 | 1368 | |
|
1363 | 1369 | The server certificate or the certificate's certificate authority (CA) |
|
1364 | 1370 | must match a certificate from this file or certificate verification |
|
1365 | 1371 | will fail and connections to the server will be refused. |
|
1366 | 1372 | |
|
1367 | 1373 | If defined, only certificates provided by this file will be used: |
|
1368 | 1374 | ``web.cacerts`` and any system/default certificates will not be |
|
1369 | 1375 | used. |
|
1370 | 1376 | |
|
1371 | 1377 | This option has no effect if the per-host ``fingerprints`` option |
|
1372 | 1378 | is set. |
|
1373 | 1379 | |
|
1374 | 1380 | The format of the file is as follows:: |
|
1375 | 1381 | |
|
1376 | 1382 | -----BEGIN CERTIFICATE----- |
|
1377 | 1383 | ... (certificate in base64 PEM encoding) ... |
|
1378 | 1384 | -----END CERTIFICATE----- |
|
1379 | 1385 | -----BEGIN CERTIFICATE----- |
|
1380 | 1386 | ... (certificate in base64 PEM encoding) ... |
|
1381 | 1387 | -----END CERTIFICATE----- |
|
1382 | 1388 | |
|
1383 | 1389 | For example:: |
|
1384 | 1390 | |
|
1385 | 1391 | [hostsecurity] |
|
1386 | 1392 | hg.example.com:fingerprints = sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2 |
|
1387 | 1393 | hg2.example.com:fingerprints = sha1:914f1aff87249c09b6859b88b1906d30756491ca, sha1:fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33 |
|
1388 | 1394 | hg3.example.com:fingerprints = sha256:9a:b0:dc:e2:75:ad:8a:b7:84:58:e5:1f:07:32:f1:87:e6:bd:24:22:af:b7:ce:8e:9c:b4:10:cf:b9:f4:0e:d2 |
|
1389 | 1395 | foo.example.com:verifycertsfile = /etc/ssl/trusted-ca-certs.pem |
|
1390 | 1396 | |
|
1391 | 1397 | To change the default minimum protocol version to TLS 1.2 but to allow TLS 1.1 |
|
1392 | 1398 | when connecting to ``hg.example.com``:: |
|
1393 | 1399 | |
|
1394 | 1400 | [hostsecurity] |
|
1395 | 1401 | minimumprotocol = tls1.2 |
|
1396 | 1402 | hg.example.com:minimumprotocol = tls1.1 |
|
1397 | 1403 | |
|
1398 | 1404 | ``http_proxy`` |
|
1399 | 1405 | -------------- |
|
1400 | 1406 | |
|
1401 | 1407 | Used to access web-based Mercurial repositories through a HTTP |
|
1402 | 1408 | proxy. |
|
1403 | 1409 | |
|
1404 | 1410 | ``host`` |
|
1405 | 1411 | Host name and (optional) port of the proxy server, for example |
|
1406 | 1412 | "myproxy:8000". |
|
1407 | 1413 | |
|
1408 | 1414 | ``no`` |
|
1409 | 1415 | Optional. Comma-separated list of host names that should bypass |
|
1410 | 1416 | the proxy. |
|
1411 | 1417 | |
|
1412 | 1418 | ``passwd`` |
|
1413 | 1419 | Optional. Password to authenticate with at the proxy server. |
|
1414 | 1420 | |
|
1415 | 1421 | ``user`` |
|
1416 | 1422 | Optional. User name to authenticate with at the proxy server. |
|
1417 | 1423 | |
|
1418 | 1424 | ``always`` |
|
1419 | 1425 | Optional. Always use the proxy, even for localhost and any entries |
|
1420 | 1426 | in ``http_proxy.no``. (default: False) |
|
1421 | 1427 | |
|
1422 | 1428 | ``http`` |
|
1423 | 1429 | ---------- |
|
1424 | 1430 | |
|
1425 | 1431 | Used to configure access to Mercurial repositories via HTTP. |
|
1426 | 1432 | |
|
1427 | 1433 | ``timeout`` |
|
1428 | 1434 | If set, blocking operations will timeout after that many seconds. |
|
1429 | 1435 | (default: None) |
|
1430 | 1436 | |
|
1431 | 1437 | ``merge`` |
|
1432 | 1438 | --------- |
|
1433 | 1439 | |
|
1434 | 1440 | This section specifies behavior during merges and updates. |
|
1435 | 1441 | |
|
1436 | 1442 | ``checkignored`` |
|
1437 | 1443 | Controls behavior when an ignored file on disk has the same name as a tracked |
|
1438 | 1444 | file in the changeset being merged or updated to, and has different |
|
1439 | 1445 | contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``, |
|
1440 | 1446 | abort on such files. With ``warn``, warn on such files and back them up as |
|
1441 | 1447 | ``.orig``. With ``ignore``, don't print a warning and back them up as |
|
1442 | 1448 | ``.orig``. (default: ``abort``) |
|
1443 | 1449 | |
|
1444 | 1450 | ``checkunknown`` |
|
1445 | 1451 | Controls behavior when an unknown file that isn't ignored has the same name |
|
1446 | 1452 | as a tracked file in the changeset being merged or updated to, and has |
|
1447 | 1453 | different contents. Similar to ``merge.checkignored``, except for files that |
|
1448 | 1454 | are not ignored. (default: ``abort``) |
|
1449 | 1455 | |
|
1450 | 1456 | ``on-failure`` |
|
1451 | 1457 | When set to ``continue`` (the default), the merge process attempts to |
|
1452 | 1458 | merge all unresolved files using the merge chosen tool, regardless of |
|
1453 | 1459 | whether previous file merge attempts during the process succeeded or not. |
|
1454 | 1460 | Setting this to ``prompt`` will prompt after any merge failure continue |
|
1455 | 1461 | or halt the merge process. Setting this to ``halt`` will automatically |
|
1456 | 1462 | halt the merge process on any merge tool failure. The merge process |
|
1457 | 1463 | can be restarted by using the ``resolve`` command. When a merge is |
|
1458 | 1464 | halted, the repository is left in a normal ``unresolved`` merge state. |
|
1459 | 1465 | (default: ``continue``) |
|
1460 | 1466 | |
|
1461 | 1467 | ``strict-capability-check`` |
|
1462 | 1468 | Whether capabilities of internal merge tools are checked strictly |
|
1463 | 1469 | or not, while examining rules to decide merge tool to be used. |
|
1464 | 1470 | (default: False) |
|
1465 | 1471 | |
|
1466 | 1472 | ``merge-patterns`` |
|
1467 | 1473 | ------------------ |
|
1468 | 1474 | |
|
1469 | 1475 | This section specifies merge tools to associate with particular file |
|
1470 | 1476 | patterns. Tools matched here will take precedence over the default |
|
1471 | 1477 | merge tool. Patterns are globs by default, rooted at the repository |
|
1472 | 1478 | root. |
|
1473 | 1479 | |
|
1474 | 1480 | Example:: |
|
1475 | 1481 | |
|
1476 | 1482 | [merge-patterns] |
|
1477 | 1483 | **.c = kdiff3 |
|
1478 | 1484 | **.jpg = myimgmerge |
|
1479 | 1485 | |
|
1480 | 1486 | ``merge-tools`` |
|
1481 | 1487 | --------------- |
|
1482 | 1488 | |
|
1483 | 1489 | This section configures external merge tools to use for file-level |
|
1484 | 1490 | merges. This section has likely been preconfigured at install time. |
|
1485 | 1491 | Use :hg:`config merge-tools` to check the existing configuration. |
|
1486 | 1492 | Also see :hg:`help merge-tools` for more details. |
|
1487 | 1493 | |
|
1488 | 1494 | Example ``~/.hgrc``:: |
|
1489 | 1495 | |
|
1490 | 1496 | [merge-tools] |
|
1491 | 1497 | # Override stock tool location |
|
1492 | 1498 | kdiff3.executable = ~/bin/kdiff3 |
|
1493 | 1499 | # Specify command line |
|
1494 | 1500 | kdiff3.args = $base $local $other -o $output |
|
1495 | 1501 | # Give higher priority |
|
1496 | 1502 | kdiff3.priority = 1 |
|
1497 | 1503 | |
|
1498 | 1504 | # Changing the priority of preconfigured tool |
|
1499 | 1505 | meld.priority = 0 |
|
1500 | 1506 | |
|
1501 | 1507 | # Disable a preconfigured tool |
|
1502 | 1508 | vimdiff.disabled = yes |
|
1503 | 1509 | |
|
1504 | 1510 | # Define new tool |
|
1505 | 1511 | myHtmlTool.args = -m $local $other $base $output |
|
1506 | 1512 | myHtmlTool.regkey = Software\FooSoftware\HtmlMerge |
|
1507 | 1513 | myHtmlTool.priority = 1 |
|
1508 | 1514 | |
|
1509 | 1515 | Supported arguments: |
|
1510 | 1516 | |
|
1511 | 1517 | ``priority`` |
|
1512 | 1518 | The priority in which to evaluate this tool. |
|
1513 | 1519 | (default: 0) |
|
1514 | 1520 | |
|
1515 | 1521 | ``executable`` |
|
1516 | 1522 | Either just the name of the executable or its pathname. |
|
1517 | 1523 | |
|
1518 | 1524 | .. container:: windows |
|
1519 | 1525 | |
|
1520 | 1526 | On Windows, the path can use environment variables with ${ProgramFiles} |
|
1521 | 1527 | syntax. |
|
1522 | 1528 | |
|
1523 | 1529 | (default: the tool name) |
|
1524 | 1530 | |
|
1525 | 1531 | ``args`` |
|
1526 | 1532 | The arguments to pass to the tool executable. You can refer to the |
|
1527 | 1533 | files being merged as well as the output file through these |
|
1528 | 1534 | variables: ``$base``, ``$local``, ``$other``, ``$output``. |
|
1529 | 1535 | |
|
1530 | 1536 | The meaning of ``$local`` and ``$other`` can vary depending on which action is |
|
1531 | 1537 | being performed. During an update or merge, ``$local`` represents the original |
|
1532 | 1538 | state of the file, while ``$other`` represents the commit you are updating to or |
|
1533 | 1539 | the commit you are merging with. During a rebase, ``$local`` represents the |
|
1534 | 1540 | destination of the rebase, and ``$other`` represents the commit being rebased. |
|
1535 | 1541 | |
|
1536 | 1542 | Some operations define custom labels to assist with identifying the revisions, |
|
1537 | 1543 | accessible via ``$labellocal``, ``$labelother``, and ``$labelbase``. If custom |
|
1538 | 1544 | labels are not available, these will be ``local``, ``other``, and ``base``, |
|
1539 | 1545 | respectively. |
|
1540 | 1546 | (default: ``$local $base $other``) |
|
1541 | 1547 | |
|
1542 | 1548 | ``premerge`` |
|
1543 | 1549 | Attempt to run internal non-interactive 3-way merge tool before |
|
1544 | 1550 | launching external tool. Options are ``true``, ``false``, ``keep``, |
|
1545 | 1551 | ``keep-merge3``, or ``keep-mergediff`` (experimental). The ``keep`` option |
|
1546 | 1552 | will leave markers in the file if the premerge fails. The ``keep-merge3`` |
|
1547 | 1553 | will do the same but include information about the base of the merge in the |
|
1548 | 1554 | marker (see internal :merge3 in :hg:`help merge-tools`). The |
|
1549 | 1555 | ``keep-mergediff`` option is similar but uses a different marker style |
|
1550 | 1556 | (see internal :merge3 in :hg:`help merge-tools`). (default: True) |
|
1551 | 1557 | |
|
1552 | 1558 | ``binary`` |
|
1553 | 1559 | This tool can merge binary files. (default: False, unless tool |
|
1554 | 1560 | was selected by file pattern match) |
|
1555 | 1561 | |
|
1556 | 1562 | ``symlink`` |
|
1557 | 1563 | This tool can merge symlinks. (default: False) |
|
1558 | 1564 | |
|
1559 | 1565 | ``check`` |
|
1560 | 1566 | A list of merge success-checking options: |
|
1561 | 1567 | |
|
1562 | 1568 | ``changed`` |
|
1563 | 1569 | Ask whether merge was successful when the merged file shows no changes. |
|
1564 | 1570 | ``conflicts`` |
|
1565 | 1571 | Check whether there are conflicts even though the tool reported success. |
|
1566 | 1572 | ``prompt`` |
|
1567 | 1573 | Always prompt for merge success, regardless of success reported by tool. |
|
1568 | 1574 | |
|
1569 | 1575 | ``fixeol`` |
|
1570 | 1576 | Attempt to fix up EOL changes caused by the merge tool. |
|
1571 | 1577 | (default: False) |
|
1572 | 1578 | |
|
1573 | 1579 | ``gui`` |
|
1574 | 1580 | This tool requires a graphical interface to run. (default: False) |
|
1575 | 1581 | |
|
1576 | 1582 | ``mergemarkers`` |
|
1577 | 1583 | Controls whether the labels passed via ``$labellocal``, ``$labelother``, and |
|
1578 | 1584 | ``$labelbase`` are ``detailed`` (respecting ``mergemarkertemplate``) or |
|
1579 | 1585 | ``basic``. If ``premerge`` is ``keep`` or ``keep-merge3``, the conflict |
|
1580 | 1586 | markers generated during premerge will be ``detailed`` if either this option or |
|
1581 | 1587 | the corresponding option in the ``[ui]`` section is ``detailed``. |
|
1582 | 1588 | (default: ``basic``) |
|
1583 | 1589 | |
|
1584 | 1590 | ``mergemarkertemplate`` |
|
1585 | 1591 | This setting can be used to override ``mergemarker`` from the |
|
1586 | 1592 | ``[command-templates]`` section on a per-tool basis; this applies to the |
|
1587 | 1593 | ``$label``-prefixed variables and to the conflict markers that are generated |
|
1588 | 1594 | if ``premerge`` is ``keep` or ``keep-merge3``. See the corresponding variable |
|
1589 | 1595 | in ``[ui]`` for more information. |
|
1590 | 1596 | |
|
1591 | 1597 | .. container:: windows |
|
1592 | 1598 | |
|
1593 | 1599 | ``regkey`` |
|
1594 | 1600 | Windows registry key which describes install location of this |
|
1595 | 1601 | tool. Mercurial will search for this key first under |
|
1596 | 1602 | ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``. |
|
1597 | 1603 | (default: None) |
|
1598 | 1604 | |
|
1599 | 1605 | ``regkeyalt`` |
|
1600 | 1606 | An alternate Windows registry key to try if the first key is not |
|
1601 | 1607 | found. The alternate key uses the same ``regname`` and ``regappend`` |
|
1602 | 1608 | semantics of the primary key. The most common use for this key |
|
1603 | 1609 | is to search for 32bit applications on 64bit operating systems. |
|
1604 | 1610 | (default: None) |
|
1605 | 1611 | |
|
1606 | 1612 | ``regname`` |
|
1607 | 1613 | Name of value to read from specified registry key. |
|
1608 | 1614 | (default: the unnamed (default) value) |
|
1609 | 1615 | |
|
1610 | 1616 | ``regappend`` |
|
1611 | 1617 | String to append to the value read from the registry, typically |
|
1612 | 1618 | the executable name of the tool. |
|
1613 | 1619 | (default: None) |
|
1614 | 1620 | |
|
1615 | 1621 | ``pager`` |
|
1616 | 1622 | --------- |
|
1617 | 1623 | |
|
1618 | 1624 | Setting used to control when to paginate and with what external tool. See |
|
1619 | 1625 | :hg:`help pager` for details. |
|
1620 | 1626 | |
|
1621 | 1627 | ``pager`` |
|
1622 | 1628 | Define the external tool used as pager. |
|
1623 | 1629 | |
|
1624 | 1630 | If no pager is set, Mercurial uses the environment variable $PAGER. |
|
1625 | 1631 | If neither pager.pager, nor $PAGER is set, a default pager will be |
|
1626 | 1632 | used, typically `less` on Unix and `more` on Windows. Example:: |
|
1627 | 1633 | |
|
1628 | 1634 | [pager] |
|
1629 | 1635 | pager = less -FRX |
|
1630 | 1636 | |
|
1631 | 1637 | ``ignore`` |
|
1632 | 1638 | List of commands to disable the pager for. Example:: |
|
1633 | 1639 | |
|
1634 | 1640 | [pager] |
|
1635 | 1641 | ignore = version, help, update |
|
1636 | 1642 | |
|
1637 | 1643 | ``patch`` |
|
1638 | 1644 | --------- |
|
1639 | 1645 | |
|
1640 | 1646 | Settings used when applying patches, for instance through the 'import' |
|
1641 | 1647 | command or with Mercurial Queues extension. |
|
1642 | 1648 | |
|
1643 | 1649 | ``eol`` |
|
1644 | 1650 | When set to 'strict' patch content and patched files end of lines |
|
1645 | 1651 | are preserved. When set to ``lf`` or ``crlf``, both files end of |
|
1646 | 1652 | lines are ignored when patching and the result line endings are |
|
1647 | 1653 | normalized to either LF (Unix) or CRLF (Windows). When set to |
|
1648 | 1654 | ``auto``, end of lines are again ignored while patching but line |
|
1649 | 1655 | endings in patched files are normalized to their original setting |
|
1650 | 1656 | on a per-file basis. If target file does not exist or has no end |
|
1651 | 1657 | of line, patch line endings are preserved. |
|
1652 | 1658 | (default: strict) |
|
1653 | 1659 | |
|
1654 | 1660 | ``fuzz`` |
|
1655 | 1661 | The number of lines of 'fuzz' to allow when applying patches. This |
|
1656 | 1662 | controls how much context the patcher is allowed to ignore when |
|
1657 | 1663 | trying to apply a patch. |
|
1658 | 1664 | (default: 2) |
|
1659 | 1665 | |
|
1660 | 1666 | ``paths`` |
|
1661 | 1667 | --------- |
|
1662 | 1668 | |
|
1663 | 1669 | Assigns symbolic names and behavior to repositories. |
|
1664 | 1670 | |
|
1665 | 1671 | Options are symbolic names defining the URL or directory that is the |
|
1666 | 1672 | location of the repository. Example:: |
|
1667 | 1673 | |
|
1668 | 1674 | [paths] |
|
1669 | 1675 | my_server = https://example.com/my_repo |
|
1670 | 1676 | local_path = /home/me/repo |
|
1671 | 1677 | |
|
1672 | 1678 | These symbolic names can be used from the command line. To pull |
|
1673 | 1679 | from ``my_server``: :hg:`pull my_server`. To push to ``local_path``: |
|
1674 | 1680 | :hg:`push local_path`. |
|
1675 | 1681 | |
|
1676 | 1682 | Options containing colons (``:``) denote sub-options that can influence |
|
1677 | 1683 | behavior for that specific path. Example:: |
|
1678 | 1684 | |
|
1679 | 1685 | [paths] |
|
1680 | 1686 | my_server = https://example.com/my_path |
|
1681 | 1687 | my_server:pushurl = ssh://example.com/my_path |
|
1682 | 1688 | |
|
1683 | 1689 | The following sub-options can be defined: |
|
1684 | 1690 | |
|
1685 | 1691 | ``pushurl`` |
|
1686 | 1692 | The URL to use for push operations. If not defined, the location |
|
1687 | 1693 | defined by the path's main entry is used. |
|
1688 | 1694 | |
|
1689 | 1695 | ``pushrev`` |
|
1690 | 1696 | A revset defining which revisions to push by default. |
|
1691 | 1697 | |
|
1692 | 1698 | When :hg:`push` is executed without a ``-r`` argument, the revset |
|
1693 | 1699 | defined by this sub-option is evaluated to determine what to push. |
|
1694 | 1700 | |
|
1695 | 1701 | For example, a value of ``.`` will push the working directory's |
|
1696 | 1702 | revision by default. |
|
1697 | 1703 | |
|
1698 | 1704 | Revsets specifying bookmarks will not result in the bookmark being |
|
1699 | 1705 | pushed. |
|
1700 | 1706 | |
|
1701 | 1707 | The following special named paths exist: |
|
1702 | 1708 | |
|
1703 | 1709 | ``default`` |
|
1704 | 1710 | The URL or directory to use when no source or remote is specified. |
|
1705 | 1711 | |
|
1706 | 1712 | :hg:`clone` will automatically define this path to the location the |
|
1707 | 1713 | repository was cloned from. |
|
1708 | 1714 | |
|
1709 | 1715 | ``default-push`` |
|
1710 | 1716 | (deprecated) The URL or directory for the default :hg:`push` location. |
|
1711 | 1717 | ``default:pushurl`` should be used instead. |
|
1712 | 1718 | |
|
1713 | 1719 | ``phases`` |
|
1714 | 1720 | ---------- |
|
1715 | 1721 | |
|
1716 | 1722 | Specifies default handling of phases. See :hg:`help phases` for more |
|
1717 | 1723 | information about working with phases. |
|
1718 | 1724 | |
|
1719 | 1725 | ``publish`` |
|
1720 | 1726 | Controls draft phase behavior when working as a server. When true, |
|
1721 | 1727 | pushed changesets are set to public in both client and server and |
|
1722 | 1728 | pulled or cloned changesets are set to public in the client. |
|
1723 | 1729 | (default: True) |
|
1724 | 1730 | |
|
1725 | 1731 | ``new-commit`` |
|
1726 | 1732 | Phase of newly-created commits. |
|
1727 | 1733 | (default: draft) |
|
1728 | 1734 | |
|
1729 | 1735 | ``checksubrepos`` |
|
1730 | 1736 | Check the phase of the current revision of each subrepository. Allowed |
|
1731 | 1737 | values are "ignore", "follow" and "abort". For settings other than |
|
1732 | 1738 | "ignore", the phase of the current revision of each subrepository is |
|
1733 | 1739 | checked before committing the parent repository. If any of those phases is |
|
1734 | 1740 | greater than the phase of the parent repository (e.g. if a subrepo is in a |
|
1735 | 1741 | "secret" phase while the parent repo is in "draft" phase), the commit is |
|
1736 | 1742 | either aborted (if checksubrepos is set to "abort") or the higher phase is |
|
1737 | 1743 | used for the parent repository commit (if set to "follow"). |
|
1738 | 1744 | (default: follow) |
|
1739 | 1745 | |
|
1740 | 1746 | |
|
1741 | 1747 | ``profiling`` |
|
1742 | 1748 | ------------- |
|
1743 | 1749 | |
|
1744 | 1750 | Specifies profiling type, format, and file output. Two profilers are |
|
1745 | 1751 | supported: an instrumenting profiler (named ``ls``), and a sampling |
|
1746 | 1752 | profiler (named ``stat``). |
|
1747 | 1753 | |
|
1748 | 1754 | In this section description, 'profiling data' stands for the raw data |
|
1749 | 1755 | collected during profiling, while 'profiling report' stands for a |
|
1750 | 1756 | statistical text report generated from the profiling data. |
|
1751 | 1757 | |
|
1752 | 1758 | ``enabled`` |
|
1753 | 1759 | Enable the profiler. |
|
1754 | 1760 | (default: false) |
|
1755 | 1761 | |
|
1756 | 1762 | This is equivalent to passing ``--profile`` on the command line. |
|
1757 | 1763 | |
|
1758 | 1764 | ``type`` |
|
1759 | 1765 | The type of profiler to use. |
|
1760 | 1766 | (default: stat) |
|
1761 | 1767 | |
|
1762 | 1768 | ``ls`` |
|
1763 | 1769 | Use Python's built-in instrumenting profiler. This profiler |
|
1764 | 1770 | works on all platforms, but each line number it reports is the |
|
1765 | 1771 | first line of a function. This restriction makes it difficult to |
|
1766 | 1772 | identify the expensive parts of a non-trivial function. |
|
1767 | 1773 | ``stat`` |
|
1768 | 1774 | Use a statistical profiler, statprof. This profiler is most |
|
1769 | 1775 | useful for profiling commands that run for longer than about 0.1 |
|
1770 | 1776 | seconds. |
|
1771 | 1777 | |
|
1772 | 1778 | ``format`` |
|
1773 | 1779 | Profiling format. Specific to the ``ls`` instrumenting profiler. |
|
1774 | 1780 | (default: text) |
|
1775 | 1781 | |
|
1776 | 1782 | ``text`` |
|
1777 | 1783 | Generate a profiling report. When saving to a file, it should be |
|
1778 | 1784 | noted that only the report is saved, and the profiling data is |
|
1779 | 1785 | not kept. |
|
1780 | 1786 | ``kcachegrind`` |
|
1781 | 1787 | Format profiling data for kcachegrind use: when saving to a |
|
1782 | 1788 | file, the generated file can directly be loaded into |
|
1783 | 1789 | kcachegrind. |
|
1784 | 1790 | |
|
1785 | 1791 | ``statformat`` |
|
1786 | 1792 | Profiling format for the ``stat`` profiler. |
|
1787 | 1793 | (default: hotpath) |
|
1788 | 1794 | |
|
1789 | 1795 | ``hotpath`` |
|
1790 | 1796 | Show a tree-based display containing the hot path of execution (where |
|
1791 | 1797 | most time was spent). |
|
1792 | 1798 | ``bymethod`` |
|
1793 | 1799 | Show a table of methods ordered by how frequently they are active. |
|
1794 | 1800 | ``byline`` |
|
1795 | 1801 | Show a table of lines in files ordered by how frequently they are active. |
|
1796 | 1802 | ``json`` |
|
1797 | 1803 | Render profiling data as JSON. |
|
1798 | 1804 | |
|
1799 | 1805 | ``frequency`` |
|
1800 | 1806 | Sampling frequency. Specific to the ``stat`` sampling profiler. |
|
1801 | 1807 | (default: 1000) |
|
1802 | 1808 | |
|
1803 | 1809 | ``output`` |
|
1804 | 1810 | File path where profiling data or report should be saved. If the |
|
1805 | 1811 | file exists, it is replaced. (default: None, data is printed on |
|
1806 | 1812 | stderr) |
|
1807 | 1813 | |
|
1808 | 1814 | ``sort`` |
|
1809 | 1815 | Sort field. Specific to the ``ls`` instrumenting profiler. |
|
1810 | 1816 | One of ``callcount``, ``reccallcount``, ``totaltime`` and |
|
1811 | 1817 | ``inlinetime``. |
|
1812 | 1818 | (default: inlinetime) |
|
1813 | 1819 | |
|
1814 | 1820 | ``time-track`` |
|
1815 | 1821 | Control if the stat profiler track ``cpu`` or ``real`` time. |
|
1816 | 1822 | (default: ``cpu`` on Windows, otherwise ``real``) |
|
1817 | 1823 | |
|
1818 | 1824 | ``limit`` |
|
1819 | 1825 | Number of lines to show. Specific to the ``ls`` instrumenting profiler. |
|
1820 | 1826 | (default: 30) |
|
1821 | 1827 | |
|
1822 | 1828 | ``nested`` |
|
1823 | 1829 | Show at most this number of lines of drill-down info after each main entry. |
|
1824 | 1830 | This can help explain the difference between Total and Inline. |
|
1825 | 1831 | Specific to the ``ls`` instrumenting profiler. |
|
1826 | 1832 | (default: 0) |
|
1827 | 1833 | |
|
1828 | 1834 | ``showmin`` |
|
1829 | 1835 | Minimum fraction of samples an entry must have for it to be displayed. |
|
1830 | 1836 | Can be specified as a float between ``0.0`` and ``1.0`` or can have a |
|
1831 | 1837 | ``%`` afterwards to allow values up to ``100``. e.g. ``5%``. |
|
1832 | 1838 | |
|
1833 | 1839 | Only used by the ``stat`` profiler. |
|
1834 | 1840 | |
|
1835 | 1841 | For the ``hotpath`` format, default is ``0.05``. |
|
1836 | 1842 | For the ``chrome`` format, default is ``0.005``. |
|
1837 | 1843 | |
|
1838 | 1844 | The option is unused on other formats. |
|
1839 | 1845 | |
|
1840 | 1846 | ``showmax`` |
|
1841 | 1847 | Maximum fraction of samples an entry can have before it is ignored in |
|
1842 | 1848 | display. Values format is the same as ``showmin``. |
|
1843 | 1849 | |
|
1844 | 1850 | Only used by the ``stat`` profiler. |
|
1845 | 1851 | |
|
1846 | 1852 | For the ``chrome`` format, default is ``0.999``. |
|
1847 | 1853 | |
|
1848 | 1854 | The option is unused on other formats. |
|
1849 | 1855 | |
|
1850 | 1856 | ``showtime`` |
|
1851 | 1857 | Show time taken as absolute durations, in addition to percentages. |
|
1852 | 1858 | Only used by the ``hotpath`` format. |
|
1853 | 1859 | (default: true) |
|
1854 | 1860 | |
|
1855 | 1861 | ``progress`` |
|
1856 | 1862 | ------------ |
|
1857 | 1863 | |
|
1858 | 1864 | Mercurial commands can draw progress bars that are as informative as |
|
1859 | 1865 | possible. Some progress bars only offer indeterminate information, while others |
|
1860 | 1866 | have a definite end point. |
|
1861 | 1867 | |
|
1862 | 1868 | ``debug`` |
|
1863 | 1869 | Whether to print debug info when updating the progress bar. (default: False) |
|
1864 | 1870 | |
|
1865 | 1871 | ``delay`` |
|
1866 | 1872 | Number of seconds (float) before showing the progress bar. (default: 3) |
|
1867 | 1873 | |
|
1868 | 1874 | ``changedelay`` |
|
1869 | 1875 | Minimum delay before showing a new topic. When set to less than 3 * refresh, |
|
1870 | 1876 | that value will be used instead. (default: 1) |
|
1871 | 1877 | |
|
1872 | 1878 | ``estimateinterval`` |
|
1873 | 1879 | Maximum sampling interval in seconds for speed and estimated time |
|
1874 | 1880 | calculation. (default: 60) |
|
1875 | 1881 | |
|
1876 | 1882 | ``refresh`` |
|
1877 | 1883 | Time in seconds between refreshes of the progress bar. (default: 0.1) |
|
1878 | 1884 | |
|
1879 | 1885 | ``format`` |
|
1880 | 1886 | Format of the progress bar. |
|
1881 | 1887 | |
|
1882 | 1888 | Valid entries for the format field are ``topic``, ``bar``, ``number``, |
|
1883 | 1889 | ``unit``, ``estimate``, ``speed``, and ``item``. ``item`` defaults to the |
|
1884 | 1890 | last 20 characters of the item, but this can be changed by adding either |
|
1885 | 1891 | ``-<num>`` which would take the last num characters, or ``+<num>`` for the |
|
1886 | 1892 | first num characters. |
|
1887 | 1893 | |
|
1888 | 1894 | (default: topic bar number estimate) |
|
1889 | 1895 | |
|
1890 | 1896 | ``width`` |
|
1891 | 1897 | If set, the maximum width of the progress information (that is, min(width, |
|
1892 | 1898 | term width) will be used). |
|
1893 | 1899 | |
|
1894 | 1900 | ``clear-complete`` |
|
1895 | 1901 | Clear the progress bar after it's done. (default: True) |
|
1896 | 1902 | |
|
1897 | 1903 | ``disable`` |
|
1898 | 1904 | If true, don't show a progress bar. |
|
1899 | 1905 | |
|
1900 | 1906 | ``assume-tty`` |
|
1901 | 1907 | If true, ALWAYS show a progress bar, unless disable is given. |
|
1902 | 1908 | |
|
1903 | 1909 | ``rebase`` |
|
1904 | 1910 | ---------- |
|
1905 | 1911 | |
|
1906 | 1912 | ``evolution.allowdivergence`` |
|
1907 | 1913 | Default to False, when True allow creating divergence when performing |
|
1908 | 1914 | rebase of obsolete changesets. |
|
1909 | 1915 | |
|
1910 | 1916 | ``revsetalias`` |
|
1911 | 1917 | --------------- |
|
1912 | 1918 | |
|
1913 | 1919 | Alias definitions for revsets. See :hg:`help revsets` for details. |
|
1914 | 1920 | |
|
1915 | 1921 | ``rewrite`` |
|
1916 | 1922 | ----------- |
|
1917 | 1923 | |
|
1918 | 1924 | ``backup-bundle`` |
|
1919 | 1925 | Whether to save stripped changesets to a bundle file. (default: True) |
|
1920 | 1926 | |
|
1921 | 1927 | ``update-timestamp`` |
|
1922 | 1928 | If true, updates the date and time of the changeset to current. It is only |
|
1923 | 1929 | applicable for `hg amend`, `hg commit --amend` and `hg uncommit` in the |
|
1924 | 1930 | current version. |
|
1925 | 1931 | |
|
1926 | 1932 | ``empty-successor`` |
|
1927 | 1933 | |
|
1928 | 1934 | Control what happens with empty successors that are the result of rewrite |
|
1929 | 1935 | operations. If set to ``skip``, the successor is not created. If set to |
|
1930 | 1936 | ``keep``, the empty successor is created and kept. |
|
1931 | 1937 | |
|
1932 | 1938 | Currently, only the rebase and absorb commands consider this configuration. |
|
1933 | 1939 | (EXPERIMENTAL) |
|
1934 | 1940 | |
|
1935 | 1941 | ``share`` |
|
1936 | 1942 | --------- |
|
1937 | 1943 | |
|
1938 | 1944 | ``safe-mismatch.source-safe`` |
|
1939 | 1945 | |
|
1940 | 1946 | Controls what happens when the shared repository does not use the |
|
1941 | 1947 | share-safe mechanism but its source repository does. |
|
1942 | 1948 | |
|
1943 | 1949 | Possible values are `abort` (default), `allow`, `upgrade-abort` and |
|
1944 | 1950 | `upgrade-abort`. |
|
1945 | 1951 | `abort`: Disallows running any command and aborts |
|
1946 | 1952 | `allow`: Respects the feature presence in the share source |
|
1947 | 1953 | `upgrade-abort`: tries to upgrade the share to use share-safe; |
|
1948 | 1954 | if it fails, aborts |
|
1949 | 1955 | `upgrade-allow`: tries to upgrade the share; if it fails, continue by |
|
1950 | 1956 | respecting the share source setting |
|
1951 | 1957 | |
|
1952 | 1958 | ``safe-mismatch.source-not-safe`` |
|
1953 | 1959 | |
|
1954 | 1960 | Controls what happens when the shared repository uses the share-safe |
|
1955 | 1961 | mechanism but its source does not. |
|
1956 | 1962 | |
|
1957 | 1963 | Possible values are `abort` (default), `allow`, `downgrade-abort` and |
|
1958 | 1964 | `downgrade-abort`. |
|
1959 | 1965 | `abort`: Disallows running any command and aborts |
|
1960 | 1966 | `allow`: Respects the feature presence in the share source |
|
1961 | 1967 | `downgrade-abort`: tries to downgrade the share to not use share-safe; |
|
1962 | 1968 | if it fails, aborts |
|
1963 | 1969 | `downgrade-allow`: tries to downgrade the share to not use share-safe; |
|
1964 | 1970 | if it fails, continue by respecting the shared |
|
1965 | 1971 | source setting |
|
1966 | 1972 | |
|
1967 | 1973 | |
|
1968 | 1974 | ``safe-mismatch.source-safe.warn`` |
|
1969 | 1975 | Shows a warning on operations if the shared repository does not use |
|
1970 | 1976 | share-safe, but the source repository does. |
|
1971 | 1977 | (default: True) |
|
1972 | 1978 | |
|
1973 | 1979 | ``safe-mismatch.source-not-safe.warn`` |
|
1974 | 1980 | Shows a warning on operations if the shared repository uses share-safe, |
|
1975 | 1981 | but the source repository does not. |
|
1976 | 1982 | (default: True) |
|
1977 | 1983 | |
|
1978 | 1984 | ``storage`` |
|
1979 | 1985 | ----------- |
|
1980 | 1986 | |
|
1981 | 1987 | Control the strategy Mercurial uses internally to store history. Options in this |
|
1982 | 1988 | category impact performance and repository size. |
|
1983 | 1989 | |
|
1984 | 1990 | ``revlog.optimize-delta-parent-choice`` |
|
1985 | 1991 | When storing a merge revision, both parents will be equally considered as |
|
1986 | 1992 | a possible delta base. This results in better delta selection and improved |
|
1987 | 1993 | revlog compression. This option is enabled by default. |
|
1988 | 1994 | |
|
1989 | 1995 | Turning this option off can result in large increase of repository size for |
|
1990 | 1996 | repository with many merges. |
|
1991 | 1997 | |
|
1992 | 1998 | ``revlog.persistent-nodemap.mmap`` |
|
1993 | 1999 | Whether to use the Operating System "memory mapping" feature (when |
|
1994 | 2000 | possible) to access the persistent nodemap data. This improve performance |
|
1995 | 2001 | and reduce memory pressure. |
|
1996 | 2002 | |
|
1997 | 2003 | Default to True. |
|
1998 | 2004 | |
|
1999 | 2005 | For details on the "persistent-nodemap" feature, see: |
|
2000 | 2006 | :hg:`help config format.use-persistent-nodemap`. |
|
2001 | 2007 | |
|
2002 | 2008 | ``revlog.persistent-nodemap.slow-path`` |
|
2003 | 2009 | Control the behavior of Merucrial when using a repository with "persistent" |
|
2004 | 2010 | nodemap with an installation of Mercurial without a fast implementation for |
|
2005 | 2011 | the feature: |
|
2006 | 2012 | |
|
2007 | 2013 | ``allow``: Silently use the slower implementation to access the repository. |
|
2008 | 2014 | ``warn``: Warn, but use the slower implementation to access the repository. |
|
2009 | 2015 | ``abort``: Prevent access to such repositories. (This is the default) |
|
2010 | 2016 | |
|
2011 | 2017 | For details on the "persistent-nodemap" feature, see: |
|
2012 | 2018 | :hg:`help config format.use-persistent-nodemap`. |
|
2013 | 2019 | |
|
2014 | 2020 | ``revlog.reuse-external-delta-parent`` |
|
2015 | 2021 | Control the order in which delta parents are considered when adding new |
|
2016 | 2022 | revisions from an external source. |
|
2017 | 2023 | (typically: apply bundle from `hg pull` or `hg push`). |
|
2018 | 2024 | |
|
2019 | 2025 | New revisions are usually provided as a delta against other revisions. By |
|
2020 | 2026 | default, Mercurial will try to reuse this delta first, therefore using the |
|
2021 | 2027 | same "delta parent" as the source. Directly using delta's from the source |
|
2022 | 2028 | reduces CPU usage and usually speeds up operation. However, in some case, |
|
2023 | 2029 | the source might have sub-optimal delta bases and forcing their reevaluation |
|
2024 | 2030 | is useful. For example, pushes from an old client could have sub-optimal |
|
2025 | 2031 | delta's parent that the server want to optimize. (lack of general delta, bad |
|
2026 | 2032 | parents, choice, lack of sparse-revlog, etc). |
|
2027 | 2033 | |
|
2028 | 2034 | This option is enabled by default. Turning it off will ensure bad delta |
|
2029 | 2035 | parent choices from older client do not propagate to this repository, at |
|
2030 | 2036 | the cost of a small increase in CPU consumption. |
|
2031 | 2037 | |
|
2032 | 2038 | Note: this option only control the order in which delta parents are |
|
2033 | 2039 | considered. Even when disabled, the existing delta from the source will be |
|
2034 | 2040 | reused if the same delta parent is selected. |
|
2035 | 2041 | |
|
2036 | 2042 | ``revlog.reuse-external-delta`` |
|
2037 | 2043 | Control the reuse of delta from external source. |
|
2038 | 2044 | (typically: apply bundle from `hg pull` or `hg push`). |
|
2039 | 2045 | |
|
2040 | 2046 | New revisions are usually provided as a delta against another revision. By |
|
2041 | 2047 | default, Mercurial will not recompute the same delta again, trusting |
|
2042 | 2048 | externally provided deltas. There have been rare cases of small adjustment |
|
2043 | 2049 | to the diffing algorithm in the past. So in some rare case, recomputing |
|
2044 | 2050 | delta provided by ancient clients can provides better results. Disabling |
|
2045 | 2051 | this option means going through a full delta recomputation for all incoming |
|
2046 | 2052 | revisions. It means a large increase in CPU usage and will slow operations |
|
2047 | 2053 | down. |
|
2048 | 2054 | |
|
2049 | 2055 | This option is enabled by default. When disabled, it also disables the |
|
2050 | 2056 | related ``storage.revlog.reuse-external-delta-parent`` option. |
|
2051 | 2057 | |
|
2052 | 2058 | ``revlog.zlib.level`` |
|
2053 | 2059 | Zlib compression level used when storing data into the repository. Accepted |
|
2054 | 2060 | Value range from 1 (lowest compression) to 9 (highest compression). Zlib |
|
2055 | 2061 | default value is 6. |
|
2056 | 2062 | |
|
2057 | 2063 | |
|
2058 | 2064 | ``revlog.zstd.level`` |
|
2059 | 2065 | zstd compression level used when storing data into the repository. Accepted |
|
2060 | 2066 | Value range from 1 (lowest compression) to 22 (highest compression). |
|
2061 | 2067 | (default 3) |
|
2062 | 2068 | |
|
2063 | 2069 | ``server`` |
|
2064 | 2070 | ---------- |
|
2065 | 2071 | |
|
2066 | 2072 | Controls generic server settings. |
|
2067 | 2073 | |
|
2068 | 2074 | ``bookmarks-pushkey-compat`` |
|
2069 | 2075 | Trigger pushkey hook when being pushed bookmark updates. This config exist |
|
2070 | 2076 | for compatibility purpose (default to True) |
|
2071 | 2077 | |
|
2072 | 2078 | If you use ``pushkey`` and ``pre-pushkey`` hooks to control bookmark |
|
2073 | 2079 | movement we recommend you migrate them to ``txnclose-bookmark`` and |
|
2074 | 2080 | ``pretxnclose-bookmark``. |
|
2075 | 2081 | |
|
2076 | 2082 | ``compressionengines`` |
|
2077 | 2083 | List of compression engines and their relative priority to advertise |
|
2078 | 2084 | to clients. |
|
2079 | 2085 | |
|
2080 | 2086 | The order of compression engines determines their priority, the first |
|
2081 | 2087 | having the highest priority. If a compression engine is not listed |
|
2082 | 2088 | here, it won't be advertised to clients. |
|
2083 | 2089 | |
|
2084 | 2090 | If not set (the default), built-in defaults are used. Run |
|
2085 | 2091 | :hg:`debuginstall` to list available compression engines and their |
|
2086 | 2092 | default wire protocol priority. |
|
2087 | 2093 | |
|
2088 | 2094 | Older Mercurial clients only support zlib compression and this setting |
|
2089 | 2095 | has no effect for legacy clients. |
|
2090 | 2096 | |
|
2091 | 2097 | ``uncompressed`` |
|
2092 | 2098 | Whether to allow clients to clone a repository using the |
|
2093 | 2099 | uncompressed streaming protocol. This transfers about 40% more |
|
2094 | 2100 | data than a regular clone, but uses less memory and CPU on both |
|
2095 | 2101 | server and client. Over a LAN (100 Mbps or better) or a very fast |
|
2096 | 2102 | WAN, an uncompressed streaming clone is a lot faster (~10x) than a |
|
2097 | 2103 | regular clone. Over most WAN connections (anything slower than |
|
2098 | 2104 | about 6 Mbps), uncompressed streaming is slower, because of the |
|
2099 | 2105 | extra data transfer overhead. This mode will also temporarily hold |
|
2100 | 2106 | the write lock while determining what data to transfer. |
|
2101 | 2107 | (default: True) |
|
2102 | 2108 | |
|
2103 | 2109 | ``uncompressedallowsecret`` |
|
2104 | 2110 | Whether to allow stream clones when the repository contains secret |
|
2105 | 2111 | changesets. (default: False) |
|
2106 | 2112 | |
|
2107 | 2113 | ``preferuncompressed`` |
|
2108 | 2114 | When set, clients will try to use the uncompressed streaming |
|
2109 | 2115 | protocol. (default: False) |
|
2110 | 2116 | |
|
2111 | 2117 | ``disablefullbundle`` |
|
2112 | 2118 | When set, servers will refuse attempts to do pull-based clones. |
|
2113 | 2119 | If this option is set, ``preferuncompressed`` and/or clone bundles |
|
2114 | 2120 | are highly recommended. Partial clones will still be allowed. |
|
2115 | 2121 | (default: False) |
|
2116 | 2122 | |
|
2117 | 2123 | ``streamunbundle`` |
|
2118 | 2124 | When set, servers will apply data sent from the client directly, |
|
2119 | 2125 | otherwise it will be written to a temporary file first. This option |
|
2120 | 2126 | effectively prevents concurrent pushes. |
|
2121 | 2127 | |
|
2122 | 2128 | ``pullbundle`` |
|
2123 | 2129 | When set, the server will check pullbundle.manifest for bundles |
|
2124 | 2130 | covering the requested heads and common nodes. The first matching |
|
2125 | 2131 | entry will be streamed to the client. |
|
2126 | 2132 | |
|
2127 | 2133 | For HTTP transport, the stream will still use zlib compression |
|
2128 | 2134 | for older clients. |
|
2129 | 2135 | |
|
2130 | 2136 | ``concurrent-push-mode`` |
|
2131 | 2137 | Level of allowed race condition between two pushing clients. |
|
2132 | 2138 | |
|
2133 | 2139 | - 'strict': push is abort if another client touched the repository |
|
2134 | 2140 | while the push was preparing. |
|
2135 | 2141 | - 'check-related': push is only aborted if it affects head that got also |
|
2136 | 2142 | affected while the push was preparing. (default since 5.4) |
|
2137 | 2143 | |
|
2138 | 2144 | 'check-related' only takes effect for compatible clients (version |
|
2139 | 2145 | 4.3 and later). Older clients will use 'strict'. |
|
2140 | 2146 | |
|
2141 | 2147 | ``validate`` |
|
2142 | 2148 | Whether to validate the completeness of pushed changesets by |
|
2143 | 2149 | checking that all new file revisions specified in manifests are |
|
2144 | 2150 | present. (default: False) |
|
2145 | 2151 | |
|
2146 | 2152 | ``maxhttpheaderlen`` |
|
2147 | 2153 | Instruct HTTP clients not to send request headers longer than this |
|
2148 | 2154 | many bytes. (default: 1024) |
|
2149 | 2155 | |
|
2150 | 2156 | ``bundle1`` |
|
2151 | 2157 | Whether to allow clients to push and pull using the legacy bundle1 |
|
2152 | 2158 | exchange format. (default: True) |
|
2153 | 2159 | |
|
2154 | 2160 | ``bundle1gd`` |
|
2155 | 2161 | Like ``bundle1`` but only used if the repository is using the |
|
2156 | 2162 | *generaldelta* storage format. (default: True) |
|
2157 | 2163 | |
|
2158 | 2164 | ``bundle1.push`` |
|
2159 | 2165 | Whether to allow clients to push using the legacy bundle1 exchange |
|
2160 | 2166 | format. (default: True) |
|
2161 | 2167 | |
|
2162 | 2168 | ``bundle1gd.push`` |
|
2163 | 2169 | Like ``bundle1.push`` but only used if the repository is using the |
|
2164 | 2170 | *generaldelta* storage format. (default: True) |
|
2165 | 2171 | |
|
2166 | 2172 | ``bundle1.pull`` |
|
2167 | 2173 | Whether to allow clients to pull using the legacy bundle1 exchange |
|
2168 | 2174 | format. (default: True) |
|
2169 | 2175 | |
|
2170 | 2176 | ``bundle1gd.pull`` |
|
2171 | 2177 | Like ``bundle1.pull`` but only used if the repository is using the |
|
2172 | 2178 | *generaldelta* storage format. (default: True) |
|
2173 | 2179 | |
|
2174 | 2180 | Large repositories using the *generaldelta* storage format should |
|
2175 | 2181 | consider setting this option because converting *generaldelta* |
|
2176 | 2182 | repositories to the exchange format required by the bundle1 data |
|
2177 | 2183 | format can consume a lot of CPU. |
|
2178 | 2184 | |
|
2179 | 2185 | ``bundle2.stream`` |
|
2180 | 2186 | Whether to allow clients to pull using the bundle2 streaming protocol. |
|
2181 | 2187 | (default: True) |
|
2182 | 2188 | |
|
2183 | 2189 | ``zliblevel`` |
|
2184 | 2190 | Integer between ``-1`` and ``9`` that controls the zlib compression level |
|
2185 | 2191 | for wire protocol commands that send zlib compressed output (notably the |
|
2186 | 2192 | commands that send repository history data). |
|
2187 | 2193 | |
|
2188 | 2194 | The default (``-1``) uses the default zlib compression level, which is |
|
2189 | 2195 | likely equivalent to ``6``. ``0`` means no compression. ``9`` means |
|
2190 | 2196 | maximum compression. |
|
2191 | 2197 | |
|
2192 | 2198 | Setting this option allows server operators to make trade-offs between |
|
2193 | 2199 | bandwidth and CPU used. Lowering the compression lowers CPU utilization |
|
2194 | 2200 | but sends more bytes to clients. |
|
2195 | 2201 | |
|
2196 | 2202 | This option only impacts the HTTP server. |
|
2197 | 2203 | |
|
2198 | 2204 | ``zstdlevel`` |
|
2199 | 2205 | Integer between ``1`` and ``22`` that controls the zstd compression level |
|
2200 | 2206 | for wire protocol commands. ``1`` is the minimal amount of compression and |
|
2201 | 2207 | ``22`` is the highest amount of compression. |
|
2202 | 2208 | |
|
2203 | 2209 | The default (``3``) should be significantly faster than zlib while likely |
|
2204 | 2210 | delivering better compression ratios. |
|
2205 | 2211 | |
|
2206 | 2212 | This option only impacts the HTTP server. |
|
2207 | 2213 | |
|
2208 | 2214 | See also ``server.zliblevel``. |
|
2209 | 2215 | |
|
2210 | 2216 | ``view`` |
|
2211 | 2217 | Repository filter used when exchanging revisions with the peer. |
|
2212 | 2218 | |
|
2213 | 2219 | The default view (``served``) excludes secret and hidden changesets. |
|
2214 | 2220 | Another useful value is ``immutable`` (no draft, secret or hidden |
|
2215 | 2221 | changesets). (EXPERIMENTAL) |
|
2216 | 2222 | |
|
2217 | 2223 | ``smtp`` |
|
2218 | 2224 | -------- |
|
2219 | 2225 | |
|
2220 | 2226 | Configuration for extensions that need to send email messages. |
|
2221 | 2227 | |
|
2222 | 2228 | ``host`` |
|
2223 | 2229 | Host name of mail server, e.g. "mail.example.com". |
|
2224 | 2230 | |
|
2225 | 2231 | ``port`` |
|
2226 | 2232 | Optional. Port to connect to on mail server. (default: 465 if |
|
2227 | 2233 | ``tls`` is smtps; 25 otherwise) |
|
2228 | 2234 | |
|
2229 | 2235 | ``tls`` |
|
2230 | 2236 | Optional. Method to enable TLS when connecting to mail server: starttls, |
|
2231 | 2237 | smtps or none. (default: none) |
|
2232 | 2238 | |
|
2233 | 2239 | ``username`` |
|
2234 | 2240 | Optional. User name for authenticating with the SMTP server. |
|
2235 | 2241 | (default: None) |
|
2236 | 2242 | |
|
2237 | 2243 | ``password`` |
|
2238 | 2244 | Optional. Password for authenticating with the SMTP server. If not |
|
2239 | 2245 | specified, interactive sessions will prompt the user for a |
|
2240 | 2246 | password; non-interactive sessions will fail. (default: None) |
|
2241 | 2247 | |
|
2242 | 2248 | ``local_hostname`` |
|
2243 | 2249 | Optional. The hostname that the sender can use to identify |
|
2244 | 2250 | itself to the MTA. |
|
2245 | 2251 | |
|
2246 | 2252 | |
|
2247 | 2253 | ``subpaths`` |
|
2248 | 2254 | ------------ |
|
2249 | 2255 | |
|
2250 | 2256 | Subrepository source URLs can go stale if a remote server changes name |
|
2251 | 2257 | or becomes temporarily unavailable. This section lets you define |
|
2252 | 2258 | rewrite rules of the form:: |
|
2253 | 2259 | |
|
2254 | 2260 | <pattern> = <replacement> |
|
2255 | 2261 | |
|
2256 | 2262 | where ``pattern`` is a regular expression matching a subrepository |
|
2257 | 2263 | source URL and ``replacement`` is the replacement string used to |
|
2258 | 2264 | rewrite it. Groups can be matched in ``pattern`` and referenced in |
|
2259 | 2265 | ``replacements``. For instance:: |
|
2260 | 2266 | |
|
2261 | 2267 | http://server/(.*)-hg/ = http://hg.server/\1/ |
|
2262 | 2268 | |
|
2263 | 2269 | rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``. |
|
2264 | 2270 | |
|
2265 | 2271 | Relative subrepository paths are first made absolute, and the |
|
2266 | 2272 | rewrite rules are then applied on the full (absolute) path. If ``pattern`` |
|
2267 | 2273 | doesn't match the full path, an attempt is made to apply it on the |
|
2268 | 2274 | relative path alone. The rules are applied in definition order. |
|
2269 | 2275 | |
|
2270 | 2276 | ``subrepos`` |
|
2271 | 2277 | ------------ |
|
2272 | 2278 | |
|
2273 | 2279 | This section contains options that control the behavior of the |
|
2274 | 2280 | subrepositories feature. See also :hg:`help subrepos`. |
|
2275 | 2281 | |
|
2276 | 2282 | Security note: auditing in Mercurial is known to be insufficient to |
|
2277 | 2283 | prevent clone-time code execution with carefully constructed Git |
|
2278 | 2284 | subrepos. It is unknown if a similar detect is present in Subversion |
|
2279 | 2285 | subrepos. Both Git and Subversion subrepos are disabled by default |
|
2280 | 2286 | out of security concerns. These subrepo types can be enabled using |
|
2281 | 2287 | the respective options below. |
|
2282 | 2288 | |
|
2283 | 2289 | ``allowed`` |
|
2284 | 2290 | Whether subrepositories are allowed in the working directory. |
|
2285 | 2291 | |
|
2286 | 2292 | When false, commands involving subrepositories (like :hg:`update`) |
|
2287 | 2293 | will fail for all subrepository types. |
|
2288 | 2294 | (default: true) |
|
2289 | 2295 | |
|
2290 | 2296 | ``hg:allowed`` |
|
2291 | 2297 | Whether Mercurial subrepositories are allowed in the working |
|
2292 | 2298 | directory. This option only has an effect if ``subrepos.allowed`` |
|
2293 | 2299 | is true. |
|
2294 | 2300 | (default: true) |
|
2295 | 2301 | |
|
2296 | 2302 | ``git:allowed`` |
|
2297 | 2303 | Whether Git subrepositories are allowed in the working directory. |
|
2298 | 2304 | This option only has an effect if ``subrepos.allowed`` is true. |
|
2299 | 2305 | |
|
2300 | 2306 | See the security note above before enabling Git subrepos. |
|
2301 | 2307 | (default: false) |
|
2302 | 2308 | |
|
2303 | 2309 | ``svn:allowed`` |
|
2304 | 2310 | Whether Subversion subrepositories are allowed in the working |
|
2305 | 2311 | directory. This option only has an effect if ``subrepos.allowed`` |
|
2306 | 2312 | is true. |
|
2307 | 2313 | |
|
2308 | 2314 | See the security note above before enabling Subversion subrepos. |
|
2309 | 2315 | (default: false) |
|
2310 | 2316 | |
|
2311 | 2317 | ``templatealias`` |
|
2312 | 2318 | ----------------- |
|
2313 | 2319 | |
|
2314 | 2320 | Alias definitions for templates. See :hg:`help templates` for details. |
|
2315 | 2321 | |
|
2316 | 2322 | ``templates`` |
|
2317 | 2323 | ------------- |
|
2318 | 2324 | |
|
2319 | 2325 | Use the ``[templates]`` section to define template strings. |
|
2320 | 2326 | See :hg:`help templates` for details. |
|
2321 | 2327 | |
|
2322 | 2328 | ``trusted`` |
|
2323 | 2329 | ----------- |
|
2324 | 2330 | |
|
2325 | 2331 | Mercurial will not use the settings in the |
|
2326 | 2332 | ``.hg/hgrc`` file from a repository if it doesn't belong to a trusted |
|
2327 | 2333 | user or to a trusted group, as various hgrc features allow arbitrary |
|
2328 | 2334 | commands to be run. This issue is often encountered when configuring |
|
2329 | 2335 | hooks or extensions for shared repositories or servers. However, |
|
2330 | 2336 | the web interface will use some safe settings from the ``[web]`` |
|
2331 | 2337 | section. |
|
2332 | 2338 | |
|
2333 | 2339 | This section specifies what users and groups are trusted. The |
|
2334 | 2340 | current user is always trusted. To trust everybody, list a user or a |
|
2335 | 2341 | group with name ``*``. These settings must be placed in an |
|
2336 | 2342 | *already-trusted file* to take effect, such as ``$HOME/.hgrc`` of the |
|
2337 | 2343 | user or service running Mercurial. |
|
2338 | 2344 | |
|
2339 | 2345 | ``users`` |
|
2340 | 2346 | Comma-separated list of trusted users. |
|
2341 | 2347 | |
|
2342 | 2348 | ``groups`` |
|
2343 | 2349 | Comma-separated list of trusted groups. |
|
2344 | 2350 | |
|
2345 | 2351 | |
|
2346 | 2352 | ``ui`` |
|
2347 | 2353 | ------ |
|
2348 | 2354 | |
|
2349 | 2355 | User interface controls. |
|
2350 | 2356 | |
|
2351 | 2357 | ``archivemeta`` |
|
2352 | 2358 | Whether to include the .hg_archival.txt file containing meta data |
|
2353 | 2359 | (hashes for the repository base and for tip) in archives created |
|
2354 | 2360 | by the :hg:`archive` command or downloaded via hgweb. |
|
2355 | 2361 | (default: True) |
|
2356 | 2362 | |
|
2357 | 2363 | ``askusername`` |
|
2358 | 2364 | Whether to prompt for a username when committing. If True, and |
|
2359 | 2365 | neither ``$HGUSER`` nor ``$EMAIL`` has been specified, then the user will |
|
2360 | 2366 | be prompted to enter a username. If no username is entered, the |
|
2361 | 2367 | default ``USER@HOST`` is used instead. |
|
2362 | 2368 | (default: False) |
|
2363 | 2369 | |
|
2364 | 2370 | ``clonebundles`` |
|
2365 | 2371 | Whether the "clone bundles" feature is enabled. |
|
2366 | 2372 | |
|
2367 | 2373 | When enabled, :hg:`clone` may download and apply a server-advertised |
|
2368 | 2374 | bundle file from a URL instead of using the normal exchange mechanism. |
|
2369 | 2375 | |
|
2370 | 2376 | This can likely result in faster and more reliable clones. |
|
2371 | 2377 | |
|
2372 | 2378 | (default: True) |
|
2373 | 2379 | |
|
2374 | 2380 | ``clonebundlefallback`` |
|
2375 | 2381 | Whether failure to apply an advertised "clone bundle" from a server |
|
2376 | 2382 | should result in fallback to a regular clone. |
|
2377 | 2383 | |
|
2378 | 2384 | This is disabled by default because servers advertising "clone |
|
2379 | 2385 | bundles" often do so to reduce server load. If advertised bundles |
|
2380 | 2386 | start mass failing and clients automatically fall back to a regular |
|
2381 | 2387 | clone, this would add significant and unexpected load to the server |
|
2382 | 2388 | since the server is expecting clone operations to be offloaded to |
|
2383 | 2389 | pre-generated bundles. Failing fast (the default behavior) ensures |
|
2384 | 2390 | clients don't overwhelm the server when "clone bundle" application |
|
2385 | 2391 | fails. |
|
2386 | 2392 | |
|
2387 | 2393 | (default: False) |
|
2388 | 2394 | |
|
2389 | 2395 | ``clonebundleprefers`` |
|
2390 | 2396 | Defines preferences for which "clone bundles" to use. |
|
2391 | 2397 | |
|
2392 | 2398 | Servers advertising "clone bundles" may advertise multiple available |
|
2393 | 2399 | bundles. Each bundle may have different attributes, such as the bundle |
|
2394 | 2400 | type and compression format. This option is used to prefer a particular |
|
2395 | 2401 | bundle over another. |
|
2396 | 2402 | |
|
2397 | 2403 | The following keys are defined by Mercurial: |
|
2398 | 2404 | |
|
2399 | 2405 | BUNDLESPEC |
|
2400 | 2406 | A bundle type specifier. These are strings passed to :hg:`bundle -t`. |
|
2401 | 2407 | e.g. ``gzip-v2`` or ``bzip2-v1``. |
|
2402 | 2408 | |
|
2403 | 2409 | COMPRESSION |
|
2404 | 2410 | The compression format of the bundle. e.g. ``gzip`` and ``bzip2``. |
|
2405 | 2411 | |
|
2406 | 2412 | Server operators may define custom keys. |
|
2407 | 2413 | |
|
2408 | 2414 | Example values: ``COMPRESSION=bzip2``, |
|
2409 | 2415 | ``BUNDLESPEC=gzip-v2, COMPRESSION=gzip``. |
|
2410 | 2416 | |
|
2411 | 2417 | By default, the first bundle advertised by the server is used. |
|
2412 | 2418 | |
|
2413 | 2419 | ``color`` |
|
2414 | 2420 | When to colorize output. Possible value are Boolean ("yes" or "no"), or |
|
2415 | 2421 | "debug", or "always". (default: "yes"). "yes" will use color whenever it |
|
2416 | 2422 | seems possible. See :hg:`help color` for details. |
|
2417 | 2423 | |
|
2418 | 2424 | ``commitsubrepos`` |
|
2419 | 2425 | Whether to commit modified subrepositories when committing the |
|
2420 | 2426 | parent repository. If False and one subrepository has uncommitted |
|
2421 | 2427 | changes, abort the commit. |
|
2422 | 2428 | (default: False) |
|
2423 | 2429 | |
|
2424 | 2430 | ``debug`` |
|
2425 | 2431 | Print debugging information. (default: False) |
|
2426 | 2432 | |
|
2427 | 2433 | ``editor`` |
|
2428 | 2434 | The editor to use during a commit. (default: ``$EDITOR`` or ``vi``) |
|
2429 | 2435 | |
|
2430 | 2436 | ``fallbackencoding`` |
|
2431 | 2437 | Encoding to try if it's not possible to decode the changelog using |
|
2432 | 2438 | UTF-8. (default: ISO-8859-1) |
|
2433 | 2439 | |
|
2434 | 2440 | ``graphnodetemplate`` |
|
2435 | 2441 | (DEPRECATED) Use ``command-templates.graphnode`` instead. |
|
2436 | 2442 | |
|
2437 | 2443 | ``ignore`` |
|
2438 | 2444 | A file to read per-user ignore patterns from. This file should be |
|
2439 | 2445 | in the same format as a repository-wide .hgignore file. Filenames |
|
2440 | 2446 | are relative to the repository root. This option supports hook syntax, |
|
2441 | 2447 | so if you want to specify multiple ignore files, you can do so by |
|
2442 | 2448 | setting something like ``ignore.other = ~/.hgignore2``. For details |
|
2443 | 2449 | of the ignore file format, see the ``hgignore(5)`` man page. |
|
2444 | 2450 | |
|
2445 | 2451 | ``interactive`` |
|
2446 | 2452 | Allow to prompt the user. (default: True) |
|
2447 | 2453 | |
|
2448 | 2454 | ``interface`` |
|
2449 | 2455 | Select the default interface for interactive features (default: text). |
|
2450 | 2456 | Possible values are 'text' and 'curses'. |
|
2451 | 2457 | |
|
2452 | 2458 | ``interface.chunkselector`` |
|
2453 | 2459 | Select the interface for change recording (e.g. :hg:`commit -i`). |
|
2454 | 2460 | Possible values are 'text' and 'curses'. |
|
2455 | 2461 | This config overrides the interface specified by ui.interface. |
|
2456 | 2462 | |
|
2457 | 2463 | ``large-file-limit`` |
|
2458 | 2464 | Largest file size that gives no memory use warning. |
|
2459 | 2465 | Possible values are integers or 0 to disable the check. |
|
2460 | 2466 | (default: 10000000) |
|
2461 | 2467 | |
|
2462 | 2468 | ``logtemplate`` |
|
2463 | 2469 | (DEPRECATED) Use ``command-templates.log`` instead. |
|
2464 | 2470 | |
|
2465 | 2471 | ``merge`` |
|
2466 | 2472 | The conflict resolution program to use during a manual merge. |
|
2467 | 2473 | For more information on merge tools see :hg:`help merge-tools`. |
|
2468 | 2474 | For configuring merge tools see the ``[merge-tools]`` section. |
|
2469 | 2475 | |
|
2470 | 2476 | ``mergemarkers`` |
|
2471 | 2477 | Sets the merge conflict marker label styling. The ``detailed`` style |
|
2472 | 2478 | uses the ``command-templates.mergemarker`` setting to style the labels. |
|
2473 | 2479 | The ``basic`` style just uses 'local' and 'other' as the marker label. |
|
2474 | 2480 | One of ``basic`` or ``detailed``. |
|
2475 | 2481 | (default: ``basic``) |
|
2476 | 2482 | |
|
2477 | 2483 | ``mergemarkertemplate`` |
|
2478 | 2484 | (DEPRECATED) Use ``command-templates.mergemarker`` instead. |
|
2479 | 2485 | |
|
2480 | 2486 | ``message-output`` |
|
2481 | 2487 | Where to write status and error messages. (default: ``stdio``) |
|
2482 | 2488 | |
|
2483 | 2489 | ``channel`` |
|
2484 | 2490 | Use separate channel for structured output. (Command-server only) |
|
2485 | 2491 | ``stderr`` |
|
2486 | 2492 | Everything to stderr. |
|
2487 | 2493 | ``stdio`` |
|
2488 | 2494 | Status to stdout, and error to stderr. |
|
2489 | 2495 | |
|
2490 | 2496 | ``origbackuppath`` |
|
2491 | 2497 | The path to a directory used to store generated .orig files. If the path is |
|
2492 | 2498 | not a directory, one will be created. If set, files stored in this |
|
2493 | 2499 | directory have the same name as the original file and do not have a .orig |
|
2494 | 2500 | suffix. |
|
2495 | 2501 | |
|
2496 | 2502 | ``paginate`` |
|
2497 | 2503 | Control the pagination of command output (default: True). See :hg:`help pager` |
|
2498 | 2504 | for details. |
|
2499 | 2505 | |
|
2500 | 2506 | ``patch`` |
|
2501 | 2507 | An optional external tool that ``hg import`` and some extensions |
|
2502 | 2508 | will use for applying patches. By default Mercurial uses an |
|
2503 | 2509 | internal patch utility. The external tool must work as the common |
|
2504 | 2510 | Unix ``patch`` program. In particular, it must accept a ``-p`` |
|
2505 | 2511 | argument to strip patch headers, a ``-d`` argument to specify the |
|
2506 | 2512 | current directory, a file name to patch, and a patch file to take |
|
2507 | 2513 | from stdin. |
|
2508 | 2514 | |
|
2509 | 2515 | It is possible to specify a patch tool together with extra |
|
2510 | 2516 | arguments. For example, setting this option to ``patch --merge`` |
|
2511 | 2517 | will use the ``patch`` program with its 2-way merge option. |
|
2512 | 2518 | |
|
2513 | 2519 | ``portablefilenames`` |
|
2514 | 2520 | Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``. |
|
2515 | 2521 | (default: ``warn``) |
|
2516 | 2522 | |
|
2517 | 2523 | ``warn`` |
|
2518 | 2524 | Print a warning message on POSIX platforms, if a file with a non-portable |
|
2519 | 2525 | filename is added (e.g. a file with a name that can't be created on |
|
2520 | 2526 | Windows because it contains reserved parts like ``AUX``, reserved |
|
2521 | 2527 | characters like ``:``, or would cause a case collision with an existing |
|
2522 | 2528 | file). |
|
2523 | 2529 | |
|
2524 | 2530 | ``ignore`` |
|
2525 | 2531 | Don't print a warning. |
|
2526 | 2532 | |
|
2527 | 2533 | ``abort`` |
|
2528 | 2534 | The command is aborted. |
|
2529 | 2535 | |
|
2530 | 2536 | ``true`` |
|
2531 | 2537 | Alias for ``warn``. |
|
2532 | 2538 | |
|
2533 | 2539 | ``false`` |
|
2534 | 2540 | Alias for ``ignore``. |
|
2535 | 2541 | |
|
2536 | 2542 | .. container:: windows |
|
2537 | 2543 | |
|
2538 | 2544 | On Windows, this configuration option is ignored and the command aborted. |
|
2539 | 2545 | |
|
2540 | 2546 | ``pre-merge-tool-output-template`` |
|
2541 | 2547 | (DEPRECATED) Use ``command-template.pre-merge-tool-output`` instead. |
|
2542 | 2548 | |
|
2543 | 2549 | ``quiet`` |
|
2544 | 2550 | Reduce the amount of output printed. |
|
2545 | 2551 | (default: False) |
|
2546 | 2552 | |
|
2547 | 2553 | ``relative-paths`` |
|
2548 | 2554 | Prefer relative paths in the UI. |
|
2549 | 2555 | |
|
2550 | 2556 | ``remotecmd`` |
|
2551 | 2557 | Remote command to use for clone/push/pull operations. |
|
2552 | 2558 | (default: ``hg``) |
|
2553 | 2559 | |
|
2554 | 2560 | ``report_untrusted`` |
|
2555 | 2561 | Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a |
|
2556 | 2562 | trusted user or group. |
|
2557 | 2563 | (default: True) |
|
2558 | 2564 | |
|
2559 | 2565 | ``slash`` |
|
2560 | 2566 | (Deprecated. Use ``slashpath`` template filter instead.) |
|
2561 | 2567 | |
|
2562 | 2568 | Display paths using a slash (``/``) as the path separator. This |
|
2563 | 2569 | only makes a difference on systems where the default path |
|
2564 | 2570 | separator is not the slash character (e.g. Windows uses the |
|
2565 | 2571 | backslash character (``\``)). |
|
2566 | 2572 | (default: False) |
|
2567 | 2573 | |
|
2568 | 2574 | ``statuscopies`` |
|
2569 | 2575 | Display copies in the status command. |
|
2570 | 2576 | |
|
2571 | 2577 | ``ssh`` |
|
2572 | 2578 | Command to use for SSH connections. (default: ``ssh``) |
|
2573 | 2579 | |
|
2574 | 2580 | ``ssherrorhint`` |
|
2575 | 2581 | A hint shown to the user in the case of SSH error (e.g. |
|
2576 | 2582 | ``Please see http://company/internalwiki/ssh.html``) |
|
2577 | 2583 | |
|
2578 | 2584 | ``strict`` |
|
2579 | 2585 | Require exact command names, instead of allowing unambiguous |
|
2580 | 2586 | abbreviations. (default: False) |
|
2581 | 2587 | |
|
2582 | 2588 | ``style`` |
|
2583 | 2589 | Name of style to use for command output. |
|
2584 | 2590 | |
|
2585 | 2591 | ``supportcontact`` |
|
2586 | 2592 | A URL where users should report a Mercurial traceback. Use this if you are a |
|
2587 | 2593 | large organisation with its own Mercurial deployment process and crash |
|
2588 | 2594 | reports should be addressed to your internal support. |
|
2589 | 2595 | |
|
2590 | 2596 | ``textwidth`` |
|
2591 | 2597 | Maximum width of help text. A longer line generated by ``hg help`` or |
|
2592 | 2598 | ``hg subcommand --help`` will be broken after white space to get this |
|
2593 | 2599 | width or the terminal width, whichever comes first. |
|
2594 | 2600 | A non-positive value will disable this and the terminal width will be |
|
2595 | 2601 | used. (default: 78) |
|
2596 | 2602 | |
|
2597 | 2603 | ``timeout`` |
|
2598 | 2604 | The timeout used when a lock is held (in seconds), a negative value |
|
2599 | 2605 | means no timeout. (default: 600) |
|
2600 | 2606 | |
|
2601 | 2607 | ``timeout.warn`` |
|
2602 | 2608 | Time (in seconds) before a warning is printed about held lock. A negative |
|
2603 | 2609 | value means no warning. (default: 0) |
|
2604 | 2610 | |
|
2605 | 2611 | ``traceback`` |
|
2606 | 2612 | Mercurial always prints a traceback when an unknown exception |
|
2607 | 2613 | occurs. Setting this to True will make Mercurial print a traceback |
|
2608 | 2614 | on all exceptions, even those recognized by Mercurial (such as |
|
2609 | 2615 | IOError or MemoryError). (default: False) |
|
2610 | 2616 | |
|
2611 | 2617 | ``tweakdefaults`` |
|
2612 | 2618 | |
|
2613 | 2619 | By default Mercurial's behavior changes very little from release |
|
2614 | 2620 | to release, but over time the recommended config settings |
|
2615 | 2621 | shift. Enable this config to opt in to get automatic tweaks to |
|
2616 | 2622 | Mercurial's behavior over time. This config setting will have no |
|
2617 | 2623 | effect if ``HGPLAIN`` is set or ``HGPLAINEXCEPT`` is set and does |
|
2618 | 2624 | not include ``tweakdefaults``. (default: False) |
|
2619 | 2625 | |
|
2620 | 2626 | It currently means:: |
|
2621 | 2627 | |
|
2622 | 2628 | .. tweakdefaultsmarker |
|
2623 | 2629 | |
|
2624 | 2630 | ``username`` |
|
2625 | 2631 | The committer of a changeset created when running "commit". |
|
2626 | 2632 | Typically a person's name and email address, e.g. ``Fred Widget |
|
2627 | 2633 | <fred@example.com>``. Environment variables in the |
|
2628 | 2634 | username are expanded. |
|
2629 | 2635 | |
|
2630 | 2636 | (default: ``$EMAIL`` or ``username@hostname``. If the username in |
|
2631 | 2637 | hgrc is empty, e.g. if the system admin set ``username =`` in the |
|
2632 | 2638 | system hgrc, it has to be specified manually or in a different |
|
2633 | 2639 | hgrc file) |
|
2634 | 2640 | |
|
2635 | 2641 | ``verbose`` |
|
2636 | 2642 | Increase the amount of output printed. (default: False) |
|
2637 | 2643 | |
|
2638 | 2644 | |
|
2639 | 2645 | ``command-templates`` |
|
2640 | 2646 | --------------------- |
|
2641 | 2647 | |
|
2642 | 2648 | Templates used for customizing the output of commands. |
|
2643 | 2649 | |
|
2644 | 2650 | ``graphnode`` |
|
2645 | 2651 | The template used to print changeset nodes in an ASCII revision graph. |
|
2646 | 2652 | (default: ``{graphnode}``) |
|
2647 | 2653 | |
|
2648 | 2654 | ``log`` |
|
2649 | 2655 | Template string for commands that print changesets. |
|
2650 | 2656 | |
|
2651 | 2657 | ``mergemarker`` |
|
2652 | 2658 | The template used to print the commit description next to each conflict |
|
2653 | 2659 | marker during merge conflicts. See :hg:`help templates` for the template |
|
2654 | 2660 | format. |
|
2655 | 2661 | |
|
2656 | 2662 | Defaults to showing the hash, tags, branches, bookmarks, author, and |
|
2657 | 2663 | the first line of the commit description. |
|
2658 | 2664 | |
|
2659 | 2665 | If you use non-ASCII characters in names for tags, branches, bookmarks, |
|
2660 | 2666 | authors, and/or commit descriptions, you must pay attention to encodings of |
|
2661 | 2667 | managed files. At template expansion, non-ASCII characters use the encoding |
|
2662 | 2668 | specified by the ``--encoding`` global option, ``HGENCODING`` or other |
|
2663 | 2669 | environment variables that govern your locale. If the encoding of the merge |
|
2664 | 2670 | markers is different from the encoding of the merged files, |
|
2665 | 2671 | serious problems may occur. |
|
2666 | 2672 | |
|
2667 | 2673 | Can be overridden per-merge-tool, see the ``[merge-tools]`` section. |
|
2668 | 2674 | |
|
2669 | 2675 | ``oneline-summary`` |
|
2670 | 2676 | A template used by `hg rebase` and other commands for showing a one-line |
|
2671 | 2677 | summary of a commit. If the template configured here is longer than one |
|
2672 | 2678 | line, then only the first line is used. |
|
2673 | 2679 | |
|
2674 | 2680 | The template can be overridden per command by defining a template in |
|
2675 | 2681 | `oneline-summary.<command>`, where `<command>` can be e.g. "rebase". |
|
2676 | 2682 | |
|
2677 | 2683 | ``pre-merge-tool-output`` |
|
2678 | 2684 | A template that is printed before executing an external merge tool. This can |
|
2679 | 2685 | be used to print out additional context that might be useful to have during |
|
2680 | 2686 | the conflict resolution, such as the description of the various commits |
|
2681 | 2687 | involved or bookmarks/tags. |
|
2682 | 2688 | |
|
2683 | 2689 | Additional information is available in the ``local`, ``base``, and ``other`` |
|
2684 | 2690 | dicts. For example: ``{local.label}``, ``{base.name}``, or |
|
2685 | 2691 | ``{other.islink}``. |
|
2686 | 2692 | |
|
2687 | 2693 | |
|
2688 | 2694 | ``web`` |
|
2689 | 2695 | ------- |
|
2690 | 2696 | |
|
2691 | 2697 | Web interface configuration. The settings in this section apply to |
|
2692 | 2698 | both the builtin webserver (started by :hg:`serve`) and the script you |
|
2693 | 2699 | run through a webserver (``hgweb.cgi`` and the derivatives for FastCGI |
|
2694 | 2700 | and WSGI). |
|
2695 | 2701 | |
|
2696 | 2702 | The Mercurial webserver does no authentication (it does not prompt for |
|
2697 | 2703 | usernames and passwords to validate *who* users are), but it does do |
|
2698 | 2704 | authorization (it grants or denies access for *authenticated users* |
|
2699 | 2705 | based on settings in this section). You must either configure your |
|
2700 | 2706 | webserver to do authentication for you, or disable the authorization |
|
2701 | 2707 | checks. |
|
2702 | 2708 | |
|
2703 | 2709 | For a quick setup in a trusted environment, e.g., a private LAN, where |
|
2704 | 2710 | you want it to accept pushes from anybody, you can use the following |
|
2705 | 2711 | command line:: |
|
2706 | 2712 | |
|
2707 | 2713 | $ hg --config web.allow-push=* --config web.push_ssl=False serve |
|
2708 | 2714 | |
|
2709 | 2715 | Note that this will allow anybody to push anything to the server and |
|
2710 | 2716 | that this should not be used for public servers. |
|
2711 | 2717 | |
|
2712 | 2718 | The full set of options is: |
|
2713 | 2719 | |
|
2714 | 2720 | ``accesslog`` |
|
2715 | 2721 | Where to output the access log. (default: stdout) |
|
2716 | 2722 | |
|
2717 | 2723 | ``address`` |
|
2718 | 2724 | Interface address to bind to. (default: all) |
|
2719 | 2725 | |
|
2720 | 2726 | ``allow-archive`` |
|
2721 | 2727 | List of archive format (bz2, gz, zip) allowed for downloading. |
|
2722 | 2728 | (default: empty) |
|
2723 | 2729 | |
|
2724 | 2730 | ``allowbz2`` |
|
2725 | 2731 | (DEPRECATED) Whether to allow .tar.bz2 downloading of repository |
|
2726 | 2732 | revisions. |
|
2727 | 2733 | (default: False) |
|
2728 | 2734 | |
|
2729 | 2735 | ``allowgz`` |
|
2730 | 2736 | (DEPRECATED) Whether to allow .tar.gz downloading of repository |
|
2731 | 2737 | revisions. |
|
2732 | 2738 | (default: False) |
|
2733 | 2739 | |
|
2734 | 2740 | ``allow-pull`` |
|
2735 | 2741 | Whether to allow pulling from the repository. (default: True) |
|
2736 | 2742 | |
|
2737 | 2743 | ``allow-push`` |
|
2738 | 2744 | Whether to allow pushing to the repository. If empty or not set, |
|
2739 | 2745 | pushing is not allowed. If the special value ``*``, any remote |
|
2740 | 2746 | user can push, including unauthenticated users. Otherwise, the |
|
2741 | 2747 | remote user must have been authenticated, and the authenticated |
|
2742 | 2748 | user name must be present in this list. The contents of the |
|
2743 | 2749 | allow-push list are examined after the deny_push list. |
|
2744 | 2750 | |
|
2745 | 2751 | ``allow_read`` |
|
2746 | 2752 | If the user has not already been denied repository access due to |
|
2747 | 2753 | the contents of deny_read, this list determines whether to grant |
|
2748 | 2754 | repository access to the user. If this list is not empty, and the |
|
2749 | 2755 | user is unauthenticated or not present in the list, then access is |
|
2750 | 2756 | denied for the user. If the list is empty or not set, then access |
|
2751 | 2757 | is permitted to all users by default. Setting allow_read to the |
|
2752 | 2758 | special value ``*`` is equivalent to it not being set (i.e. access |
|
2753 | 2759 | is permitted to all users). The contents of the allow_read list are |
|
2754 | 2760 | examined after the deny_read list. |
|
2755 | 2761 | |
|
2756 | 2762 | ``allowzip`` |
|
2757 | 2763 | (DEPRECATED) Whether to allow .zip downloading of repository |
|
2758 | 2764 | revisions. This feature creates temporary files. |
|
2759 | 2765 | (default: False) |
|
2760 | 2766 | |
|
2761 | 2767 | ``archivesubrepos`` |
|
2762 | 2768 | Whether to recurse into subrepositories when archiving. |
|
2763 | 2769 | (default: False) |
|
2764 | 2770 | |
|
2765 | 2771 | ``baseurl`` |
|
2766 | 2772 | Base URL to use when publishing URLs in other locations, so |
|
2767 | 2773 | third-party tools like email notification hooks can construct |
|
2768 | 2774 | URLs. Example: ``http://hgserver/repos/``. |
|
2769 | 2775 | |
|
2770 | 2776 | ``cacerts`` |
|
2771 | 2777 | Path to file containing a list of PEM encoded certificate |
|
2772 | 2778 | authority certificates. Environment variables and ``~user`` |
|
2773 | 2779 | constructs are expanded in the filename. If specified on the |
|
2774 | 2780 | client, then it will verify the identity of remote HTTPS servers |
|
2775 | 2781 | with these certificates. |
|
2776 | 2782 | |
|
2777 | 2783 | To disable SSL verification temporarily, specify ``--insecure`` from |
|
2778 | 2784 | command line. |
|
2779 | 2785 | |
|
2780 | 2786 | You can use OpenSSL's CA certificate file if your platform has |
|
2781 | 2787 | one. On most Linux systems this will be |
|
2782 | 2788 | ``/etc/ssl/certs/ca-certificates.crt``. Otherwise you will have to |
|
2783 | 2789 | generate this file manually. The form must be as follows:: |
|
2784 | 2790 | |
|
2785 | 2791 | -----BEGIN CERTIFICATE----- |
|
2786 | 2792 | ... (certificate in base64 PEM encoding) ... |
|
2787 | 2793 | -----END CERTIFICATE----- |
|
2788 | 2794 | -----BEGIN CERTIFICATE----- |
|
2789 | 2795 | ... (certificate in base64 PEM encoding) ... |
|
2790 | 2796 | -----END CERTIFICATE----- |
|
2791 | 2797 | |
|
2792 | 2798 | ``cache`` |
|
2793 | 2799 | Whether to support caching in hgweb. (default: True) |
|
2794 | 2800 | |
|
2795 | 2801 | ``certificate`` |
|
2796 | 2802 | Certificate to use when running :hg:`serve`. |
|
2797 | 2803 | |
|
2798 | 2804 | ``collapse`` |
|
2799 | 2805 | With ``descend`` enabled, repositories in subdirectories are shown at |
|
2800 | 2806 | a single level alongside repositories in the current path. With |
|
2801 | 2807 | ``collapse`` also enabled, repositories residing at a deeper level than |
|
2802 | 2808 | the current path are grouped behind navigable directory entries that |
|
2803 | 2809 | lead to the locations of these repositories. In effect, this setting |
|
2804 | 2810 | collapses each collection of repositories found within a subdirectory |
|
2805 | 2811 | into a single entry for that subdirectory. (default: False) |
|
2806 | 2812 | |
|
2807 | 2813 | ``comparisoncontext`` |
|
2808 | 2814 | Number of lines of context to show in side-by-side file comparison. If |
|
2809 | 2815 | negative or the value ``full``, whole files are shown. (default: 5) |
|
2810 | 2816 | |
|
2811 | 2817 | This setting can be overridden by a ``context`` request parameter to the |
|
2812 | 2818 | ``comparison`` command, taking the same values. |
|
2813 | 2819 | |
|
2814 | 2820 | ``contact`` |
|
2815 | 2821 | Name or email address of the person in charge of the repository. |
|
2816 | 2822 | (default: ui.username or ``$EMAIL`` or "unknown" if unset or empty) |
|
2817 | 2823 | |
|
2818 | 2824 | ``csp`` |
|
2819 | 2825 | Send a ``Content-Security-Policy`` HTTP header with this value. |
|
2820 | 2826 | |
|
2821 | 2827 | The value may contain a special string ``%nonce%``, which will be replaced |
|
2822 | 2828 | by a randomly-generated one-time use value. If the value contains |
|
2823 | 2829 | ``%nonce%``, ``web.cache`` will be disabled, as caching undermines the |
|
2824 | 2830 | one-time property of the nonce. This nonce will also be inserted into |
|
2825 | 2831 | ``<script>`` elements containing inline JavaScript. |
|
2826 | 2832 | |
|
2827 | 2833 | Note: lots of HTML content sent by the server is derived from repository |
|
2828 | 2834 | data. Please consider the potential for malicious repository data to |
|
2829 | 2835 | "inject" itself into generated HTML content as part of your security |
|
2830 | 2836 | threat model. |
|
2831 | 2837 | |
|
2832 | 2838 | ``deny_push`` |
|
2833 | 2839 | Whether to deny pushing to the repository. If empty or not set, |
|
2834 | 2840 | push is not denied. If the special value ``*``, all remote users are |
|
2835 | 2841 | denied push. Otherwise, unauthenticated users are all denied, and |
|
2836 | 2842 | any authenticated user name present in this list is also denied. The |
|
2837 | 2843 | contents of the deny_push list are examined before the allow-push list. |
|
2838 | 2844 | |
|
2839 | 2845 | ``deny_read`` |
|
2840 | 2846 | Whether to deny reading/viewing of the repository. If this list is |
|
2841 | 2847 | not empty, unauthenticated users are all denied, and any |
|
2842 | 2848 | authenticated user name present in this list is also denied access to |
|
2843 | 2849 | the repository. If set to the special value ``*``, all remote users |
|
2844 | 2850 | are denied access (rarely needed ;). If deny_read is empty or not set, |
|
2845 | 2851 | the determination of repository access depends on the presence and |
|
2846 | 2852 | content of the allow_read list (see description). If both |
|
2847 | 2853 | deny_read and allow_read are empty or not set, then access is |
|
2848 | 2854 | permitted to all users by default. If the repository is being |
|
2849 | 2855 | served via hgwebdir, denied users will not be able to see it in |
|
2850 | 2856 | the list of repositories. The contents of the deny_read list have |
|
2851 | 2857 | priority over (are examined before) the contents of the allow_read |
|
2852 | 2858 | list. |
|
2853 | 2859 | |
|
2854 | 2860 | ``descend`` |
|
2855 | 2861 | hgwebdir indexes will not descend into subdirectories. Only repositories |
|
2856 | 2862 | directly in the current path will be shown (other repositories are still |
|
2857 | 2863 | available from the index corresponding to their containing path). |
|
2858 | 2864 | |
|
2859 | 2865 | ``description`` |
|
2860 | 2866 | Textual description of the repository's purpose or contents. |
|
2861 | 2867 | (default: "unknown") |
|
2862 | 2868 | |
|
2863 | 2869 | ``encoding`` |
|
2864 | 2870 | Character encoding name. (default: the current locale charset) |
|
2865 | 2871 | Example: "UTF-8". |
|
2866 | 2872 | |
|
2867 | 2873 | ``errorlog`` |
|
2868 | 2874 | Where to output the error log. (default: stderr) |
|
2869 | 2875 | |
|
2870 | 2876 | ``guessmime`` |
|
2871 | 2877 | Control MIME types for raw download of file content. |
|
2872 | 2878 | Set to True to let hgweb guess the content type from the file |
|
2873 | 2879 | extension. This will serve HTML files as ``text/html`` and might |
|
2874 | 2880 | allow cross-site scripting attacks when serving untrusted |
|
2875 | 2881 | repositories. (default: False) |
|
2876 | 2882 | |
|
2877 | 2883 | ``hidden`` |
|
2878 | 2884 | Whether to hide the repository in the hgwebdir index. |
|
2879 | 2885 | (default: False) |
|
2880 | 2886 | |
|
2881 | 2887 | ``ipv6`` |
|
2882 | 2888 | Whether to use IPv6. (default: False) |
|
2883 | 2889 | |
|
2884 | 2890 | ``labels`` |
|
2885 | 2891 | List of string *labels* associated with the repository. |
|
2886 | 2892 | |
|
2887 | 2893 | Labels are exposed as a template keyword and can be used to customize |
|
2888 | 2894 | output. e.g. the ``index`` template can group or filter repositories |
|
2889 | 2895 | by labels and the ``summary`` template can display additional content |
|
2890 | 2896 | if a specific label is present. |
|
2891 | 2897 | |
|
2892 | 2898 | ``logoimg`` |
|
2893 | 2899 | File name of the logo image that some templates display on each page. |
|
2894 | 2900 | The file name is relative to ``staticurl``. That is, the full path to |
|
2895 | 2901 | the logo image is "staticurl/logoimg". |
|
2896 | 2902 | If unset, ``hglogo.png`` will be used. |
|
2897 | 2903 | |
|
2898 | 2904 | ``logourl`` |
|
2899 | 2905 | Base URL to use for logos. If unset, ``https://mercurial-scm.org/`` |
|
2900 | 2906 | will be used. |
|
2901 | 2907 | |
|
2902 | 2908 | ``maxchanges`` |
|
2903 | 2909 | Maximum number of changes to list on the changelog. (default: 10) |
|
2904 | 2910 | |
|
2905 | 2911 | ``maxfiles`` |
|
2906 | 2912 | Maximum number of files to list per changeset. (default: 10) |
|
2907 | 2913 | |
|
2908 | 2914 | ``maxshortchanges`` |
|
2909 | 2915 | Maximum number of changes to list on the shortlog, graph or filelog |
|
2910 | 2916 | pages. (default: 60) |
|
2911 | 2917 | |
|
2912 | 2918 | ``name`` |
|
2913 | 2919 | Repository name to use in the web interface. |
|
2914 | 2920 | (default: current working directory) |
|
2915 | 2921 | |
|
2916 | 2922 | ``port`` |
|
2917 | 2923 | Port to listen on. (default: 8000) |
|
2918 | 2924 | |
|
2919 | 2925 | ``prefix`` |
|
2920 | 2926 | Prefix path to serve from. (default: '' (server root)) |
|
2921 | 2927 | |
|
2922 | 2928 | ``push_ssl`` |
|
2923 | 2929 | Whether to require that inbound pushes be transported over SSL to |
|
2924 | 2930 | prevent password sniffing. (default: True) |
|
2925 | 2931 | |
|
2926 | 2932 | ``refreshinterval`` |
|
2927 | 2933 | How frequently directory listings re-scan the filesystem for new |
|
2928 | 2934 | repositories, in seconds. This is relevant when wildcards are used |
|
2929 | 2935 | to define paths. Depending on how much filesystem traversal is |
|
2930 | 2936 | required, refreshing may negatively impact performance. |
|
2931 | 2937 | |
|
2932 | 2938 | Values less than or equal to 0 always refresh. |
|
2933 | 2939 | (default: 20) |
|
2934 | 2940 | |
|
2935 | 2941 | ``server-header`` |
|
2936 | 2942 | Value for HTTP ``Server`` response header. |
|
2937 | 2943 | |
|
2938 | 2944 | ``static`` |
|
2939 | 2945 | Directory where static files are served from. |
|
2940 | 2946 | |
|
2941 | 2947 | ``staticurl`` |
|
2942 | 2948 | Base URL to use for static files. If unset, static files (e.g. the |
|
2943 | 2949 | hgicon.png favicon) will be served by the CGI script itself. Use |
|
2944 | 2950 | this setting to serve them directly with the HTTP server. |
|
2945 | 2951 | Example: ``http://hgserver/static/``. |
|
2946 | 2952 | |
|
2947 | 2953 | ``stripes`` |
|
2948 | 2954 | How many lines a "zebra stripe" should span in multi-line output. |
|
2949 | 2955 | Set to 0 to disable. (default: 1) |
|
2950 | 2956 | |
|
2951 | 2957 | ``style`` |
|
2952 | 2958 | Which template map style to use. The available options are the names of |
|
2953 | 2959 | subdirectories in the HTML templates path. (default: ``paper``) |
|
2954 | 2960 | Example: ``monoblue``. |
|
2955 | 2961 | |
|
2956 | 2962 | ``templates`` |
|
2957 | 2963 | Where to find the HTML templates. The default path to the HTML templates |
|
2958 | 2964 | can be obtained from ``hg debuginstall``. |
|
2959 | 2965 | |
|
2960 | 2966 | ``websub`` |
|
2961 | 2967 | ---------- |
|
2962 | 2968 | |
|
2963 | 2969 | Web substitution filter definition. You can use this section to |
|
2964 | 2970 | define a set of regular expression substitution patterns which |
|
2965 | 2971 | let you automatically modify the hgweb server output. |
|
2966 | 2972 | |
|
2967 | 2973 | The default hgweb templates only apply these substitution patterns |
|
2968 | 2974 | on the revision description fields. You can apply them anywhere |
|
2969 | 2975 | you want when you create your own templates by adding calls to the |
|
2970 | 2976 | "websub" filter (usually after calling the "escape" filter). |
|
2971 | 2977 | |
|
2972 | 2978 | This can be used, for example, to convert issue references to links |
|
2973 | 2979 | to your issue tracker, or to convert "markdown-like" syntax into |
|
2974 | 2980 | HTML (see the examples below). |
|
2975 | 2981 | |
|
2976 | 2982 | Each entry in this section names a substitution filter. |
|
2977 | 2983 | The value of each entry defines the substitution expression itself. |
|
2978 | 2984 | The websub expressions follow the old interhg extension syntax, |
|
2979 | 2985 | which in turn imitates the Unix sed replacement syntax:: |
|
2980 | 2986 | |
|
2981 | 2987 | patternname = s/SEARCH_REGEX/REPLACE_EXPRESSION/[i] |
|
2982 | 2988 | |
|
2983 | 2989 | You can use any separator other than "/". The final "i" is optional |
|
2984 | 2990 | and indicates that the search must be case insensitive. |
|
2985 | 2991 | |
|
2986 | 2992 | Examples:: |
|
2987 | 2993 | |
|
2988 | 2994 | [websub] |
|
2989 | 2995 | issues = s|issue(\d+)|<a href="http://bts.example.org/issue\1">issue\1</a>|i |
|
2990 | 2996 | italic = s/\b_(\S+)_\b/<i>\1<\/i>/ |
|
2991 | 2997 | bold = s/\*\b(\S+)\b\*/<b>\1<\/b>/ |
|
2992 | 2998 | |
|
2993 | 2999 | ``worker`` |
|
2994 | 3000 | ---------- |
|
2995 | 3001 | |
|
2996 | 3002 | Parallel master/worker configuration. We currently perform working |
|
2997 | 3003 | directory updates in parallel on Unix-like systems, which greatly |
|
2998 | 3004 | helps performance. |
|
2999 | 3005 | |
|
3000 | 3006 | ``enabled`` |
|
3001 | 3007 | Whether to enable workers code to be used. |
|
3002 | 3008 | (default: true) |
|
3003 | 3009 | |
|
3004 | 3010 | ``numcpus`` |
|
3005 | 3011 | Number of CPUs to use for parallel operations. A zero or |
|
3006 | 3012 | negative value is treated as ``use the default``. |
|
3007 | 3013 | (default: 4 or the number of CPUs on the system, whichever is larger) |
|
3008 | 3014 | |
|
3009 | 3015 | ``backgroundclose`` |
|
3010 | 3016 | Whether to enable closing file handles on background threads during certain |
|
3011 | 3017 | operations. Some platforms aren't very efficient at closing file |
|
3012 | 3018 | handles that have been written or appended to. By performing file closing |
|
3013 | 3019 | on background threads, file write rate can increase substantially. |
|
3014 | 3020 | (default: true on Windows, false elsewhere) |
|
3015 | 3021 | |
|
3016 | 3022 | ``backgroundcloseminfilecount`` |
|
3017 | 3023 | Minimum number of files required to trigger background file closing. |
|
3018 | 3024 | Operations not writing this many files won't start background close |
|
3019 | 3025 | threads. |
|
3020 | 3026 | (default: 2048) |
|
3021 | 3027 | |
|
3022 | 3028 | ``backgroundclosemaxqueue`` |
|
3023 | 3029 | The maximum number of opened file handles waiting to be closed in the |
|
3024 | 3030 | background. This option only has an effect if ``backgroundclose`` is |
|
3025 | 3031 | enabled. |
|
3026 | 3032 | (default: 384) |
|
3027 | 3033 | |
|
3028 | 3034 | ``backgroundclosethreadcount`` |
|
3029 | 3035 | Number of threads to process background file closes. Only relevant if |
|
3030 | 3036 | ``backgroundclose`` is enabled. |
|
3031 | 3037 | (default: 4) |
@@ -1,176 +1,172 | |||
|
1 | 1 | Repositories contain a file (``.hg/requires``) containing a list of |
|
2 | 2 | features/capabilities that are *required* for clients to interface |
|
3 | 3 | with the repository. This file has been present in Mercurial since |
|
4 | 4 | version 0.9.2 (released December 2006). |
|
5 | 5 | |
|
6 | 6 | One of the first things clients do when opening a repository is read |
|
7 | 7 | ``.hg/requires`` and verify that all listed requirements are supported, |
|
8 | 8 | aborting if not. Requirements are therefore a strong mechanism to |
|
9 | 9 | prevent incompatible clients from reading from unknown repository |
|
10 | 10 | formats or even corrupting them by writing to them. |
|
11 | 11 | |
|
12 | 12 | Extensions may add requirements. When they do this, clients not running |
|
13 | 13 | an extension will be unable to read from repositories. |
|
14 | 14 | |
|
15 | 15 | The following sections describe the requirements defined by the |
|
16 | 16 | Mercurial core distribution. |
|
17 | 17 | |
|
18 | 18 | revlogv1 |
|
19 | 19 | ======== |
|
20 | 20 | |
|
21 | 21 | When present, revlogs are version 1 (RevlogNG). RevlogNG was introduced |
|
22 | 22 | in 2006. The ``revlogv1`` requirement has been enabled by default |
|
23 | 23 | since the ``requires`` file was introduced in Mercurial 0.9.2. |
|
24 | 24 | |
|
25 | 25 | If this requirement is not present, version 0 revlogs are assumed. |
|
26 | 26 | |
|
27 | 27 | store |
|
28 | 28 | ===== |
|
29 | 29 | |
|
30 | 30 | The *store* repository layout should be used. |
|
31 | 31 | |
|
32 | 32 | This requirement has been enabled by default since the ``requires`` file |
|
33 | 33 | was introduced in Mercurial 0.9.2. |
|
34 | 34 | |
|
35 | 35 | fncache |
|
36 | 36 | ======= |
|
37 | 37 | |
|
38 | 38 | The *fncache* repository layout should be used. |
|
39 | 39 | |
|
40 | 40 | The *fncache* layout hash encodes filenames with long paths and |
|
41 | 41 | encodes reserved filenames. |
|
42 | 42 | |
|
43 | 43 | This requirement is enabled by default when the *store* requirement is |
|
44 | 44 | enabled (which is the default behavior). It was introduced in Mercurial |
|
45 | 45 | 1.1 (released December 2008). |
|
46 | 46 | |
|
47 | 47 | shared |
|
48 | 48 | ====== |
|
49 | 49 | |
|
50 | 50 | Denotes that the store for a repository is shared from another location |
|
51 | 51 | (defined by the ``.hg/sharedpath`` file). |
|
52 | 52 | |
|
53 | 53 | This requirement is set when a repository is created via :hg:`share`. |
|
54 | 54 | |
|
55 | 55 | The requirement was added in Mercurial 1.3 (released July 2009). |
|
56 | 56 | |
|
57 | 57 | relshared |
|
58 | 58 | ========= |
|
59 | 59 | |
|
60 | 60 | Derivative of ``shared``; the location of the store is relative to the |
|
61 | 61 | store of this repository. |
|
62 | 62 | |
|
63 | 63 | This requirement is set when a repository is created via :hg:`share` |
|
64 | 64 | using the ``--relative`` option. |
|
65 | 65 | |
|
66 | 66 | The requirement was added in Mercurial 4.2 (released May 2017). |
|
67 | 67 | |
|
68 | 68 | dotencode |
|
69 | 69 | ========= |
|
70 | 70 | |
|
71 | 71 | The *dotencode* repository layout should be used. |
|
72 | 72 | |
|
73 | 73 | The *dotencode* layout encodes the first period or space in filenames |
|
74 | 74 | to prevent issues on OS X and Windows. |
|
75 | 75 | |
|
76 | 76 | This requirement is enabled by default when the *store* requirement |
|
77 | 77 | is enabled (which is the default behavior). It was introduced in |
|
78 | 78 | Mercurial 1.7 (released November 2010). |
|
79 | 79 | |
|
80 | 80 | parentdelta |
|
81 | 81 | =========== |
|
82 | 82 | |
|
83 | 83 | Denotes a revlog delta encoding format that was experimental and |
|
84 | 84 | replaced by *generaldelta*. It should not be seen in the wild because |
|
85 | 85 | it was never enabled by default. |
|
86 | 86 | |
|
87 | 87 | This requirement was added in Mercurial 1.7 and removed in Mercurial |
|
88 | 88 | 1.9. |
|
89 | 89 | |
|
90 | 90 | generaldelta |
|
91 | 91 | ============ |
|
92 | 92 | |
|
93 | 93 | Revlogs should be created with the *generaldelta* flag enabled. The |
|
94 | 94 | generaldelta flag will cause deltas to be encoded against a parent |
|
95 | 95 | revision instead of the previous revision in the revlog. |
|
96 | 96 | |
|
97 | 97 | Support for this requirement was added in Mercurial 1.9 (released |
|
98 | 98 | July 2011). The requirement was disabled on new repositories by |
|
99 | 99 | default until Mercurial 3.7 (released February 2016). |
|
100 | 100 | |
|
101 | 101 | manifestv2 |
|
102 | 102 | ========== |
|
103 | 103 | |
|
104 | 104 | Denotes that version 2 of manifests are being used. |
|
105 | 105 | |
|
106 | 106 | Support for this requirement was added in Mercurial 3.4 (released |
|
107 | 107 | May 2015). The new format failed to meet expectations and support |
|
108 | 108 | for the format and requirement were removed in Mercurial 4.6 |
|
109 | 109 | (released May 2018) since the feature never graduated frome experiment |
|
110 | 110 | status. |
|
111 | 111 | |
|
112 | 112 | treemanifest |
|
113 | 113 | ============ |
|
114 | 114 | |
|
115 | 115 | Denotes that tree manifests are being used. Tree manifests are |
|
116 | 116 | one manifest per directory (as opposed to a single flat manifest). |
|
117 | 117 | |
|
118 | 118 | Support for this requirement was added in Mercurial 3.4 (released |
|
119 | 119 | August 2015). The requirement is currently experimental and is |
|
120 | 120 | disabled by default. |
|
121 | 121 | |
|
122 | 122 | exp-sparse |
|
123 | 123 | ========== |
|
124 | 124 | |
|
125 | 125 | The working directory is sparse (only contains a subset of files). |
|
126 | 126 | |
|
127 | 127 | Support for this requirement was added in Mercurial 4.3 (released |
|
128 | 128 | August 2017). This requirement and feature are experimental and may |
|
129 | 129 | disappear in a future Mercurial release. The requirement will only |
|
130 | 130 | be present on repositories that have opted in to a sparse working |
|
131 | 131 | directory. |
|
132 | 132 | |
|
133 | 133 | bookmarksinstore |
|
134 | 134 | ================== |
|
135 | 135 | |
|
136 | 136 | Bookmarks are stored in ``.hg/store/`` instead of directly in ``.hg/`` |
|
137 | 137 | where they used to be stored. The active bookmark is still stored |
|
138 | 138 | directly in ``.hg/``. This makes them always shared by ``hg share``, |
|
139 | 139 | whether or not ``-B`` was passed. |
|
140 | 140 | |
|
141 | 141 | Support for this requirement was added in Mercurial 5.1 (released |
|
142 | 142 | August 2019). The requirement will only be present on repositories |
|
143 | 143 | that have opted in to this format (by having |
|
144 | 144 | ``format.bookmarks-in-store=true`` set when they were created). |
|
145 | 145 | |
|
146 | 146 | persistent-nodemap |
|
147 | 147 | ================== |
|
148 | 148 | |
|
149 | 149 | The `nodemap` index (mapping nodeid to local revision number) is persisted on |
|
150 | 150 | disk. This provides speed benefit (if the associated native code is used). The |
|
151 | 151 | persistent nodemap is only used for two revlogs: the changelog and the |
|
152 | 152 | manifestlog. |
|
153 | 153 | |
|
154 | 154 | Support for this requirement was added in Mercurial 5.5 (released August 2020). |
|
155 | 155 | Note that as of 5.5, only installations compiled with the Rust extension will |
|
156 | 156 | benefit from a speedup. The other installations will do the necessary work to |
|
157 | 157 | keep the index up to date, but will suffer a slowdown. |
|
158 | 158 | |
|
159 | 159 | exp-sharesafe |
|
160 | 160 | ============= |
|
161 | 161 | |
|
162 | NOTE: This requirement is for internal development only. The semantics are not | |
|
163 | frozed yet, the feature is experimental. It's not advised to use it for any | |
|
164 | production repository yet. | |
|
165 | ||
|
166 | 162 | Represents that the repository can be shared safely. Requirements and config of |
|
167 | 163 | the source repository will be shared. |
|
168 | 164 | Requirements are stored in ``.hg/store`` instead of directly in ``.hg/`` where |
|
169 | 165 | they used to be stored. Some working copy related requirements are still stored |
|
170 | 166 | in ``.hg/``. |
|
171 | 167 | Shares read the ``.hg/hgrc`` of the source repository. |
|
172 | 168 | |
|
173 | 169 | Support for this requirement was added in Mercurial 5.7 (released |
|
174 | 170 | February 2021). The requirement will only be present on repositories that have |
|
175 |
opted in to this format (by having ``format.e |
|
|
171 | opted in to this format (by having ``format.use-share-safe=true`` set when | |
|
176 | 172 | they were created). |
@@ -1,3692 +1,3692 | |||
|
1 | 1 | # localrepo.py - read/write repository class for mercurial |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
4 | 4 | # |
|
5 | 5 | # This software may be used and distributed according to the terms of the |
|
6 | 6 | # GNU General Public License version 2 or any later version. |
|
7 | 7 | |
|
8 | 8 | from __future__ import absolute_import |
|
9 | 9 | |
|
10 | 10 | import errno |
|
11 | 11 | import functools |
|
12 | 12 | import os |
|
13 | 13 | import random |
|
14 | 14 | import sys |
|
15 | 15 | import time |
|
16 | 16 | import weakref |
|
17 | 17 | |
|
18 | 18 | from .i18n import _ |
|
19 | 19 | from .node import ( |
|
20 | 20 | bin, |
|
21 | 21 | hex, |
|
22 | 22 | nullid, |
|
23 | 23 | nullrev, |
|
24 | 24 | short, |
|
25 | 25 | ) |
|
26 | 26 | from .pycompat import ( |
|
27 | 27 | delattr, |
|
28 | 28 | getattr, |
|
29 | 29 | ) |
|
30 | 30 | from . import ( |
|
31 | 31 | bookmarks, |
|
32 | 32 | branchmap, |
|
33 | 33 | bundle2, |
|
34 | 34 | bundlecaches, |
|
35 | 35 | changegroup, |
|
36 | 36 | color, |
|
37 | 37 | commit, |
|
38 | 38 | context, |
|
39 | 39 | dirstate, |
|
40 | 40 | dirstateguard, |
|
41 | 41 | discovery, |
|
42 | 42 | encoding, |
|
43 | 43 | error, |
|
44 | 44 | exchange, |
|
45 | 45 | extensions, |
|
46 | 46 | filelog, |
|
47 | 47 | hook, |
|
48 | 48 | lock as lockmod, |
|
49 | 49 | match as matchmod, |
|
50 | 50 | mergestate as mergestatemod, |
|
51 | 51 | mergeutil, |
|
52 | 52 | namespaces, |
|
53 | 53 | narrowspec, |
|
54 | 54 | obsolete, |
|
55 | 55 | pathutil, |
|
56 | 56 | phases, |
|
57 | 57 | pushkey, |
|
58 | 58 | pycompat, |
|
59 | 59 | rcutil, |
|
60 | 60 | repoview, |
|
61 | 61 | requirements as requirementsmod, |
|
62 | 62 | revlog, |
|
63 | 63 | revset, |
|
64 | 64 | revsetlang, |
|
65 | 65 | scmutil, |
|
66 | 66 | sparse, |
|
67 | 67 | store as storemod, |
|
68 | 68 | subrepoutil, |
|
69 | 69 | tags as tagsmod, |
|
70 | 70 | transaction, |
|
71 | 71 | txnutil, |
|
72 | 72 | util, |
|
73 | 73 | vfs as vfsmod, |
|
74 | 74 | ) |
|
75 | 75 | |
|
76 | 76 | from .interfaces import ( |
|
77 | 77 | repository, |
|
78 | 78 | util as interfaceutil, |
|
79 | 79 | ) |
|
80 | 80 | |
|
81 | 81 | from .utils import ( |
|
82 | 82 | hashutil, |
|
83 | 83 | procutil, |
|
84 | 84 | stringutil, |
|
85 | 85 | ) |
|
86 | 86 | |
|
87 | 87 | from .revlogutils import constants as revlogconst |
|
88 | 88 | |
|
89 | 89 | release = lockmod.release |
|
90 | 90 | urlerr = util.urlerr |
|
91 | 91 | urlreq = util.urlreq |
|
92 | 92 | |
|
93 | 93 | # set of (path, vfs-location) tuples. vfs-location is: |
|
94 | 94 | # - 'plain for vfs relative paths |
|
95 | 95 | # - '' for svfs relative paths |
|
96 | 96 | _cachedfiles = set() |
|
97 | 97 | |
|
98 | 98 | |
|
99 | 99 | class _basefilecache(scmutil.filecache): |
|
100 | 100 | """All filecache usage on repo are done for logic that should be unfiltered""" |
|
101 | 101 | |
|
102 | 102 | def __get__(self, repo, type=None): |
|
103 | 103 | if repo is None: |
|
104 | 104 | return self |
|
105 | 105 | # proxy to unfiltered __dict__ since filtered repo has no entry |
|
106 | 106 | unfi = repo.unfiltered() |
|
107 | 107 | try: |
|
108 | 108 | return unfi.__dict__[self.sname] |
|
109 | 109 | except KeyError: |
|
110 | 110 | pass |
|
111 | 111 | return super(_basefilecache, self).__get__(unfi, type) |
|
112 | 112 | |
|
113 | 113 | def set(self, repo, value): |
|
114 | 114 | return super(_basefilecache, self).set(repo.unfiltered(), value) |
|
115 | 115 | |
|
116 | 116 | |
|
117 | 117 | class repofilecache(_basefilecache): |
|
118 | 118 | """filecache for files in .hg but outside of .hg/store""" |
|
119 | 119 | |
|
120 | 120 | def __init__(self, *paths): |
|
121 | 121 | super(repofilecache, self).__init__(*paths) |
|
122 | 122 | for path in paths: |
|
123 | 123 | _cachedfiles.add((path, b'plain')) |
|
124 | 124 | |
|
125 | 125 | def join(self, obj, fname): |
|
126 | 126 | return obj.vfs.join(fname) |
|
127 | 127 | |
|
128 | 128 | |
|
129 | 129 | class storecache(_basefilecache): |
|
130 | 130 | """filecache for files in the store""" |
|
131 | 131 | |
|
132 | 132 | def __init__(self, *paths): |
|
133 | 133 | super(storecache, self).__init__(*paths) |
|
134 | 134 | for path in paths: |
|
135 | 135 | _cachedfiles.add((path, b'')) |
|
136 | 136 | |
|
137 | 137 | def join(self, obj, fname): |
|
138 | 138 | return obj.sjoin(fname) |
|
139 | 139 | |
|
140 | 140 | |
|
141 | 141 | class mixedrepostorecache(_basefilecache): |
|
142 | 142 | """filecache for a mix files in .hg/store and outside""" |
|
143 | 143 | |
|
144 | 144 | def __init__(self, *pathsandlocations): |
|
145 | 145 | # scmutil.filecache only uses the path for passing back into our |
|
146 | 146 | # join(), so we can safely pass a list of paths and locations |
|
147 | 147 | super(mixedrepostorecache, self).__init__(*pathsandlocations) |
|
148 | 148 | _cachedfiles.update(pathsandlocations) |
|
149 | 149 | |
|
150 | 150 | def join(self, obj, fnameandlocation): |
|
151 | 151 | fname, location = fnameandlocation |
|
152 | 152 | if location == b'plain': |
|
153 | 153 | return obj.vfs.join(fname) |
|
154 | 154 | else: |
|
155 | 155 | if location != b'': |
|
156 | 156 | raise error.ProgrammingError( |
|
157 | 157 | b'unexpected location: %s' % location |
|
158 | 158 | ) |
|
159 | 159 | return obj.sjoin(fname) |
|
160 | 160 | |
|
161 | 161 | |
|
162 | 162 | def isfilecached(repo, name): |
|
163 | 163 | """check if a repo has already cached "name" filecache-ed property |
|
164 | 164 | |
|
165 | 165 | This returns (cachedobj-or-None, iscached) tuple. |
|
166 | 166 | """ |
|
167 | 167 | cacheentry = repo.unfiltered()._filecache.get(name, None) |
|
168 | 168 | if not cacheentry: |
|
169 | 169 | return None, False |
|
170 | 170 | return cacheentry.obj, True |
|
171 | 171 | |
|
172 | 172 | |
|
173 | 173 | class unfilteredpropertycache(util.propertycache): |
|
174 | 174 | """propertycache that apply to unfiltered repo only""" |
|
175 | 175 | |
|
176 | 176 | def __get__(self, repo, type=None): |
|
177 | 177 | unfi = repo.unfiltered() |
|
178 | 178 | if unfi is repo: |
|
179 | 179 | return super(unfilteredpropertycache, self).__get__(unfi) |
|
180 | 180 | return getattr(unfi, self.name) |
|
181 | 181 | |
|
182 | 182 | |
|
183 | 183 | class filteredpropertycache(util.propertycache): |
|
184 | 184 | """propertycache that must take filtering in account""" |
|
185 | 185 | |
|
186 | 186 | def cachevalue(self, obj, value): |
|
187 | 187 | object.__setattr__(obj, self.name, value) |
|
188 | 188 | |
|
189 | 189 | |
|
190 | 190 | def hasunfilteredcache(repo, name): |
|
191 | 191 | """check if a repo has an unfilteredpropertycache value for <name>""" |
|
192 | 192 | return name in vars(repo.unfiltered()) |
|
193 | 193 | |
|
194 | 194 | |
|
195 | 195 | def unfilteredmethod(orig): |
|
196 | 196 | """decorate method that always need to be run on unfiltered version""" |
|
197 | 197 | |
|
198 | 198 | @functools.wraps(orig) |
|
199 | 199 | def wrapper(repo, *args, **kwargs): |
|
200 | 200 | return orig(repo.unfiltered(), *args, **kwargs) |
|
201 | 201 | |
|
202 | 202 | return wrapper |
|
203 | 203 | |
|
204 | 204 | |
|
205 | 205 | moderncaps = { |
|
206 | 206 | b'lookup', |
|
207 | 207 | b'branchmap', |
|
208 | 208 | b'pushkey', |
|
209 | 209 | b'known', |
|
210 | 210 | b'getbundle', |
|
211 | 211 | b'unbundle', |
|
212 | 212 | } |
|
213 | 213 | legacycaps = moderncaps.union({b'changegroupsubset'}) |
|
214 | 214 | |
|
215 | 215 | |
|
216 | 216 | @interfaceutil.implementer(repository.ipeercommandexecutor) |
|
217 | 217 | class localcommandexecutor(object): |
|
218 | 218 | def __init__(self, peer): |
|
219 | 219 | self._peer = peer |
|
220 | 220 | self._sent = False |
|
221 | 221 | self._closed = False |
|
222 | 222 | |
|
223 | 223 | def __enter__(self): |
|
224 | 224 | return self |
|
225 | 225 | |
|
226 | 226 | def __exit__(self, exctype, excvalue, exctb): |
|
227 | 227 | self.close() |
|
228 | 228 | |
|
229 | 229 | def callcommand(self, command, args): |
|
230 | 230 | if self._sent: |
|
231 | 231 | raise error.ProgrammingError( |
|
232 | 232 | b'callcommand() cannot be used after sendcommands()' |
|
233 | 233 | ) |
|
234 | 234 | |
|
235 | 235 | if self._closed: |
|
236 | 236 | raise error.ProgrammingError( |
|
237 | 237 | b'callcommand() cannot be used after close()' |
|
238 | 238 | ) |
|
239 | 239 | |
|
240 | 240 | # We don't need to support anything fancy. Just call the named |
|
241 | 241 | # method on the peer and return a resolved future. |
|
242 | 242 | fn = getattr(self._peer, pycompat.sysstr(command)) |
|
243 | 243 | |
|
244 | 244 | f = pycompat.futures.Future() |
|
245 | 245 | |
|
246 | 246 | try: |
|
247 | 247 | result = fn(**pycompat.strkwargs(args)) |
|
248 | 248 | except Exception: |
|
249 | 249 | pycompat.future_set_exception_info(f, sys.exc_info()[1:]) |
|
250 | 250 | else: |
|
251 | 251 | f.set_result(result) |
|
252 | 252 | |
|
253 | 253 | return f |
|
254 | 254 | |
|
255 | 255 | def sendcommands(self): |
|
256 | 256 | self._sent = True |
|
257 | 257 | |
|
258 | 258 | def close(self): |
|
259 | 259 | self._closed = True |
|
260 | 260 | |
|
261 | 261 | |
|
262 | 262 | @interfaceutil.implementer(repository.ipeercommands) |
|
263 | 263 | class localpeer(repository.peer): |
|
264 | 264 | '''peer for a local repo; reflects only the most recent API''' |
|
265 | 265 | |
|
266 | 266 | def __init__(self, repo, caps=None): |
|
267 | 267 | super(localpeer, self).__init__() |
|
268 | 268 | |
|
269 | 269 | if caps is None: |
|
270 | 270 | caps = moderncaps.copy() |
|
271 | 271 | self._repo = repo.filtered(b'served') |
|
272 | 272 | self.ui = repo.ui |
|
273 | 273 | self._caps = repo._restrictcapabilities(caps) |
|
274 | 274 | |
|
275 | 275 | # Begin of _basepeer interface. |
|
276 | 276 | |
|
277 | 277 | def url(self): |
|
278 | 278 | return self._repo.url() |
|
279 | 279 | |
|
280 | 280 | def local(self): |
|
281 | 281 | return self._repo |
|
282 | 282 | |
|
283 | 283 | def peer(self): |
|
284 | 284 | return self |
|
285 | 285 | |
|
286 | 286 | def canpush(self): |
|
287 | 287 | return True |
|
288 | 288 | |
|
289 | 289 | def close(self): |
|
290 | 290 | self._repo.close() |
|
291 | 291 | |
|
292 | 292 | # End of _basepeer interface. |
|
293 | 293 | |
|
294 | 294 | # Begin of _basewirecommands interface. |
|
295 | 295 | |
|
296 | 296 | def branchmap(self): |
|
297 | 297 | return self._repo.branchmap() |
|
298 | 298 | |
|
299 | 299 | def capabilities(self): |
|
300 | 300 | return self._caps |
|
301 | 301 | |
|
302 | 302 | def clonebundles(self): |
|
303 | 303 | return self._repo.tryread(bundlecaches.CB_MANIFEST_FILE) |
|
304 | 304 | |
|
305 | 305 | def debugwireargs(self, one, two, three=None, four=None, five=None): |
|
306 | 306 | """Used to test argument passing over the wire""" |
|
307 | 307 | return b"%s %s %s %s %s" % ( |
|
308 | 308 | one, |
|
309 | 309 | two, |
|
310 | 310 | pycompat.bytestr(three), |
|
311 | 311 | pycompat.bytestr(four), |
|
312 | 312 | pycompat.bytestr(five), |
|
313 | 313 | ) |
|
314 | 314 | |
|
315 | 315 | def getbundle( |
|
316 | 316 | self, source, heads=None, common=None, bundlecaps=None, **kwargs |
|
317 | 317 | ): |
|
318 | 318 | chunks = exchange.getbundlechunks( |
|
319 | 319 | self._repo, |
|
320 | 320 | source, |
|
321 | 321 | heads=heads, |
|
322 | 322 | common=common, |
|
323 | 323 | bundlecaps=bundlecaps, |
|
324 | 324 | **kwargs |
|
325 | 325 | )[1] |
|
326 | 326 | cb = util.chunkbuffer(chunks) |
|
327 | 327 | |
|
328 | 328 | if exchange.bundle2requested(bundlecaps): |
|
329 | 329 | # When requesting a bundle2, getbundle returns a stream to make the |
|
330 | 330 | # wire level function happier. We need to build a proper object |
|
331 | 331 | # from it in local peer. |
|
332 | 332 | return bundle2.getunbundler(self.ui, cb) |
|
333 | 333 | else: |
|
334 | 334 | return changegroup.getunbundler(b'01', cb, None) |
|
335 | 335 | |
|
336 | 336 | def heads(self): |
|
337 | 337 | return self._repo.heads() |
|
338 | 338 | |
|
339 | 339 | def known(self, nodes): |
|
340 | 340 | return self._repo.known(nodes) |
|
341 | 341 | |
|
342 | 342 | def listkeys(self, namespace): |
|
343 | 343 | return self._repo.listkeys(namespace) |
|
344 | 344 | |
|
345 | 345 | def lookup(self, key): |
|
346 | 346 | return self._repo.lookup(key) |
|
347 | 347 | |
|
348 | 348 | def pushkey(self, namespace, key, old, new): |
|
349 | 349 | return self._repo.pushkey(namespace, key, old, new) |
|
350 | 350 | |
|
351 | 351 | def stream_out(self): |
|
352 | 352 | raise error.Abort(_(b'cannot perform stream clone against local peer')) |
|
353 | 353 | |
|
354 | 354 | def unbundle(self, bundle, heads, url): |
|
355 | 355 | """apply a bundle on a repo |
|
356 | 356 | |
|
357 | 357 | This function handles the repo locking itself.""" |
|
358 | 358 | try: |
|
359 | 359 | try: |
|
360 | 360 | bundle = exchange.readbundle(self.ui, bundle, None) |
|
361 | 361 | ret = exchange.unbundle(self._repo, bundle, heads, b'push', url) |
|
362 | 362 | if util.safehasattr(ret, b'getchunks'): |
|
363 | 363 | # This is a bundle20 object, turn it into an unbundler. |
|
364 | 364 | # This little dance should be dropped eventually when the |
|
365 | 365 | # API is finally improved. |
|
366 | 366 | stream = util.chunkbuffer(ret.getchunks()) |
|
367 | 367 | ret = bundle2.getunbundler(self.ui, stream) |
|
368 | 368 | return ret |
|
369 | 369 | except Exception as exc: |
|
370 | 370 | # If the exception contains output salvaged from a bundle2 |
|
371 | 371 | # reply, we need to make sure it is printed before continuing |
|
372 | 372 | # to fail. So we build a bundle2 with such output and consume |
|
373 | 373 | # it directly. |
|
374 | 374 | # |
|
375 | 375 | # This is not very elegant but allows a "simple" solution for |
|
376 | 376 | # issue4594 |
|
377 | 377 | output = getattr(exc, '_bundle2salvagedoutput', ()) |
|
378 | 378 | if output: |
|
379 | 379 | bundler = bundle2.bundle20(self._repo.ui) |
|
380 | 380 | for out in output: |
|
381 | 381 | bundler.addpart(out) |
|
382 | 382 | stream = util.chunkbuffer(bundler.getchunks()) |
|
383 | 383 | b = bundle2.getunbundler(self.ui, stream) |
|
384 | 384 | bundle2.processbundle(self._repo, b) |
|
385 | 385 | raise |
|
386 | 386 | except error.PushRaced as exc: |
|
387 | 387 | raise error.ResponseError( |
|
388 | 388 | _(b'push failed:'), stringutil.forcebytestr(exc) |
|
389 | 389 | ) |
|
390 | 390 | |
|
391 | 391 | # End of _basewirecommands interface. |
|
392 | 392 | |
|
393 | 393 | # Begin of peer interface. |
|
394 | 394 | |
|
395 | 395 | def commandexecutor(self): |
|
396 | 396 | return localcommandexecutor(self) |
|
397 | 397 | |
|
398 | 398 | # End of peer interface. |
|
399 | 399 | |
|
400 | 400 | |
|
401 | 401 | @interfaceutil.implementer(repository.ipeerlegacycommands) |
|
402 | 402 | class locallegacypeer(localpeer): |
|
403 | 403 | """peer extension which implements legacy methods too; used for tests with |
|
404 | 404 | restricted capabilities""" |
|
405 | 405 | |
|
406 | 406 | def __init__(self, repo): |
|
407 | 407 | super(locallegacypeer, self).__init__(repo, caps=legacycaps) |
|
408 | 408 | |
|
409 | 409 | # Begin of baselegacywirecommands interface. |
|
410 | 410 | |
|
411 | 411 | def between(self, pairs): |
|
412 | 412 | return self._repo.between(pairs) |
|
413 | 413 | |
|
414 | 414 | def branches(self, nodes): |
|
415 | 415 | return self._repo.branches(nodes) |
|
416 | 416 | |
|
417 | 417 | def changegroup(self, nodes, source): |
|
418 | 418 | outgoing = discovery.outgoing( |
|
419 | 419 | self._repo, missingroots=nodes, ancestorsof=self._repo.heads() |
|
420 | 420 | ) |
|
421 | 421 | return changegroup.makechangegroup(self._repo, outgoing, b'01', source) |
|
422 | 422 | |
|
423 | 423 | def changegroupsubset(self, bases, heads, source): |
|
424 | 424 | outgoing = discovery.outgoing( |
|
425 | 425 | self._repo, missingroots=bases, ancestorsof=heads |
|
426 | 426 | ) |
|
427 | 427 | return changegroup.makechangegroup(self._repo, outgoing, b'01', source) |
|
428 | 428 | |
|
429 | 429 | # End of baselegacywirecommands interface. |
|
430 | 430 | |
|
431 | 431 | |
|
432 | 432 | # Functions receiving (ui, features) that extensions can register to impact |
|
433 | 433 | # the ability to load repositories with custom requirements. Only |
|
434 | 434 | # functions defined in loaded extensions are called. |
|
435 | 435 | # |
|
436 | 436 | # The function receives a set of requirement strings that the repository |
|
437 | 437 | # is capable of opening. Functions will typically add elements to the |
|
438 | 438 | # set to reflect that the extension knows how to handle that requirements. |
|
439 | 439 | featuresetupfuncs = set() |
|
440 | 440 | |
|
441 | 441 | |
|
442 | 442 | def _getsharedvfs(hgvfs, requirements): |
|
443 | 443 | """returns the vfs object pointing to root of shared source |
|
444 | 444 | repo for a shared repository |
|
445 | 445 | |
|
446 | 446 | hgvfs is vfs pointing at .hg/ of current repo (shared one) |
|
447 | 447 | requirements is a set of requirements of current repo (shared one) |
|
448 | 448 | """ |
|
449 | 449 | # The ``shared`` or ``relshared`` requirements indicate the |
|
450 | 450 | # store lives in the path contained in the ``.hg/sharedpath`` file. |
|
451 | 451 | # This is an absolute path for ``shared`` and relative to |
|
452 | 452 | # ``.hg/`` for ``relshared``. |
|
453 | 453 | sharedpath = hgvfs.read(b'sharedpath').rstrip(b'\n') |
|
454 | 454 | if requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements: |
|
455 | 455 | sharedpath = hgvfs.join(sharedpath) |
|
456 | 456 | |
|
457 | 457 | sharedvfs = vfsmod.vfs(sharedpath, realpath=True) |
|
458 | 458 | |
|
459 | 459 | if not sharedvfs.exists(): |
|
460 | 460 | raise error.RepoError( |
|
461 | 461 | _(b'.hg/sharedpath points to nonexistent directory %s') |
|
462 | 462 | % sharedvfs.base |
|
463 | 463 | ) |
|
464 | 464 | return sharedvfs |
|
465 | 465 | |
|
466 | 466 | |
|
467 | 467 | def _readrequires(vfs, allowmissing): |
|
468 | 468 | """reads the require file present at root of this vfs |
|
469 | 469 | and return a set of requirements |
|
470 | 470 | |
|
471 | 471 | If allowmissing is True, we suppress ENOENT if raised""" |
|
472 | 472 | # requires file contains a newline-delimited list of |
|
473 | 473 | # features/capabilities the opener (us) must have in order to use |
|
474 | 474 | # the repository. This file was introduced in Mercurial 0.9.2, |
|
475 | 475 | # which means very old repositories may not have one. We assume |
|
476 | 476 | # a missing file translates to no requirements. |
|
477 | 477 | try: |
|
478 | 478 | requirements = set(vfs.read(b'requires').splitlines()) |
|
479 | 479 | except IOError as e: |
|
480 | 480 | if not (allowmissing and e.errno == errno.ENOENT): |
|
481 | 481 | raise |
|
482 | 482 | requirements = set() |
|
483 | 483 | return requirements |
|
484 | 484 | |
|
485 | 485 | |
|
486 | 486 | def makelocalrepository(baseui, path, intents=None): |
|
487 | 487 | """Create a local repository object. |
|
488 | 488 | |
|
489 | 489 | Given arguments needed to construct a local repository, this function |
|
490 | 490 | performs various early repository loading functionality (such as |
|
491 | 491 | reading the ``.hg/requires`` and ``.hg/hgrc`` files), validates that |
|
492 | 492 | the repository can be opened, derives a type suitable for representing |
|
493 | 493 | that repository, and returns an instance of it. |
|
494 | 494 | |
|
495 | 495 | The returned object conforms to the ``repository.completelocalrepository`` |
|
496 | 496 | interface. |
|
497 | 497 | |
|
498 | 498 | The repository type is derived by calling a series of factory functions |
|
499 | 499 | for each aspect/interface of the final repository. These are defined by |
|
500 | 500 | ``REPO_INTERFACES``. |
|
501 | 501 | |
|
502 | 502 | Each factory function is called to produce a type implementing a specific |
|
503 | 503 | interface. The cumulative list of returned types will be combined into a |
|
504 | 504 | new type and that type will be instantiated to represent the local |
|
505 | 505 | repository. |
|
506 | 506 | |
|
507 | 507 | The factory functions each receive various state that may be consulted |
|
508 | 508 | as part of deriving a type. |
|
509 | 509 | |
|
510 | 510 | Extensions should wrap these factory functions to customize repository type |
|
511 | 511 | creation. Note that an extension's wrapped function may be called even if |
|
512 | 512 | that extension is not loaded for the repo being constructed. Extensions |
|
513 | 513 | should check if their ``__name__`` appears in the |
|
514 | 514 | ``extensionmodulenames`` set passed to the factory function and no-op if |
|
515 | 515 | not. |
|
516 | 516 | """ |
|
517 | 517 | ui = baseui.copy() |
|
518 | 518 | # Prevent copying repo configuration. |
|
519 | 519 | ui.copy = baseui.copy |
|
520 | 520 | |
|
521 | 521 | # Working directory VFS rooted at repository root. |
|
522 | 522 | wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) |
|
523 | 523 | |
|
524 | 524 | # Main VFS for .hg/ directory. |
|
525 | 525 | hgpath = wdirvfs.join(b'.hg') |
|
526 | 526 | hgvfs = vfsmod.vfs(hgpath, cacheaudited=True) |
|
527 | 527 | # Whether this repository is shared one or not |
|
528 | 528 | shared = False |
|
529 | 529 | # If this repository is shared, vfs pointing to shared repo |
|
530 | 530 | sharedvfs = None |
|
531 | 531 | |
|
532 | 532 | # The .hg/ path should exist and should be a directory. All other |
|
533 | 533 | # cases are errors. |
|
534 | 534 | if not hgvfs.isdir(): |
|
535 | 535 | try: |
|
536 | 536 | hgvfs.stat() |
|
537 | 537 | except OSError as e: |
|
538 | 538 | if e.errno != errno.ENOENT: |
|
539 | 539 | raise |
|
540 | 540 | except ValueError as e: |
|
541 | 541 | # Can be raised on Python 3.8 when path is invalid. |
|
542 | 542 | raise error.Abort( |
|
543 | 543 | _(b'invalid path %s: %s') % (path, pycompat.bytestr(e)) |
|
544 | 544 | ) |
|
545 | 545 | |
|
546 | 546 | raise error.RepoError(_(b'repository %s not found') % path) |
|
547 | 547 | |
|
548 | 548 | requirements = _readrequires(hgvfs, True) |
|
549 | 549 | shared = ( |
|
550 | 550 | requirementsmod.SHARED_REQUIREMENT in requirements |
|
551 | 551 | or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements |
|
552 | 552 | ) |
|
553 | 553 | storevfs = None |
|
554 | 554 | if shared: |
|
555 | 555 | # This is a shared repo |
|
556 | 556 | sharedvfs = _getsharedvfs(hgvfs, requirements) |
|
557 | 557 | storevfs = vfsmod.vfs(sharedvfs.join(b'store')) |
|
558 | 558 | else: |
|
559 | 559 | storevfs = vfsmod.vfs(hgvfs.join(b'store')) |
|
560 | 560 | |
|
561 | 561 | # if .hg/requires contains the sharesafe requirement, it means |
|
562 | 562 | # there exists a `.hg/store/requires` too and we should read it |
|
563 | 563 | # NOTE: presence of SHARESAFE_REQUIREMENT imply that store requirement |
|
564 | 564 | # is present. We never write SHARESAFE_REQUIREMENT for a repo if store |
|
565 | 565 | # is not present, refer checkrequirementscompat() for that |
|
566 | 566 | # |
|
567 | 567 | # However, if SHARESAFE_REQUIREMENT is not present, it means that the |
|
568 | 568 | # repository was shared the old way. We check the share source .hg/requires |
|
569 | 569 | # for SHARESAFE_REQUIREMENT to detect whether the current repository needs |
|
570 | 570 | # to be reshared |
|
571 | 571 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements: |
|
572 | 572 | |
|
573 | 573 | if ( |
|
574 | 574 | shared |
|
575 | 575 | and requirementsmod.SHARESAFE_REQUIREMENT |
|
576 | 576 | not in _readrequires(sharedvfs, True) |
|
577 | 577 | ): |
|
578 | 578 | mismatch_warn = ui.configbool( |
|
579 | 579 | b'share', b'safe-mismatch.source-not-safe.warn' |
|
580 | 580 | ) |
|
581 | 581 | mismatch_config = ui.config( |
|
582 | 582 | b'share', b'safe-mismatch.source-not-safe' |
|
583 | 583 | ) |
|
584 | 584 | if mismatch_config in ( |
|
585 | 585 | b'downgrade-allow', |
|
586 | 586 | b'allow', |
|
587 | 587 | b'downgrade-abort', |
|
588 | 588 | ): |
|
589 | 589 | # prevent cyclic import localrepo -> upgrade -> localrepo |
|
590 | 590 | from . import upgrade |
|
591 | 591 | |
|
592 | 592 | upgrade.downgrade_share_to_non_safe( |
|
593 | 593 | ui, |
|
594 | 594 | hgvfs, |
|
595 | 595 | sharedvfs, |
|
596 | 596 | requirements, |
|
597 | 597 | mismatch_config, |
|
598 | 598 | mismatch_warn, |
|
599 | 599 | ) |
|
600 | 600 | elif mismatch_config == b'abort': |
|
601 | 601 | raise error.Abort( |
|
602 | 602 | _( |
|
603 | 603 | b"share source does not support exp-sharesafe requirement" |
|
604 | 604 | ) |
|
605 | 605 | ) |
|
606 | 606 | else: |
|
607 | 607 | hint = _( |
|
608 | 608 | "run `hg help config.share.safe-mismatch.source-not-safe`" |
|
609 | 609 | ) |
|
610 | 610 | raise error.Abort( |
|
611 | 611 | _( |
|
612 | 612 | b"share-safe mismatch with source.\nUnrecognized" |
|
613 | 613 | b" value '%s' of `share.safe-mismatch.source-not-safe`" |
|
614 | 614 | b" set." |
|
615 | 615 | ) |
|
616 | 616 | % mismatch_config, |
|
617 | 617 | hint=hint, |
|
618 | 618 | ) |
|
619 | 619 | else: |
|
620 | 620 | requirements |= _readrequires(storevfs, False) |
|
621 | 621 | elif shared: |
|
622 | 622 | sourcerequires = _readrequires(sharedvfs, False) |
|
623 | 623 | if requirementsmod.SHARESAFE_REQUIREMENT in sourcerequires: |
|
624 | 624 | mismatch_config = ui.config(b'share', b'safe-mismatch.source-safe') |
|
625 | 625 | mismatch_warn = ui.configbool( |
|
626 | 626 | b'share', b'safe-mismatch.source-safe.warn' |
|
627 | 627 | ) |
|
628 | 628 | if mismatch_config in ( |
|
629 | 629 | b'upgrade-allow', |
|
630 | 630 | b'allow', |
|
631 | 631 | b'upgrade-abort', |
|
632 | 632 | ): |
|
633 | 633 | # prevent cyclic import localrepo -> upgrade -> localrepo |
|
634 | 634 | from . import upgrade |
|
635 | 635 | |
|
636 | 636 | upgrade.upgrade_share_to_safe( |
|
637 | 637 | ui, |
|
638 | 638 | hgvfs, |
|
639 | 639 | storevfs, |
|
640 | 640 | requirements, |
|
641 | 641 | mismatch_config, |
|
642 | 642 | mismatch_warn, |
|
643 | 643 | ) |
|
644 | 644 | elif mismatch_config == b'abort': |
|
645 | 645 | raise error.Abort( |
|
646 | 646 | _( |
|
647 | 647 | b'version mismatch: source uses share-safe' |
|
648 | 648 | b' functionality while the current share does not' |
|
649 | 649 | ) |
|
650 | 650 | ) |
|
651 | 651 | else: |
|
652 | 652 | hint = _("run `hg help config.share.safe-mismatch.source-safe`") |
|
653 | 653 | raise error.Abort( |
|
654 | 654 | _( |
|
655 | 655 | b"share-safe mismatch with source.\nUnrecognized" |
|
656 | 656 | b" value '%s' of `share.safe-mismatch.source-safe` set." |
|
657 | 657 | ) |
|
658 | 658 | % mismatch_config, |
|
659 | 659 | hint=hint, |
|
660 | 660 | ) |
|
661 | 661 | |
|
662 | 662 | # The .hg/hgrc file may load extensions or contain config options |
|
663 | 663 | # that influence repository construction. Attempt to load it and |
|
664 | 664 | # process any new extensions that it may have pulled in. |
|
665 | 665 | if loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs): |
|
666 | 666 | afterhgrcload(ui, wdirvfs, hgvfs, requirements) |
|
667 | 667 | extensions.loadall(ui) |
|
668 | 668 | extensions.populateui(ui) |
|
669 | 669 | |
|
670 | 670 | # Set of module names of extensions loaded for this repository. |
|
671 | 671 | extensionmodulenames = {m.__name__ for n, m in extensions.extensions(ui)} |
|
672 | 672 | |
|
673 | 673 | supportedrequirements = gathersupportedrequirements(ui) |
|
674 | 674 | |
|
675 | 675 | # We first validate the requirements are known. |
|
676 | 676 | ensurerequirementsrecognized(requirements, supportedrequirements) |
|
677 | 677 | |
|
678 | 678 | # Then we validate that the known set is reasonable to use together. |
|
679 | 679 | ensurerequirementscompatible(ui, requirements) |
|
680 | 680 | |
|
681 | 681 | # TODO there are unhandled edge cases related to opening repositories with |
|
682 | 682 | # shared storage. If storage is shared, we should also test for requirements |
|
683 | 683 | # compatibility in the pointed-to repo. This entails loading the .hg/hgrc in |
|
684 | 684 | # that repo, as that repo may load extensions needed to open it. This is a |
|
685 | 685 | # bit complicated because we don't want the other hgrc to overwrite settings |
|
686 | 686 | # in this hgrc. |
|
687 | 687 | # |
|
688 | 688 | # This bug is somewhat mitigated by the fact that we copy the .hg/requires |
|
689 | 689 | # file when sharing repos. But if a requirement is added after the share is |
|
690 | 690 | # performed, thereby introducing a new requirement for the opener, we may |
|
691 | 691 | # will not see that and could encounter a run-time error interacting with |
|
692 | 692 | # that shared store since it has an unknown-to-us requirement. |
|
693 | 693 | |
|
694 | 694 | # At this point, we know we should be capable of opening the repository. |
|
695 | 695 | # Now get on with doing that. |
|
696 | 696 | |
|
697 | 697 | features = set() |
|
698 | 698 | |
|
699 | 699 | # The "store" part of the repository holds versioned data. How it is |
|
700 | 700 | # accessed is determined by various requirements. If `shared` or |
|
701 | 701 | # `relshared` requirements are present, this indicates current repository |
|
702 | 702 | # is a share and store exists in path mentioned in `.hg/sharedpath` |
|
703 | 703 | if shared: |
|
704 | 704 | storebasepath = sharedvfs.base |
|
705 | 705 | cachepath = sharedvfs.join(b'cache') |
|
706 | 706 | features.add(repository.REPO_FEATURE_SHARED_STORAGE) |
|
707 | 707 | else: |
|
708 | 708 | storebasepath = hgvfs.base |
|
709 | 709 | cachepath = hgvfs.join(b'cache') |
|
710 | 710 | wcachepath = hgvfs.join(b'wcache') |
|
711 | 711 | |
|
712 | 712 | # The store has changed over time and the exact layout is dictated by |
|
713 | 713 | # requirements. The store interface abstracts differences across all |
|
714 | 714 | # of them. |
|
715 | 715 | store = makestore( |
|
716 | 716 | requirements, |
|
717 | 717 | storebasepath, |
|
718 | 718 | lambda base: vfsmod.vfs(base, cacheaudited=True), |
|
719 | 719 | ) |
|
720 | 720 | hgvfs.createmode = store.createmode |
|
721 | 721 | |
|
722 | 722 | storevfs = store.vfs |
|
723 | 723 | storevfs.options = resolvestorevfsoptions(ui, requirements, features) |
|
724 | 724 | |
|
725 | 725 | # The cache vfs is used to manage cache files. |
|
726 | 726 | cachevfs = vfsmod.vfs(cachepath, cacheaudited=True) |
|
727 | 727 | cachevfs.createmode = store.createmode |
|
728 | 728 | # The cache vfs is used to manage cache files related to the working copy |
|
729 | 729 | wcachevfs = vfsmod.vfs(wcachepath, cacheaudited=True) |
|
730 | 730 | wcachevfs.createmode = store.createmode |
|
731 | 731 | |
|
732 | 732 | # Now resolve the type for the repository object. We do this by repeatedly |
|
733 | 733 | # calling a factory function to produces types for specific aspects of the |
|
734 | 734 | # repo's operation. The aggregate returned types are used as base classes |
|
735 | 735 | # for a dynamically-derived type, which will represent our new repository. |
|
736 | 736 | |
|
737 | 737 | bases = [] |
|
738 | 738 | extrastate = {} |
|
739 | 739 | |
|
740 | 740 | for iface, fn in REPO_INTERFACES: |
|
741 | 741 | # We pass all potentially useful state to give extensions tons of |
|
742 | 742 | # flexibility. |
|
743 | 743 | typ = fn()( |
|
744 | 744 | ui=ui, |
|
745 | 745 | intents=intents, |
|
746 | 746 | requirements=requirements, |
|
747 | 747 | features=features, |
|
748 | 748 | wdirvfs=wdirvfs, |
|
749 | 749 | hgvfs=hgvfs, |
|
750 | 750 | store=store, |
|
751 | 751 | storevfs=storevfs, |
|
752 | 752 | storeoptions=storevfs.options, |
|
753 | 753 | cachevfs=cachevfs, |
|
754 | 754 | wcachevfs=wcachevfs, |
|
755 | 755 | extensionmodulenames=extensionmodulenames, |
|
756 | 756 | extrastate=extrastate, |
|
757 | 757 | baseclasses=bases, |
|
758 | 758 | ) |
|
759 | 759 | |
|
760 | 760 | if not isinstance(typ, type): |
|
761 | 761 | raise error.ProgrammingError( |
|
762 | 762 | b'unable to construct type for %s' % iface |
|
763 | 763 | ) |
|
764 | 764 | |
|
765 | 765 | bases.append(typ) |
|
766 | 766 | |
|
767 | 767 | # type() allows you to use characters in type names that wouldn't be |
|
768 | 768 | # recognized as Python symbols in source code. We abuse that to add |
|
769 | 769 | # rich information about our constructed repo. |
|
770 | 770 | name = pycompat.sysstr( |
|
771 | 771 | b'derivedrepo:%s<%s>' % (wdirvfs.base, b','.join(sorted(requirements))) |
|
772 | 772 | ) |
|
773 | 773 | |
|
774 | 774 | cls = type(name, tuple(bases), {}) |
|
775 | 775 | |
|
776 | 776 | return cls( |
|
777 | 777 | baseui=baseui, |
|
778 | 778 | ui=ui, |
|
779 | 779 | origroot=path, |
|
780 | 780 | wdirvfs=wdirvfs, |
|
781 | 781 | hgvfs=hgvfs, |
|
782 | 782 | requirements=requirements, |
|
783 | 783 | supportedrequirements=supportedrequirements, |
|
784 | 784 | sharedpath=storebasepath, |
|
785 | 785 | store=store, |
|
786 | 786 | cachevfs=cachevfs, |
|
787 | 787 | wcachevfs=wcachevfs, |
|
788 | 788 | features=features, |
|
789 | 789 | intents=intents, |
|
790 | 790 | ) |
|
791 | 791 | |
|
792 | 792 | |
|
793 | 793 | def loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs=None): |
|
794 | 794 | """Load hgrc files/content into a ui instance. |
|
795 | 795 | |
|
796 | 796 | This is called during repository opening to load any additional |
|
797 | 797 | config files or settings relevant to the current repository. |
|
798 | 798 | |
|
799 | 799 | Returns a bool indicating whether any additional configs were loaded. |
|
800 | 800 | |
|
801 | 801 | Extensions should monkeypatch this function to modify how per-repo |
|
802 | 802 | configs are loaded. For example, an extension may wish to pull in |
|
803 | 803 | configs from alternate files or sources. |
|
804 | 804 | |
|
805 | 805 | sharedvfs is vfs object pointing to source repo if the current one is a |
|
806 | 806 | shared one |
|
807 | 807 | """ |
|
808 | 808 | if not rcutil.use_repo_hgrc(): |
|
809 | 809 | return False |
|
810 | 810 | |
|
811 | 811 | ret = False |
|
812 | 812 | # first load config from shared source if we has to |
|
813 | 813 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements and sharedvfs: |
|
814 | 814 | try: |
|
815 | 815 | ui.readconfig(sharedvfs.join(b'hgrc'), root=sharedvfs.base) |
|
816 | 816 | ret = True |
|
817 | 817 | except IOError: |
|
818 | 818 | pass |
|
819 | 819 | |
|
820 | 820 | try: |
|
821 | 821 | ui.readconfig(hgvfs.join(b'hgrc'), root=wdirvfs.base) |
|
822 | 822 | ret = True |
|
823 | 823 | except IOError: |
|
824 | 824 | pass |
|
825 | 825 | |
|
826 | 826 | try: |
|
827 | 827 | ui.readconfig(hgvfs.join(b'hgrc-not-shared'), root=wdirvfs.base) |
|
828 | 828 | ret = True |
|
829 | 829 | except IOError: |
|
830 | 830 | pass |
|
831 | 831 | |
|
832 | 832 | return ret |
|
833 | 833 | |
|
834 | 834 | |
|
835 | 835 | def afterhgrcload(ui, wdirvfs, hgvfs, requirements): |
|
836 | 836 | """Perform additional actions after .hg/hgrc is loaded. |
|
837 | 837 | |
|
838 | 838 | This function is called during repository loading immediately after |
|
839 | 839 | the .hg/hgrc file is loaded and before per-repo extensions are loaded. |
|
840 | 840 | |
|
841 | 841 | The function can be used to validate configs, automatically add |
|
842 | 842 | options (including extensions) based on requirements, etc. |
|
843 | 843 | """ |
|
844 | 844 | |
|
845 | 845 | # Map of requirements to list of extensions to load automatically when |
|
846 | 846 | # requirement is present. |
|
847 | 847 | autoextensions = { |
|
848 | 848 | b'git': [b'git'], |
|
849 | 849 | b'largefiles': [b'largefiles'], |
|
850 | 850 | b'lfs': [b'lfs'], |
|
851 | 851 | } |
|
852 | 852 | |
|
853 | 853 | for requirement, names in sorted(autoextensions.items()): |
|
854 | 854 | if requirement not in requirements: |
|
855 | 855 | continue |
|
856 | 856 | |
|
857 | 857 | for name in names: |
|
858 | 858 | if not ui.hasconfig(b'extensions', name): |
|
859 | 859 | ui.setconfig(b'extensions', name, b'', source=b'autoload') |
|
860 | 860 | |
|
861 | 861 | |
|
862 | 862 | def gathersupportedrequirements(ui): |
|
863 | 863 | """Determine the complete set of recognized requirements.""" |
|
864 | 864 | # Start with all requirements supported by this file. |
|
865 | 865 | supported = set(localrepository._basesupported) |
|
866 | 866 | |
|
867 | 867 | # Execute ``featuresetupfuncs`` entries if they belong to an extension |
|
868 | 868 | # relevant to this ui instance. |
|
869 | 869 | modules = {m.__name__ for n, m in extensions.extensions(ui)} |
|
870 | 870 | |
|
871 | 871 | for fn in featuresetupfuncs: |
|
872 | 872 | if fn.__module__ in modules: |
|
873 | 873 | fn(ui, supported) |
|
874 | 874 | |
|
875 | 875 | # Add derived requirements from registered compression engines. |
|
876 | 876 | for name in util.compengines: |
|
877 | 877 | engine = util.compengines[name] |
|
878 | 878 | if engine.available() and engine.revlogheader(): |
|
879 | 879 | supported.add(b'exp-compression-%s' % name) |
|
880 | 880 | if engine.name() == b'zstd': |
|
881 | 881 | supported.add(b'revlog-compression-zstd') |
|
882 | 882 | |
|
883 | 883 | return supported |
|
884 | 884 | |
|
885 | 885 | |
|
886 | 886 | def ensurerequirementsrecognized(requirements, supported): |
|
887 | 887 | """Validate that a set of local requirements is recognized. |
|
888 | 888 | |
|
889 | 889 | Receives a set of requirements. Raises an ``error.RepoError`` if there |
|
890 | 890 | exists any requirement in that set that currently loaded code doesn't |
|
891 | 891 | recognize. |
|
892 | 892 | |
|
893 | 893 | Returns a set of supported requirements. |
|
894 | 894 | """ |
|
895 | 895 | missing = set() |
|
896 | 896 | |
|
897 | 897 | for requirement in requirements: |
|
898 | 898 | if requirement in supported: |
|
899 | 899 | continue |
|
900 | 900 | |
|
901 | 901 | if not requirement or not requirement[0:1].isalnum(): |
|
902 | 902 | raise error.RequirementError(_(b'.hg/requires file is corrupt')) |
|
903 | 903 | |
|
904 | 904 | missing.add(requirement) |
|
905 | 905 | |
|
906 | 906 | if missing: |
|
907 | 907 | raise error.RequirementError( |
|
908 | 908 | _(b'repository requires features unknown to this Mercurial: %s') |
|
909 | 909 | % b' '.join(sorted(missing)), |
|
910 | 910 | hint=_( |
|
911 | 911 | b'see https://mercurial-scm.org/wiki/MissingRequirement ' |
|
912 | 912 | b'for more information' |
|
913 | 913 | ), |
|
914 | 914 | ) |
|
915 | 915 | |
|
916 | 916 | |
|
917 | 917 | def ensurerequirementscompatible(ui, requirements): |
|
918 | 918 | """Validates that a set of recognized requirements is mutually compatible. |
|
919 | 919 | |
|
920 | 920 | Some requirements may not be compatible with others or require |
|
921 | 921 | config options that aren't enabled. This function is called during |
|
922 | 922 | repository opening to ensure that the set of requirements needed |
|
923 | 923 | to open a repository is sane and compatible with config options. |
|
924 | 924 | |
|
925 | 925 | Extensions can monkeypatch this function to perform additional |
|
926 | 926 | checking. |
|
927 | 927 | |
|
928 | 928 | ``error.RepoError`` should be raised on failure. |
|
929 | 929 | """ |
|
930 | 930 | if ( |
|
931 | 931 | requirementsmod.SPARSE_REQUIREMENT in requirements |
|
932 | 932 | and not sparse.enabled |
|
933 | 933 | ): |
|
934 | 934 | raise error.RepoError( |
|
935 | 935 | _( |
|
936 | 936 | b'repository is using sparse feature but ' |
|
937 | 937 | b'sparse is not enabled; enable the ' |
|
938 | 938 | b'"sparse" extensions to access' |
|
939 | 939 | ) |
|
940 | 940 | ) |
|
941 | 941 | |
|
942 | 942 | |
|
943 | 943 | def makestore(requirements, path, vfstype): |
|
944 | 944 | """Construct a storage object for a repository.""" |
|
945 | 945 | if b'store' in requirements: |
|
946 | 946 | if b'fncache' in requirements: |
|
947 | 947 | return storemod.fncachestore( |
|
948 | 948 | path, vfstype, b'dotencode' in requirements |
|
949 | 949 | ) |
|
950 | 950 | |
|
951 | 951 | return storemod.encodedstore(path, vfstype) |
|
952 | 952 | |
|
953 | 953 | return storemod.basicstore(path, vfstype) |
|
954 | 954 | |
|
955 | 955 | |
|
956 | 956 | def resolvestorevfsoptions(ui, requirements, features): |
|
957 | 957 | """Resolve the options to pass to the store vfs opener. |
|
958 | 958 | |
|
959 | 959 | The returned dict is used to influence behavior of the storage layer. |
|
960 | 960 | """ |
|
961 | 961 | options = {} |
|
962 | 962 | |
|
963 | 963 | if requirementsmod.TREEMANIFEST_REQUIREMENT in requirements: |
|
964 | 964 | options[b'treemanifest'] = True |
|
965 | 965 | |
|
966 | 966 | # experimental config: format.manifestcachesize |
|
967 | 967 | manifestcachesize = ui.configint(b'format', b'manifestcachesize') |
|
968 | 968 | if manifestcachesize is not None: |
|
969 | 969 | options[b'manifestcachesize'] = manifestcachesize |
|
970 | 970 | |
|
971 | 971 | # In the absence of another requirement superseding a revlog-related |
|
972 | 972 | # requirement, we have to assume the repo is using revlog version 0. |
|
973 | 973 | # This revlog format is super old and we don't bother trying to parse |
|
974 | 974 | # opener options for it because those options wouldn't do anything |
|
975 | 975 | # meaningful on such old repos. |
|
976 | 976 | if ( |
|
977 | 977 | b'revlogv1' in requirements |
|
978 | 978 | or requirementsmod.REVLOGV2_REQUIREMENT in requirements |
|
979 | 979 | ): |
|
980 | 980 | options.update(resolverevlogstorevfsoptions(ui, requirements, features)) |
|
981 | 981 | else: # explicitly mark repo as using revlogv0 |
|
982 | 982 | options[b'revlogv0'] = True |
|
983 | 983 | |
|
984 | 984 | if requirementsmod.COPIESSDC_REQUIREMENT in requirements: |
|
985 | 985 | options[b'copies-storage'] = b'changeset-sidedata' |
|
986 | 986 | else: |
|
987 | 987 | writecopiesto = ui.config(b'experimental', b'copies.write-to') |
|
988 | 988 | copiesextramode = (b'changeset-only', b'compatibility') |
|
989 | 989 | if writecopiesto in copiesextramode: |
|
990 | 990 | options[b'copies-storage'] = b'extra' |
|
991 | 991 | |
|
992 | 992 | return options |
|
993 | 993 | |
|
994 | 994 | |
|
995 | 995 | def resolverevlogstorevfsoptions(ui, requirements, features): |
|
996 | 996 | """Resolve opener options specific to revlogs.""" |
|
997 | 997 | |
|
998 | 998 | options = {} |
|
999 | 999 | options[b'flagprocessors'] = {} |
|
1000 | 1000 | |
|
1001 | 1001 | if b'revlogv1' in requirements: |
|
1002 | 1002 | options[b'revlogv1'] = True |
|
1003 | 1003 | if requirementsmod.REVLOGV2_REQUIREMENT in requirements: |
|
1004 | 1004 | options[b'revlogv2'] = True |
|
1005 | 1005 | |
|
1006 | 1006 | if b'generaldelta' in requirements: |
|
1007 | 1007 | options[b'generaldelta'] = True |
|
1008 | 1008 | |
|
1009 | 1009 | # experimental config: format.chunkcachesize |
|
1010 | 1010 | chunkcachesize = ui.configint(b'format', b'chunkcachesize') |
|
1011 | 1011 | if chunkcachesize is not None: |
|
1012 | 1012 | options[b'chunkcachesize'] = chunkcachesize |
|
1013 | 1013 | |
|
1014 | 1014 | deltabothparents = ui.configbool( |
|
1015 | 1015 | b'storage', b'revlog.optimize-delta-parent-choice' |
|
1016 | 1016 | ) |
|
1017 | 1017 | options[b'deltabothparents'] = deltabothparents |
|
1018 | 1018 | |
|
1019 | 1019 | lazydelta = ui.configbool(b'storage', b'revlog.reuse-external-delta') |
|
1020 | 1020 | lazydeltabase = False |
|
1021 | 1021 | if lazydelta: |
|
1022 | 1022 | lazydeltabase = ui.configbool( |
|
1023 | 1023 | b'storage', b'revlog.reuse-external-delta-parent' |
|
1024 | 1024 | ) |
|
1025 | 1025 | if lazydeltabase is None: |
|
1026 | 1026 | lazydeltabase = not scmutil.gddeltaconfig(ui) |
|
1027 | 1027 | options[b'lazydelta'] = lazydelta |
|
1028 | 1028 | options[b'lazydeltabase'] = lazydeltabase |
|
1029 | 1029 | |
|
1030 | 1030 | chainspan = ui.configbytes(b'experimental', b'maxdeltachainspan') |
|
1031 | 1031 | if 0 <= chainspan: |
|
1032 | 1032 | options[b'maxdeltachainspan'] = chainspan |
|
1033 | 1033 | |
|
1034 | 1034 | mmapindexthreshold = ui.configbytes(b'experimental', b'mmapindexthreshold') |
|
1035 | 1035 | if mmapindexthreshold is not None: |
|
1036 | 1036 | options[b'mmapindexthreshold'] = mmapindexthreshold |
|
1037 | 1037 | |
|
1038 | 1038 | withsparseread = ui.configbool(b'experimental', b'sparse-read') |
|
1039 | 1039 | srdensitythres = float( |
|
1040 | 1040 | ui.config(b'experimental', b'sparse-read.density-threshold') |
|
1041 | 1041 | ) |
|
1042 | 1042 | srmingapsize = ui.configbytes(b'experimental', b'sparse-read.min-gap-size') |
|
1043 | 1043 | options[b'with-sparse-read'] = withsparseread |
|
1044 | 1044 | options[b'sparse-read-density-threshold'] = srdensitythres |
|
1045 | 1045 | options[b'sparse-read-min-gap-size'] = srmingapsize |
|
1046 | 1046 | |
|
1047 | 1047 | sparserevlog = requirementsmod.SPARSEREVLOG_REQUIREMENT in requirements |
|
1048 | 1048 | options[b'sparse-revlog'] = sparserevlog |
|
1049 | 1049 | if sparserevlog: |
|
1050 | 1050 | options[b'generaldelta'] = True |
|
1051 | 1051 | |
|
1052 | 1052 | sidedata = requirementsmod.SIDEDATA_REQUIREMENT in requirements |
|
1053 | 1053 | options[b'side-data'] = sidedata |
|
1054 | 1054 | |
|
1055 | 1055 | maxchainlen = None |
|
1056 | 1056 | if sparserevlog: |
|
1057 | 1057 | maxchainlen = revlogconst.SPARSE_REVLOG_MAX_CHAIN_LENGTH |
|
1058 | 1058 | # experimental config: format.maxchainlen |
|
1059 | 1059 | maxchainlen = ui.configint(b'format', b'maxchainlen', maxchainlen) |
|
1060 | 1060 | if maxchainlen is not None: |
|
1061 | 1061 | options[b'maxchainlen'] = maxchainlen |
|
1062 | 1062 | |
|
1063 | 1063 | for r in requirements: |
|
1064 | 1064 | # we allow multiple compression engine requirement to co-exist because |
|
1065 | 1065 | # strickly speaking, revlog seems to support mixed compression style. |
|
1066 | 1066 | # |
|
1067 | 1067 | # The compression used for new entries will be "the last one" |
|
1068 | 1068 | prefix = r.startswith |
|
1069 | 1069 | if prefix(b'revlog-compression-') or prefix(b'exp-compression-'): |
|
1070 | 1070 | options[b'compengine'] = r.split(b'-', 2)[2] |
|
1071 | 1071 | |
|
1072 | 1072 | options[b'zlib.level'] = ui.configint(b'storage', b'revlog.zlib.level') |
|
1073 | 1073 | if options[b'zlib.level'] is not None: |
|
1074 | 1074 | if not (0 <= options[b'zlib.level'] <= 9): |
|
1075 | 1075 | msg = _(b'invalid value for `storage.revlog.zlib.level` config: %d') |
|
1076 | 1076 | raise error.Abort(msg % options[b'zlib.level']) |
|
1077 | 1077 | options[b'zstd.level'] = ui.configint(b'storage', b'revlog.zstd.level') |
|
1078 | 1078 | if options[b'zstd.level'] is not None: |
|
1079 | 1079 | if not (0 <= options[b'zstd.level'] <= 22): |
|
1080 | 1080 | msg = _(b'invalid value for `storage.revlog.zstd.level` config: %d') |
|
1081 | 1081 | raise error.Abort(msg % options[b'zstd.level']) |
|
1082 | 1082 | |
|
1083 | 1083 | if requirementsmod.NARROW_REQUIREMENT in requirements: |
|
1084 | 1084 | options[b'enableellipsis'] = True |
|
1085 | 1085 | |
|
1086 | 1086 | if ui.configbool(b'experimental', b'rust.index'): |
|
1087 | 1087 | options[b'rust.index'] = True |
|
1088 | 1088 | if requirementsmod.NODEMAP_REQUIREMENT in requirements: |
|
1089 | 1089 | slow_path = ui.config( |
|
1090 | 1090 | b'storage', b'revlog.persistent-nodemap.slow-path' |
|
1091 | 1091 | ) |
|
1092 | 1092 | if slow_path not in (b'allow', b'warn', b'abort'): |
|
1093 | 1093 | default = ui.config_default( |
|
1094 | 1094 | b'storage', b'revlog.persistent-nodemap.slow-path' |
|
1095 | 1095 | ) |
|
1096 | 1096 | msg = _( |
|
1097 | 1097 | b'unknown value for config ' |
|
1098 | 1098 | b'"storage.revlog.persistent-nodemap.slow-path": "%s"\n' |
|
1099 | 1099 | ) |
|
1100 | 1100 | ui.warn(msg % slow_path) |
|
1101 | 1101 | if not ui.quiet: |
|
1102 | 1102 | ui.warn(_(b'falling back to default value: %s\n') % default) |
|
1103 | 1103 | slow_path = default |
|
1104 | 1104 | |
|
1105 | 1105 | msg = _( |
|
1106 | 1106 | b"accessing `persistent-nodemap` repository without associated " |
|
1107 | 1107 | b"fast implementation." |
|
1108 | 1108 | ) |
|
1109 | 1109 | hint = _( |
|
1110 | 1110 | b"check `hg help config.format.use-persistent-nodemap` " |
|
1111 | 1111 | b"for details" |
|
1112 | 1112 | ) |
|
1113 | 1113 | if not revlog.HAS_FAST_PERSISTENT_NODEMAP: |
|
1114 | 1114 | if slow_path == b'warn': |
|
1115 | 1115 | msg = b"warning: " + msg + b'\n' |
|
1116 | 1116 | ui.warn(msg) |
|
1117 | 1117 | if not ui.quiet: |
|
1118 | 1118 | hint = b'(' + hint + b')\n' |
|
1119 | 1119 | ui.warn(hint) |
|
1120 | 1120 | if slow_path == b'abort': |
|
1121 | 1121 | raise error.Abort(msg, hint=hint) |
|
1122 | 1122 | options[b'persistent-nodemap'] = True |
|
1123 | 1123 | if ui.configbool(b'storage', b'revlog.persistent-nodemap.mmap'): |
|
1124 | 1124 | options[b'persistent-nodemap.mmap'] = True |
|
1125 | 1125 | if ui.configbool(b'devel', b'persistent-nodemap'): |
|
1126 | 1126 | options[b'devel-force-nodemap'] = True |
|
1127 | 1127 | |
|
1128 | 1128 | return options |
|
1129 | 1129 | |
|
1130 | 1130 | |
|
1131 | 1131 | def makemain(**kwargs): |
|
1132 | 1132 | """Produce a type conforming to ``ilocalrepositorymain``.""" |
|
1133 | 1133 | return localrepository |
|
1134 | 1134 | |
|
1135 | 1135 | |
|
1136 | 1136 | @interfaceutil.implementer(repository.ilocalrepositoryfilestorage) |
|
1137 | 1137 | class revlogfilestorage(object): |
|
1138 | 1138 | """File storage when using revlogs.""" |
|
1139 | 1139 | |
|
1140 | 1140 | def file(self, path): |
|
1141 | 1141 | if path[0] == b'/': |
|
1142 | 1142 | path = path[1:] |
|
1143 | 1143 | |
|
1144 | 1144 | return filelog.filelog(self.svfs, path) |
|
1145 | 1145 | |
|
1146 | 1146 | |
|
1147 | 1147 | @interfaceutil.implementer(repository.ilocalrepositoryfilestorage) |
|
1148 | 1148 | class revlognarrowfilestorage(object): |
|
1149 | 1149 | """File storage when using revlogs and narrow files.""" |
|
1150 | 1150 | |
|
1151 | 1151 | def file(self, path): |
|
1152 | 1152 | if path[0] == b'/': |
|
1153 | 1153 | path = path[1:] |
|
1154 | 1154 | |
|
1155 | 1155 | return filelog.narrowfilelog(self.svfs, path, self._storenarrowmatch) |
|
1156 | 1156 | |
|
1157 | 1157 | |
|
1158 | 1158 | def makefilestorage(requirements, features, **kwargs): |
|
1159 | 1159 | """Produce a type conforming to ``ilocalrepositoryfilestorage``.""" |
|
1160 | 1160 | features.add(repository.REPO_FEATURE_REVLOG_FILE_STORAGE) |
|
1161 | 1161 | features.add(repository.REPO_FEATURE_STREAM_CLONE) |
|
1162 | 1162 | |
|
1163 | 1163 | if requirementsmod.NARROW_REQUIREMENT in requirements: |
|
1164 | 1164 | return revlognarrowfilestorage |
|
1165 | 1165 | else: |
|
1166 | 1166 | return revlogfilestorage |
|
1167 | 1167 | |
|
1168 | 1168 | |
|
1169 | 1169 | # List of repository interfaces and factory functions for them. Each |
|
1170 | 1170 | # will be called in order during ``makelocalrepository()`` to iteratively |
|
1171 | 1171 | # derive the final type for a local repository instance. We capture the |
|
1172 | 1172 | # function as a lambda so we don't hold a reference and the module-level |
|
1173 | 1173 | # functions can be wrapped. |
|
1174 | 1174 | REPO_INTERFACES = [ |
|
1175 | 1175 | (repository.ilocalrepositorymain, lambda: makemain), |
|
1176 | 1176 | (repository.ilocalrepositoryfilestorage, lambda: makefilestorage), |
|
1177 | 1177 | ] |
|
1178 | 1178 | |
|
1179 | 1179 | |
|
1180 | 1180 | @interfaceutil.implementer(repository.ilocalrepositorymain) |
|
1181 | 1181 | class localrepository(object): |
|
1182 | 1182 | """Main class for representing local repositories. |
|
1183 | 1183 | |
|
1184 | 1184 | All local repositories are instances of this class. |
|
1185 | 1185 | |
|
1186 | 1186 | Constructed on its own, instances of this class are not usable as |
|
1187 | 1187 | repository objects. To obtain a usable repository object, call |
|
1188 | 1188 | ``hg.repository()``, ``localrepo.instance()``, or |
|
1189 | 1189 | ``localrepo.makelocalrepository()``. The latter is the lowest-level. |
|
1190 | 1190 | ``instance()`` adds support for creating new repositories. |
|
1191 | 1191 | ``hg.repository()`` adds more extension integration, including calling |
|
1192 | 1192 | ``reposetup()``. Generally speaking, ``hg.repository()`` should be |
|
1193 | 1193 | used. |
|
1194 | 1194 | """ |
|
1195 | 1195 | |
|
1196 | 1196 | # obsolete experimental requirements: |
|
1197 | 1197 | # - manifestv2: An experimental new manifest format that allowed |
|
1198 | 1198 | # for stem compression of long paths. Experiment ended up not |
|
1199 | 1199 | # being successful (repository sizes went up due to worse delta |
|
1200 | 1200 | # chains), and the code was deleted in 4.6. |
|
1201 | 1201 | supportedformats = { |
|
1202 | 1202 | b'revlogv1', |
|
1203 | 1203 | b'generaldelta', |
|
1204 | 1204 | requirementsmod.TREEMANIFEST_REQUIREMENT, |
|
1205 | 1205 | requirementsmod.COPIESSDC_REQUIREMENT, |
|
1206 | 1206 | requirementsmod.REVLOGV2_REQUIREMENT, |
|
1207 | 1207 | requirementsmod.SIDEDATA_REQUIREMENT, |
|
1208 | 1208 | requirementsmod.SPARSEREVLOG_REQUIREMENT, |
|
1209 | 1209 | requirementsmod.NODEMAP_REQUIREMENT, |
|
1210 | 1210 | bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT, |
|
1211 | 1211 | requirementsmod.SHARESAFE_REQUIREMENT, |
|
1212 | 1212 | } |
|
1213 | 1213 | _basesupported = supportedformats | { |
|
1214 | 1214 | b'store', |
|
1215 | 1215 | b'fncache', |
|
1216 | 1216 | requirementsmod.SHARED_REQUIREMENT, |
|
1217 | 1217 | requirementsmod.RELATIVE_SHARED_REQUIREMENT, |
|
1218 | 1218 | b'dotencode', |
|
1219 | 1219 | requirementsmod.SPARSE_REQUIREMENT, |
|
1220 | 1220 | requirementsmod.INTERNAL_PHASE_REQUIREMENT, |
|
1221 | 1221 | } |
|
1222 | 1222 | |
|
1223 | 1223 | # list of prefix for file which can be written without 'wlock' |
|
1224 | 1224 | # Extensions should extend this list when needed |
|
1225 | 1225 | _wlockfreeprefix = { |
|
1226 | 1226 | # We migh consider requiring 'wlock' for the next |
|
1227 | 1227 | # two, but pretty much all the existing code assume |
|
1228 | 1228 | # wlock is not needed so we keep them excluded for |
|
1229 | 1229 | # now. |
|
1230 | 1230 | b'hgrc', |
|
1231 | 1231 | b'requires', |
|
1232 | 1232 | # XXX cache is a complicatged business someone |
|
1233 | 1233 | # should investigate this in depth at some point |
|
1234 | 1234 | b'cache/', |
|
1235 | 1235 | # XXX shouldn't be dirstate covered by the wlock? |
|
1236 | 1236 | b'dirstate', |
|
1237 | 1237 | # XXX bisect was still a bit too messy at the time |
|
1238 | 1238 | # this changeset was introduced. Someone should fix |
|
1239 | 1239 | # the remainig bit and drop this line |
|
1240 | 1240 | b'bisect.state', |
|
1241 | 1241 | } |
|
1242 | 1242 | |
|
1243 | 1243 | def __init__( |
|
1244 | 1244 | self, |
|
1245 | 1245 | baseui, |
|
1246 | 1246 | ui, |
|
1247 | 1247 | origroot, |
|
1248 | 1248 | wdirvfs, |
|
1249 | 1249 | hgvfs, |
|
1250 | 1250 | requirements, |
|
1251 | 1251 | supportedrequirements, |
|
1252 | 1252 | sharedpath, |
|
1253 | 1253 | store, |
|
1254 | 1254 | cachevfs, |
|
1255 | 1255 | wcachevfs, |
|
1256 | 1256 | features, |
|
1257 | 1257 | intents=None, |
|
1258 | 1258 | ): |
|
1259 | 1259 | """Create a new local repository instance. |
|
1260 | 1260 | |
|
1261 | 1261 | Most callers should use ``hg.repository()``, ``localrepo.instance()``, |
|
1262 | 1262 | or ``localrepo.makelocalrepository()`` for obtaining a new repository |
|
1263 | 1263 | object. |
|
1264 | 1264 | |
|
1265 | 1265 | Arguments: |
|
1266 | 1266 | |
|
1267 | 1267 | baseui |
|
1268 | 1268 | ``ui.ui`` instance that ``ui`` argument was based off of. |
|
1269 | 1269 | |
|
1270 | 1270 | ui |
|
1271 | 1271 | ``ui.ui`` instance for use by the repository. |
|
1272 | 1272 | |
|
1273 | 1273 | origroot |
|
1274 | 1274 | ``bytes`` path to working directory root of this repository. |
|
1275 | 1275 | |
|
1276 | 1276 | wdirvfs |
|
1277 | 1277 | ``vfs.vfs`` rooted at the working directory. |
|
1278 | 1278 | |
|
1279 | 1279 | hgvfs |
|
1280 | 1280 | ``vfs.vfs`` rooted at .hg/ |
|
1281 | 1281 | |
|
1282 | 1282 | requirements |
|
1283 | 1283 | ``set`` of bytestrings representing repository opening requirements. |
|
1284 | 1284 | |
|
1285 | 1285 | supportedrequirements |
|
1286 | 1286 | ``set`` of bytestrings representing repository requirements that we |
|
1287 | 1287 | know how to open. May be a supetset of ``requirements``. |
|
1288 | 1288 | |
|
1289 | 1289 | sharedpath |
|
1290 | 1290 | ``bytes`` Defining path to storage base directory. Points to a |
|
1291 | 1291 | ``.hg/`` directory somewhere. |
|
1292 | 1292 | |
|
1293 | 1293 | store |
|
1294 | 1294 | ``store.basicstore`` (or derived) instance providing access to |
|
1295 | 1295 | versioned storage. |
|
1296 | 1296 | |
|
1297 | 1297 | cachevfs |
|
1298 | 1298 | ``vfs.vfs`` used for cache files. |
|
1299 | 1299 | |
|
1300 | 1300 | wcachevfs |
|
1301 | 1301 | ``vfs.vfs`` used for cache files related to the working copy. |
|
1302 | 1302 | |
|
1303 | 1303 | features |
|
1304 | 1304 | ``set`` of bytestrings defining features/capabilities of this |
|
1305 | 1305 | instance. |
|
1306 | 1306 | |
|
1307 | 1307 | intents |
|
1308 | 1308 | ``set`` of system strings indicating what this repo will be used |
|
1309 | 1309 | for. |
|
1310 | 1310 | """ |
|
1311 | 1311 | self.baseui = baseui |
|
1312 | 1312 | self.ui = ui |
|
1313 | 1313 | self.origroot = origroot |
|
1314 | 1314 | # vfs rooted at working directory. |
|
1315 | 1315 | self.wvfs = wdirvfs |
|
1316 | 1316 | self.root = wdirvfs.base |
|
1317 | 1317 | # vfs rooted at .hg/. Used to access most non-store paths. |
|
1318 | 1318 | self.vfs = hgvfs |
|
1319 | 1319 | self.path = hgvfs.base |
|
1320 | 1320 | self.requirements = requirements |
|
1321 | 1321 | self.supported = supportedrequirements |
|
1322 | 1322 | self.sharedpath = sharedpath |
|
1323 | 1323 | self.store = store |
|
1324 | 1324 | self.cachevfs = cachevfs |
|
1325 | 1325 | self.wcachevfs = wcachevfs |
|
1326 | 1326 | self.features = features |
|
1327 | 1327 | |
|
1328 | 1328 | self.filtername = None |
|
1329 | 1329 | |
|
1330 | 1330 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( |
|
1331 | 1331 | b'devel', b'check-locks' |
|
1332 | 1332 | ): |
|
1333 | 1333 | self.vfs.audit = self._getvfsward(self.vfs.audit) |
|
1334 | 1334 | # A list of callback to shape the phase if no data were found. |
|
1335 | 1335 | # Callback are in the form: func(repo, roots) --> processed root. |
|
1336 | 1336 | # This list it to be filled by extension during repo setup |
|
1337 | 1337 | self._phasedefaults = [] |
|
1338 | 1338 | |
|
1339 | 1339 | color.setup(self.ui) |
|
1340 | 1340 | |
|
1341 | 1341 | self.spath = self.store.path |
|
1342 | 1342 | self.svfs = self.store.vfs |
|
1343 | 1343 | self.sjoin = self.store.join |
|
1344 | 1344 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( |
|
1345 | 1345 | b'devel', b'check-locks' |
|
1346 | 1346 | ): |
|
1347 | 1347 | if util.safehasattr(self.svfs, b'vfs'): # this is filtervfs |
|
1348 | 1348 | self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit) |
|
1349 | 1349 | else: # standard vfs |
|
1350 | 1350 | self.svfs.audit = self._getsvfsward(self.svfs.audit) |
|
1351 | 1351 | |
|
1352 | 1352 | self._dirstatevalidatewarned = False |
|
1353 | 1353 | |
|
1354 | 1354 | self._branchcaches = branchmap.BranchMapCache() |
|
1355 | 1355 | self._revbranchcache = None |
|
1356 | 1356 | self._filterpats = {} |
|
1357 | 1357 | self._datafilters = {} |
|
1358 | 1358 | self._transref = self._lockref = self._wlockref = None |
|
1359 | 1359 | |
|
1360 | 1360 | # A cache for various files under .hg/ that tracks file changes, |
|
1361 | 1361 | # (used by the filecache decorator) |
|
1362 | 1362 | # |
|
1363 | 1363 | # Maps a property name to its util.filecacheentry |
|
1364 | 1364 | self._filecache = {} |
|
1365 | 1365 | |
|
1366 | 1366 | # hold sets of revision to be filtered |
|
1367 | 1367 | # should be cleared when something might have changed the filter value: |
|
1368 | 1368 | # - new changesets, |
|
1369 | 1369 | # - phase change, |
|
1370 | 1370 | # - new obsolescence marker, |
|
1371 | 1371 | # - working directory parent change, |
|
1372 | 1372 | # - bookmark changes |
|
1373 | 1373 | self.filteredrevcache = {} |
|
1374 | 1374 | |
|
1375 | 1375 | # post-dirstate-status hooks |
|
1376 | 1376 | self._postdsstatus = [] |
|
1377 | 1377 | |
|
1378 | 1378 | # generic mapping between names and nodes |
|
1379 | 1379 | self.names = namespaces.namespaces() |
|
1380 | 1380 | |
|
1381 | 1381 | # Key to signature value. |
|
1382 | 1382 | self._sparsesignaturecache = {} |
|
1383 | 1383 | # Signature to cached matcher instance. |
|
1384 | 1384 | self._sparsematchercache = {} |
|
1385 | 1385 | |
|
1386 | 1386 | self._extrafilterid = repoview.extrafilter(ui) |
|
1387 | 1387 | |
|
1388 | 1388 | self.filecopiesmode = None |
|
1389 | 1389 | if requirementsmod.COPIESSDC_REQUIREMENT in self.requirements: |
|
1390 | 1390 | self.filecopiesmode = b'changeset-sidedata' |
|
1391 | 1391 | |
|
1392 | 1392 | def _getvfsward(self, origfunc): |
|
1393 | 1393 | """build a ward for self.vfs""" |
|
1394 | 1394 | rref = weakref.ref(self) |
|
1395 | 1395 | |
|
1396 | 1396 | def checkvfs(path, mode=None): |
|
1397 | 1397 | ret = origfunc(path, mode=mode) |
|
1398 | 1398 | repo = rref() |
|
1399 | 1399 | if ( |
|
1400 | 1400 | repo is None |
|
1401 | 1401 | or not util.safehasattr(repo, b'_wlockref') |
|
1402 | 1402 | or not util.safehasattr(repo, b'_lockref') |
|
1403 | 1403 | ): |
|
1404 | 1404 | return |
|
1405 | 1405 | if mode in (None, b'r', b'rb'): |
|
1406 | 1406 | return |
|
1407 | 1407 | if path.startswith(repo.path): |
|
1408 | 1408 | # truncate name relative to the repository (.hg) |
|
1409 | 1409 | path = path[len(repo.path) + 1 :] |
|
1410 | 1410 | if path.startswith(b'cache/'): |
|
1411 | 1411 | msg = b'accessing cache with vfs instead of cachevfs: "%s"' |
|
1412 | 1412 | repo.ui.develwarn(msg % path, stacklevel=3, config=b"cache-vfs") |
|
1413 | 1413 | # path prefixes covered by 'lock' |
|
1414 | 1414 | vfs_path_prefixes = ( |
|
1415 | 1415 | b'journal.', |
|
1416 | 1416 | b'undo.', |
|
1417 | 1417 | b'strip-backup/', |
|
1418 | 1418 | b'cache/', |
|
1419 | 1419 | ) |
|
1420 | 1420 | if any(path.startswith(prefix) for prefix in vfs_path_prefixes): |
|
1421 | 1421 | if repo._currentlock(repo._lockref) is None: |
|
1422 | 1422 | repo.ui.develwarn( |
|
1423 | 1423 | b'write with no lock: "%s"' % path, |
|
1424 | 1424 | stacklevel=3, |
|
1425 | 1425 | config=b'check-locks', |
|
1426 | 1426 | ) |
|
1427 | 1427 | elif repo._currentlock(repo._wlockref) is None: |
|
1428 | 1428 | # rest of vfs files are covered by 'wlock' |
|
1429 | 1429 | # |
|
1430 | 1430 | # exclude special files |
|
1431 | 1431 | for prefix in self._wlockfreeprefix: |
|
1432 | 1432 | if path.startswith(prefix): |
|
1433 | 1433 | return |
|
1434 | 1434 | repo.ui.develwarn( |
|
1435 | 1435 | b'write with no wlock: "%s"' % path, |
|
1436 | 1436 | stacklevel=3, |
|
1437 | 1437 | config=b'check-locks', |
|
1438 | 1438 | ) |
|
1439 | 1439 | return ret |
|
1440 | 1440 | |
|
1441 | 1441 | return checkvfs |
|
1442 | 1442 | |
|
1443 | 1443 | def _getsvfsward(self, origfunc): |
|
1444 | 1444 | """build a ward for self.svfs""" |
|
1445 | 1445 | rref = weakref.ref(self) |
|
1446 | 1446 | |
|
1447 | 1447 | def checksvfs(path, mode=None): |
|
1448 | 1448 | ret = origfunc(path, mode=mode) |
|
1449 | 1449 | repo = rref() |
|
1450 | 1450 | if repo is None or not util.safehasattr(repo, b'_lockref'): |
|
1451 | 1451 | return |
|
1452 | 1452 | if mode in (None, b'r', b'rb'): |
|
1453 | 1453 | return |
|
1454 | 1454 | if path.startswith(repo.sharedpath): |
|
1455 | 1455 | # truncate name relative to the repository (.hg) |
|
1456 | 1456 | path = path[len(repo.sharedpath) + 1 :] |
|
1457 | 1457 | if repo._currentlock(repo._lockref) is None: |
|
1458 | 1458 | repo.ui.develwarn( |
|
1459 | 1459 | b'write with no lock: "%s"' % path, stacklevel=4 |
|
1460 | 1460 | ) |
|
1461 | 1461 | return ret |
|
1462 | 1462 | |
|
1463 | 1463 | return checksvfs |
|
1464 | 1464 | |
|
1465 | 1465 | def close(self): |
|
1466 | 1466 | self._writecaches() |
|
1467 | 1467 | |
|
1468 | 1468 | def _writecaches(self): |
|
1469 | 1469 | if self._revbranchcache: |
|
1470 | 1470 | self._revbranchcache.write() |
|
1471 | 1471 | |
|
1472 | 1472 | def _restrictcapabilities(self, caps): |
|
1473 | 1473 | if self.ui.configbool(b'experimental', b'bundle2-advertise'): |
|
1474 | 1474 | caps = set(caps) |
|
1475 | 1475 | capsblob = bundle2.encodecaps( |
|
1476 | 1476 | bundle2.getrepocaps(self, role=b'client') |
|
1477 | 1477 | ) |
|
1478 | 1478 | caps.add(b'bundle2=' + urlreq.quote(capsblob)) |
|
1479 | 1479 | return caps |
|
1480 | 1480 | |
|
1481 | 1481 | # Don't cache auditor/nofsauditor, or you'll end up with reference cycle: |
|
1482 | 1482 | # self -> auditor -> self._checknested -> self |
|
1483 | 1483 | |
|
1484 | 1484 | @property |
|
1485 | 1485 | def auditor(self): |
|
1486 | 1486 | # This is only used by context.workingctx.match in order to |
|
1487 | 1487 | # detect files in subrepos. |
|
1488 | 1488 | return pathutil.pathauditor(self.root, callback=self._checknested) |
|
1489 | 1489 | |
|
1490 | 1490 | @property |
|
1491 | 1491 | def nofsauditor(self): |
|
1492 | 1492 | # This is only used by context.basectx.match in order to detect |
|
1493 | 1493 | # files in subrepos. |
|
1494 | 1494 | return pathutil.pathauditor( |
|
1495 | 1495 | self.root, callback=self._checknested, realfs=False, cached=True |
|
1496 | 1496 | ) |
|
1497 | 1497 | |
|
1498 | 1498 | def _checknested(self, path): |
|
1499 | 1499 | """Determine if path is a legal nested repository.""" |
|
1500 | 1500 | if not path.startswith(self.root): |
|
1501 | 1501 | return False |
|
1502 | 1502 | subpath = path[len(self.root) + 1 :] |
|
1503 | 1503 | normsubpath = util.pconvert(subpath) |
|
1504 | 1504 | |
|
1505 | 1505 | # XXX: Checking against the current working copy is wrong in |
|
1506 | 1506 | # the sense that it can reject things like |
|
1507 | 1507 | # |
|
1508 | 1508 | # $ hg cat -r 10 sub/x.txt |
|
1509 | 1509 | # |
|
1510 | 1510 | # if sub/ is no longer a subrepository in the working copy |
|
1511 | 1511 | # parent revision. |
|
1512 | 1512 | # |
|
1513 | 1513 | # However, it can of course also allow things that would have |
|
1514 | 1514 | # been rejected before, such as the above cat command if sub/ |
|
1515 | 1515 | # is a subrepository now, but was a normal directory before. |
|
1516 | 1516 | # The old path auditor would have rejected by mistake since it |
|
1517 | 1517 | # panics when it sees sub/.hg/. |
|
1518 | 1518 | # |
|
1519 | 1519 | # All in all, checking against the working copy seems sensible |
|
1520 | 1520 | # since we want to prevent access to nested repositories on |
|
1521 | 1521 | # the filesystem *now*. |
|
1522 | 1522 | ctx = self[None] |
|
1523 | 1523 | parts = util.splitpath(subpath) |
|
1524 | 1524 | while parts: |
|
1525 | 1525 | prefix = b'/'.join(parts) |
|
1526 | 1526 | if prefix in ctx.substate: |
|
1527 | 1527 | if prefix == normsubpath: |
|
1528 | 1528 | return True |
|
1529 | 1529 | else: |
|
1530 | 1530 | sub = ctx.sub(prefix) |
|
1531 | 1531 | return sub.checknested(subpath[len(prefix) + 1 :]) |
|
1532 | 1532 | else: |
|
1533 | 1533 | parts.pop() |
|
1534 | 1534 | return False |
|
1535 | 1535 | |
|
1536 | 1536 | def peer(self): |
|
1537 | 1537 | return localpeer(self) # not cached to avoid reference cycle |
|
1538 | 1538 | |
|
1539 | 1539 | def unfiltered(self): |
|
1540 | 1540 | """Return unfiltered version of the repository |
|
1541 | 1541 | |
|
1542 | 1542 | Intended to be overwritten by filtered repo.""" |
|
1543 | 1543 | return self |
|
1544 | 1544 | |
|
1545 | 1545 | def filtered(self, name, visibilityexceptions=None): |
|
1546 | 1546 | """Return a filtered version of a repository |
|
1547 | 1547 | |
|
1548 | 1548 | The `name` parameter is the identifier of the requested view. This |
|
1549 | 1549 | will return a repoview object set "exactly" to the specified view. |
|
1550 | 1550 | |
|
1551 | 1551 | This function does not apply recursive filtering to a repository. For |
|
1552 | 1552 | example calling `repo.filtered("served")` will return a repoview using |
|
1553 | 1553 | the "served" view, regardless of the initial view used by `repo`. |
|
1554 | 1554 | |
|
1555 | 1555 | In other word, there is always only one level of `repoview` "filtering". |
|
1556 | 1556 | """ |
|
1557 | 1557 | if self._extrafilterid is not None and b'%' not in name: |
|
1558 | 1558 | name = name + b'%' + self._extrafilterid |
|
1559 | 1559 | |
|
1560 | 1560 | cls = repoview.newtype(self.unfiltered().__class__) |
|
1561 | 1561 | return cls(self, name, visibilityexceptions) |
|
1562 | 1562 | |
|
1563 | 1563 | @mixedrepostorecache( |
|
1564 | 1564 | (b'bookmarks', b'plain'), |
|
1565 | 1565 | (b'bookmarks.current', b'plain'), |
|
1566 | 1566 | (b'bookmarks', b''), |
|
1567 | 1567 | (b'00changelog.i', b''), |
|
1568 | 1568 | ) |
|
1569 | 1569 | def _bookmarks(self): |
|
1570 | 1570 | # Since the multiple files involved in the transaction cannot be |
|
1571 | 1571 | # written atomically (with current repository format), there is a race |
|
1572 | 1572 | # condition here. |
|
1573 | 1573 | # |
|
1574 | 1574 | # 1) changelog content A is read |
|
1575 | 1575 | # 2) outside transaction update changelog to content B |
|
1576 | 1576 | # 3) outside transaction update bookmark file referring to content B |
|
1577 | 1577 | # 4) bookmarks file content is read and filtered against changelog-A |
|
1578 | 1578 | # |
|
1579 | 1579 | # When this happens, bookmarks against nodes missing from A are dropped. |
|
1580 | 1580 | # |
|
1581 | 1581 | # Having this happening during read is not great, but it become worse |
|
1582 | 1582 | # when this happen during write because the bookmarks to the "unknown" |
|
1583 | 1583 | # nodes will be dropped for good. However, writes happen within locks. |
|
1584 | 1584 | # This locking makes it possible to have a race free consistent read. |
|
1585 | 1585 | # For this purpose data read from disc before locking are |
|
1586 | 1586 | # "invalidated" right after the locks are taken. This invalidations are |
|
1587 | 1587 | # "light", the `filecache` mechanism keep the data in memory and will |
|
1588 | 1588 | # reuse them if the underlying files did not changed. Not parsing the |
|
1589 | 1589 | # same data multiple times helps performances. |
|
1590 | 1590 | # |
|
1591 | 1591 | # Unfortunately in the case describe above, the files tracked by the |
|
1592 | 1592 | # bookmarks file cache might not have changed, but the in-memory |
|
1593 | 1593 | # content is still "wrong" because we used an older changelog content |
|
1594 | 1594 | # to process the on-disk data. So after locking, the changelog would be |
|
1595 | 1595 | # refreshed but `_bookmarks` would be preserved. |
|
1596 | 1596 | # Adding `00changelog.i` to the list of tracked file is not |
|
1597 | 1597 | # enough, because at the time we build the content for `_bookmarks` in |
|
1598 | 1598 | # (4), the changelog file has already diverged from the content used |
|
1599 | 1599 | # for loading `changelog` in (1) |
|
1600 | 1600 | # |
|
1601 | 1601 | # To prevent the issue, we force the changelog to be explicitly |
|
1602 | 1602 | # reloaded while computing `_bookmarks`. The data race can still happen |
|
1603 | 1603 | # without the lock (with a narrower window), but it would no longer go |
|
1604 | 1604 | # undetected during the lock time refresh. |
|
1605 | 1605 | # |
|
1606 | 1606 | # The new schedule is as follow |
|
1607 | 1607 | # |
|
1608 | 1608 | # 1) filecache logic detect that `_bookmarks` needs to be computed |
|
1609 | 1609 | # 2) cachestat for `bookmarks` and `changelog` are captured (for book) |
|
1610 | 1610 | # 3) We force `changelog` filecache to be tested |
|
1611 | 1611 | # 4) cachestat for `changelog` are captured (for changelog) |
|
1612 | 1612 | # 5) `_bookmarks` is computed and cached |
|
1613 | 1613 | # |
|
1614 | 1614 | # The step in (3) ensure we have a changelog at least as recent as the |
|
1615 | 1615 | # cache stat computed in (1). As a result at locking time: |
|
1616 | 1616 | # * if the changelog did not changed since (1) -> we can reuse the data |
|
1617 | 1617 | # * otherwise -> the bookmarks get refreshed. |
|
1618 | 1618 | self._refreshchangelog() |
|
1619 | 1619 | return bookmarks.bmstore(self) |
|
1620 | 1620 | |
|
1621 | 1621 | def _refreshchangelog(self): |
|
1622 | 1622 | """make sure the in memory changelog match the on-disk one""" |
|
1623 | 1623 | if 'changelog' in vars(self) and self.currenttransaction() is None: |
|
1624 | 1624 | del self.changelog |
|
1625 | 1625 | |
|
1626 | 1626 | @property |
|
1627 | 1627 | def _activebookmark(self): |
|
1628 | 1628 | return self._bookmarks.active |
|
1629 | 1629 | |
|
1630 | 1630 | # _phasesets depend on changelog. what we need is to call |
|
1631 | 1631 | # _phasecache.invalidate() if '00changelog.i' was changed, but it |
|
1632 | 1632 | # can't be easily expressed in filecache mechanism. |
|
1633 | 1633 | @storecache(b'phaseroots', b'00changelog.i') |
|
1634 | 1634 | def _phasecache(self): |
|
1635 | 1635 | return phases.phasecache(self, self._phasedefaults) |
|
1636 | 1636 | |
|
1637 | 1637 | @storecache(b'obsstore') |
|
1638 | 1638 | def obsstore(self): |
|
1639 | 1639 | return obsolete.makestore(self.ui, self) |
|
1640 | 1640 | |
|
1641 | 1641 | @storecache(b'00changelog.i') |
|
1642 | 1642 | def changelog(self): |
|
1643 | 1643 | # load dirstate before changelog to avoid race see issue6303 |
|
1644 | 1644 | self.dirstate.prefetch_parents() |
|
1645 | 1645 | return self.store.changelog(txnutil.mayhavepending(self.root)) |
|
1646 | 1646 | |
|
1647 | 1647 | @storecache(b'00manifest.i') |
|
1648 | 1648 | def manifestlog(self): |
|
1649 | 1649 | return self.store.manifestlog(self, self._storenarrowmatch) |
|
1650 | 1650 | |
|
1651 | 1651 | @repofilecache(b'dirstate') |
|
1652 | 1652 | def dirstate(self): |
|
1653 | 1653 | return self._makedirstate() |
|
1654 | 1654 | |
|
1655 | 1655 | def _makedirstate(self): |
|
1656 | 1656 | """Extension point for wrapping the dirstate per-repo.""" |
|
1657 | 1657 | sparsematchfn = lambda: sparse.matcher(self) |
|
1658 | 1658 | |
|
1659 | 1659 | return dirstate.dirstate( |
|
1660 | 1660 | self.vfs, self.ui, self.root, self._dirstatevalidate, sparsematchfn |
|
1661 | 1661 | ) |
|
1662 | 1662 | |
|
1663 | 1663 | def _dirstatevalidate(self, node): |
|
1664 | 1664 | try: |
|
1665 | 1665 | self.changelog.rev(node) |
|
1666 | 1666 | return node |
|
1667 | 1667 | except error.LookupError: |
|
1668 | 1668 | if not self._dirstatevalidatewarned: |
|
1669 | 1669 | self._dirstatevalidatewarned = True |
|
1670 | 1670 | self.ui.warn( |
|
1671 | 1671 | _(b"warning: ignoring unknown working parent %s!\n") |
|
1672 | 1672 | % short(node) |
|
1673 | 1673 | ) |
|
1674 | 1674 | return nullid |
|
1675 | 1675 | |
|
1676 | 1676 | @storecache(narrowspec.FILENAME) |
|
1677 | 1677 | def narrowpats(self): |
|
1678 | 1678 | """matcher patterns for this repository's narrowspec |
|
1679 | 1679 | |
|
1680 | 1680 | A tuple of (includes, excludes). |
|
1681 | 1681 | """ |
|
1682 | 1682 | return narrowspec.load(self) |
|
1683 | 1683 | |
|
1684 | 1684 | @storecache(narrowspec.FILENAME) |
|
1685 | 1685 | def _storenarrowmatch(self): |
|
1686 | 1686 | if requirementsmod.NARROW_REQUIREMENT not in self.requirements: |
|
1687 | 1687 | return matchmod.always() |
|
1688 | 1688 | include, exclude = self.narrowpats |
|
1689 | 1689 | return narrowspec.match(self.root, include=include, exclude=exclude) |
|
1690 | 1690 | |
|
1691 | 1691 | @storecache(narrowspec.FILENAME) |
|
1692 | 1692 | def _narrowmatch(self): |
|
1693 | 1693 | if requirementsmod.NARROW_REQUIREMENT not in self.requirements: |
|
1694 | 1694 | return matchmod.always() |
|
1695 | 1695 | narrowspec.checkworkingcopynarrowspec(self) |
|
1696 | 1696 | include, exclude = self.narrowpats |
|
1697 | 1697 | return narrowspec.match(self.root, include=include, exclude=exclude) |
|
1698 | 1698 | |
|
1699 | 1699 | def narrowmatch(self, match=None, includeexact=False): |
|
1700 | 1700 | """matcher corresponding the the repo's narrowspec |
|
1701 | 1701 | |
|
1702 | 1702 | If `match` is given, then that will be intersected with the narrow |
|
1703 | 1703 | matcher. |
|
1704 | 1704 | |
|
1705 | 1705 | If `includeexact` is True, then any exact matches from `match` will |
|
1706 | 1706 | be included even if they're outside the narrowspec. |
|
1707 | 1707 | """ |
|
1708 | 1708 | if match: |
|
1709 | 1709 | if includeexact and not self._narrowmatch.always(): |
|
1710 | 1710 | # do not exclude explicitly-specified paths so that they can |
|
1711 | 1711 | # be warned later on |
|
1712 | 1712 | em = matchmod.exact(match.files()) |
|
1713 | 1713 | nm = matchmod.unionmatcher([self._narrowmatch, em]) |
|
1714 | 1714 | return matchmod.intersectmatchers(match, nm) |
|
1715 | 1715 | return matchmod.intersectmatchers(match, self._narrowmatch) |
|
1716 | 1716 | return self._narrowmatch |
|
1717 | 1717 | |
|
1718 | 1718 | def setnarrowpats(self, newincludes, newexcludes): |
|
1719 | 1719 | narrowspec.save(self, newincludes, newexcludes) |
|
1720 | 1720 | self.invalidate(clearfilecache=True) |
|
1721 | 1721 | |
|
1722 | 1722 | @unfilteredpropertycache |
|
1723 | 1723 | def _quick_access_changeid_null(self): |
|
1724 | 1724 | return { |
|
1725 | 1725 | b'null': (nullrev, nullid), |
|
1726 | 1726 | nullrev: (nullrev, nullid), |
|
1727 | 1727 | nullid: (nullrev, nullid), |
|
1728 | 1728 | } |
|
1729 | 1729 | |
|
1730 | 1730 | @unfilteredpropertycache |
|
1731 | 1731 | def _quick_access_changeid_wc(self): |
|
1732 | 1732 | # also fast path access to the working copy parents |
|
1733 | 1733 | # however, only do it for filter that ensure wc is visible. |
|
1734 | 1734 | quick = self._quick_access_changeid_null.copy() |
|
1735 | 1735 | cl = self.unfiltered().changelog |
|
1736 | 1736 | for node in self.dirstate.parents(): |
|
1737 | 1737 | if node == nullid: |
|
1738 | 1738 | continue |
|
1739 | 1739 | rev = cl.index.get_rev(node) |
|
1740 | 1740 | if rev is None: |
|
1741 | 1741 | # unknown working copy parent case: |
|
1742 | 1742 | # |
|
1743 | 1743 | # skip the fast path and let higher code deal with it |
|
1744 | 1744 | continue |
|
1745 | 1745 | pair = (rev, node) |
|
1746 | 1746 | quick[rev] = pair |
|
1747 | 1747 | quick[node] = pair |
|
1748 | 1748 | # also add the parents of the parents |
|
1749 | 1749 | for r in cl.parentrevs(rev): |
|
1750 | 1750 | if r == nullrev: |
|
1751 | 1751 | continue |
|
1752 | 1752 | n = cl.node(r) |
|
1753 | 1753 | pair = (r, n) |
|
1754 | 1754 | quick[r] = pair |
|
1755 | 1755 | quick[n] = pair |
|
1756 | 1756 | p1node = self.dirstate.p1() |
|
1757 | 1757 | if p1node != nullid: |
|
1758 | 1758 | quick[b'.'] = quick[p1node] |
|
1759 | 1759 | return quick |
|
1760 | 1760 | |
|
1761 | 1761 | @unfilteredmethod |
|
1762 | 1762 | def _quick_access_changeid_invalidate(self): |
|
1763 | 1763 | if '_quick_access_changeid_wc' in vars(self): |
|
1764 | 1764 | del self.__dict__['_quick_access_changeid_wc'] |
|
1765 | 1765 | |
|
1766 | 1766 | @property |
|
1767 | 1767 | def _quick_access_changeid(self): |
|
1768 | 1768 | """an helper dictionnary for __getitem__ calls |
|
1769 | 1769 | |
|
1770 | 1770 | This contains a list of symbol we can recognise right away without |
|
1771 | 1771 | further processing. |
|
1772 | 1772 | """ |
|
1773 | 1773 | if self.filtername in repoview.filter_has_wc: |
|
1774 | 1774 | return self._quick_access_changeid_wc |
|
1775 | 1775 | return self._quick_access_changeid_null |
|
1776 | 1776 | |
|
1777 | 1777 | def __getitem__(self, changeid): |
|
1778 | 1778 | # dealing with special cases |
|
1779 | 1779 | if changeid is None: |
|
1780 | 1780 | return context.workingctx(self) |
|
1781 | 1781 | if isinstance(changeid, context.basectx): |
|
1782 | 1782 | return changeid |
|
1783 | 1783 | |
|
1784 | 1784 | # dealing with multiple revisions |
|
1785 | 1785 | if isinstance(changeid, slice): |
|
1786 | 1786 | # wdirrev isn't contiguous so the slice shouldn't include it |
|
1787 | 1787 | return [ |
|
1788 | 1788 | self[i] |
|
1789 | 1789 | for i in pycompat.xrange(*changeid.indices(len(self))) |
|
1790 | 1790 | if i not in self.changelog.filteredrevs |
|
1791 | 1791 | ] |
|
1792 | 1792 | |
|
1793 | 1793 | # dealing with some special values |
|
1794 | 1794 | quick_access = self._quick_access_changeid.get(changeid) |
|
1795 | 1795 | if quick_access is not None: |
|
1796 | 1796 | rev, node = quick_access |
|
1797 | 1797 | return context.changectx(self, rev, node, maybe_filtered=False) |
|
1798 | 1798 | if changeid == b'tip': |
|
1799 | 1799 | node = self.changelog.tip() |
|
1800 | 1800 | rev = self.changelog.rev(node) |
|
1801 | 1801 | return context.changectx(self, rev, node) |
|
1802 | 1802 | |
|
1803 | 1803 | # dealing with arbitrary values |
|
1804 | 1804 | try: |
|
1805 | 1805 | if isinstance(changeid, int): |
|
1806 | 1806 | node = self.changelog.node(changeid) |
|
1807 | 1807 | rev = changeid |
|
1808 | 1808 | elif changeid == b'.': |
|
1809 | 1809 | # this is a hack to delay/avoid loading obsmarkers |
|
1810 | 1810 | # when we know that '.' won't be hidden |
|
1811 | 1811 | node = self.dirstate.p1() |
|
1812 | 1812 | rev = self.unfiltered().changelog.rev(node) |
|
1813 | 1813 | elif len(changeid) == 20: |
|
1814 | 1814 | try: |
|
1815 | 1815 | node = changeid |
|
1816 | 1816 | rev = self.changelog.rev(changeid) |
|
1817 | 1817 | except error.FilteredLookupError: |
|
1818 | 1818 | changeid = hex(changeid) # for the error message |
|
1819 | 1819 | raise |
|
1820 | 1820 | except LookupError: |
|
1821 | 1821 | # check if it might have come from damaged dirstate |
|
1822 | 1822 | # |
|
1823 | 1823 | # XXX we could avoid the unfiltered if we had a recognizable |
|
1824 | 1824 | # exception for filtered changeset access |
|
1825 | 1825 | if ( |
|
1826 | 1826 | self.local() |
|
1827 | 1827 | and changeid in self.unfiltered().dirstate.parents() |
|
1828 | 1828 | ): |
|
1829 | 1829 | msg = _(b"working directory has unknown parent '%s'!") |
|
1830 | 1830 | raise error.Abort(msg % short(changeid)) |
|
1831 | 1831 | changeid = hex(changeid) # for the error message |
|
1832 | 1832 | raise |
|
1833 | 1833 | |
|
1834 | 1834 | elif len(changeid) == 40: |
|
1835 | 1835 | node = bin(changeid) |
|
1836 | 1836 | rev = self.changelog.rev(node) |
|
1837 | 1837 | else: |
|
1838 | 1838 | raise error.ProgrammingError( |
|
1839 | 1839 | b"unsupported changeid '%s' of type %s" |
|
1840 | 1840 | % (changeid, pycompat.bytestr(type(changeid))) |
|
1841 | 1841 | ) |
|
1842 | 1842 | |
|
1843 | 1843 | return context.changectx(self, rev, node) |
|
1844 | 1844 | |
|
1845 | 1845 | except (error.FilteredIndexError, error.FilteredLookupError): |
|
1846 | 1846 | raise error.FilteredRepoLookupError( |
|
1847 | 1847 | _(b"filtered revision '%s'") % pycompat.bytestr(changeid) |
|
1848 | 1848 | ) |
|
1849 | 1849 | except (IndexError, LookupError): |
|
1850 | 1850 | raise error.RepoLookupError( |
|
1851 | 1851 | _(b"unknown revision '%s'") % pycompat.bytestr(changeid) |
|
1852 | 1852 | ) |
|
1853 | 1853 | except error.WdirUnsupported: |
|
1854 | 1854 | return context.workingctx(self) |
|
1855 | 1855 | |
|
1856 | 1856 | def __contains__(self, changeid): |
|
1857 | 1857 | """True if the given changeid exists""" |
|
1858 | 1858 | try: |
|
1859 | 1859 | self[changeid] |
|
1860 | 1860 | return True |
|
1861 | 1861 | except error.RepoLookupError: |
|
1862 | 1862 | return False |
|
1863 | 1863 | |
|
1864 | 1864 | def __nonzero__(self): |
|
1865 | 1865 | return True |
|
1866 | 1866 | |
|
1867 | 1867 | __bool__ = __nonzero__ |
|
1868 | 1868 | |
|
1869 | 1869 | def __len__(self): |
|
1870 | 1870 | # no need to pay the cost of repoview.changelog |
|
1871 | 1871 | unfi = self.unfiltered() |
|
1872 | 1872 | return len(unfi.changelog) |
|
1873 | 1873 | |
|
1874 | 1874 | def __iter__(self): |
|
1875 | 1875 | return iter(self.changelog) |
|
1876 | 1876 | |
|
1877 | 1877 | def revs(self, expr, *args): |
|
1878 | 1878 | """Find revisions matching a revset. |
|
1879 | 1879 | |
|
1880 | 1880 | The revset is specified as a string ``expr`` that may contain |
|
1881 | 1881 | %-formatting to escape certain types. See ``revsetlang.formatspec``. |
|
1882 | 1882 | |
|
1883 | 1883 | Revset aliases from the configuration are not expanded. To expand |
|
1884 | 1884 | user aliases, consider calling ``scmutil.revrange()`` or |
|
1885 | 1885 | ``repo.anyrevs([expr], user=True)``. |
|
1886 | 1886 | |
|
1887 | 1887 | Returns a smartset.abstractsmartset, which is a list-like interface |
|
1888 | 1888 | that contains integer revisions. |
|
1889 | 1889 | """ |
|
1890 | 1890 | tree = revsetlang.spectree(expr, *args) |
|
1891 | 1891 | return revset.makematcher(tree)(self) |
|
1892 | 1892 | |
|
1893 | 1893 | def set(self, expr, *args): |
|
1894 | 1894 | """Find revisions matching a revset and emit changectx instances. |
|
1895 | 1895 | |
|
1896 | 1896 | This is a convenience wrapper around ``revs()`` that iterates the |
|
1897 | 1897 | result and is a generator of changectx instances. |
|
1898 | 1898 | |
|
1899 | 1899 | Revset aliases from the configuration are not expanded. To expand |
|
1900 | 1900 | user aliases, consider calling ``scmutil.revrange()``. |
|
1901 | 1901 | """ |
|
1902 | 1902 | for r in self.revs(expr, *args): |
|
1903 | 1903 | yield self[r] |
|
1904 | 1904 | |
|
1905 | 1905 | def anyrevs(self, specs, user=False, localalias=None): |
|
1906 | 1906 | """Find revisions matching one of the given revsets. |
|
1907 | 1907 | |
|
1908 | 1908 | Revset aliases from the configuration are not expanded by default. To |
|
1909 | 1909 | expand user aliases, specify ``user=True``. To provide some local |
|
1910 | 1910 | definitions overriding user aliases, set ``localalias`` to |
|
1911 | 1911 | ``{name: definitionstring}``. |
|
1912 | 1912 | """ |
|
1913 | 1913 | if specs == [b'null']: |
|
1914 | 1914 | return revset.baseset([nullrev]) |
|
1915 | 1915 | if specs == [b'.']: |
|
1916 | 1916 | quick_data = self._quick_access_changeid.get(b'.') |
|
1917 | 1917 | if quick_data is not None: |
|
1918 | 1918 | return revset.baseset([quick_data[0]]) |
|
1919 | 1919 | if user: |
|
1920 | 1920 | m = revset.matchany( |
|
1921 | 1921 | self.ui, |
|
1922 | 1922 | specs, |
|
1923 | 1923 | lookup=revset.lookupfn(self), |
|
1924 | 1924 | localalias=localalias, |
|
1925 | 1925 | ) |
|
1926 | 1926 | else: |
|
1927 | 1927 | m = revset.matchany(None, specs, localalias=localalias) |
|
1928 | 1928 | return m(self) |
|
1929 | 1929 | |
|
1930 | 1930 | def url(self): |
|
1931 | 1931 | return b'file:' + self.root |
|
1932 | 1932 | |
|
1933 | 1933 | def hook(self, name, throw=False, **args): |
|
1934 | 1934 | """Call a hook, passing this repo instance. |
|
1935 | 1935 | |
|
1936 | 1936 | This a convenience method to aid invoking hooks. Extensions likely |
|
1937 | 1937 | won't call this unless they have registered a custom hook or are |
|
1938 | 1938 | replacing code that is expected to call a hook. |
|
1939 | 1939 | """ |
|
1940 | 1940 | return hook.hook(self.ui, self, name, throw, **args) |
|
1941 | 1941 | |
|
1942 | 1942 | @filteredpropertycache |
|
1943 | 1943 | def _tagscache(self): |
|
1944 | 1944 | """Returns a tagscache object that contains various tags related |
|
1945 | 1945 | caches.""" |
|
1946 | 1946 | |
|
1947 | 1947 | # This simplifies its cache management by having one decorated |
|
1948 | 1948 | # function (this one) and the rest simply fetch things from it. |
|
1949 | 1949 | class tagscache(object): |
|
1950 | 1950 | def __init__(self): |
|
1951 | 1951 | # These two define the set of tags for this repository. tags |
|
1952 | 1952 | # maps tag name to node; tagtypes maps tag name to 'global' or |
|
1953 | 1953 | # 'local'. (Global tags are defined by .hgtags across all |
|
1954 | 1954 | # heads, and local tags are defined in .hg/localtags.) |
|
1955 | 1955 | # They constitute the in-memory cache of tags. |
|
1956 | 1956 | self.tags = self.tagtypes = None |
|
1957 | 1957 | |
|
1958 | 1958 | self.nodetagscache = self.tagslist = None |
|
1959 | 1959 | |
|
1960 | 1960 | cache = tagscache() |
|
1961 | 1961 | cache.tags, cache.tagtypes = self._findtags() |
|
1962 | 1962 | |
|
1963 | 1963 | return cache |
|
1964 | 1964 | |
|
1965 | 1965 | def tags(self): |
|
1966 | 1966 | '''return a mapping of tag to node''' |
|
1967 | 1967 | t = {} |
|
1968 | 1968 | if self.changelog.filteredrevs: |
|
1969 | 1969 | tags, tt = self._findtags() |
|
1970 | 1970 | else: |
|
1971 | 1971 | tags = self._tagscache.tags |
|
1972 | 1972 | rev = self.changelog.rev |
|
1973 | 1973 | for k, v in pycompat.iteritems(tags): |
|
1974 | 1974 | try: |
|
1975 | 1975 | # ignore tags to unknown nodes |
|
1976 | 1976 | rev(v) |
|
1977 | 1977 | t[k] = v |
|
1978 | 1978 | except (error.LookupError, ValueError): |
|
1979 | 1979 | pass |
|
1980 | 1980 | return t |
|
1981 | 1981 | |
|
1982 | 1982 | def _findtags(self): |
|
1983 | 1983 | """Do the hard work of finding tags. Return a pair of dicts |
|
1984 | 1984 | (tags, tagtypes) where tags maps tag name to node, and tagtypes |
|
1985 | 1985 | maps tag name to a string like \'global\' or \'local\'. |
|
1986 | 1986 | Subclasses or extensions are free to add their own tags, but |
|
1987 | 1987 | should be aware that the returned dicts will be retained for the |
|
1988 | 1988 | duration of the localrepo object.""" |
|
1989 | 1989 | |
|
1990 | 1990 | # XXX what tagtype should subclasses/extensions use? Currently |
|
1991 | 1991 | # mq and bookmarks add tags, but do not set the tagtype at all. |
|
1992 | 1992 | # Should each extension invent its own tag type? Should there |
|
1993 | 1993 | # be one tagtype for all such "virtual" tags? Or is the status |
|
1994 | 1994 | # quo fine? |
|
1995 | 1995 | |
|
1996 | 1996 | # map tag name to (node, hist) |
|
1997 | 1997 | alltags = tagsmod.findglobaltags(self.ui, self) |
|
1998 | 1998 | # map tag name to tag type |
|
1999 | 1999 | tagtypes = {tag: b'global' for tag in alltags} |
|
2000 | 2000 | |
|
2001 | 2001 | tagsmod.readlocaltags(self.ui, self, alltags, tagtypes) |
|
2002 | 2002 | |
|
2003 | 2003 | # Build the return dicts. Have to re-encode tag names because |
|
2004 | 2004 | # the tags module always uses UTF-8 (in order not to lose info |
|
2005 | 2005 | # writing to the cache), but the rest of Mercurial wants them in |
|
2006 | 2006 | # local encoding. |
|
2007 | 2007 | tags = {} |
|
2008 | 2008 | for (name, (node, hist)) in pycompat.iteritems(alltags): |
|
2009 | 2009 | if node != nullid: |
|
2010 | 2010 | tags[encoding.tolocal(name)] = node |
|
2011 | 2011 | tags[b'tip'] = self.changelog.tip() |
|
2012 | 2012 | tagtypes = { |
|
2013 | 2013 | encoding.tolocal(name): value |
|
2014 | 2014 | for (name, value) in pycompat.iteritems(tagtypes) |
|
2015 | 2015 | } |
|
2016 | 2016 | return (tags, tagtypes) |
|
2017 | 2017 | |
|
2018 | 2018 | def tagtype(self, tagname): |
|
2019 | 2019 | """ |
|
2020 | 2020 | return the type of the given tag. result can be: |
|
2021 | 2021 | |
|
2022 | 2022 | 'local' : a local tag |
|
2023 | 2023 | 'global' : a global tag |
|
2024 | 2024 | None : tag does not exist |
|
2025 | 2025 | """ |
|
2026 | 2026 | |
|
2027 | 2027 | return self._tagscache.tagtypes.get(tagname) |
|
2028 | 2028 | |
|
2029 | 2029 | def tagslist(self): |
|
2030 | 2030 | '''return a list of tags ordered by revision''' |
|
2031 | 2031 | if not self._tagscache.tagslist: |
|
2032 | 2032 | l = [] |
|
2033 | 2033 | for t, n in pycompat.iteritems(self.tags()): |
|
2034 | 2034 | l.append((self.changelog.rev(n), t, n)) |
|
2035 | 2035 | self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)] |
|
2036 | 2036 | |
|
2037 | 2037 | return self._tagscache.tagslist |
|
2038 | 2038 | |
|
2039 | 2039 | def nodetags(self, node): |
|
2040 | 2040 | '''return the tags associated with a node''' |
|
2041 | 2041 | if not self._tagscache.nodetagscache: |
|
2042 | 2042 | nodetagscache = {} |
|
2043 | 2043 | for t, n in pycompat.iteritems(self._tagscache.tags): |
|
2044 | 2044 | nodetagscache.setdefault(n, []).append(t) |
|
2045 | 2045 | for tags in pycompat.itervalues(nodetagscache): |
|
2046 | 2046 | tags.sort() |
|
2047 | 2047 | self._tagscache.nodetagscache = nodetagscache |
|
2048 | 2048 | return self._tagscache.nodetagscache.get(node, []) |
|
2049 | 2049 | |
|
2050 | 2050 | def nodebookmarks(self, node): |
|
2051 | 2051 | """return the list of bookmarks pointing to the specified node""" |
|
2052 | 2052 | return self._bookmarks.names(node) |
|
2053 | 2053 | |
|
2054 | 2054 | def branchmap(self): |
|
2055 | 2055 | """returns a dictionary {branch: [branchheads]} with branchheads |
|
2056 | 2056 | ordered by increasing revision number""" |
|
2057 | 2057 | return self._branchcaches[self] |
|
2058 | 2058 | |
|
2059 | 2059 | @unfilteredmethod |
|
2060 | 2060 | def revbranchcache(self): |
|
2061 | 2061 | if not self._revbranchcache: |
|
2062 | 2062 | self._revbranchcache = branchmap.revbranchcache(self.unfiltered()) |
|
2063 | 2063 | return self._revbranchcache |
|
2064 | 2064 | |
|
2065 | 2065 | def branchtip(self, branch, ignoremissing=False): |
|
2066 | 2066 | """return the tip node for a given branch |
|
2067 | 2067 | |
|
2068 | 2068 | If ignoremissing is True, then this method will not raise an error. |
|
2069 | 2069 | This is helpful for callers that only expect None for a missing branch |
|
2070 | 2070 | (e.g. namespace). |
|
2071 | 2071 | |
|
2072 | 2072 | """ |
|
2073 | 2073 | try: |
|
2074 | 2074 | return self.branchmap().branchtip(branch) |
|
2075 | 2075 | except KeyError: |
|
2076 | 2076 | if not ignoremissing: |
|
2077 | 2077 | raise error.RepoLookupError(_(b"unknown branch '%s'") % branch) |
|
2078 | 2078 | else: |
|
2079 | 2079 | pass |
|
2080 | 2080 | |
|
2081 | 2081 | def lookup(self, key): |
|
2082 | 2082 | node = scmutil.revsymbol(self, key).node() |
|
2083 | 2083 | if node is None: |
|
2084 | 2084 | raise error.RepoLookupError(_(b"unknown revision '%s'") % key) |
|
2085 | 2085 | return node |
|
2086 | 2086 | |
|
2087 | 2087 | def lookupbranch(self, key): |
|
2088 | 2088 | if self.branchmap().hasbranch(key): |
|
2089 | 2089 | return key |
|
2090 | 2090 | |
|
2091 | 2091 | return scmutil.revsymbol(self, key).branch() |
|
2092 | 2092 | |
|
2093 | 2093 | def known(self, nodes): |
|
2094 | 2094 | cl = self.changelog |
|
2095 | 2095 | get_rev = cl.index.get_rev |
|
2096 | 2096 | filtered = cl.filteredrevs |
|
2097 | 2097 | result = [] |
|
2098 | 2098 | for n in nodes: |
|
2099 | 2099 | r = get_rev(n) |
|
2100 | 2100 | resp = not (r is None or r in filtered) |
|
2101 | 2101 | result.append(resp) |
|
2102 | 2102 | return result |
|
2103 | 2103 | |
|
2104 | 2104 | def local(self): |
|
2105 | 2105 | return self |
|
2106 | 2106 | |
|
2107 | 2107 | def publishing(self): |
|
2108 | 2108 | # it's safe (and desirable) to trust the publish flag unconditionally |
|
2109 | 2109 | # so that we don't finalize changes shared between users via ssh or nfs |
|
2110 | 2110 | return self.ui.configbool(b'phases', b'publish', untrusted=True) |
|
2111 | 2111 | |
|
2112 | 2112 | def cancopy(self): |
|
2113 | 2113 | # so statichttprepo's override of local() works |
|
2114 | 2114 | if not self.local(): |
|
2115 | 2115 | return False |
|
2116 | 2116 | if not self.publishing(): |
|
2117 | 2117 | return True |
|
2118 | 2118 | # if publishing we can't copy if there is filtered content |
|
2119 | 2119 | return not self.filtered(b'visible').changelog.filteredrevs |
|
2120 | 2120 | |
|
2121 | 2121 | def shared(self): |
|
2122 | 2122 | '''the type of shared repository (None if not shared)''' |
|
2123 | 2123 | if self.sharedpath != self.path: |
|
2124 | 2124 | return b'store' |
|
2125 | 2125 | return None |
|
2126 | 2126 | |
|
2127 | 2127 | def wjoin(self, f, *insidef): |
|
2128 | 2128 | return self.vfs.reljoin(self.root, f, *insidef) |
|
2129 | 2129 | |
|
2130 | 2130 | def setparents(self, p1, p2=nullid): |
|
2131 | 2131 | self[None].setparents(p1, p2) |
|
2132 | 2132 | self._quick_access_changeid_invalidate() |
|
2133 | 2133 | |
|
2134 | 2134 | def filectx(self, path, changeid=None, fileid=None, changectx=None): |
|
2135 | 2135 | """changeid must be a changeset revision, if specified. |
|
2136 | 2136 | fileid can be a file revision or node.""" |
|
2137 | 2137 | return context.filectx( |
|
2138 | 2138 | self, path, changeid, fileid, changectx=changectx |
|
2139 | 2139 | ) |
|
2140 | 2140 | |
|
2141 | 2141 | def getcwd(self): |
|
2142 | 2142 | return self.dirstate.getcwd() |
|
2143 | 2143 | |
|
2144 | 2144 | def pathto(self, f, cwd=None): |
|
2145 | 2145 | return self.dirstate.pathto(f, cwd) |
|
2146 | 2146 | |
|
2147 | 2147 | def _loadfilter(self, filter): |
|
2148 | 2148 | if filter not in self._filterpats: |
|
2149 | 2149 | l = [] |
|
2150 | 2150 | for pat, cmd in self.ui.configitems(filter): |
|
2151 | 2151 | if cmd == b'!': |
|
2152 | 2152 | continue |
|
2153 | 2153 | mf = matchmod.match(self.root, b'', [pat]) |
|
2154 | 2154 | fn = None |
|
2155 | 2155 | params = cmd |
|
2156 | 2156 | for name, filterfn in pycompat.iteritems(self._datafilters): |
|
2157 | 2157 | if cmd.startswith(name): |
|
2158 | 2158 | fn = filterfn |
|
2159 | 2159 | params = cmd[len(name) :].lstrip() |
|
2160 | 2160 | break |
|
2161 | 2161 | if not fn: |
|
2162 | 2162 | fn = lambda s, c, **kwargs: procutil.filter(s, c) |
|
2163 | 2163 | fn.__name__ = 'commandfilter' |
|
2164 | 2164 | # Wrap old filters not supporting keyword arguments |
|
2165 | 2165 | if not pycompat.getargspec(fn)[2]: |
|
2166 | 2166 | oldfn = fn |
|
2167 | 2167 | fn = lambda s, c, oldfn=oldfn, **kwargs: oldfn(s, c) |
|
2168 | 2168 | fn.__name__ = 'compat-' + oldfn.__name__ |
|
2169 | 2169 | l.append((mf, fn, params)) |
|
2170 | 2170 | self._filterpats[filter] = l |
|
2171 | 2171 | return self._filterpats[filter] |
|
2172 | 2172 | |
|
2173 | 2173 | def _filter(self, filterpats, filename, data): |
|
2174 | 2174 | for mf, fn, cmd in filterpats: |
|
2175 | 2175 | if mf(filename): |
|
2176 | 2176 | self.ui.debug( |
|
2177 | 2177 | b"filtering %s through %s\n" |
|
2178 | 2178 | % (filename, cmd or pycompat.sysbytes(fn.__name__)) |
|
2179 | 2179 | ) |
|
2180 | 2180 | data = fn(data, cmd, ui=self.ui, repo=self, filename=filename) |
|
2181 | 2181 | break |
|
2182 | 2182 | |
|
2183 | 2183 | return data |
|
2184 | 2184 | |
|
2185 | 2185 | @unfilteredpropertycache |
|
2186 | 2186 | def _encodefilterpats(self): |
|
2187 | 2187 | return self._loadfilter(b'encode') |
|
2188 | 2188 | |
|
2189 | 2189 | @unfilteredpropertycache |
|
2190 | 2190 | def _decodefilterpats(self): |
|
2191 | 2191 | return self._loadfilter(b'decode') |
|
2192 | 2192 | |
|
2193 | 2193 | def adddatafilter(self, name, filter): |
|
2194 | 2194 | self._datafilters[name] = filter |
|
2195 | 2195 | |
|
2196 | 2196 | def wread(self, filename): |
|
2197 | 2197 | if self.wvfs.islink(filename): |
|
2198 | 2198 | data = self.wvfs.readlink(filename) |
|
2199 | 2199 | else: |
|
2200 | 2200 | data = self.wvfs.read(filename) |
|
2201 | 2201 | return self._filter(self._encodefilterpats, filename, data) |
|
2202 | 2202 | |
|
2203 | 2203 | def wwrite(self, filename, data, flags, backgroundclose=False, **kwargs): |
|
2204 | 2204 | """write ``data`` into ``filename`` in the working directory |
|
2205 | 2205 | |
|
2206 | 2206 | This returns length of written (maybe decoded) data. |
|
2207 | 2207 | """ |
|
2208 | 2208 | data = self._filter(self._decodefilterpats, filename, data) |
|
2209 | 2209 | if b'l' in flags: |
|
2210 | 2210 | self.wvfs.symlink(data, filename) |
|
2211 | 2211 | else: |
|
2212 | 2212 | self.wvfs.write( |
|
2213 | 2213 | filename, data, backgroundclose=backgroundclose, **kwargs |
|
2214 | 2214 | ) |
|
2215 | 2215 | if b'x' in flags: |
|
2216 | 2216 | self.wvfs.setflags(filename, False, True) |
|
2217 | 2217 | else: |
|
2218 | 2218 | self.wvfs.setflags(filename, False, False) |
|
2219 | 2219 | return len(data) |
|
2220 | 2220 | |
|
2221 | 2221 | def wwritedata(self, filename, data): |
|
2222 | 2222 | return self._filter(self._decodefilterpats, filename, data) |
|
2223 | 2223 | |
|
2224 | 2224 | def currenttransaction(self): |
|
2225 | 2225 | """return the current transaction or None if non exists""" |
|
2226 | 2226 | if self._transref: |
|
2227 | 2227 | tr = self._transref() |
|
2228 | 2228 | else: |
|
2229 | 2229 | tr = None |
|
2230 | 2230 | |
|
2231 | 2231 | if tr and tr.running(): |
|
2232 | 2232 | return tr |
|
2233 | 2233 | return None |
|
2234 | 2234 | |
|
2235 | 2235 | def transaction(self, desc, report=None): |
|
2236 | 2236 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( |
|
2237 | 2237 | b'devel', b'check-locks' |
|
2238 | 2238 | ): |
|
2239 | 2239 | if self._currentlock(self._lockref) is None: |
|
2240 | 2240 | raise error.ProgrammingError(b'transaction requires locking') |
|
2241 | 2241 | tr = self.currenttransaction() |
|
2242 | 2242 | if tr is not None: |
|
2243 | 2243 | return tr.nest(name=desc) |
|
2244 | 2244 | |
|
2245 | 2245 | # abort here if the journal already exists |
|
2246 | 2246 | if self.svfs.exists(b"journal"): |
|
2247 | 2247 | raise error.RepoError( |
|
2248 | 2248 | _(b"abandoned transaction found"), |
|
2249 | 2249 | hint=_(b"run 'hg recover' to clean up transaction"), |
|
2250 | 2250 | ) |
|
2251 | 2251 | |
|
2252 | 2252 | idbase = b"%.40f#%f" % (random.random(), time.time()) |
|
2253 | 2253 | ha = hex(hashutil.sha1(idbase).digest()) |
|
2254 | 2254 | txnid = b'TXN:' + ha |
|
2255 | 2255 | self.hook(b'pretxnopen', throw=True, txnname=desc, txnid=txnid) |
|
2256 | 2256 | |
|
2257 | 2257 | self._writejournal(desc) |
|
2258 | 2258 | renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()] |
|
2259 | 2259 | if report: |
|
2260 | 2260 | rp = report |
|
2261 | 2261 | else: |
|
2262 | 2262 | rp = self.ui.warn |
|
2263 | 2263 | vfsmap = {b'plain': self.vfs, b'store': self.svfs} # root of .hg/ |
|
2264 | 2264 | # we must avoid cyclic reference between repo and transaction. |
|
2265 | 2265 | reporef = weakref.ref(self) |
|
2266 | 2266 | # Code to track tag movement |
|
2267 | 2267 | # |
|
2268 | 2268 | # Since tags are all handled as file content, it is actually quite hard |
|
2269 | 2269 | # to track these movement from a code perspective. So we fallback to a |
|
2270 | 2270 | # tracking at the repository level. One could envision to track changes |
|
2271 | 2271 | # to the '.hgtags' file through changegroup apply but that fails to |
|
2272 | 2272 | # cope with case where transaction expose new heads without changegroup |
|
2273 | 2273 | # being involved (eg: phase movement). |
|
2274 | 2274 | # |
|
2275 | 2275 | # For now, We gate the feature behind a flag since this likely comes |
|
2276 | 2276 | # with performance impacts. The current code run more often than needed |
|
2277 | 2277 | # and do not use caches as much as it could. The current focus is on |
|
2278 | 2278 | # the behavior of the feature so we disable it by default. The flag |
|
2279 | 2279 | # will be removed when we are happy with the performance impact. |
|
2280 | 2280 | # |
|
2281 | 2281 | # Once this feature is no longer experimental move the following |
|
2282 | 2282 | # documentation to the appropriate help section: |
|
2283 | 2283 | # |
|
2284 | 2284 | # The ``HG_TAG_MOVED`` variable will be set if the transaction touched |
|
2285 | 2285 | # tags (new or changed or deleted tags). In addition the details of |
|
2286 | 2286 | # these changes are made available in a file at: |
|
2287 | 2287 | # ``REPOROOT/.hg/changes/tags.changes``. |
|
2288 | 2288 | # Make sure you check for HG_TAG_MOVED before reading that file as it |
|
2289 | 2289 | # might exist from a previous transaction even if no tag were touched |
|
2290 | 2290 | # in this one. Changes are recorded in a line base format:: |
|
2291 | 2291 | # |
|
2292 | 2292 | # <action> <hex-node> <tag-name>\n |
|
2293 | 2293 | # |
|
2294 | 2294 | # Actions are defined as follow: |
|
2295 | 2295 | # "-R": tag is removed, |
|
2296 | 2296 | # "+A": tag is added, |
|
2297 | 2297 | # "-M": tag is moved (old value), |
|
2298 | 2298 | # "+M": tag is moved (new value), |
|
2299 | 2299 | tracktags = lambda x: None |
|
2300 | 2300 | # experimental config: experimental.hook-track-tags |
|
2301 | 2301 | shouldtracktags = self.ui.configbool( |
|
2302 | 2302 | b'experimental', b'hook-track-tags' |
|
2303 | 2303 | ) |
|
2304 | 2304 | if desc != b'strip' and shouldtracktags: |
|
2305 | 2305 | oldheads = self.changelog.headrevs() |
|
2306 | 2306 | |
|
2307 | 2307 | def tracktags(tr2): |
|
2308 | 2308 | repo = reporef() |
|
2309 | 2309 | oldfnodes = tagsmod.fnoderevs(repo.ui, repo, oldheads) |
|
2310 | 2310 | newheads = repo.changelog.headrevs() |
|
2311 | 2311 | newfnodes = tagsmod.fnoderevs(repo.ui, repo, newheads) |
|
2312 | 2312 | # notes: we compare lists here. |
|
2313 | 2313 | # As we do it only once buiding set would not be cheaper |
|
2314 | 2314 | changes = tagsmod.difftags(repo.ui, repo, oldfnodes, newfnodes) |
|
2315 | 2315 | if changes: |
|
2316 | 2316 | tr2.hookargs[b'tag_moved'] = b'1' |
|
2317 | 2317 | with repo.vfs( |
|
2318 | 2318 | b'changes/tags.changes', b'w', atomictemp=True |
|
2319 | 2319 | ) as changesfile: |
|
2320 | 2320 | # note: we do not register the file to the transaction |
|
2321 | 2321 | # because we needs it to still exist on the transaction |
|
2322 | 2322 | # is close (for txnclose hooks) |
|
2323 | 2323 | tagsmod.writediff(changesfile, changes) |
|
2324 | 2324 | |
|
2325 | 2325 | def validate(tr2): |
|
2326 | 2326 | """will run pre-closing hooks""" |
|
2327 | 2327 | # XXX the transaction API is a bit lacking here so we take a hacky |
|
2328 | 2328 | # path for now |
|
2329 | 2329 | # |
|
2330 | 2330 | # We cannot add this as a "pending" hooks since the 'tr.hookargs' |
|
2331 | 2331 | # dict is copied before these run. In addition we needs the data |
|
2332 | 2332 | # available to in memory hooks too. |
|
2333 | 2333 | # |
|
2334 | 2334 | # Moreover, we also need to make sure this runs before txnclose |
|
2335 | 2335 | # hooks and there is no "pending" mechanism that would execute |
|
2336 | 2336 | # logic only if hooks are about to run. |
|
2337 | 2337 | # |
|
2338 | 2338 | # Fixing this limitation of the transaction is also needed to track |
|
2339 | 2339 | # other families of changes (bookmarks, phases, obsolescence). |
|
2340 | 2340 | # |
|
2341 | 2341 | # This will have to be fixed before we remove the experimental |
|
2342 | 2342 | # gating. |
|
2343 | 2343 | tracktags(tr2) |
|
2344 | 2344 | repo = reporef() |
|
2345 | 2345 | |
|
2346 | 2346 | singleheadopt = (b'experimental', b'single-head-per-branch') |
|
2347 | 2347 | singlehead = repo.ui.configbool(*singleheadopt) |
|
2348 | 2348 | if singlehead: |
|
2349 | 2349 | singleheadsub = repo.ui.configsuboptions(*singleheadopt)[1] |
|
2350 | 2350 | accountclosed = singleheadsub.get( |
|
2351 | 2351 | b"account-closed-heads", False |
|
2352 | 2352 | ) |
|
2353 | 2353 | if singleheadsub.get(b"public-changes-only", False): |
|
2354 | 2354 | filtername = b"immutable" |
|
2355 | 2355 | else: |
|
2356 | 2356 | filtername = b"visible" |
|
2357 | 2357 | scmutil.enforcesinglehead( |
|
2358 | 2358 | repo, tr2, desc, accountclosed, filtername |
|
2359 | 2359 | ) |
|
2360 | 2360 | if hook.hashook(repo.ui, b'pretxnclose-bookmark'): |
|
2361 | 2361 | for name, (old, new) in sorted( |
|
2362 | 2362 | tr.changes[b'bookmarks'].items() |
|
2363 | 2363 | ): |
|
2364 | 2364 | args = tr.hookargs.copy() |
|
2365 | 2365 | args.update(bookmarks.preparehookargs(name, old, new)) |
|
2366 | 2366 | repo.hook( |
|
2367 | 2367 | b'pretxnclose-bookmark', |
|
2368 | 2368 | throw=True, |
|
2369 | 2369 | **pycompat.strkwargs(args) |
|
2370 | 2370 | ) |
|
2371 | 2371 | if hook.hashook(repo.ui, b'pretxnclose-phase'): |
|
2372 | 2372 | cl = repo.unfiltered().changelog |
|
2373 | 2373 | for revs, (old, new) in tr.changes[b'phases']: |
|
2374 | 2374 | for rev in revs: |
|
2375 | 2375 | args = tr.hookargs.copy() |
|
2376 | 2376 | node = hex(cl.node(rev)) |
|
2377 | 2377 | args.update(phases.preparehookargs(node, old, new)) |
|
2378 | 2378 | repo.hook( |
|
2379 | 2379 | b'pretxnclose-phase', |
|
2380 | 2380 | throw=True, |
|
2381 | 2381 | **pycompat.strkwargs(args) |
|
2382 | 2382 | ) |
|
2383 | 2383 | |
|
2384 | 2384 | repo.hook( |
|
2385 | 2385 | b'pretxnclose', throw=True, **pycompat.strkwargs(tr.hookargs) |
|
2386 | 2386 | ) |
|
2387 | 2387 | |
|
2388 | 2388 | def releasefn(tr, success): |
|
2389 | 2389 | repo = reporef() |
|
2390 | 2390 | if repo is None: |
|
2391 | 2391 | # If the repo has been GC'd (and this release function is being |
|
2392 | 2392 | # called from transaction.__del__), there's not much we can do, |
|
2393 | 2393 | # so just leave the unfinished transaction there and let the |
|
2394 | 2394 | # user run `hg recover`. |
|
2395 | 2395 | return |
|
2396 | 2396 | if success: |
|
2397 | 2397 | # this should be explicitly invoked here, because |
|
2398 | 2398 | # in-memory changes aren't written out at closing |
|
2399 | 2399 | # transaction, if tr.addfilegenerator (via |
|
2400 | 2400 | # dirstate.write or so) isn't invoked while |
|
2401 | 2401 | # transaction running |
|
2402 | 2402 | repo.dirstate.write(None) |
|
2403 | 2403 | else: |
|
2404 | 2404 | # discard all changes (including ones already written |
|
2405 | 2405 | # out) in this transaction |
|
2406 | 2406 | narrowspec.restorebackup(self, b'journal.narrowspec') |
|
2407 | 2407 | narrowspec.restorewcbackup(self, b'journal.narrowspec.dirstate') |
|
2408 | 2408 | repo.dirstate.restorebackup(None, b'journal.dirstate') |
|
2409 | 2409 | |
|
2410 | 2410 | repo.invalidate(clearfilecache=True) |
|
2411 | 2411 | |
|
2412 | 2412 | tr = transaction.transaction( |
|
2413 | 2413 | rp, |
|
2414 | 2414 | self.svfs, |
|
2415 | 2415 | vfsmap, |
|
2416 | 2416 | b"journal", |
|
2417 | 2417 | b"undo", |
|
2418 | 2418 | aftertrans(renames), |
|
2419 | 2419 | self.store.createmode, |
|
2420 | 2420 | validator=validate, |
|
2421 | 2421 | releasefn=releasefn, |
|
2422 | 2422 | checkambigfiles=_cachedfiles, |
|
2423 | 2423 | name=desc, |
|
2424 | 2424 | ) |
|
2425 | 2425 | tr.changes[b'origrepolen'] = len(self) |
|
2426 | 2426 | tr.changes[b'obsmarkers'] = set() |
|
2427 | 2427 | tr.changes[b'phases'] = [] |
|
2428 | 2428 | tr.changes[b'bookmarks'] = {} |
|
2429 | 2429 | |
|
2430 | 2430 | tr.hookargs[b'txnid'] = txnid |
|
2431 | 2431 | tr.hookargs[b'txnname'] = desc |
|
2432 | 2432 | tr.hookargs[b'changes'] = tr.changes |
|
2433 | 2433 | # note: writing the fncache only during finalize mean that the file is |
|
2434 | 2434 | # outdated when running hooks. As fncache is used for streaming clone, |
|
2435 | 2435 | # this is not expected to break anything that happen during the hooks. |
|
2436 | 2436 | tr.addfinalize(b'flush-fncache', self.store.write) |
|
2437 | 2437 | |
|
2438 | 2438 | def txnclosehook(tr2): |
|
2439 | 2439 | """To be run if transaction is successful, will schedule a hook run""" |
|
2440 | 2440 | # Don't reference tr2 in hook() so we don't hold a reference. |
|
2441 | 2441 | # This reduces memory consumption when there are multiple |
|
2442 | 2442 | # transactions per lock. This can likely go away if issue5045 |
|
2443 | 2443 | # fixes the function accumulation. |
|
2444 | 2444 | hookargs = tr2.hookargs |
|
2445 | 2445 | |
|
2446 | 2446 | def hookfunc(unused_success): |
|
2447 | 2447 | repo = reporef() |
|
2448 | 2448 | if hook.hashook(repo.ui, b'txnclose-bookmark'): |
|
2449 | 2449 | bmchanges = sorted(tr.changes[b'bookmarks'].items()) |
|
2450 | 2450 | for name, (old, new) in bmchanges: |
|
2451 | 2451 | args = tr.hookargs.copy() |
|
2452 | 2452 | args.update(bookmarks.preparehookargs(name, old, new)) |
|
2453 | 2453 | repo.hook( |
|
2454 | 2454 | b'txnclose-bookmark', |
|
2455 | 2455 | throw=False, |
|
2456 | 2456 | **pycompat.strkwargs(args) |
|
2457 | 2457 | ) |
|
2458 | 2458 | |
|
2459 | 2459 | if hook.hashook(repo.ui, b'txnclose-phase'): |
|
2460 | 2460 | cl = repo.unfiltered().changelog |
|
2461 | 2461 | phasemv = sorted( |
|
2462 | 2462 | tr.changes[b'phases'], key=lambda r: r[0][0] |
|
2463 | 2463 | ) |
|
2464 | 2464 | for revs, (old, new) in phasemv: |
|
2465 | 2465 | for rev in revs: |
|
2466 | 2466 | args = tr.hookargs.copy() |
|
2467 | 2467 | node = hex(cl.node(rev)) |
|
2468 | 2468 | args.update(phases.preparehookargs(node, old, new)) |
|
2469 | 2469 | repo.hook( |
|
2470 | 2470 | b'txnclose-phase', |
|
2471 | 2471 | throw=False, |
|
2472 | 2472 | **pycompat.strkwargs(args) |
|
2473 | 2473 | ) |
|
2474 | 2474 | |
|
2475 | 2475 | repo.hook( |
|
2476 | 2476 | b'txnclose', throw=False, **pycompat.strkwargs(hookargs) |
|
2477 | 2477 | ) |
|
2478 | 2478 | |
|
2479 | 2479 | reporef()._afterlock(hookfunc) |
|
2480 | 2480 | |
|
2481 | 2481 | tr.addfinalize(b'txnclose-hook', txnclosehook) |
|
2482 | 2482 | # Include a leading "-" to make it happen before the transaction summary |
|
2483 | 2483 | # reports registered via scmutil.registersummarycallback() whose names |
|
2484 | 2484 | # are 00-txnreport etc. That way, the caches will be warm when the |
|
2485 | 2485 | # callbacks run. |
|
2486 | 2486 | tr.addpostclose(b'-warm-cache', self._buildcacheupdater(tr)) |
|
2487 | 2487 | |
|
2488 | 2488 | def txnaborthook(tr2): |
|
2489 | 2489 | """To be run if transaction is aborted""" |
|
2490 | 2490 | reporef().hook( |
|
2491 | 2491 | b'txnabort', throw=False, **pycompat.strkwargs(tr2.hookargs) |
|
2492 | 2492 | ) |
|
2493 | 2493 | |
|
2494 | 2494 | tr.addabort(b'txnabort-hook', txnaborthook) |
|
2495 | 2495 | # avoid eager cache invalidation. in-memory data should be identical |
|
2496 | 2496 | # to stored data if transaction has no error. |
|
2497 | 2497 | tr.addpostclose(b'refresh-filecachestats', self._refreshfilecachestats) |
|
2498 | 2498 | self._transref = weakref.ref(tr) |
|
2499 | 2499 | scmutil.registersummarycallback(self, tr, desc) |
|
2500 | 2500 | return tr |
|
2501 | 2501 | |
|
2502 | 2502 | def _journalfiles(self): |
|
2503 | 2503 | return ( |
|
2504 | 2504 | (self.svfs, b'journal'), |
|
2505 | 2505 | (self.svfs, b'journal.narrowspec'), |
|
2506 | 2506 | (self.vfs, b'journal.narrowspec.dirstate'), |
|
2507 | 2507 | (self.vfs, b'journal.dirstate'), |
|
2508 | 2508 | (self.vfs, b'journal.branch'), |
|
2509 | 2509 | (self.vfs, b'journal.desc'), |
|
2510 | 2510 | (bookmarks.bookmarksvfs(self), b'journal.bookmarks'), |
|
2511 | 2511 | (self.svfs, b'journal.phaseroots'), |
|
2512 | 2512 | ) |
|
2513 | 2513 | |
|
2514 | 2514 | def undofiles(self): |
|
2515 | 2515 | return [(vfs, undoname(x)) for vfs, x in self._journalfiles()] |
|
2516 | 2516 | |
|
2517 | 2517 | @unfilteredmethod |
|
2518 | 2518 | def _writejournal(self, desc): |
|
2519 | 2519 | self.dirstate.savebackup(None, b'journal.dirstate') |
|
2520 | 2520 | narrowspec.savewcbackup(self, b'journal.narrowspec.dirstate') |
|
2521 | 2521 | narrowspec.savebackup(self, b'journal.narrowspec') |
|
2522 | 2522 | self.vfs.write( |
|
2523 | 2523 | b"journal.branch", encoding.fromlocal(self.dirstate.branch()) |
|
2524 | 2524 | ) |
|
2525 | 2525 | self.vfs.write(b"journal.desc", b"%d\n%s\n" % (len(self), desc)) |
|
2526 | 2526 | bookmarksvfs = bookmarks.bookmarksvfs(self) |
|
2527 | 2527 | bookmarksvfs.write( |
|
2528 | 2528 | b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks") |
|
2529 | 2529 | ) |
|
2530 | 2530 | self.svfs.write(b"journal.phaseroots", self.svfs.tryread(b"phaseroots")) |
|
2531 | 2531 | |
|
2532 | 2532 | def recover(self): |
|
2533 | 2533 | with self.lock(): |
|
2534 | 2534 | if self.svfs.exists(b"journal"): |
|
2535 | 2535 | self.ui.status(_(b"rolling back interrupted transaction\n")) |
|
2536 | 2536 | vfsmap = { |
|
2537 | 2537 | b'': self.svfs, |
|
2538 | 2538 | b'plain': self.vfs, |
|
2539 | 2539 | } |
|
2540 | 2540 | transaction.rollback( |
|
2541 | 2541 | self.svfs, |
|
2542 | 2542 | vfsmap, |
|
2543 | 2543 | b"journal", |
|
2544 | 2544 | self.ui.warn, |
|
2545 | 2545 | checkambigfiles=_cachedfiles, |
|
2546 | 2546 | ) |
|
2547 | 2547 | self.invalidate() |
|
2548 | 2548 | return True |
|
2549 | 2549 | else: |
|
2550 | 2550 | self.ui.warn(_(b"no interrupted transaction available\n")) |
|
2551 | 2551 | return False |
|
2552 | 2552 | |
|
2553 | 2553 | def rollback(self, dryrun=False, force=False): |
|
2554 | 2554 | wlock = lock = dsguard = None |
|
2555 | 2555 | try: |
|
2556 | 2556 | wlock = self.wlock() |
|
2557 | 2557 | lock = self.lock() |
|
2558 | 2558 | if self.svfs.exists(b"undo"): |
|
2559 | 2559 | dsguard = dirstateguard.dirstateguard(self, b'rollback') |
|
2560 | 2560 | |
|
2561 | 2561 | return self._rollback(dryrun, force, dsguard) |
|
2562 | 2562 | else: |
|
2563 | 2563 | self.ui.warn(_(b"no rollback information available\n")) |
|
2564 | 2564 | return 1 |
|
2565 | 2565 | finally: |
|
2566 | 2566 | release(dsguard, lock, wlock) |
|
2567 | 2567 | |
|
2568 | 2568 | @unfilteredmethod # Until we get smarter cache management |
|
2569 | 2569 | def _rollback(self, dryrun, force, dsguard): |
|
2570 | 2570 | ui = self.ui |
|
2571 | 2571 | try: |
|
2572 | 2572 | args = self.vfs.read(b'undo.desc').splitlines() |
|
2573 | 2573 | (oldlen, desc, detail) = (int(args[0]), args[1], None) |
|
2574 | 2574 | if len(args) >= 3: |
|
2575 | 2575 | detail = args[2] |
|
2576 | 2576 | oldtip = oldlen - 1 |
|
2577 | 2577 | |
|
2578 | 2578 | if detail and ui.verbose: |
|
2579 | 2579 | msg = _( |
|
2580 | 2580 | b'repository tip rolled back to revision %d' |
|
2581 | 2581 | b' (undo %s: %s)\n' |
|
2582 | 2582 | ) % (oldtip, desc, detail) |
|
2583 | 2583 | else: |
|
2584 | 2584 | msg = _( |
|
2585 | 2585 | b'repository tip rolled back to revision %d (undo %s)\n' |
|
2586 | 2586 | ) % (oldtip, desc) |
|
2587 | 2587 | except IOError: |
|
2588 | 2588 | msg = _(b'rolling back unknown transaction\n') |
|
2589 | 2589 | desc = None |
|
2590 | 2590 | |
|
2591 | 2591 | if not force and self[b'.'] != self[b'tip'] and desc == b'commit': |
|
2592 | 2592 | raise error.Abort( |
|
2593 | 2593 | _( |
|
2594 | 2594 | b'rollback of last commit while not checked out ' |
|
2595 | 2595 | b'may lose data' |
|
2596 | 2596 | ), |
|
2597 | 2597 | hint=_(b'use -f to force'), |
|
2598 | 2598 | ) |
|
2599 | 2599 | |
|
2600 | 2600 | ui.status(msg) |
|
2601 | 2601 | if dryrun: |
|
2602 | 2602 | return 0 |
|
2603 | 2603 | |
|
2604 | 2604 | parents = self.dirstate.parents() |
|
2605 | 2605 | self.destroying() |
|
2606 | 2606 | vfsmap = {b'plain': self.vfs, b'': self.svfs} |
|
2607 | 2607 | transaction.rollback( |
|
2608 | 2608 | self.svfs, vfsmap, b'undo', ui.warn, checkambigfiles=_cachedfiles |
|
2609 | 2609 | ) |
|
2610 | 2610 | bookmarksvfs = bookmarks.bookmarksvfs(self) |
|
2611 | 2611 | if bookmarksvfs.exists(b'undo.bookmarks'): |
|
2612 | 2612 | bookmarksvfs.rename( |
|
2613 | 2613 | b'undo.bookmarks', b'bookmarks', checkambig=True |
|
2614 | 2614 | ) |
|
2615 | 2615 | if self.svfs.exists(b'undo.phaseroots'): |
|
2616 | 2616 | self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True) |
|
2617 | 2617 | self.invalidate() |
|
2618 | 2618 | |
|
2619 | 2619 | has_node = self.changelog.index.has_node |
|
2620 | 2620 | parentgone = any(not has_node(p) for p in parents) |
|
2621 | 2621 | if parentgone: |
|
2622 | 2622 | # prevent dirstateguard from overwriting already restored one |
|
2623 | 2623 | dsguard.close() |
|
2624 | 2624 | |
|
2625 | 2625 | narrowspec.restorebackup(self, b'undo.narrowspec') |
|
2626 | 2626 | narrowspec.restorewcbackup(self, b'undo.narrowspec.dirstate') |
|
2627 | 2627 | self.dirstate.restorebackup(None, b'undo.dirstate') |
|
2628 | 2628 | try: |
|
2629 | 2629 | branch = self.vfs.read(b'undo.branch') |
|
2630 | 2630 | self.dirstate.setbranch(encoding.tolocal(branch)) |
|
2631 | 2631 | except IOError: |
|
2632 | 2632 | ui.warn( |
|
2633 | 2633 | _( |
|
2634 | 2634 | b'named branch could not be reset: ' |
|
2635 | 2635 | b'current branch is still \'%s\'\n' |
|
2636 | 2636 | ) |
|
2637 | 2637 | % self.dirstate.branch() |
|
2638 | 2638 | ) |
|
2639 | 2639 | |
|
2640 | 2640 | parents = tuple([p.rev() for p in self[None].parents()]) |
|
2641 | 2641 | if len(parents) > 1: |
|
2642 | 2642 | ui.status( |
|
2643 | 2643 | _( |
|
2644 | 2644 | b'working directory now based on ' |
|
2645 | 2645 | b'revisions %d and %d\n' |
|
2646 | 2646 | ) |
|
2647 | 2647 | % parents |
|
2648 | 2648 | ) |
|
2649 | 2649 | else: |
|
2650 | 2650 | ui.status( |
|
2651 | 2651 | _(b'working directory now based on revision %d\n') % parents |
|
2652 | 2652 | ) |
|
2653 | 2653 | mergestatemod.mergestate.clean(self) |
|
2654 | 2654 | |
|
2655 | 2655 | # TODO: if we know which new heads may result from this rollback, pass |
|
2656 | 2656 | # them to destroy(), which will prevent the branchhead cache from being |
|
2657 | 2657 | # invalidated. |
|
2658 | 2658 | self.destroyed() |
|
2659 | 2659 | return 0 |
|
2660 | 2660 | |
|
2661 | 2661 | def _buildcacheupdater(self, newtransaction): |
|
2662 | 2662 | """called during transaction to build the callback updating cache |
|
2663 | 2663 | |
|
2664 | 2664 | Lives on the repository to help extension who might want to augment |
|
2665 | 2665 | this logic. For this purpose, the created transaction is passed to the |
|
2666 | 2666 | method. |
|
2667 | 2667 | """ |
|
2668 | 2668 | # we must avoid cyclic reference between repo and transaction. |
|
2669 | 2669 | reporef = weakref.ref(self) |
|
2670 | 2670 | |
|
2671 | 2671 | def updater(tr): |
|
2672 | 2672 | repo = reporef() |
|
2673 | 2673 | repo.updatecaches(tr) |
|
2674 | 2674 | |
|
2675 | 2675 | return updater |
|
2676 | 2676 | |
|
2677 | 2677 | @unfilteredmethod |
|
2678 | 2678 | def updatecaches(self, tr=None, full=False): |
|
2679 | 2679 | """warm appropriate caches |
|
2680 | 2680 | |
|
2681 | 2681 | If this function is called after a transaction closed. The transaction |
|
2682 | 2682 | will be available in the 'tr' argument. This can be used to selectively |
|
2683 | 2683 | update caches relevant to the changes in that transaction. |
|
2684 | 2684 | |
|
2685 | 2685 | If 'full' is set, make sure all caches the function knows about have |
|
2686 | 2686 | up-to-date data. Even the ones usually loaded more lazily. |
|
2687 | 2687 | """ |
|
2688 | 2688 | if tr is not None and tr.hookargs.get(b'source') == b'strip': |
|
2689 | 2689 | # During strip, many caches are invalid but |
|
2690 | 2690 | # later call to `destroyed` will refresh them. |
|
2691 | 2691 | return |
|
2692 | 2692 | |
|
2693 | 2693 | if tr is None or tr.changes[b'origrepolen'] < len(self): |
|
2694 | 2694 | # accessing the 'served' branchmap should refresh all the others, |
|
2695 | 2695 | self.ui.debug(b'updating the branch cache\n') |
|
2696 | 2696 | self.filtered(b'served').branchmap() |
|
2697 | 2697 | self.filtered(b'served.hidden').branchmap() |
|
2698 | 2698 | |
|
2699 | 2699 | if full: |
|
2700 | 2700 | unfi = self.unfiltered() |
|
2701 | 2701 | |
|
2702 | 2702 | self.changelog.update_caches(transaction=tr) |
|
2703 | 2703 | self.manifestlog.update_caches(transaction=tr) |
|
2704 | 2704 | |
|
2705 | 2705 | rbc = unfi.revbranchcache() |
|
2706 | 2706 | for r in unfi.changelog: |
|
2707 | 2707 | rbc.branchinfo(r) |
|
2708 | 2708 | rbc.write() |
|
2709 | 2709 | |
|
2710 | 2710 | # ensure the working copy parents are in the manifestfulltextcache |
|
2711 | 2711 | for ctx in self[b'.'].parents(): |
|
2712 | 2712 | ctx.manifest() # accessing the manifest is enough |
|
2713 | 2713 | |
|
2714 | 2714 | # accessing fnode cache warms the cache |
|
2715 | 2715 | tagsmod.fnoderevs(self.ui, unfi, unfi.changelog.revs()) |
|
2716 | 2716 | # accessing tags warm the cache |
|
2717 | 2717 | self.tags() |
|
2718 | 2718 | self.filtered(b'served').tags() |
|
2719 | 2719 | |
|
2720 | 2720 | # The `full` arg is documented as updating even the lazily-loaded |
|
2721 | 2721 | # caches immediately, so we're forcing a write to cause these caches |
|
2722 | 2722 | # to be warmed up even if they haven't explicitly been requested |
|
2723 | 2723 | # yet (if they've never been used by hg, they won't ever have been |
|
2724 | 2724 | # written, even if they're a subset of another kind of cache that |
|
2725 | 2725 | # *has* been used). |
|
2726 | 2726 | for filt in repoview.filtertable.keys(): |
|
2727 | 2727 | filtered = self.filtered(filt) |
|
2728 | 2728 | filtered.branchmap().write(filtered) |
|
2729 | 2729 | |
|
2730 | 2730 | def invalidatecaches(self): |
|
2731 | 2731 | |
|
2732 | 2732 | if '_tagscache' in vars(self): |
|
2733 | 2733 | # can't use delattr on proxy |
|
2734 | 2734 | del self.__dict__['_tagscache'] |
|
2735 | 2735 | |
|
2736 | 2736 | self._branchcaches.clear() |
|
2737 | 2737 | self.invalidatevolatilesets() |
|
2738 | 2738 | self._sparsesignaturecache.clear() |
|
2739 | 2739 | |
|
2740 | 2740 | def invalidatevolatilesets(self): |
|
2741 | 2741 | self.filteredrevcache.clear() |
|
2742 | 2742 | obsolete.clearobscaches(self) |
|
2743 | 2743 | self._quick_access_changeid_invalidate() |
|
2744 | 2744 | |
|
2745 | 2745 | def invalidatedirstate(self): |
|
2746 | 2746 | """Invalidates the dirstate, causing the next call to dirstate |
|
2747 | 2747 | to check if it was modified since the last time it was read, |
|
2748 | 2748 | rereading it if it has. |
|
2749 | 2749 | |
|
2750 | 2750 | This is different to dirstate.invalidate() that it doesn't always |
|
2751 | 2751 | rereads the dirstate. Use dirstate.invalidate() if you want to |
|
2752 | 2752 | explicitly read the dirstate again (i.e. restoring it to a previous |
|
2753 | 2753 | known good state).""" |
|
2754 | 2754 | if hasunfilteredcache(self, 'dirstate'): |
|
2755 | 2755 | for k in self.dirstate._filecache: |
|
2756 | 2756 | try: |
|
2757 | 2757 | delattr(self.dirstate, k) |
|
2758 | 2758 | except AttributeError: |
|
2759 | 2759 | pass |
|
2760 | 2760 | delattr(self.unfiltered(), 'dirstate') |
|
2761 | 2761 | |
|
2762 | 2762 | def invalidate(self, clearfilecache=False): |
|
2763 | 2763 | """Invalidates both store and non-store parts other than dirstate |
|
2764 | 2764 | |
|
2765 | 2765 | If a transaction is running, invalidation of store is omitted, |
|
2766 | 2766 | because discarding in-memory changes might cause inconsistency |
|
2767 | 2767 | (e.g. incomplete fncache causes unintentional failure, but |
|
2768 | 2768 | redundant one doesn't). |
|
2769 | 2769 | """ |
|
2770 | 2770 | unfiltered = self.unfiltered() # all file caches are stored unfiltered |
|
2771 | 2771 | for k in list(self._filecache.keys()): |
|
2772 | 2772 | # dirstate is invalidated separately in invalidatedirstate() |
|
2773 | 2773 | if k == b'dirstate': |
|
2774 | 2774 | continue |
|
2775 | 2775 | if ( |
|
2776 | 2776 | k == b'changelog' |
|
2777 | 2777 | and self.currenttransaction() |
|
2778 | 2778 | and self.changelog._delayed |
|
2779 | 2779 | ): |
|
2780 | 2780 | # The changelog object may store unwritten revisions. We don't |
|
2781 | 2781 | # want to lose them. |
|
2782 | 2782 | # TODO: Solve the problem instead of working around it. |
|
2783 | 2783 | continue |
|
2784 | 2784 | |
|
2785 | 2785 | if clearfilecache: |
|
2786 | 2786 | del self._filecache[k] |
|
2787 | 2787 | try: |
|
2788 | 2788 | delattr(unfiltered, k) |
|
2789 | 2789 | except AttributeError: |
|
2790 | 2790 | pass |
|
2791 | 2791 | self.invalidatecaches() |
|
2792 | 2792 | if not self.currenttransaction(): |
|
2793 | 2793 | # TODO: Changing contents of store outside transaction |
|
2794 | 2794 | # causes inconsistency. We should make in-memory store |
|
2795 | 2795 | # changes detectable, and abort if changed. |
|
2796 | 2796 | self.store.invalidatecaches() |
|
2797 | 2797 | |
|
2798 | 2798 | def invalidateall(self): |
|
2799 | 2799 | """Fully invalidates both store and non-store parts, causing the |
|
2800 | 2800 | subsequent operation to reread any outside changes.""" |
|
2801 | 2801 | # extension should hook this to invalidate its caches |
|
2802 | 2802 | self.invalidate() |
|
2803 | 2803 | self.invalidatedirstate() |
|
2804 | 2804 | |
|
2805 | 2805 | @unfilteredmethod |
|
2806 | 2806 | def _refreshfilecachestats(self, tr): |
|
2807 | 2807 | """Reload stats of cached files so that they are flagged as valid""" |
|
2808 | 2808 | for k, ce in self._filecache.items(): |
|
2809 | 2809 | k = pycompat.sysstr(k) |
|
2810 | 2810 | if k == 'dirstate' or k not in self.__dict__: |
|
2811 | 2811 | continue |
|
2812 | 2812 | ce.refresh() |
|
2813 | 2813 | |
|
2814 | 2814 | def _lock( |
|
2815 | 2815 | self, |
|
2816 | 2816 | vfs, |
|
2817 | 2817 | lockname, |
|
2818 | 2818 | wait, |
|
2819 | 2819 | releasefn, |
|
2820 | 2820 | acquirefn, |
|
2821 | 2821 | desc, |
|
2822 | 2822 | ): |
|
2823 | 2823 | timeout = 0 |
|
2824 | 2824 | warntimeout = 0 |
|
2825 | 2825 | if wait: |
|
2826 | 2826 | timeout = self.ui.configint(b"ui", b"timeout") |
|
2827 | 2827 | warntimeout = self.ui.configint(b"ui", b"timeout.warn") |
|
2828 | 2828 | # internal config: ui.signal-safe-lock |
|
2829 | 2829 | signalsafe = self.ui.configbool(b'ui', b'signal-safe-lock') |
|
2830 | 2830 | |
|
2831 | 2831 | l = lockmod.trylock( |
|
2832 | 2832 | self.ui, |
|
2833 | 2833 | vfs, |
|
2834 | 2834 | lockname, |
|
2835 | 2835 | timeout, |
|
2836 | 2836 | warntimeout, |
|
2837 | 2837 | releasefn=releasefn, |
|
2838 | 2838 | acquirefn=acquirefn, |
|
2839 | 2839 | desc=desc, |
|
2840 | 2840 | signalsafe=signalsafe, |
|
2841 | 2841 | ) |
|
2842 | 2842 | return l |
|
2843 | 2843 | |
|
2844 | 2844 | def _afterlock(self, callback): |
|
2845 | 2845 | """add a callback to be run when the repository is fully unlocked |
|
2846 | 2846 | |
|
2847 | 2847 | The callback will be executed when the outermost lock is released |
|
2848 | 2848 | (with wlock being higher level than 'lock').""" |
|
2849 | 2849 | for ref in (self._wlockref, self._lockref): |
|
2850 | 2850 | l = ref and ref() |
|
2851 | 2851 | if l and l.held: |
|
2852 | 2852 | l.postrelease.append(callback) |
|
2853 | 2853 | break |
|
2854 | 2854 | else: # no lock have been found. |
|
2855 | 2855 | callback(True) |
|
2856 | 2856 | |
|
2857 | 2857 | def lock(self, wait=True): |
|
2858 | 2858 | """Lock the repository store (.hg/store) and return a weak reference |
|
2859 | 2859 | to the lock. Use this before modifying the store (e.g. committing or |
|
2860 | 2860 | stripping). If you are opening a transaction, get a lock as well.) |
|
2861 | 2861 | |
|
2862 | 2862 | If both 'lock' and 'wlock' must be acquired, ensure you always acquires |
|
2863 | 2863 | 'wlock' first to avoid a dead-lock hazard.""" |
|
2864 | 2864 | l = self._currentlock(self._lockref) |
|
2865 | 2865 | if l is not None: |
|
2866 | 2866 | l.lock() |
|
2867 | 2867 | return l |
|
2868 | 2868 | |
|
2869 | 2869 | l = self._lock( |
|
2870 | 2870 | vfs=self.svfs, |
|
2871 | 2871 | lockname=b"lock", |
|
2872 | 2872 | wait=wait, |
|
2873 | 2873 | releasefn=None, |
|
2874 | 2874 | acquirefn=self.invalidate, |
|
2875 | 2875 | desc=_(b'repository %s') % self.origroot, |
|
2876 | 2876 | ) |
|
2877 | 2877 | self._lockref = weakref.ref(l) |
|
2878 | 2878 | return l |
|
2879 | 2879 | |
|
2880 | 2880 | def wlock(self, wait=True): |
|
2881 | 2881 | """Lock the non-store parts of the repository (everything under |
|
2882 | 2882 | .hg except .hg/store) and return a weak reference to the lock. |
|
2883 | 2883 | |
|
2884 | 2884 | Use this before modifying files in .hg. |
|
2885 | 2885 | |
|
2886 | 2886 | If both 'lock' and 'wlock' must be acquired, ensure you always acquires |
|
2887 | 2887 | 'wlock' first to avoid a dead-lock hazard.""" |
|
2888 | 2888 | l = self._wlockref and self._wlockref() |
|
2889 | 2889 | if l is not None and l.held: |
|
2890 | 2890 | l.lock() |
|
2891 | 2891 | return l |
|
2892 | 2892 | |
|
2893 | 2893 | # We do not need to check for non-waiting lock acquisition. Such |
|
2894 | 2894 | # acquisition would not cause dead-lock as they would just fail. |
|
2895 | 2895 | if wait and ( |
|
2896 | 2896 | self.ui.configbool(b'devel', b'all-warnings') |
|
2897 | 2897 | or self.ui.configbool(b'devel', b'check-locks') |
|
2898 | 2898 | ): |
|
2899 | 2899 | if self._currentlock(self._lockref) is not None: |
|
2900 | 2900 | self.ui.develwarn(b'"wlock" acquired after "lock"') |
|
2901 | 2901 | |
|
2902 | 2902 | def unlock(): |
|
2903 | 2903 | if self.dirstate.pendingparentchange(): |
|
2904 | 2904 | self.dirstate.invalidate() |
|
2905 | 2905 | else: |
|
2906 | 2906 | self.dirstate.write(None) |
|
2907 | 2907 | |
|
2908 | 2908 | self._filecache[b'dirstate'].refresh() |
|
2909 | 2909 | |
|
2910 | 2910 | l = self._lock( |
|
2911 | 2911 | self.vfs, |
|
2912 | 2912 | b"wlock", |
|
2913 | 2913 | wait, |
|
2914 | 2914 | unlock, |
|
2915 | 2915 | self.invalidatedirstate, |
|
2916 | 2916 | _(b'working directory of %s') % self.origroot, |
|
2917 | 2917 | ) |
|
2918 | 2918 | self._wlockref = weakref.ref(l) |
|
2919 | 2919 | return l |
|
2920 | 2920 | |
|
2921 | 2921 | def _currentlock(self, lockref): |
|
2922 | 2922 | """Returns the lock if it's held, or None if it's not.""" |
|
2923 | 2923 | if lockref is None: |
|
2924 | 2924 | return None |
|
2925 | 2925 | l = lockref() |
|
2926 | 2926 | if l is None or not l.held: |
|
2927 | 2927 | return None |
|
2928 | 2928 | return l |
|
2929 | 2929 | |
|
2930 | 2930 | def currentwlock(self): |
|
2931 | 2931 | """Returns the wlock if it's held, or None if it's not.""" |
|
2932 | 2932 | return self._currentlock(self._wlockref) |
|
2933 | 2933 | |
|
2934 | 2934 | def checkcommitpatterns(self, wctx, match, status, fail): |
|
2935 | 2935 | """check for commit arguments that aren't committable""" |
|
2936 | 2936 | if match.isexact() or match.prefix(): |
|
2937 | 2937 | matched = set(status.modified + status.added + status.removed) |
|
2938 | 2938 | |
|
2939 | 2939 | for f in match.files(): |
|
2940 | 2940 | f = self.dirstate.normalize(f) |
|
2941 | 2941 | if f == b'.' or f in matched or f in wctx.substate: |
|
2942 | 2942 | continue |
|
2943 | 2943 | if f in status.deleted: |
|
2944 | 2944 | fail(f, _(b'file not found!')) |
|
2945 | 2945 | # Is it a directory that exists or used to exist? |
|
2946 | 2946 | if self.wvfs.isdir(f) or wctx.p1().hasdir(f): |
|
2947 | 2947 | d = f + b'/' |
|
2948 | 2948 | for mf in matched: |
|
2949 | 2949 | if mf.startswith(d): |
|
2950 | 2950 | break |
|
2951 | 2951 | else: |
|
2952 | 2952 | fail(f, _(b"no match under directory!")) |
|
2953 | 2953 | elif f not in self.dirstate: |
|
2954 | 2954 | fail(f, _(b"file not tracked!")) |
|
2955 | 2955 | |
|
2956 | 2956 | @unfilteredmethod |
|
2957 | 2957 | def commit( |
|
2958 | 2958 | self, |
|
2959 | 2959 | text=b"", |
|
2960 | 2960 | user=None, |
|
2961 | 2961 | date=None, |
|
2962 | 2962 | match=None, |
|
2963 | 2963 | force=False, |
|
2964 | 2964 | editor=None, |
|
2965 | 2965 | extra=None, |
|
2966 | 2966 | ): |
|
2967 | 2967 | """Add a new revision to current repository. |
|
2968 | 2968 | |
|
2969 | 2969 | Revision information is gathered from the working directory, |
|
2970 | 2970 | match can be used to filter the committed files. If editor is |
|
2971 | 2971 | supplied, it is called to get a commit message. |
|
2972 | 2972 | """ |
|
2973 | 2973 | if extra is None: |
|
2974 | 2974 | extra = {} |
|
2975 | 2975 | |
|
2976 | 2976 | def fail(f, msg): |
|
2977 | 2977 | raise error.InputError(b'%s: %s' % (f, msg)) |
|
2978 | 2978 | |
|
2979 | 2979 | if not match: |
|
2980 | 2980 | match = matchmod.always() |
|
2981 | 2981 | |
|
2982 | 2982 | if not force: |
|
2983 | 2983 | match.bad = fail |
|
2984 | 2984 | |
|
2985 | 2985 | # lock() for recent changelog (see issue4368) |
|
2986 | 2986 | with self.wlock(), self.lock(): |
|
2987 | 2987 | wctx = self[None] |
|
2988 | 2988 | merge = len(wctx.parents()) > 1 |
|
2989 | 2989 | |
|
2990 | 2990 | if not force and merge and not match.always(): |
|
2991 | 2991 | raise error.Abort( |
|
2992 | 2992 | _( |
|
2993 | 2993 | b'cannot partially commit a merge ' |
|
2994 | 2994 | b'(do not specify files or patterns)' |
|
2995 | 2995 | ) |
|
2996 | 2996 | ) |
|
2997 | 2997 | |
|
2998 | 2998 | status = self.status(match=match, clean=force) |
|
2999 | 2999 | if force: |
|
3000 | 3000 | status.modified.extend( |
|
3001 | 3001 | status.clean |
|
3002 | 3002 | ) # mq may commit clean files |
|
3003 | 3003 | |
|
3004 | 3004 | # check subrepos |
|
3005 | 3005 | subs, commitsubs, newstate = subrepoutil.precommit( |
|
3006 | 3006 | self.ui, wctx, status, match, force=force |
|
3007 | 3007 | ) |
|
3008 | 3008 | |
|
3009 | 3009 | # make sure all explicit patterns are matched |
|
3010 | 3010 | if not force: |
|
3011 | 3011 | self.checkcommitpatterns(wctx, match, status, fail) |
|
3012 | 3012 | |
|
3013 | 3013 | cctx = context.workingcommitctx( |
|
3014 | 3014 | self, status, text, user, date, extra |
|
3015 | 3015 | ) |
|
3016 | 3016 | |
|
3017 | 3017 | ms = mergestatemod.mergestate.read(self) |
|
3018 | 3018 | mergeutil.checkunresolved(ms) |
|
3019 | 3019 | |
|
3020 | 3020 | # internal config: ui.allowemptycommit |
|
3021 | 3021 | if cctx.isempty() and not self.ui.configbool( |
|
3022 | 3022 | b'ui', b'allowemptycommit' |
|
3023 | 3023 | ): |
|
3024 | 3024 | self.ui.debug(b'nothing to commit, clearing merge state\n') |
|
3025 | 3025 | ms.reset() |
|
3026 | 3026 | return None |
|
3027 | 3027 | |
|
3028 | 3028 | if merge and cctx.deleted(): |
|
3029 | 3029 | raise error.Abort(_(b"cannot commit merge with missing files")) |
|
3030 | 3030 | |
|
3031 | 3031 | if editor: |
|
3032 | 3032 | cctx._text = editor(self, cctx, subs) |
|
3033 | 3033 | edited = text != cctx._text |
|
3034 | 3034 | |
|
3035 | 3035 | # Save commit message in case this transaction gets rolled back |
|
3036 | 3036 | # (e.g. by a pretxncommit hook). Leave the content alone on |
|
3037 | 3037 | # the assumption that the user will use the same editor again. |
|
3038 | 3038 | msgfn = self.savecommitmessage(cctx._text) |
|
3039 | 3039 | |
|
3040 | 3040 | # commit subs and write new state |
|
3041 | 3041 | if subs: |
|
3042 | 3042 | uipathfn = scmutil.getuipathfn(self) |
|
3043 | 3043 | for s in sorted(commitsubs): |
|
3044 | 3044 | sub = wctx.sub(s) |
|
3045 | 3045 | self.ui.status( |
|
3046 | 3046 | _(b'committing subrepository %s\n') |
|
3047 | 3047 | % uipathfn(subrepoutil.subrelpath(sub)) |
|
3048 | 3048 | ) |
|
3049 | 3049 | sr = sub.commit(cctx._text, user, date) |
|
3050 | 3050 | newstate[s] = (newstate[s][0], sr) |
|
3051 | 3051 | subrepoutil.writestate(self, newstate) |
|
3052 | 3052 | |
|
3053 | 3053 | p1, p2 = self.dirstate.parents() |
|
3054 | 3054 | hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or b'') |
|
3055 | 3055 | try: |
|
3056 | 3056 | self.hook( |
|
3057 | 3057 | b"precommit", throw=True, parent1=hookp1, parent2=hookp2 |
|
3058 | 3058 | ) |
|
3059 | 3059 | with self.transaction(b'commit'): |
|
3060 | 3060 | ret = self.commitctx(cctx, True) |
|
3061 | 3061 | # update bookmarks, dirstate and mergestate |
|
3062 | 3062 | bookmarks.update(self, [p1, p2], ret) |
|
3063 | 3063 | cctx.markcommitted(ret) |
|
3064 | 3064 | ms.reset() |
|
3065 | 3065 | except: # re-raises |
|
3066 | 3066 | if edited: |
|
3067 | 3067 | self.ui.write( |
|
3068 | 3068 | _(b'note: commit message saved in %s\n') % msgfn |
|
3069 | 3069 | ) |
|
3070 | 3070 | self.ui.write( |
|
3071 | 3071 | _( |
|
3072 | 3072 | b"note: use 'hg commit --logfile " |
|
3073 | 3073 | b".hg/last-message.txt --edit' to reuse it\n" |
|
3074 | 3074 | ) |
|
3075 | 3075 | ) |
|
3076 | 3076 | raise |
|
3077 | 3077 | |
|
3078 | 3078 | def commithook(unused_success): |
|
3079 | 3079 | # hack for command that use a temporary commit (eg: histedit) |
|
3080 | 3080 | # temporary commit got stripped before hook release |
|
3081 | 3081 | if self.changelog.hasnode(ret): |
|
3082 | 3082 | self.hook( |
|
3083 | 3083 | b"commit", node=hex(ret), parent1=hookp1, parent2=hookp2 |
|
3084 | 3084 | ) |
|
3085 | 3085 | |
|
3086 | 3086 | self._afterlock(commithook) |
|
3087 | 3087 | return ret |
|
3088 | 3088 | |
|
3089 | 3089 | @unfilteredmethod |
|
3090 | 3090 | def commitctx(self, ctx, error=False, origctx=None): |
|
3091 | 3091 | return commit.commitctx(self, ctx, error=error, origctx=origctx) |
|
3092 | 3092 | |
|
3093 | 3093 | @unfilteredmethod |
|
3094 | 3094 | def destroying(self): |
|
3095 | 3095 | """Inform the repository that nodes are about to be destroyed. |
|
3096 | 3096 | Intended for use by strip and rollback, so there's a common |
|
3097 | 3097 | place for anything that has to be done before destroying history. |
|
3098 | 3098 | |
|
3099 | 3099 | This is mostly useful for saving state that is in memory and waiting |
|
3100 | 3100 | to be flushed when the current lock is released. Because a call to |
|
3101 | 3101 | destroyed is imminent, the repo will be invalidated causing those |
|
3102 | 3102 | changes to stay in memory (waiting for the next unlock), or vanish |
|
3103 | 3103 | completely. |
|
3104 | 3104 | """ |
|
3105 | 3105 | # When using the same lock to commit and strip, the phasecache is left |
|
3106 | 3106 | # dirty after committing. Then when we strip, the repo is invalidated, |
|
3107 | 3107 | # causing those changes to disappear. |
|
3108 | 3108 | if '_phasecache' in vars(self): |
|
3109 | 3109 | self._phasecache.write() |
|
3110 | 3110 | |
|
3111 | 3111 | @unfilteredmethod |
|
3112 | 3112 | def destroyed(self): |
|
3113 | 3113 | """Inform the repository that nodes have been destroyed. |
|
3114 | 3114 | Intended for use by strip and rollback, so there's a common |
|
3115 | 3115 | place for anything that has to be done after destroying history. |
|
3116 | 3116 | """ |
|
3117 | 3117 | # When one tries to: |
|
3118 | 3118 | # 1) destroy nodes thus calling this method (e.g. strip) |
|
3119 | 3119 | # 2) use phasecache somewhere (e.g. commit) |
|
3120 | 3120 | # |
|
3121 | 3121 | # then 2) will fail because the phasecache contains nodes that were |
|
3122 | 3122 | # removed. We can either remove phasecache from the filecache, |
|
3123 | 3123 | # causing it to reload next time it is accessed, or simply filter |
|
3124 | 3124 | # the removed nodes now and write the updated cache. |
|
3125 | 3125 | self._phasecache.filterunknown(self) |
|
3126 | 3126 | self._phasecache.write() |
|
3127 | 3127 | |
|
3128 | 3128 | # refresh all repository caches |
|
3129 | 3129 | self.updatecaches() |
|
3130 | 3130 | |
|
3131 | 3131 | # Ensure the persistent tag cache is updated. Doing it now |
|
3132 | 3132 | # means that the tag cache only has to worry about destroyed |
|
3133 | 3133 | # heads immediately after a strip/rollback. That in turn |
|
3134 | 3134 | # guarantees that "cachetip == currenttip" (comparing both rev |
|
3135 | 3135 | # and node) always means no nodes have been added or destroyed. |
|
3136 | 3136 | |
|
3137 | 3137 | # XXX this is suboptimal when qrefresh'ing: we strip the current |
|
3138 | 3138 | # head, refresh the tag cache, then immediately add a new head. |
|
3139 | 3139 | # But I think doing it this way is necessary for the "instant |
|
3140 | 3140 | # tag cache retrieval" case to work. |
|
3141 | 3141 | self.invalidate() |
|
3142 | 3142 | |
|
3143 | 3143 | def status( |
|
3144 | 3144 | self, |
|
3145 | 3145 | node1=b'.', |
|
3146 | 3146 | node2=None, |
|
3147 | 3147 | match=None, |
|
3148 | 3148 | ignored=False, |
|
3149 | 3149 | clean=False, |
|
3150 | 3150 | unknown=False, |
|
3151 | 3151 | listsubrepos=False, |
|
3152 | 3152 | ): |
|
3153 | 3153 | '''a convenience method that calls node1.status(node2)''' |
|
3154 | 3154 | return self[node1].status( |
|
3155 | 3155 | node2, match, ignored, clean, unknown, listsubrepos |
|
3156 | 3156 | ) |
|
3157 | 3157 | |
|
3158 | 3158 | def addpostdsstatus(self, ps): |
|
3159 | 3159 | """Add a callback to run within the wlock, at the point at which status |
|
3160 | 3160 | fixups happen. |
|
3161 | 3161 | |
|
3162 | 3162 | On status completion, callback(wctx, status) will be called with the |
|
3163 | 3163 | wlock held, unless the dirstate has changed from underneath or the wlock |
|
3164 | 3164 | couldn't be grabbed. |
|
3165 | 3165 | |
|
3166 | 3166 | Callbacks should not capture and use a cached copy of the dirstate -- |
|
3167 | 3167 | it might change in the meanwhile. Instead, they should access the |
|
3168 | 3168 | dirstate via wctx.repo().dirstate. |
|
3169 | 3169 | |
|
3170 | 3170 | This list is emptied out after each status run -- extensions should |
|
3171 | 3171 | make sure it adds to this list each time dirstate.status is called. |
|
3172 | 3172 | Extensions should also make sure they don't call this for statuses |
|
3173 | 3173 | that don't involve the dirstate. |
|
3174 | 3174 | """ |
|
3175 | 3175 | |
|
3176 | 3176 | # The list is located here for uniqueness reasons -- it is actually |
|
3177 | 3177 | # managed by the workingctx, but that isn't unique per-repo. |
|
3178 | 3178 | self._postdsstatus.append(ps) |
|
3179 | 3179 | |
|
3180 | 3180 | def postdsstatus(self): |
|
3181 | 3181 | """Used by workingctx to get the list of post-dirstate-status hooks.""" |
|
3182 | 3182 | return self._postdsstatus |
|
3183 | 3183 | |
|
3184 | 3184 | def clearpostdsstatus(self): |
|
3185 | 3185 | """Used by workingctx to clear post-dirstate-status hooks.""" |
|
3186 | 3186 | del self._postdsstatus[:] |
|
3187 | 3187 | |
|
3188 | 3188 | def heads(self, start=None): |
|
3189 | 3189 | if start is None: |
|
3190 | 3190 | cl = self.changelog |
|
3191 | 3191 | headrevs = reversed(cl.headrevs()) |
|
3192 | 3192 | return [cl.node(rev) for rev in headrevs] |
|
3193 | 3193 | |
|
3194 | 3194 | heads = self.changelog.heads(start) |
|
3195 | 3195 | # sort the output in rev descending order |
|
3196 | 3196 | return sorted(heads, key=self.changelog.rev, reverse=True) |
|
3197 | 3197 | |
|
3198 | 3198 | def branchheads(self, branch=None, start=None, closed=False): |
|
3199 | 3199 | """return a (possibly filtered) list of heads for the given branch |
|
3200 | 3200 | |
|
3201 | 3201 | Heads are returned in topological order, from newest to oldest. |
|
3202 | 3202 | If branch is None, use the dirstate branch. |
|
3203 | 3203 | If start is not None, return only heads reachable from start. |
|
3204 | 3204 | If closed is True, return heads that are marked as closed as well. |
|
3205 | 3205 | """ |
|
3206 | 3206 | if branch is None: |
|
3207 | 3207 | branch = self[None].branch() |
|
3208 | 3208 | branches = self.branchmap() |
|
3209 | 3209 | if not branches.hasbranch(branch): |
|
3210 | 3210 | return [] |
|
3211 | 3211 | # the cache returns heads ordered lowest to highest |
|
3212 | 3212 | bheads = list(reversed(branches.branchheads(branch, closed=closed))) |
|
3213 | 3213 | if start is not None: |
|
3214 | 3214 | # filter out the heads that cannot be reached from startrev |
|
3215 | 3215 | fbheads = set(self.changelog.nodesbetween([start], bheads)[2]) |
|
3216 | 3216 | bheads = [h for h in bheads if h in fbheads] |
|
3217 | 3217 | return bheads |
|
3218 | 3218 | |
|
3219 | 3219 | def branches(self, nodes): |
|
3220 | 3220 | if not nodes: |
|
3221 | 3221 | nodes = [self.changelog.tip()] |
|
3222 | 3222 | b = [] |
|
3223 | 3223 | for n in nodes: |
|
3224 | 3224 | t = n |
|
3225 | 3225 | while True: |
|
3226 | 3226 | p = self.changelog.parents(n) |
|
3227 | 3227 | if p[1] != nullid or p[0] == nullid: |
|
3228 | 3228 | b.append((t, n, p[0], p[1])) |
|
3229 | 3229 | break |
|
3230 | 3230 | n = p[0] |
|
3231 | 3231 | return b |
|
3232 | 3232 | |
|
3233 | 3233 | def between(self, pairs): |
|
3234 | 3234 | r = [] |
|
3235 | 3235 | |
|
3236 | 3236 | for top, bottom in pairs: |
|
3237 | 3237 | n, l, i = top, [], 0 |
|
3238 | 3238 | f = 1 |
|
3239 | 3239 | |
|
3240 | 3240 | while n != bottom and n != nullid: |
|
3241 | 3241 | p = self.changelog.parents(n)[0] |
|
3242 | 3242 | if i == f: |
|
3243 | 3243 | l.append(n) |
|
3244 | 3244 | f = f * 2 |
|
3245 | 3245 | n = p |
|
3246 | 3246 | i += 1 |
|
3247 | 3247 | |
|
3248 | 3248 | r.append(l) |
|
3249 | 3249 | |
|
3250 | 3250 | return r |
|
3251 | 3251 | |
|
3252 | 3252 | def checkpush(self, pushop): |
|
3253 | 3253 | """Extensions can override this function if additional checks have |
|
3254 | 3254 | to be performed before pushing, or call it if they override push |
|
3255 | 3255 | command. |
|
3256 | 3256 | """ |
|
3257 | 3257 | |
|
3258 | 3258 | @unfilteredpropertycache |
|
3259 | 3259 | def prepushoutgoinghooks(self): |
|
3260 | 3260 | """Return util.hooks consists of a pushop with repo, remote, outgoing |
|
3261 | 3261 | methods, which are called before pushing changesets. |
|
3262 | 3262 | """ |
|
3263 | 3263 | return util.hooks() |
|
3264 | 3264 | |
|
3265 | 3265 | def pushkey(self, namespace, key, old, new): |
|
3266 | 3266 | try: |
|
3267 | 3267 | tr = self.currenttransaction() |
|
3268 | 3268 | hookargs = {} |
|
3269 | 3269 | if tr is not None: |
|
3270 | 3270 | hookargs.update(tr.hookargs) |
|
3271 | 3271 | hookargs = pycompat.strkwargs(hookargs) |
|
3272 | 3272 | hookargs['namespace'] = namespace |
|
3273 | 3273 | hookargs['key'] = key |
|
3274 | 3274 | hookargs['old'] = old |
|
3275 | 3275 | hookargs['new'] = new |
|
3276 | 3276 | self.hook(b'prepushkey', throw=True, **hookargs) |
|
3277 | 3277 | except error.HookAbort as exc: |
|
3278 | 3278 | self.ui.write_err(_(b"pushkey-abort: %s\n") % exc) |
|
3279 | 3279 | if exc.hint: |
|
3280 | 3280 | self.ui.write_err(_(b"(%s)\n") % exc.hint) |
|
3281 | 3281 | return False |
|
3282 | 3282 | self.ui.debug(b'pushing key for "%s:%s"\n' % (namespace, key)) |
|
3283 | 3283 | ret = pushkey.push(self, namespace, key, old, new) |
|
3284 | 3284 | |
|
3285 | 3285 | def runhook(unused_success): |
|
3286 | 3286 | self.hook( |
|
3287 | 3287 | b'pushkey', |
|
3288 | 3288 | namespace=namespace, |
|
3289 | 3289 | key=key, |
|
3290 | 3290 | old=old, |
|
3291 | 3291 | new=new, |
|
3292 | 3292 | ret=ret, |
|
3293 | 3293 | ) |
|
3294 | 3294 | |
|
3295 | 3295 | self._afterlock(runhook) |
|
3296 | 3296 | return ret |
|
3297 | 3297 | |
|
3298 | 3298 | def listkeys(self, namespace): |
|
3299 | 3299 | self.hook(b'prelistkeys', throw=True, namespace=namespace) |
|
3300 | 3300 | self.ui.debug(b'listing keys for "%s"\n' % namespace) |
|
3301 | 3301 | values = pushkey.list(self, namespace) |
|
3302 | 3302 | self.hook(b'listkeys', namespace=namespace, values=values) |
|
3303 | 3303 | return values |
|
3304 | 3304 | |
|
3305 | 3305 | def debugwireargs(self, one, two, three=None, four=None, five=None): |
|
3306 | 3306 | '''used to test argument passing over the wire''' |
|
3307 | 3307 | return b"%s %s %s %s %s" % ( |
|
3308 | 3308 | one, |
|
3309 | 3309 | two, |
|
3310 | 3310 | pycompat.bytestr(three), |
|
3311 | 3311 | pycompat.bytestr(four), |
|
3312 | 3312 | pycompat.bytestr(five), |
|
3313 | 3313 | ) |
|
3314 | 3314 | |
|
3315 | 3315 | def savecommitmessage(self, text): |
|
3316 | 3316 | fp = self.vfs(b'last-message.txt', b'wb') |
|
3317 | 3317 | try: |
|
3318 | 3318 | fp.write(text) |
|
3319 | 3319 | finally: |
|
3320 | 3320 | fp.close() |
|
3321 | 3321 | return self.pathto(fp.name[len(self.root) + 1 :]) |
|
3322 | 3322 | |
|
3323 | 3323 | |
|
3324 | 3324 | # used to avoid circular references so destructors work |
|
3325 | 3325 | def aftertrans(files): |
|
3326 | 3326 | renamefiles = [tuple(t) for t in files] |
|
3327 | 3327 | |
|
3328 | 3328 | def a(): |
|
3329 | 3329 | for vfs, src, dest in renamefiles: |
|
3330 | 3330 | # if src and dest refer to a same file, vfs.rename is a no-op, |
|
3331 | 3331 | # leaving both src and dest on disk. delete dest to make sure |
|
3332 | 3332 | # the rename couldn't be such a no-op. |
|
3333 | 3333 | vfs.tryunlink(dest) |
|
3334 | 3334 | try: |
|
3335 | 3335 | vfs.rename(src, dest) |
|
3336 | 3336 | except OSError: # journal file does not yet exist |
|
3337 | 3337 | pass |
|
3338 | 3338 | |
|
3339 | 3339 | return a |
|
3340 | 3340 | |
|
3341 | 3341 | |
|
3342 | 3342 | def undoname(fn): |
|
3343 | 3343 | base, name = os.path.split(fn) |
|
3344 | 3344 | assert name.startswith(b'journal') |
|
3345 | 3345 | return os.path.join(base, name.replace(b'journal', b'undo', 1)) |
|
3346 | 3346 | |
|
3347 | 3347 | |
|
3348 | 3348 | def instance(ui, path, create, intents=None, createopts=None): |
|
3349 | 3349 | localpath = util.urllocalpath(path) |
|
3350 | 3350 | if create: |
|
3351 | 3351 | createrepository(ui, localpath, createopts=createopts) |
|
3352 | 3352 | |
|
3353 | 3353 | return makelocalrepository(ui, localpath, intents=intents) |
|
3354 | 3354 | |
|
3355 | 3355 | |
|
3356 | 3356 | def islocal(path): |
|
3357 | 3357 | return True |
|
3358 | 3358 | |
|
3359 | 3359 | |
|
3360 | 3360 | def defaultcreateopts(ui, createopts=None): |
|
3361 | 3361 | """Populate the default creation options for a repository. |
|
3362 | 3362 | |
|
3363 | 3363 | A dictionary of explicitly requested creation options can be passed |
|
3364 | 3364 | in. Missing keys will be populated. |
|
3365 | 3365 | """ |
|
3366 | 3366 | createopts = dict(createopts or {}) |
|
3367 | 3367 | |
|
3368 | 3368 | if b'backend' not in createopts: |
|
3369 | 3369 | # experimental config: storage.new-repo-backend |
|
3370 | 3370 | createopts[b'backend'] = ui.config(b'storage', b'new-repo-backend') |
|
3371 | 3371 | |
|
3372 | 3372 | return createopts |
|
3373 | 3373 | |
|
3374 | 3374 | |
|
3375 | 3375 | def newreporequirements(ui, createopts): |
|
3376 | 3376 | """Determine the set of requirements for a new local repository. |
|
3377 | 3377 | |
|
3378 | 3378 | Extensions can wrap this function to specify custom requirements for |
|
3379 | 3379 | new repositories. |
|
3380 | 3380 | """ |
|
3381 | 3381 | # If the repo is being created from a shared repository, we copy |
|
3382 | 3382 | # its requirements. |
|
3383 | 3383 | if b'sharedrepo' in createopts: |
|
3384 | 3384 | requirements = set(createopts[b'sharedrepo'].requirements) |
|
3385 | 3385 | if createopts.get(b'sharedrelative'): |
|
3386 | 3386 | requirements.add(requirementsmod.RELATIVE_SHARED_REQUIREMENT) |
|
3387 | 3387 | else: |
|
3388 | 3388 | requirements.add(requirementsmod.SHARED_REQUIREMENT) |
|
3389 | 3389 | |
|
3390 | 3390 | return requirements |
|
3391 | 3391 | |
|
3392 | 3392 | if b'backend' not in createopts: |
|
3393 | 3393 | raise error.ProgrammingError( |
|
3394 | 3394 | b'backend key not present in createopts; ' |
|
3395 | 3395 | b'was defaultcreateopts() called?' |
|
3396 | 3396 | ) |
|
3397 | 3397 | |
|
3398 | 3398 | if createopts[b'backend'] != b'revlogv1': |
|
3399 | 3399 | raise error.Abort( |
|
3400 | 3400 | _( |
|
3401 | 3401 | b'unable to determine repository requirements for ' |
|
3402 | 3402 | b'storage backend: %s' |
|
3403 | 3403 | ) |
|
3404 | 3404 | % createopts[b'backend'] |
|
3405 | 3405 | ) |
|
3406 | 3406 | |
|
3407 | 3407 | requirements = {b'revlogv1'} |
|
3408 | 3408 | if ui.configbool(b'format', b'usestore'): |
|
3409 | 3409 | requirements.add(b'store') |
|
3410 | 3410 | if ui.configbool(b'format', b'usefncache'): |
|
3411 | 3411 | requirements.add(b'fncache') |
|
3412 | 3412 | if ui.configbool(b'format', b'dotencode'): |
|
3413 | 3413 | requirements.add(b'dotencode') |
|
3414 | 3414 | |
|
3415 | 3415 | compengines = ui.configlist(b'format', b'revlog-compression') |
|
3416 | 3416 | for compengine in compengines: |
|
3417 | 3417 | if compengine in util.compengines: |
|
3418 | 3418 | break |
|
3419 | 3419 | else: |
|
3420 | 3420 | raise error.Abort( |
|
3421 | 3421 | _( |
|
3422 | 3422 | b'compression engines %s defined by ' |
|
3423 | 3423 | b'format.revlog-compression not available' |
|
3424 | 3424 | ) |
|
3425 | 3425 | % b', '.join(b'"%s"' % e for e in compengines), |
|
3426 | 3426 | hint=_( |
|
3427 | 3427 | b'run "hg debuginstall" to list available ' |
|
3428 | 3428 | b'compression engines' |
|
3429 | 3429 | ), |
|
3430 | 3430 | ) |
|
3431 | 3431 | |
|
3432 | 3432 | # zlib is the historical default and doesn't need an explicit requirement. |
|
3433 | 3433 | if compengine == b'zstd': |
|
3434 | 3434 | requirements.add(b'revlog-compression-zstd') |
|
3435 | 3435 | elif compengine != b'zlib': |
|
3436 | 3436 | requirements.add(b'exp-compression-%s' % compengine) |
|
3437 | 3437 | |
|
3438 | 3438 | if scmutil.gdinitconfig(ui): |
|
3439 | 3439 | requirements.add(b'generaldelta') |
|
3440 | 3440 | if ui.configbool(b'format', b'sparse-revlog'): |
|
3441 | 3441 | requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT) |
|
3442 | 3442 | |
|
3443 | 3443 | # experimental config: format.exp-use-side-data |
|
3444 | 3444 | if ui.configbool(b'format', b'exp-use-side-data'): |
|
3445 | 3445 | requirements.add(requirementsmod.SIDEDATA_REQUIREMENT) |
|
3446 | 3446 | # experimental config: format.exp-use-copies-side-data-changeset |
|
3447 | 3447 | if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'): |
|
3448 | 3448 | requirements.add(requirementsmod.SIDEDATA_REQUIREMENT) |
|
3449 | 3449 | requirements.add(requirementsmod.COPIESSDC_REQUIREMENT) |
|
3450 | 3450 | if ui.configbool(b'experimental', b'treemanifest'): |
|
3451 | 3451 | requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT) |
|
3452 | 3452 | |
|
3453 | 3453 | revlogv2 = ui.config(b'experimental', b'revlogv2') |
|
3454 | 3454 | if revlogv2 == b'enable-unstable-format-and-corrupt-my-data': |
|
3455 | 3455 | requirements.remove(b'revlogv1') |
|
3456 | 3456 | # generaldelta is implied by revlogv2. |
|
3457 | 3457 | requirements.discard(b'generaldelta') |
|
3458 | 3458 | requirements.add(requirementsmod.REVLOGV2_REQUIREMENT) |
|
3459 | 3459 | # experimental config: format.internal-phase |
|
3460 | 3460 | if ui.configbool(b'format', b'internal-phase'): |
|
3461 | 3461 | requirements.add(requirementsmod.INTERNAL_PHASE_REQUIREMENT) |
|
3462 | 3462 | |
|
3463 | 3463 | if createopts.get(b'narrowfiles'): |
|
3464 | 3464 | requirements.add(requirementsmod.NARROW_REQUIREMENT) |
|
3465 | 3465 | |
|
3466 | 3466 | if createopts.get(b'lfs'): |
|
3467 | 3467 | requirements.add(b'lfs') |
|
3468 | 3468 | |
|
3469 | 3469 | if ui.configbool(b'format', b'bookmarks-in-store'): |
|
3470 | 3470 | requirements.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT) |
|
3471 | 3471 | |
|
3472 | 3472 | if ui.configbool(b'format', b'use-persistent-nodemap'): |
|
3473 | 3473 | requirements.add(requirementsmod.NODEMAP_REQUIREMENT) |
|
3474 | 3474 | |
|
3475 | 3475 | # if share-safe is enabled, let's create the new repository with the new |
|
3476 | 3476 | # requirement |
|
3477 |
if ui.configbool(b'format', b'e |
|
|
3477 | if ui.configbool(b'format', b'use-share-safe'): | |
|
3478 | 3478 | requirements.add(requirementsmod.SHARESAFE_REQUIREMENT) |
|
3479 | 3479 | |
|
3480 | 3480 | return requirements |
|
3481 | 3481 | |
|
3482 | 3482 | |
|
3483 | 3483 | def checkrequirementscompat(ui, requirements): |
|
3484 | 3484 | """Checks compatibility of repository requirements enabled and disabled. |
|
3485 | 3485 | |
|
3486 | 3486 | Returns a set of requirements which needs to be dropped because dependend |
|
3487 | 3487 | requirements are not enabled. Also warns users about it""" |
|
3488 | 3488 | |
|
3489 | 3489 | dropped = set() |
|
3490 | 3490 | |
|
3491 | 3491 | if b'store' not in requirements: |
|
3492 | 3492 | if bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT in requirements: |
|
3493 | 3493 | ui.warn( |
|
3494 | 3494 | _( |
|
3495 | 3495 | b'ignoring enabled \'format.bookmarks-in-store\' config ' |
|
3496 | 3496 | b'beacuse it is incompatible with disabled ' |
|
3497 | 3497 | b'\'format.usestore\' config\n' |
|
3498 | 3498 | ) |
|
3499 | 3499 | ) |
|
3500 | 3500 | dropped.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT) |
|
3501 | 3501 | |
|
3502 | 3502 | if ( |
|
3503 | 3503 | requirementsmod.SHARED_REQUIREMENT in requirements |
|
3504 | 3504 | or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements |
|
3505 | 3505 | ): |
|
3506 | 3506 | raise error.Abort( |
|
3507 | 3507 | _( |
|
3508 | 3508 | b"cannot create shared repository as source was created" |
|
3509 | 3509 | b" with 'format.usestore' config disabled" |
|
3510 | 3510 | ) |
|
3511 | 3511 | ) |
|
3512 | 3512 | |
|
3513 | 3513 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements: |
|
3514 | 3514 | ui.warn( |
|
3515 | 3515 | _( |
|
3516 |
b"ignoring enabled 'format.e |
|
|
3516 | b"ignoring enabled 'format.use-share-safe' config because " | |
|
3517 | 3517 | b"it is incompatible with disabled 'format.usestore'" |
|
3518 | 3518 | b" config\n" |
|
3519 | 3519 | ) |
|
3520 | 3520 | ) |
|
3521 | 3521 | dropped.add(requirementsmod.SHARESAFE_REQUIREMENT) |
|
3522 | 3522 | |
|
3523 | 3523 | return dropped |
|
3524 | 3524 | |
|
3525 | 3525 | |
|
3526 | 3526 | def filterknowncreateopts(ui, createopts): |
|
3527 | 3527 | """Filters a dict of repo creation options against options that are known. |
|
3528 | 3528 | |
|
3529 | 3529 | Receives a dict of repo creation options and returns a dict of those |
|
3530 | 3530 | options that we don't know how to handle. |
|
3531 | 3531 | |
|
3532 | 3532 | This function is called as part of repository creation. If the |
|
3533 | 3533 | returned dict contains any items, repository creation will not |
|
3534 | 3534 | be allowed, as it means there was a request to create a repository |
|
3535 | 3535 | with options not recognized by loaded code. |
|
3536 | 3536 | |
|
3537 | 3537 | Extensions can wrap this function to filter out creation options |
|
3538 | 3538 | they know how to handle. |
|
3539 | 3539 | """ |
|
3540 | 3540 | known = { |
|
3541 | 3541 | b'backend', |
|
3542 | 3542 | b'lfs', |
|
3543 | 3543 | b'narrowfiles', |
|
3544 | 3544 | b'sharedrepo', |
|
3545 | 3545 | b'sharedrelative', |
|
3546 | 3546 | b'shareditems', |
|
3547 | 3547 | b'shallowfilestore', |
|
3548 | 3548 | } |
|
3549 | 3549 | |
|
3550 | 3550 | return {k: v for k, v in createopts.items() if k not in known} |
|
3551 | 3551 | |
|
3552 | 3552 | |
|
3553 | 3553 | def createrepository(ui, path, createopts=None): |
|
3554 | 3554 | """Create a new repository in a vfs. |
|
3555 | 3555 | |
|
3556 | 3556 | ``path`` path to the new repo's working directory. |
|
3557 | 3557 | ``createopts`` options for the new repository. |
|
3558 | 3558 | |
|
3559 | 3559 | The following keys for ``createopts`` are recognized: |
|
3560 | 3560 | |
|
3561 | 3561 | backend |
|
3562 | 3562 | The storage backend to use. |
|
3563 | 3563 | lfs |
|
3564 | 3564 | Repository will be created with ``lfs`` requirement. The lfs extension |
|
3565 | 3565 | will automatically be loaded when the repository is accessed. |
|
3566 | 3566 | narrowfiles |
|
3567 | 3567 | Set up repository to support narrow file storage. |
|
3568 | 3568 | sharedrepo |
|
3569 | 3569 | Repository object from which storage should be shared. |
|
3570 | 3570 | sharedrelative |
|
3571 | 3571 | Boolean indicating if the path to the shared repo should be |
|
3572 | 3572 | stored as relative. By default, the pointer to the "parent" repo |
|
3573 | 3573 | is stored as an absolute path. |
|
3574 | 3574 | shareditems |
|
3575 | 3575 | Set of items to share to the new repository (in addition to storage). |
|
3576 | 3576 | shallowfilestore |
|
3577 | 3577 | Indicates that storage for files should be shallow (not all ancestor |
|
3578 | 3578 | revisions are known). |
|
3579 | 3579 | """ |
|
3580 | 3580 | createopts = defaultcreateopts(ui, createopts=createopts) |
|
3581 | 3581 | |
|
3582 | 3582 | unknownopts = filterknowncreateopts(ui, createopts) |
|
3583 | 3583 | |
|
3584 | 3584 | if not isinstance(unknownopts, dict): |
|
3585 | 3585 | raise error.ProgrammingError( |
|
3586 | 3586 | b'filterknowncreateopts() did not return a dict' |
|
3587 | 3587 | ) |
|
3588 | 3588 | |
|
3589 | 3589 | if unknownopts: |
|
3590 | 3590 | raise error.Abort( |
|
3591 | 3591 | _( |
|
3592 | 3592 | b'unable to create repository because of unknown ' |
|
3593 | 3593 | b'creation option: %s' |
|
3594 | 3594 | ) |
|
3595 | 3595 | % b', '.join(sorted(unknownopts)), |
|
3596 | 3596 | hint=_(b'is a required extension not loaded?'), |
|
3597 | 3597 | ) |
|
3598 | 3598 | |
|
3599 | 3599 | requirements = newreporequirements(ui, createopts=createopts) |
|
3600 | 3600 | requirements -= checkrequirementscompat(ui, requirements) |
|
3601 | 3601 | |
|
3602 | 3602 | wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) |
|
3603 | 3603 | |
|
3604 | 3604 | hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg')) |
|
3605 | 3605 | if hgvfs.exists(): |
|
3606 | 3606 | raise error.RepoError(_(b'repository %s already exists') % path) |
|
3607 | 3607 | |
|
3608 | 3608 | if b'sharedrepo' in createopts: |
|
3609 | 3609 | sharedpath = createopts[b'sharedrepo'].sharedpath |
|
3610 | 3610 | |
|
3611 | 3611 | if createopts.get(b'sharedrelative'): |
|
3612 | 3612 | try: |
|
3613 | 3613 | sharedpath = os.path.relpath(sharedpath, hgvfs.base) |
|
3614 | 3614 | except (IOError, ValueError) as e: |
|
3615 | 3615 | # ValueError is raised on Windows if the drive letters differ |
|
3616 | 3616 | # on each path. |
|
3617 | 3617 | raise error.Abort( |
|
3618 | 3618 | _(b'cannot calculate relative path'), |
|
3619 | 3619 | hint=stringutil.forcebytestr(e), |
|
3620 | 3620 | ) |
|
3621 | 3621 | |
|
3622 | 3622 | if not wdirvfs.exists(): |
|
3623 | 3623 | wdirvfs.makedirs() |
|
3624 | 3624 | |
|
3625 | 3625 | hgvfs.makedir(notindexed=True) |
|
3626 | 3626 | if b'sharedrepo' not in createopts: |
|
3627 | 3627 | hgvfs.mkdir(b'cache') |
|
3628 | 3628 | hgvfs.mkdir(b'wcache') |
|
3629 | 3629 | |
|
3630 | 3630 | if b'store' in requirements and b'sharedrepo' not in createopts: |
|
3631 | 3631 | hgvfs.mkdir(b'store') |
|
3632 | 3632 | |
|
3633 | 3633 | # We create an invalid changelog outside the store so very old |
|
3634 | 3634 | # Mercurial versions (which didn't know about the requirements |
|
3635 | 3635 | # file) encounter an error on reading the changelog. This |
|
3636 | 3636 | # effectively locks out old clients and prevents them from |
|
3637 | 3637 | # mucking with a repo in an unknown format. |
|
3638 | 3638 | # |
|
3639 | 3639 | # The revlog header has version 2, which won't be recognized by |
|
3640 | 3640 | # such old clients. |
|
3641 | 3641 | hgvfs.append( |
|
3642 | 3642 | b'00changelog.i', |
|
3643 | 3643 | b'\0\0\0\2 dummy changelog to prevent using the old repo ' |
|
3644 | 3644 | b'layout', |
|
3645 | 3645 | ) |
|
3646 | 3646 | |
|
3647 | 3647 | # Filter the requirements into working copy and store ones |
|
3648 | 3648 | wcreq, storereq = scmutil.filterrequirements(requirements) |
|
3649 | 3649 | # write working copy ones |
|
3650 | 3650 | scmutil.writerequires(hgvfs, wcreq) |
|
3651 | 3651 | # If there are store requirements and the current repository |
|
3652 | 3652 | # is not a shared one, write stored requirements |
|
3653 | 3653 | # For new shared repository, we don't need to write the store |
|
3654 | 3654 | # requirements as they are already present in store requires |
|
3655 | 3655 | if storereq and b'sharedrepo' not in createopts: |
|
3656 | 3656 | storevfs = vfsmod.vfs(hgvfs.join(b'store'), cacheaudited=True) |
|
3657 | 3657 | scmutil.writerequires(storevfs, storereq) |
|
3658 | 3658 | |
|
3659 | 3659 | # Write out file telling readers where to find the shared store. |
|
3660 | 3660 | if b'sharedrepo' in createopts: |
|
3661 | 3661 | hgvfs.write(b'sharedpath', sharedpath) |
|
3662 | 3662 | |
|
3663 | 3663 | if createopts.get(b'shareditems'): |
|
3664 | 3664 | shared = b'\n'.join(sorted(createopts[b'shareditems'])) + b'\n' |
|
3665 | 3665 | hgvfs.write(b'shared', shared) |
|
3666 | 3666 | |
|
3667 | 3667 | |
|
3668 | 3668 | def poisonrepository(repo): |
|
3669 | 3669 | """Poison a repository instance so it can no longer be used.""" |
|
3670 | 3670 | # Perform any cleanup on the instance. |
|
3671 | 3671 | repo.close() |
|
3672 | 3672 | |
|
3673 | 3673 | # Our strategy is to replace the type of the object with one that |
|
3674 | 3674 | # has all attribute lookups result in error. |
|
3675 | 3675 | # |
|
3676 | 3676 | # But we have to allow the close() method because some constructors |
|
3677 | 3677 | # of repos call close() on repo references. |
|
3678 | 3678 | class poisonedrepository(object): |
|
3679 | 3679 | def __getattribute__(self, item): |
|
3680 | 3680 | if item == 'close': |
|
3681 | 3681 | return object.__getattribute__(self, item) |
|
3682 | 3682 | |
|
3683 | 3683 | raise error.ProgrammingError( |
|
3684 | 3684 | b'repo instances should not be used after unshare' |
|
3685 | 3685 | ) |
|
3686 | 3686 | |
|
3687 | 3687 | def close(self): |
|
3688 | 3688 | pass |
|
3689 | 3689 | |
|
3690 | 3690 | # We may have a repoview, which intercepts __setattr__. So be sure |
|
3691 | 3691 | # we operate at the lowest level possible. |
|
3692 | 3692 | object.__setattr__(repo, '__class__', poisonedrepository) |
@@ -1,75 +1,75 | |||
|
1 | 1 | # requirements.py - objects and functions related to repository requirements |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
4 | 4 | # |
|
5 | 5 | # This software may be used and distributed according to the terms of the |
|
6 | 6 | # GNU General Public License version 2 or any later version. |
|
7 | 7 | |
|
8 | 8 | from __future__ import absolute_import |
|
9 | 9 | |
|
10 | 10 | # When narrowing is finalized and no longer subject to format changes, |
|
11 | 11 | # we should move this to just "narrow" or similar. |
|
12 | 12 | NARROW_REQUIREMENT = b'narrowhg-experimental' |
|
13 | 13 | |
|
14 | 14 | # Enables sparse working directory usage |
|
15 | 15 | SPARSE_REQUIREMENT = b'exp-sparse' |
|
16 | 16 | |
|
17 | 17 | # Enables the internal phase which is used to hide changesets instead |
|
18 | 18 | # of stripping them |
|
19 | 19 | INTERNAL_PHASE_REQUIREMENT = b'internal-phase' |
|
20 | 20 | |
|
21 | 21 | # Stores manifest in Tree structure |
|
22 | 22 | TREEMANIFEST_REQUIREMENT = b'treemanifest' |
|
23 | 23 | |
|
24 | 24 | # Increment the sub-version when the revlog v2 format changes to lock out old |
|
25 | 25 | # clients. |
|
26 | 26 | REVLOGV2_REQUIREMENT = b'exp-revlogv2.1' |
|
27 | 27 | |
|
28 | 28 | # A repository with the sparserevlog feature will have delta chains that |
|
29 | 29 | # can spread over a larger span. Sparse reading cuts these large spans into |
|
30 | 30 | # pieces, so that each piece isn't too big. |
|
31 | 31 | # Without the sparserevlog capability, reading from the repository could use |
|
32 | 32 | # huge amounts of memory, because the whole span would be read at once, |
|
33 | 33 | # including all the intermediate revisions that aren't pertinent for the chain. |
|
34 | 34 | # This is why once a repository has enabled sparse-read, it becomes required. |
|
35 | 35 | SPARSEREVLOG_REQUIREMENT = b'sparserevlog' |
|
36 | 36 | |
|
37 | 37 | # A repository with the sidedataflag requirement will allow to store extra |
|
38 | 38 | # information for revision without altering their original hashes. |
|
39 | 39 | SIDEDATA_REQUIREMENT = b'exp-sidedata-flag' |
|
40 | 40 | |
|
41 | 41 | # A repository with the the copies-sidedata-changeset requirement will store |
|
42 | 42 | # copies related information in changeset's sidedata. |
|
43 | 43 | COPIESSDC_REQUIREMENT = b'exp-copies-sidedata-changeset' |
|
44 | 44 | |
|
45 | 45 | # The repository use persistent nodemap for the changelog and the manifest. |
|
46 | 46 | NODEMAP_REQUIREMENT = b'persistent-nodemap' |
|
47 | 47 | |
|
48 | 48 | # Denotes that the current repository is a share |
|
49 | 49 | SHARED_REQUIREMENT = b'shared' |
|
50 | 50 | |
|
51 | 51 | # Denotes that current repository is a share and the shared source path is |
|
52 | 52 | # relative to the current repository root path |
|
53 | 53 | RELATIVE_SHARED_REQUIREMENT = b'relshared' |
|
54 | 54 | |
|
55 | 55 | # A repository with share implemented safely. The repository has different |
|
56 | 56 | # store and working copy requirements i.e. both `.hg/requires` and |
|
57 | 57 | # `.hg/store/requires` are present. |
|
58 |
SHARESAFE_REQUIREMENT = b' |
|
|
58 | SHARESAFE_REQUIREMENT = b'share-safe' | |
|
59 | 59 | |
|
60 | 60 | # List of requirements which are working directory specific |
|
61 | 61 | # These requirements cannot be shared between repositories if they |
|
62 | 62 | # share the same store |
|
63 | 63 | # * sparse is a working directory specific functionality and hence working |
|
64 | 64 | # directory specific requirement |
|
65 | 65 | # * SHARED_REQUIREMENT and RELATIVE_SHARED_REQUIREMENT are requirements which |
|
66 | 66 | # represents that the current working copy/repository shares store of another |
|
67 | 67 | # repo. Hence both of them should be stored in working copy |
|
68 | 68 | # * SHARESAFE_REQUIREMENT needs to be stored in working dir to mark that rest of |
|
69 | 69 | # the requirements are stored in store's requires |
|
70 | 70 | WORKING_DIR_REQUIREMENTS = { |
|
71 | 71 | SPARSE_REQUIREMENT, |
|
72 | 72 | SHARED_REQUIREMENT, |
|
73 | 73 | RELATIVE_SHARED_REQUIREMENT, |
|
74 | 74 | SHARESAFE_REQUIREMENT, |
|
75 | 75 | } |
@@ -1,911 +1,911 | |||
|
1 | 1 | # upgrade.py - functions for in place upgrade of Mercurial repository |
|
2 | 2 | # |
|
3 | 3 | # Copyright (c) 2016-present, Gregory Szorc |
|
4 | 4 | # |
|
5 | 5 | # This software may be used and distributed according to the terms of the |
|
6 | 6 | # GNU General Public License version 2 or any later version. |
|
7 | 7 | |
|
8 | 8 | from __future__ import absolute_import |
|
9 | 9 | |
|
10 | 10 | from ..i18n import _ |
|
11 | 11 | from .. import ( |
|
12 | 12 | error, |
|
13 | 13 | localrepo, |
|
14 | 14 | requirements, |
|
15 | 15 | revlog, |
|
16 | 16 | util, |
|
17 | 17 | ) |
|
18 | 18 | |
|
19 | 19 | from ..utils import compression |
|
20 | 20 | |
|
21 | 21 | # list of requirements that request a clone of all revlog if added/removed |
|
22 | 22 | RECLONES_REQUIREMENTS = { |
|
23 | 23 | b'generaldelta', |
|
24 | 24 | requirements.SPARSEREVLOG_REQUIREMENT, |
|
25 | 25 | } |
|
26 | 26 | |
|
27 | 27 | |
|
28 | 28 | def preservedrequirements(repo): |
|
29 | 29 | return set() |
|
30 | 30 | |
|
31 | 31 | |
|
32 | 32 | FORMAT_VARIANT = b'deficiency' |
|
33 | 33 | OPTIMISATION = b'optimization' |
|
34 | 34 | |
|
35 | 35 | |
|
36 | 36 | class improvement(object): |
|
37 | 37 | """Represents an improvement that can be made as part of an upgrade. |
|
38 | 38 | |
|
39 | 39 | The following attributes are defined on each instance: |
|
40 | 40 | |
|
41 | 41 | name |
|
42 | 42 | Machine-readable string uniquely identifying this improvement. It |
|
43 | 43 | will be mapped to an action later in the upgrade process. |
|
44 | 44 | |
|
45 | 45 | type |
|
46 | 46 | Either ``FORMAT_VARIANT`` or ``OPTIMISATION``. |
|
47 | 47 | A format variant is where we change the storage format. Not all format |
|
48 | 48 | variant changes are an obvious problem. |
|
49 | 49 | An optimization is an action (sometimes optional) that |
|
50 | 50 | can be taken to further improve the state of the repository. |
|
51 | 51 | |
|
52 | 52 | description |
|
53 | 53 | Message intended for humans explaining the improvement in more detail, |
|
54 | 54 | including the implications of it. For ``FORMAT_VARIANT`` types, should be |
|
55 | 55 | worded in the present tense. For ``OPTIMISATION`` types, should be |
|
56 | 56 | worded in the future tense. |
|
57 | 57 | |
|
58 | 58 | upgrademessage |
|
59 | 59 | Message intended for humans explaining what an upgrade addressing this |
|
60 | 60 | issue will do. Should be worded in the future tense. |
|
61 | 61 | |
|
62 | 62 | postupgrademessage |
|
63 | 63 | Message intended for humans which will be shown post an upgrade |
|
64 | 64 | operation when the improvement will be added |
|
65 | 65 | |
|
66 | 66 | postdowngrademessage |
|
67 | 67 | Message intended for humans which will be shown post an upgrade |
|
68 | 68 | operation in which this improvement was removed |
|
69 | 69 | """ |
|
70 | 70 | |
|
71 | 71 | def __init__(self, name, type, description, upgrademessage): |
|
72 | 72 | self.name = name |
|
73 | 73 | self.type = type |
|
74 | 74 | self.description = description |
|
75 | 75 | self.upgrademessage = upgrademessage |
|
76 | 76 | self.postupgrademessage = None |
|
77 | 77 | self.postdowngrademessage = None |
|
78 | 78 | |
|
79 | 79 | def __eq__(self, other): |
|
80 | 80 | if not isinstance(other, improvement): |
|
81 | 81 | # This is what python tell use to do |
|
82 | 82 | return NotImplemented |
|
83 | 83 | return self.name == other.name |
|
84 | 84 | |
|
85 | 85 | def __ne__(self, other): |
|
86 | 86 | return not (self == other) |
|
87 | 87 | |
|
88 | 88 | def __hash__(self): |
|
89 | 89 | return hash(self.name) |
|
90 | 90 | |
|
91 | 91 | |
|
92 | 92 | allformatvariant = [] |
|
93 | 93 | |
|
94 | 94 | |
|
95 | 95 | def registerformatvariant(cls): |
|
96 | 96 | allformatvariant.append(cls) |
|
97 | 97 | return cls |
|
98 | 98 | |
|
99 | 99 | |
|
100 | 100 | class formatvariant(improvement): |
|
101 | 101 | """an improvement subclass dedicated to repository format""" |
|
102 | 102 | |
|
103 | 103 | type = FORMAT_VARIANT |
|
104 | 104 | ### The following attributes should be defined for each class: |
|
105 | 105 | |
|
106 | 106 | # machine-readable string uniquely identifying this improvement. it will be |
|
107 | 107 | # mapped to an action later in the upgrade process. |
|
108 | 108 | name = None |
|
109 | 109 | |
|
110 | 110 | # message intended for humans explaining the improvement in more detail, |
|
111 | 111 | # including the implications of it ``FORMAT_VARIANT`` types, should be |
|
112 | 112 | # worded |
|
113 | 113 | # in the present tense. |
|
114 | 114 | description = None |
|
115 | 115 | |
|
116 | 116 | # message intended for humans explaining what an upgrade addressing this |
|
117 | 117 | # issue will do. should be worded in the future tense. |
|
118 | 118 | upgrademessage = None |
|
119 | 119 | |
|
120 | 120 | # value of current Mercurial default for new repository |
|
121 | 121 | default = None |
|
122 | 122 | |
|
123 | 123 | # Message intended for humans which will be shown post an upgrade |
|
124 | 124 | # operation when the improvement will be added |
|
125 | 125 | postupgrademessage = None |
|
126 | 126 | |
|
127 | 127 | # Message intended for humans which will be shown post an upgrade |
|
128 | 128 | # operation in which this improvement was removed |
|
129 | 129 | postdowngrademessage = None |
|
130 | 130 | |
|
131 | 131 | def __init__(self): |
|
132 | 132 | raise NotImplementedError() |
|
133 | 133 | |
|
134 | 134 | @staticmethod |
|
135 | 135 | def fromrepo(repo): |
|
136 | 136 | """current value of the variant in the repository""" |
|
137 | 137 | raise NotImplementedError() |
|
138 | 138 | |
|
139 | 139 | @staticmethod |
|
140 | 140 | def fromconfig(repo): |
|
141 | 141 | """current value of the variant in the configuration""" |
|
142 | 142 | raise NotImplementedError() |
|
143 | 143 | |
|
144 | 144 | |
|
145 | 145 | class requirementformatvariant(formatvariant): |
|
146 | 146 | """formatvariant based on a 'requirement' name. |
|
147 | 147 | |
|
148 | 148 | Many format variant are controlled by a 'requirement'. We define a small |
|
149 | 149 | subclass to factor the code. |
|
150 | 150 | """ |
|
151 | 151 | |
|
152 | 152 | # the requirement that control this format variant |
|
153 | 153 | _requirement = None |
|
154 | 154 | |
|
155 | 155 | @staticmethod |
|
156 | 156 | def _newreporequirements(ui): |
|
157 | 157 | return localrepo.newreporequirements( |
|
158 | 158 | ui, localrepo.defaultcreateopts(ui) |
|
159 | 159 | ) |
|
160 | 160 | |
|
161 | 161 | @classmethod |
|
162 | 162 | def fromrepo(cls, repo): |
|
163 | 163 | assert cls._requirement is not None |
|
164 | 164 | return cls._requirement in repo.requirements |
|
165 | 165 | |
|
166 | 166 | @classmethod |
|
167 | 167 | def fromconfig(cls, repo): |
|
168 | 168 | assert cls._requirement is not None |
|
169 | 169 | return cls._requirement in cls._newreporequirements(repo.ui) |
|
170 | 170 | |
|
171 | 171 | |
|
172 | 172 | @registerformatvariant |
|
173 | 173 | class fncache(requirementformatvariant): |
|
174 | 174 | name = b'fncache' |
|
175 | 175 | |
|
176 | 176 | _requirement = b'fncache' |
|
177 | 177 | |
|
178 | 178 | default = True |
|
179 | 179 | |
|
180 | 180 | description = _( |
|
181 | 181 | b'long and reserved filenames may not work correctly; ' |
|
182 | 182 | b'repository performance is sub-optimal' |
|
183 | 183 | ) |
|
184 | 184 | |
|
185 | 185 | upgrademessage = _( |
|
186 | 186 | b'repository will be more resilient to storing ' |
|
187 | 187 | b'certain paths and performance of certain ' |
|
188 | 188 | b'operations should be improved' |
|
189 | 189 | ) |
|
190 | 190 | |
|
191 | 191 | |
|
192 | 192 | @registerformatvariant |
|
193 | 193 | class dotencode(requirementformatvariant): |
|
194 | 194 | name = b'dotencode' |
|
195 | 195 | |
|
196 | 196 | _requirement = b'dotencode' |
|
197 | 197 | |
|
198 | 198 | default = True |
|
199 | 199 | |
|
200 | 200 | description = _( |
|
201 | 201 | b'storage of filenames beginning with a period or ' |
|
202 | 202 | b'space may not work correctly' |
|
203 | 203 | ) |
|
204 | 204 | |
|
205 | 205 | upgrademessage = _( |
|
206 | 206 | b'repository will be better able to store files ' |
|
207 | 207 | b'beginning with a space or period' |
|
208 | 208 | ) |
|
209 | 209 | |
|
210 | 210 | |
|
211 | 211 | @registerformatvariant |
|
212 | 212 | class generaldelta(requirementformatvariant): |
|
213 | 213 | name = b'generaldelta' |
|
214 | 214 | |
|
215 | 215 | _requirement = b'generaldelta' |
|
216 | 216 | |
|
217 | 217 | default = True |
|
218 | 218 | |
|
219 | 219 | description = _( |
|
220 | 220 | b'deltas within internal storage are unable to ' |
|
221 | 221 | b'choose optimal revisions; repository is larger and ' |
|
222 | 222 | b'slower than it could be; interaction with other ' |
|
223 | 223 | b'repositories may require extra network and CPU ' |
|
224 | 224 | b'resources, making "hg push" and "hg pull" slower' |
|
225 | 225 | ) |
|
226 | 226 | |
|
227 | 227 | upgrademessage = _( |
|
228 | 228 | b'repository storage will be able to create ' |
|
229 | 229 | b'optimal deltas; new repository data will be ' |
|
230 | 230 | b'smaller and read times should decrease; ' |
|
231 | 231 | b'interacting with other repositories using this ' |
|
232 | 232 | b'storage model should require less network and ' |
|
233 | 233 | b'CPU resources, making "hg push" and "hg pull" ' |
|
234 | 234 | b'faster' |
|
235 | 235 | ) |
|
236 | 236 | |
|
237 | 237 | |
|
238 | 238 | @registerformatvariant |
|
239 | 239 | class sharesafe(requirementformatvariant): |
|
240 |
name = b' |
|
|
240 | name = b'share-safe' | |
|
241 | 241 | _requirement = requirements.SHARESAFE_REQUIREMENT |
|
242 | 242 | |
|
243 | 243 | default = False |
|
244 | 244 | |
|
245 | 245 | description = _( |
|
246 | 246 | b'old shared repositories do not share source repository ' |
|
247 | 247 | b'requirements and config. This leads to various problems ' |
|
248 | 248 | b'when the source repository format is upgraded or some new ' |
|
249 | 249 | b'extensions are enabled.' |
|
250 | 250 | ) |
|
251 | 251 | |
|
252 | 252 | upgrademessage = _( |
|
253 | 253 | b'Upgrades a repository to share-safe format so that future ' |
|
254 | 254 | b'shares of this repository share its requirements and configs.' |
|
255 | 255 | ) |
|
256 | 256 | |
|
257 | 257 | postdowngrademessage = _( |
|
258 | 258 | b'repository downgraded to not use share safe mode, ' |
|
259 | 259 | b'existing shares will not work and needs to' |
|
260 | 260 | b' be reshared.' |
|
261 | 261 | ) |
|
262 | 262 | |
|
263 | 263 | postupgrademessage = _( |
|
264 | 264 | b'repository upgraded to share safe mode, existing' |
|
265 | 265 | b' shares will still work in old non-safe mode. ' |
|
266 | 266 | b'Re-share existing shares to use them in safe mode' |
|
267 | 267 | b' New shares will be created in safe mode.' |
|
268 | 268 | ) |
|
269 | 269 | |
|
270 | 270 | |
|
271 | 271 | @registerformatvariant |
|
272 | 272 | class sparserevlog(requirementformatvariant): |
|
273 | 273 | name = b'sparserevlog' |
|
274 | 274 | |
|
275 | 275 | _requirement = requirements.SPARSEREVLOG_REQUIREMENT |
|
276 | 276 | |
|
277 | 277 | default = True |
|
278 | 278 | |
|
279 | 279 | description = _( |
|
280 | 280 | b'in order to limit disk reading and memory usage on older ' |
|
281 | 281 | b'version, the span of a delta chain from its root to its ' |
|
282 | 282 | b'end is limited, whatever the relevant data in this span. ' |
|
283 | 283 | b'This can severly limit Mercurial ability to build good ' |
|
284 | 284 | b'chain of delta resulting is much more storage space being ' |
|
285 | 285 | b'taken and limit reusability of on disk delta during ' |
|
286 | 286 | b'exchange.' |
|
287 | 287 | ) |
|
288 | 288 | |
|
289 | 289 | upgrademessage = _( |
|
290 | 290 | b'Revlog supports delta chain with more unused data ' |
|
291 | 291 | b'between payload. These gaps will be skipped at read ' |
|
292 | 292 | b'time. This allows for better delta chains, making a ' |
|
293 | 293 | b'better compression and faster exchange with server.' |
|
294 | 294 | ) |
|
295 | 295 | |
|
296 | 296 | |
|
297 | 297 | @registerformatvariant |
|
298 | 298 | class sidedata(requirementformatvariant): |
|
299 | 299 | name = b'sidedata' |
|
300 | 300 | |
|
301 | 301 | _requirement = requirements.SIDEDATA_REQUIREMENT |
|
302 | 302 | |
|
303 | 303 | default = False |
|
304 | 304 | |
|
305 | 305 | description = _( |
|
306 | 306 | b'Allows storage of extra data alongside a revision, ' |
|
307 | 307 | b'unlocking various caching options.' |
|
308 | 308 | ) |
|
309 | 309 | |
|
310 | 310 | upgrademessage = _(b'Allows storage of extra data alongside a revision.') |
|
311 | 311 | |
|
312 | 312 | |
|
313 | 313 | @registerformatvariant |
|
314 | 314 | class persistentnodemap(requirementformatvariant): |
|
315 | 315 | name = b'persistent-nodemap' |
|
316 | 316 | |
|
317 | 317 | _requirement = requirements.NODEMAP_REQUIREMENT |
|
318 | 318 | |
|
319 | 319 | default = False |
|
320 | 320 | |
|
321 | 321 | description = _( |
|
322 | 322 | b'persist the node -> rev mapping on disk to speedup lookup' |
|
323 | 323 | ) |
|
324 | 324 | |
|
325 | 325 | upgrademessage = _(b'Speedup revision lookup by node id.') |
|
326 | 326 | |
|
327 | 327 | |
|
328 | 328 | @registerformatvariant |
|
329 | 329 | class copiessdc(requirementformatvariant): |
|
330 | 330 | name = b'copies-sdc' |
|
331 | 331 | |
|
332 | 332 | _requirement = requirements.COPIESSDC_REQUIREMENT |
|
333 | 333 | |
|
334 | 334 | default = False |
|
335 | 335 | |
|
336 | 336 | description = _(b'Stores copies information alongside changesets.') |
|
337 | 337 | |
|
338 | 338 | upgrademessage = _( |
|
339 | 339 | b'Allows to use more efficient algorithm to deal with ' b'copy tracing.' |
|
340 | 340 | ) |
|
341 | 341 | |
|
342 | 342 | |
|
343 | 343 | @registerformatvariant |
|
344 | 344 | class removecldeltachain(formatvariant): |
|
345 | 345 | name = b'plain-cl-delta' |
|
346 | 346 | |
|
347 | 347 | default = True |
|
348 | 348 | |
|
349 | 349 | description = _( |
|
350 | 350 | b'changelog storage is using deltas instead of ' |
|
351 | 351 | b'raw entries; changelog reading and any ' |
|
352 | 352 | b'operation relying on changelog data are slower ' |
|
353 | 353 | b'than they could be' |
|
354 | 354 | ) |
|
355 | 355 | |
|
356 | 356 | upgrademessage = _( |
|
357 | 357 | b'changelog storage will be reformated to ' |
|
358 | 358 | b'store raw entries; changelog reading will be ' |
|
359 | 359 | b'faster; changelog size may be reduced' |
|
360 | 360 | ) |
|
361 | 361 | |
|
362 | 362 | @staticmethod |
|
363 | 363 | def fromrepo(repo): |
|
364 | 364 | # Mercurial 4.0 changed changelogs to not use delta chains. Search for |
|
365 | 365 | # changelogs with deltas. |
|
366 | 366 | cl = repo.changelog |
|
367 | 367 | chainbase = cl.chainbase |
|
368 | 368 | return all(rev == chainbase(rev) for rev in cl) |
|
369 | 369 | |
|
370 | 370 | @staticmethod |
|
371 | 371 | def fromconfig(repo): |
|
372 | 372 | return True |
|
373 | 373 | |
|
374 | 374 | |
|
375 | 375 | @registerformatvariant |
|
376 | 376 | class compressionengine(formatvariant): |
|
377 | 377 | name = b'compression' |
|
378 | 378 | default = b'zlib' |
|
379 | 379 | |
|
380 | 380 | description = _( |
|
381 | 381 | b'Compresion algorithm used to compress data. ' |
|
382 | 382 | b'Some engine are faster than other' |
|
383 | 383 | ) |
|
384 | 384 | |
|
385 | 385 | upgrademessage = _( |
|
386 | 386 | b'revlog content will be recompressed with the new algorithm.' |
|
387 | 387 | ) |
|
388 | 388 | |
|
389 | 389 | @classmethod |
|
390 | 390 | def fromrepo(cls, repo): |
|
391 | 391 | # we allow multiple compression engine requirement to co-exist because |
|
392 | 392 | # strickly speaking, revlog seems to support mixed compression style. |
|
393 | 393 | # |
|
394 | 394 | # The compression used for new entries will be "the last one" |
|
395 | 395 | compression = b'zlib' |
|
396 | 396 | for req in repo.requirements: |
|
397 | 397 | prefix = req.startswith |
|
398 | 398 | if prefix(b'revlog-compression-') or prefix(b'exp-compression-'): |
|
399 | 399 | compression = req.split(b'-', 2)[2] |
|
400 | 400 | return compression |
|
401 | 401 | |
|
402 | 402 | @classmethod |
|
403 | 403 | def fromconfig(cls, repo): |
|
404 | 404 | compengines = repo.ui.configlist(b'format', b'revlog-compression') |
|
405 | 405 | # return the first valid value as the selection code would do |
|
406 | 406 | for comp in compengines: |
|
407 | 407 | if comp in util.compengines: |
|
408 | 408 | return comp |
|
409 | 409 | |
|
410 | 410 | # no valide compression found lets display it all for clarity |
|
411 | 411 | return b','.join(compengines) |
|
412 | 412 | |
|
413 | 413 | |
|
414 | 414 | @registerformatvariant |
|
415 | 415 | class compressionlevel(formatvariant): |
|
416 | 416 | name = b'compression-level' |
|
417 | 417 | default = b'default' |
|
418 | 418 | |
|
419 | 419 | description = _(b'compression level') |
|
420 | 420 | |
|
421 | 421 | upgrademessage = _(b'revlog content will be recompressed') |
|
422 | 422 | |
|
423 | 423 | @classmethod |
|
424 | 424 | def fromrepo(cls, repo): |
|
425 | 425 | comp = compressionengine.fromrepo(repo) |
|
426 | 426 | level = None |
|
427 | 427 | if comp == b'zlib': |
|
428 | 428 | level = repo.ui.configint(b'storage', b'revlog.zlib.level') |
|
429 | 429 | elif comp == b'zstd': |
|
430 | 430 | level = repo.ui.configint(b'storage', b'revlog.zstd.level') |
|
431 | 431 | if level is None: |
|
432 | 432 | return b'default' |
|
433 | 433 | return bytes(level) |
|
434 | 434 | |
|
435 | 435 | @classmethod |
|
436 | 436 | def fromconfig(cls, repo): |
|
437 | 437 | comp = compressionengine.fromconfig(repo) |
|
438 | 438 | level = None |
|
439 | 439 | if comp == b'zlib': |
|
440 | 440 | level = repo.ui.configint(b'storage', b'revlog.zlib.level') |
|
441 | 441 | elif comp == b'zstd': |
|
442 | 442 | level = repo.ui.configint(b'storage', b'revlog.zstd.level') |
|
443 | 443 | if level is None: |
|
444 | 444 | return b'default' |
|
445 | 445 | return bytes(level) |
|
446 | 446 | |
|
447 | 447 | |
|
448 | 448 | def find_format_upgrades(repo): |
|
449 | 449 | """returns a list of format upgrades which can be perform on the repo""" |
|
450 | 450 | upgrades = [] |
|
451 | 451 | |
|
452 | 452 | # We could detect lack of revlogv1 and store here, but they were added |
|
453 | 453 | # in 0.9.2 and we don't support upgrading repos without these |
|
454 | 454 | # requirements, so let's not bother. |
|
455 | 455 | |
|
456 | 456 | for fv in allformatvariant: |
|
457 | 457 | if not fv.fromrepo(repo): |
|
458 | 458 | upgrades.append(fv) |
|
459 | 459 | |
|
460 | 460 | return upgrades |
|
461 | 461 | |
|
462 | 462 | |
|
463 | 463 | def find_format_downgrades(repo): |
|
464 | 464 | """returns a list of format downgrades which will be performed on the repo |
|
465 | 465 | because of disabled config option for them""" |
|
466 | 466 | |
|
467 | 467 | downgrades = [] |
|
468 | 468 | |
|
469 | 469 | for fv in allformatvariant: |
|
470 | 470 | if fv.name == b'compression': |
|
471 | 471 | # If there is a compression change between repository |
|
472 | 472 | # and config, destination repository compression will change |
|
473 | 473 | # and current compression will be removed. |
|
474 | 474 | if fv.fromrepo(repo) != fv.fromconfig(repo): |
|
475 | 475 | downgrades.append(fv) |
|
476 | 476 | continue |
|
477 | 477 | # format variant exist in repo but does not exist in new repository |
|
478 | 478 | # config |
|
479 | 479 | if fv.fromrepo(repo) and not fv.fromconfig(repo): |
|
480 | 480 | downgrades.append(fv) |
|
481 | 481 | |
|
482 | 482 | return downgrades |
|
483 | 483 | |
|
484 | 484 | |
|
485 | 485 | ALL_OPTIMISATIONS = [] |
|
486 | 486 | |
|
487 | 487 | |
|
488 | 488 | def register_optimization(obj): |
|
489 | 489 | ALL_OPTIMISATIONS.append(obj) |
|
490 | 490 | return obj |
|
491 | 491 | |
|
492 | 492 | |
|
493 | 493 | register_optimization( |
|
494 | 494 | improvement( |
|
495 | 495 | name=b're-delta-parent', |
|
496 | 496 | type=OPTIMISATION, |
|
497 | 497 | description=_( |
|
498 | 498 | b'deltas within internal storage will be recalculated to ' |
|
499 | 499 | b'choose an optimal base revision where this was not ' |
|
500 | 500 | b'already done; the size of the repository may shrink and ' |
|
501 | 501 | b'various operations may become faster; the first time ' |
|
502 | 502 | b'this optimization is performed could slow down upgrade ' |
|
503 | 503 | b'execution considerably; subsequent invocations should ' |
|
504 | 504 | b'not run noticeably slower' |
|
505 | 505 | ), |
|
506 | 506 | upgrademessage=_( |
|
507 | 507 | b'deltas within internal storage will choose a new ' |
|
508 | 508 | b'base revision if needed' |
|
509 | 509 | ), |
|
510 | 510 | ) |
|
511 | 511 | ) |
|
512 | 512 | |
|
513 | 513 | register_optimization( |
|
514 | 514 | improvement( |
|
515 | 515 | name=b're-delta-multibase', |
|
516 | 516 | type=OPTIMISATION, |
|
517 | 517 | description=_( |
|
518 | 518 | b'deltas within internal storage will be recalculated ' |
|
519 | 519 | b'against multiple base revision and the smallest ' |
|
520 | 520 | b'difference will be used; the size of the repository may ' |
|
521 | 521 | b'shrink significantly when there are many merges; this ' |
|
522 | 522 | b'optimization will slow down execution in proportion to ' |
|
523 | 523 | b'the number of merges in the repository and the amount ' |
|
524 | 524 | b'of files in the repository; this slow down should not ' |
|
525 | 525 | b'be significant unless there are tens of thousands of ' |
|
526 | 526 | b'files and thousands of merges' |
|
527 | 527 | ), |
|
528 | 528 | upgrademessage=_( |
|
529 | 529 | b'deltas within internal storage will choose an ' |
|
530 | 530 | b'optimal delta by computing deltas against multiple ' |
|
531 | 531 | b'parents; may slow down execution time ' |
|
532 | 532 | b'significantly' |
|
533 | 533 | ), |
|
534 | 534 | ) |
|
535 | 535 | ) |
|
536 | 536 | |
|
537 | 537 | register_optimization( |
|
538 | 538 | improvement( |
|
539 | 539 | name=b're-delta-all', |
|
540 | 540 | type=OPTIMISATION, |
|
541 | 541 | description=_( |
|
542 | 542 | b'deltas within internal storage will always be ' |
|
543 | 543 | b'recalculated without reusing prior deltas; this will ' |
|
544 | 544 | b'likely make execution run several times slower; this ' |
|
545 | 545 | b'optimization is typically not needed' |
|
546 | 546 | ), |
|
547 | 547 | upgrademessage=_( |
|
548 | 548 | b'deltas within internal storage will be fully ' |
|
549 | 549 | b'recomputed; this will likely drastically slow down ' |
|
550 | 550 | b'execution time' |
|
551 | 551 | ), |
|
552 | 552 | ) |
|
553 | 553 | ) |
|
554 | 554 | |
|
555 | 555 | register_optimization( |
|
556 | 556 | improvement( |
|
557 | 557 | name=b're-delta-fulladd', |
|
558 | 558 | type=OPTIMISATION, |
|
559 | 559 | description=_( |
|
560 | 560 | b'every revision will be re-added as if it was new ' |
|
561 | 561 | b'content. It will go through the full storage ' |
|
562 | 562 | b'mechanism giving extensions a chance to process it ' |
|
563 | 563 | b'(eg. lfs). This is similar to "re-delta-all" but even ' |
|
564 | 564 | b'slower since more logic is involved.' |
|
565 | 565 | ), |
|
566 | 566 | upgrademessage=_( |
|
567 | 567 | b'each revision will be added as new content to the ' |
|
568 | 568 | b'internal storage; this will likely drastically slow ' |
|
569 | 569 | b'down execution time, but some extensions might need ' |
|
570 | 570 | b'it' |
|
571 | 571 | ), |
|
572 | 572 | ) |
|
573 | 573 | ) |
|
574 | 574 | |
|
575 | 575 | |
|
576 | 576 | def findoptimizations(repo): |
|
577 | 577 | """Determine optimisation that could be used during upgrade""" |
|
578 | 578 | # These are unconditionally added. There is logic later that figures out |
|
579 | 579 | # which ones to apply. |
|
580 | 580 | return list(ALL_OPTIMISATIONS) |
|
581 | 581 | |
|
582 | 582 | |
|
583 | 583 | def determine_upgrade_actions( |
|
584 | 584 | repo, format_upgrades, optimizations, sourcereqs, destreqs |
|
585 | 585 | ): |
|
586 | 586 | """Determine upgrade actions that will be performed. |
|
587 | 587 | |
|
588 | 588 | Given a list of improvements as returned by ``find_format_upgrades`` and |
|
589 | 589 | ``findoptimizations``, determine the list of upgrade actions that |
|
590 | 590 | will be performed. |
|
591 | 591 | |
|
592 | 592 | The role of this function is to filter improvements if needed, apply |
|
593 | 593 | recommended optimizations from the improvements list that make sense, |
|
594 | 594 | etc. |
|
595 | 595 | |
|
596 | 596 | Returns a list of action names. |
|
597 | 597 | """ |
|
598 | 598 | newactions = [] |
|
599 | 599 | |
|
600 | 600 | for d in format_upgrades: |
|
601 | 601 | name = d._requirement |
|
602 | 602 | |
|
603 | 603 | # If the action is a requirement that doesn't show up in the |
|
604 | 604 | # destination requirements, prune the action. |
|
605 | 605 | if name is not None and name not in destreqs: |
|
606 | 606 | continue |
|
607 | 607 | |
|
608 | 608 | newactions.append(d) |
|
609 | 609 | |
|
610 | 610 | newactions.extend(o for o in sorted(optimizations) if o not in newactions) |
|
611 | 611 | |
|
612 | 612 | # FUTURE consider adding some optimizations here for certain transitions. |
|
613 | 613 | # e.g. adding generaldelta could schedule parent redeltas. |
|
614 | 614 | |
|
615 | 615 | return newactions |
|
616 | 616 | |
|
617 | 617 | |
|
618 | 618 | class UpgradeOperation(object): |
|
619 | 619 | """represent the work to be done during an upgrade""" |
|
620 | 620 | |
|
621 | 621 | def __init__( |
|
622 | 622 | self, |
|
623 | 623 | ui, |
|
624 | 624 | new_requirements, |
|
625 | 625 | current_requirements, |
|
626 | 626 | upgrade_actions, |
|
627 | 627 | removed_actions, |
|
628 | 628 | revlogs_to_process, |
|
629 | 629 | ): |
|
630 | 630 | self.ui = ui |
|
631 | 631 | self.new_requirements = new_requirements |
|
632 | 632 | self.current_requirements = current_requirements |
|
633 | 633 | # list of upgrade actions the operation will perform |
|
634 | 634 | self.upgrade_actions = upgrade_actions |
|
635 | 635 | self._upgrade_actions_names = set([a.name for a in upgrade_actions]) |
|
636 | 636 | self.removed_actions = removed_actions |
|
637 | 637 | self.revlogs_to_process = revlogs_to_process |
|
638 | 638 | # requirements which will be added by the operation |
|
639 | 639 | self._added_requirements = ( |
|
640 | 640 | self.new_requirements - self.current_requirements |
|
641 | 641 | ) |
|
642 | 642 | # requirements which will be removed by the operation |
|
643 | 643 | self._removed_requirements = ( |
|
644 | 644 | self.current_requirements - self.new_requirements |
|
645 | 645 | ) |
|
646 | 646 | # requirements which will be preserved by the operation |
|
647 | 647 | self._preserved_requirements = ( |
|
648 | 648 | self.current_requirements & self.new_requirements |
|
649 | 649 | ) |
|
650 | 650 | # optimizations which are not used and it's recommended that they |
|
651 | 651 | # should use them |
|
652 | 652 | all_optimizations = findoptimizations(None) |
|
653 | 653 | self.unused_optimizations = [ |
|
654 | 654 | i for i in all_optimizations if i not in self.upgrade_actions |
|
655 | 655 | ] |
|
656 | 656 | |
|
657 | 657 | # delta reuse mode of this upgrade operation |
|
658 | 658 | self.delta_reuse_mode = revlog.revlog.DELTAREUSEALWAYS |
|
659 | 659 | if b're-delta-all' in self._upgrade_actions_names: |
|
660 | 660 | self.delta_reuse_mode = revlog.revlog.DELTAREUSENEVER |
|
661 | 661 | elif b're-delta-parent' in self._upgrade_actions_names: |
|
662 | 662 | self.delta_reuse_mode = revlog.revlog.DELTAREUSESAMEREVS |
|
663 | 663 | elif b're-delta-multibase' in self._upgrade_actions_names: |
|
664 | 664 | self.delta_reuse_mode = revlog.revlog.DELTAREUSESAMEREVS |
|
665 | 665 | elif b're-delta-fulladd' in self._upgrade_actions_names: |
|
666 | 666 | self.delta_reuse_mode = revlog.revlog.DELTAREUSEFULLADD |
|
667 | 667 | |
|
668 | 668 | # should this operation force re-delta of both parents |
|
669 | 669 | self.force_re_delta_both_parents = ( |
|
670 | 670 | b're-delta-multibase' in self._upgrade_actions_names |
|
671 | 671 | ) |
|
672 | 672 | |
|
673 | 673 | def _write_labeled(self, l, label): |
|
674 | 674 | """ |
|
675 | 675 | Utility function to aid writing of a list under one label |
|
676 | 676 | """ |
|
677 | 677 | first = True |
|
678 | 678 | for r in sorted(l): |
|
679 | 679 | if not first: |
|
680 | 680 | self.ui.write(b', ') |
|
681 | 681 | self.ui.write(r, label=label) |
|
682 | 682 | first = False |
|
683 | 683 | |
|
684 | 684 | def print_requirements(self): |
|
685 | 685 | self.ui.write(_(b'requirements\n')) |
|
686 | 686 | self.ui.write(_(b' preserved: ')) |
|
687 | 687 | self._write_labeled( |
|
688 | 688 | self._preserved_requirements, "upgrade-repo.requirement.preserved" |
|
689 | 689 | ) |
|
690 | 690 | self.ui.write((b'\n')) |
|
691 | 691 | if self._removed_requirements: |
|
692 | 692 | self.ui.write(_(b' removed: ')) |
|
693 | 693 | self._write_labeled( |
|
694 | 694 | self._removed_requirements, "upgrade-repo.requirement.removed" |
|
695 | 695 | ) |
|
696 | 696 | self.ui.write((b'\n')) |
|
697 | 697 | if self._added_requirements: |
|
698 | 698 | self.ui.write(_(b' added: ')) |
|
699 | 699 | self._write_labeled( |
|
700 | 700 | self._added_requirements, "upgrade-repo.requirement.added" |
|
701 | 701 | ) |
|
702 | 702 | self.ui.write((b'\n')) |
|
703 | 703 | self.ui.write(b'\n') |
|
704 | 704 | |
|
705 | 705 | def print_optimisations(self): |
|
706 | 706 | optimisations = [ |
|
707 | 707 | a for a in self.upgrade_actions if a.type == OPTIMISATION |
|
708 | 708 | ] |
|
709 | 709 | optimisations.sort(key=lambda a: a.name) |
|
710 | 710 | if optimisations: |
|
711 | 711 | self.ui.write(_(b'optimisations: ')) |
|
712 | 712 | self._write_labeled( |
|
713 | 713 | [a.name for a in optimisations], |
|
714 | 714 | "upgrade-repo.optimisation.performed", |
|
715 | 715 | ) |
|
716 | 716 | self.ui.write(b'\n\n') |
|
717 | 717 | |
|
718 | 718 | def print_upgrade_actions(self): |
|
719 | 719 | for a in self.upgrade_actions: |
|
720 | 720 | self.ui.status(b'%s\n %s\n\n' % (a.name, a.upgrademessage)) |
|
721 | 721 | |
|
722 | 722 | def print_affected_revlogs(self): |
|
723 | 723 | if not self.revlogs_to_process: |
|
724 | 724 | self.ui.write((b'no revlogs to process\n')) |
|
725 | 725 | else: |
|
726 | 726 | self.ui.write((b'processed revlogs:\n')) |
|
727 | 727 | for r in sorted(self.revlogs_to_process): |
|
728 | 728 | self.ui.write((b' - %s\n' % r)) |
|
729 | 729 | self.ui.write((b'\n')) |
|
730 | 730 | |
|
731 | 731 | def print_unused_optimizations(self): |
|
732 | 732 | for i in self.unused_optimizations: |
|
733 | 733 | self.ui.status(_(b'%s\n %s\n\n') % (i.name, i.description)) |
|
734 | 734 | |
|
735 | 735 | def has_upgrade_action(self, name): |
|
736 | 736 | """ Check whether the upgrade operation will perform this action """ |
|
737 | 737 | return name in self._upgrade_actions_names |
|
738 | 738 | |
|
739 | 739 | def print_post_op_messages(self): |
|
740 | 740 | """ print post upgrade operation warning messages """ |
|
741 | 741 | for a in self.upgrade_actions: |
|
742 | 742 | if a.postupgrademessage is not None: |
|
743 | 743 | self.ui.warn(b'%s\n' % a.postupgrademessage) |
|
744 | 744 | for a in self.removed_actions: |
|
745 | 745 | if a.postdowngrademessage is not None: |
|
746 | 746 | self.ui.warn(b'%s\n' % a.postdowngrademessage) |
|
747 | 747 | |
|
748 | 748 | |
|
749 | 749 | ### Code checking if a repository can got through the upgrade process at all. # |
|
750 | 750 | |
|
751 | 751 | |
|
752 | 752 | def requiredsourcerequirements(repo): |
|
753 | 753 | """Obtain requirements required to be present to upgrade a repo. |
|
754 | 754 | |
|
755 | 755 | An upgrade will not be allowed if the repository doesn't have the |
|
756 | 756 | requirements returned by this function. |
|
757 | 757 | """ |
|
758 | 758 | return { |
|
759 | 759 | # Introduced in Mercurial 0.9.2. |
|
760 | 760 | b'revlogv1', |
|
761 | 761 | # Introduced in Mercurial 0.9.2. |
|
762 | 762 | b'store', |
|
763 | 763 | } |
|
764 | 764 | |
|
765 | 765 | |
|
766 | 766 | def blocksourcerequirements(repo): |
|
767 | 767 | """Obtain requirements that will prevent an upgrade from occurring. |
|
768 | 768 | |
|
769 | 769 | An upgrade cannot be performed if the source repository contains a |
|
770 | 770 | requirements in the returned set. |
|
771 | 771 | """ |
|
772 | 772 | return { |
|
773 | 773 | # The upgrade code does not yet support these experimental features. |
|
774 | 774 | # This is an artificial limitation. |
|
775 | 775 | requirements.TREEMANIFEST_REQUIREMENT, |
|
776 | 776 | # This was a precursor to generaldelta and was never enabled by default. |
|
777 | 777 | # It should (hopefully) not exist in the wild. |
|
778 | 778 | b'parentdelta', |
|
779 | 779 | # Upgrade should operate on the actual store, not the shared link. |
|
780 | 780 | requirements.SHARED_REQUIREMENT, |
|
781 | 781 | } |
|
782 | 782 | |
|
783 | 783 | |
|
784 | 784 | def check_source_requirements(repo): |
|
785 | 785 | """Ensure that no existing requirements prevent the repository upgrade""" |
|
786 | 786 | |
|
787 | 787 | required = requiredsourcerequirements(repo) |
|
788 | 788 | missingreqs = required - repo.requirements |
|
789 | 789 | if missingreqs: |
|
790 | 790 | msg = _(b'cannot upgrade repository; requirement missing: %s') |
|
791 | 791 | missingreqs = b', '.join(sorted(missingreqs)) |
|
792 | 792 | raise error.Abort(msg % missingreqs) |
|
793 | 793 | |
|
794 | 794 | blocking = blocksourcerequirements(repo) |
|
795 | 795 | blockingreqs = blocking & repo.requirements |
|
796 | 796 | if blockingreqs: |
|
797 | 797 | m = _(b'cannot upgrade repository; unsupported source requirement: %s') |
|
798 | 798 | blockingreqs = b', '.join(sorted(blockingreqs)) |
|
799 | 799 | raise error.Abort(m % blockingreqs) |
|
800 | 800 | |
|
801 | 801 | |
|
802 | 802 | ### Verify the validity of the planned requirement changes #################### |
|
803 | 803 | |
|
804 | 804 | |
|
805 | 805 | def supportremovedrequirements(repo): |
|
806 | 806 | """Obtain requirements that can be removed during an upgrade. |
|
807 | 807 | |
|
808 | 808 | If an upgrade were to create a repository that dropped a requirement, |
|
809 | 809 | the dropped requirement must appear in the returned set for the upgrade |
|
810 | 810 | to be allowed. |
|
811 | 811 | """ |
|
812 | 812 | supported = { |
|
813 | 813 | requirements.SPARSEREVLOG_REQUIREMENT, |
|
814 | 814 | requirements.SIDEDATA_REQUIREMENT, |
|
815 | 815 | requirements.COPIESSDC_REQUIREMENT, |
|
816 | 816 | requirements.NODEMAP_REQUIREMENT, |
|
817 | 817 | requirements.SHARESAFE_REQUIREMENT, |
|
818 | 818 | } |
|
819 | 819 | for name in compression.compengines: |
|
820 | 820 | engine = compression.compengines[name] |
|
821 | 821 | if engine.available() and engine.revlogheader(): |
|
822 | 822 | supported.add(b'exp-compression-%s' % name) |
|
823 | 823 | if engine.name() == b'zstd': |
|
824 | 824 | supported.add(b'revlog-compression-zstd') |
|
825 | 825 | return supported |
|
826 | 826 | |
|
827 | 827 | |
|
828 | 828 | def supporteddestrequirements(repo): |
|
829 | 829 | """Obtain requirements that upgrade supports in the destination. |
|
830 | 830 | |
|
831 | 831 | If the result of the upgrade would create requirements not in this set, |
|
832 | 832 | the upgrade is disallowed. |
|
833 | 833 | |
|
834 | 834 | Extensions should monkeypatch this to add their custom requirements. |
|
835 | 835 | """ |
|
836 | 836 | supported = { |
|
837 | 837 | b'dotencode', |
|
838 | 838 | b'fncache', |
|
839 | 839 | b'generaldelta', |
|
840 | 840 | b'revlogv1', |
|
841 | 841 | b'store', |
|
842 | 842 | requirements.SPARSEREVLOG_REQUIREMENT, |
|
843 | 843 | requirements.SIDEDATA_REQUIREMENT, |
|
844 | 844 | requirements.COPIESSDC_REQUIREMENT, |
|
845 | 845 | requirements.NODEMAP_REQUIREMENT, |
|
846 | 846 | requirements.SHARESAFE_REQUIREMENT, |
|
847 | 847 | } |
|
848 | 848 | for name in compression.compengines: |
|
849 | 849 | engine = compression.compengines[name] |
|
850 | 850 | if engine.available() and engine.revlogheader(): |
|
851 | 851 | supported.add(b'exp-compression-%s' % name) |
|
852 | 852 | if engine.name() == b'zstd': |
|
853 | 853 | supported.add(b'revlog-compression-zstd') |
|
854 | 854 | return supported |
|
855 | 855 | |
|
856 | 856 | |
|
857 | 857 | def allowednewrequirements(repo): |
|
858 | 858 | """Obtain requirements that can be added to a repository during upgrade. |
|
859 | 859 | |
|
860 | 860 | This is used to disallow proposed requirements from being added when |
|
861 | 861 | they weren't present before. |
|
862 | 862 | |
|
863 | 863 | We use a list of allowed requirement additions instead of a list of known |
|
864 | 864 | bad additions because the whitelist approach is safer and will prevent |
|
865 | 865 | future, unknown requirements from accidentally being added. |
|
866 | 866 | """ |
|
867 | 867 | supported = { |
|
868 | 868 | b'dotencode', |
|
869 | 869 | b'fncache', |
|
870 | 870 | b'generaldelta', |
|
871 | 871 | requirements.SPARSEREVLOG_REQUIREMENT, |
|
872 | 872 | requirements.SIDEDATA_REQUIREMENT, |
|
873 | 873 | requirements.COPIESSDC_REQUIREMENT, |
|
874 | 874 | requirements.NODEMAP_REQUIREMENT, |
|
875 | 875 | requirements.SHARESAFE_REQUIREMENT, |
|
876 | 876 | } |
|
877 | 877 | for name in compression.compengines: |
|
878 | 878 | engine = compression.compengines[name] |
|
879 | 879 | if engine.available() and engine.revlogheader(): |
|
880 | 880 | supported.add(b'exp-compression-%s' % name) |
|
881 | 881 | if engine.name() == b'zstd': |
|
882 | 882 | supported.add(b'revlog-compression-zstd') |
|
883 | 883 | return supported |
|
884 | 884 | |
|
885 | 885 | |
|
886 | 886 | def check_requirements_changes(repo, new_reqs): |
|
887 | 887 | old_reqs = repo.requirements |
|
888 | 888 | |
|
889 | 889 | support_removal = supportremovedrequirements(repo) |
|
890 | 890 | no_remove_reqs = old_reqs - new_reqs - support_removal |
|
891 | 891 | if no_remove_reqs: |
|
892 | 892 | msg = _(b'cannot upgrade repository; requirement would be removed: %s') |
|
893 | 893 | no_remove_reqs = b', '.join(sorted(no_remove_reqs)) |
|
894 | 894 | raise error.Abort(msg % no_remove_reqs) |
|
895 | 895 | |
|
896 | 896 | support_addition = allowednewrequirements(repo) |
|
897 | 897 | no_add_reqs = new_reqs - old_reqs - support_addition |
|
898 | 898 | if no_add_reqs: |
|
899 | 899 | m = _(b'cannot upgrade repository; do not support adding requirement: ') |
|
900 | 900 | no_add_reqs = b', '.join(sorted(no_add_reqs)) |
|
901 | 901 | raise error.Abort(m + no_add_reqs) |
|
902 | 902 | |
|
903 | 903 | supported = supporteddestrequirements(repo) |
|
904 | 904 | unsupported_reqs = new_reqs - supported |
|
905 | 905 | if unsupported_reqs: |
|
906 | 906 | msg = _( |
|
907 | 907 | b'cannot upgrade repository; do not support destination ' |
|
908 | 908 | b'requirement: %s' |
|
909 | 909 | ) |
|
910 | 910 | unsupported_reqs = b', '.join(sorted(unsupported_reqs)) |
|
911 | 911 | raise error.Abort(msg % unsupported_reqs) |
@@ -1,1754 +1,1754 | |||
|
1 | 1 | #testcases filelog compatibility changeset sidedata upgraded |
|
2 | 2 | |
|
3 | 3 | ===================================================== |
|
4 | 4 | Test Copy tracing for chain of copies involving merge |
|
5 | 5 | ===================================================== |
|
6 | 6 | |
|
7 | 7 | This test files covers copies/rename case for a chains of commit where merges |
|
8 | 8 | are involved. It cheks we do not have unwanted update of behavior and that the |
|
9 | 9 | different options to retrieve copies behave correctly. |
|
10 | 10 | |
|
11 | 11 | |
|
12 | 12 | Setup |
|
13 | 13 | ===== |
|
14 | 14 | |
|
15 | 15 | use git diff to see rename |
|
16 | 16 | |
|
17 | 17 | $ cat << EOF >> $HGRCPATH |
|
18 | 18 | > [diff] |
|
19 | 19 | > git=yes |
|
20 | 20 | > [command-templates] |
|
21 | 21 | > log={rev} {desc}\n |
|
22 | 22 | > EOF |
|
23 | 23 | |
|
24 | 24 | #if compatibility |
|
25 | 25 | $ cat >> $HGRCPATH << EOF |
|
26 | 26 | > [experimental] |
|
27 | 27 | > copies.read-from = compatibility |
|
28 | 28 | > EOF |
|
29 | 29 | #endif |
|
30 | 30 | |
|
31 | 31 | #if changeset |
|
32 | 32 | $ cat >> $HGRCPATH << EOF |
|
33 | 33 | > [experimental] |
|
34 | 34 | > copies.read-from = changeset-only |
|
35 | 35 | > copies.write-to = changeset-only |
|
36 | 36 | > EOF |
|
37 | 37 | #endif |
|
38 | 38 | |
|
39 | 39 | #if sidedata |
|
40 | 40 | $ cat >> $HGRCPATH << EOF |
|
41 | 41 | > [format] |
|
42 | 42 | > exp-use-side-data = yes |
|
43 | 43 | > exp-use-copies-side-data-changeset = yes |
|
44 | 44 | > EOF |
|
45 | 45 | #endif |
|
46 | 46 | |
|
47 | 47 | |
|
48 | 48 | $ hg init repo-chain |
|
49 | 49 | $ cd repo-chain |
|
50 | 50 | |
|
51 | 51 | Add some linear rename initialy |
|
52 | 52 | |
|
53 | 53 | $ echo a > a |
|
54 | 54 | $ echo b > b |
|
55 | 55 | $ echo h > h |
|
56 | 56 | $ hg ci -Am 'i-0 initial commit: a b h' |
|
57 | 57 | adding a |
|
58 | 58 | adding b |
|
59 | 59 | adding h |
|
60 | 60 | $ hg mv a c |
|
61 | 61 | $ hg ci -Am 'i-1: a -move-> c' |
|
62 | 62 | $ hg mv c d |
|
63 | 63 | $ hg ci -Am 'i-2: c -move-> d' |
|
64 | 64 | $ hg log -G |
|
65 | 65 | @ 2 i-2: c -move-> d |
|
66 | 66 | | |
|
67 | 67 | o 1 i-1: a -move-> c |
|
68 | 68 | | |
|
69 | 69 | o 0 i-0 initial commit: a b h |
|
70 | 70 | |
|
71 | 71 | |
|
72 | 72 | And having another branch with renames on the other side |
|
73 | 73 | |
|
74 | 74 | $ hg mv d e |
|
75 | 75 | $ hg ci -Am 'a-1: d -move-> e' |
|
76 | 76 | $ hg mv e f |
|
77 | 77 | $ hg ci -Am 'a-2: e -move-> f' |
|
78 | 78 | $ hg log -G --rev '::.' |
|
79 | 79 | @ 4 a-2: e -move-> f |
|
80 | 80 | | |
|
81 | 81 | o 3 a-1: d -move-> e |
|
82 | 82 | | |
|
83 | 83 | o 2 i-2: c -move-> d |
|
84 | 84 | | |
|
85 | 85 | o 1 i-1: a -move-> c |
|
86 | 86 | | |
|
87 | 87 | o 0 i-0 initial commit: a b h |
|
88 | 88 | |
|
89 | 89 | |
|
90 | 90 | Have a branching with nothing on one side |
|
91 | 91 | |
|
92 | 92 | $ hg up 'desc("i-2")' |
|
93 | 93 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
94 | 94 | $ echo foo > b |
|
95 | 95 | $ hg ci -m 'b-1: b update' |
|
96 | 96 | created new head |
|
97 | 97 | $ hg log -G --rev '::.' |
|
98 | 98 | @ 5 b-1: b update |
|
99 | 99 | | |
|
100 | 100 | o 2 i-2: c -move-> d |
|
101 | 101 | | |
|
102 | 102 | o 1 i-1: a -move-> c |
|
103 | 103 | | |
|
104 | 104 | o 0 i-0 initial commit: a b h |
|
105 | 105 | |
|
106 | 106 | |
|
107 | 107 | Create a branch that delete a file previous renamed |
|
108 | 108 | |
|
109 | 109 | $ hg up 'desc("i-2")' |
|
110 | 110 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
111 | 111 | $ hg rm d |
|
112 | 112 | $ hg ci -m 'c-1 delete d' |
|
113 | 113 | created new head |
|
114 | 114 | $ hg log -G --rev '::.' |
|
115 | 115 | @ 6 c-1 delete d |
|
116 | 116 | | |
|
117 | 117 | o 2 i-2: c -move-> d |
|
118 | 118 | | |
|
119 | 119 | o 1 i-1: a -move-> c |
|
120 | 120 | | |
|
121 | 121 | o 0 i-0 initial commit: a b h |
|
122 | 122 | |
|
123 | 123 | |
|
124 | 124 | Create a branch that delete a file previous renamed and recreate it |
|
125 | 125 | |
|
126 | 126 | $ hg up 'desc("i-2")' |
|
127 | 127 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
128 | 128 | $ hg rm d |
|
129 | 129 | $ hg ci -m 'd-1 delete d' |
|
130 | 130 | created new head |
|
131 | 131 | $ echo bar > d |
|
132 | 132 | $ hg add d |
|
133 | 133 | $ hg ci -m 'd-2 re-add d' |
|
134 | 134 | $ hg log -G --rev '::.' |
|
135 | 135 | @ 8 d-2 re-add d |
|
136 | 136 | | |
|
137 | 137 | o 7 d-1 delete d |
|
138 | 138 | | |
|
139 | 139 | o 2 i-2: c -move-> d |
|
140 | 140 | | |
|
141 | 141 | o 1 i-1: a -move-> c |
|
142 | 142 | | |
|
143 | 143 | o 0 i-0 initial commit: a b h |
|
144 | 144 | |
|
145 | 145 | |
|
146 | 146 | Having another branch renaming a different file to the same filename as another |
|
147 | 147 | |
|
148 | 148 | $ hg up 'desc("i-2")' |
|
149 | 149 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
150 | 150 | $ hg mv b g |
|
151 | 151 | $ hg ci -m 'e-1 b -move-> g' |
|
152 | 152 | created new head |
|
153 | 153 | $ hg mv g f |
|
154 | 154 | $ hg ci -m 'e-2 g -move-> f' |
|
155 | 155 | $ hg log -G --rev '::.' |
|
156 | 156 | @ 10 e-2 g -move-> f |
|
157 | 157 | | |
|
158 | 158 | o 9 e-1 b -move-> g |
|
159 | 159 | | |
|
160 | 160 | o 2 i-2: c -move-> d |
|
161 | 161 | | |
|
162 | 162 | o 1 i-1: a -move-> c |
|
163 | 163 | | |
|
164 | 164 | o 0 i-0 initial commit: a b h |
|
165 | 165 | |
|
166 | 166 | |
|
167 | 167 | Setup all merge |
|
168 | 168 | =============== |
|
169 | 169 | |
|
170 | 170 | This is done beforehand to validate that the upgrade process creates valid copy |
|
171 | 171 | information. |
|
172 | 172 | |
|
173 | 173 | merging with unrelated change does not interfere with the renames |
|
174 | 174 | --------------------------------------------------------------- |
|
175 | 175 | |
|
176 | 176 | - rename on one side |
|
177 | 177 | - unrelated change on the other side |
|
178 | 178 | |
|
179 | 179 | $ hg up 'desc("b-1")' |
|
180 | 180 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
181 | 181 | $ hg merge 'desc("a-2")' |
|
182 | 182 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
183 | 183 | (branch merge, don't forget to commit) |
|
184 | 184 | $ hg ci -m 'mBAm-0 simple merge - one way' |
|
185 | 185 | $ hg up 'desc("a-2")' |
|
186 | 186 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
187 | 187 | $ hg merge 'desc("b-1")' |
|
188 | 188 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
189 | 189 | (branch merge, don't forget to commit) |
|
190 | 190 | $ hg ci -m 'mABm-0 simple merge - the other way' |
|
191 | 191 | created new head |
|
192 | 192 | $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))' |
|
193 | 193 | @ 12 mABm-0 simple merge - the other way |
|
194 | 194 | |\ |
|
195 | 195 | +---o 11 mBAm-0 simple merge - one way |
|
196 | 196 | | |/ |
|
197 | 197 | | o 5 b-1: b update |
|
198 | 198 | | | |
|
199 | 199 | o | 4 a-2: e -move-> f |
|
200 | 200 | | | |
|
201 | 201 | o | 3 a-1: d -move-> e |
|
202 | 202 | |/ |
|
203 | 203 | o 2 i-2: c -move-> d |
|
204 | 204 | | |
|
205 | 205 | o 1 i-1: a -move-> c |
|
206 | 206 | | |
|
207 | 207 | o 0 i-0 initial commit: a b h |
|
208 | 208 | |
|
209 | 209 | |
|
210 | 210 | |
|
211 | 211 | merging with the side having a delete |
|
212 | 212 | ------------------------------------- |
|
213 | 213 | |
|
214 | 214 | case summary: |
|
215 | 215 | - one with change to an unrelated file |
|
216 | 216 | - one deleting the change |
|
217 | 217 | and recreate an unrelated file after the merge |
|
218 | 218 | |
|
219 | 219 | $ hg up 'desc("b-1")' |
|
220 | 220 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
221 | 221 | $ hg merge 'desc("c-1")' |
|
222 | 222 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
223 | 223 | (branch merge, don't forget to commit) |
|
224 | 224 | $ hg ci -m 'mBCm-0 simple merge - one way' |
|
225 | 225 | $ echo bar > d |
|
226 | 226 | $ hg add d |
|
227 | 227 | $ hg ci -m 'mBCm-1 re-add d' |
|
228 | 228 | $ hg up 'desc("c-1")' |
|
229 | 229 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
230 | 230 | $ hg merge 'desc("b-1")' |
|
231 | 231 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
232 | 232 | (branch merge, don't forget to commit) |
|
233 | 233 | $ hg ci -m 'mCBm-0 simple merge - the other way' |
|
234 | 234 | created new head |
|
235 | 235 | $ echo bar > d |
|
236 | 236 | $ hg add d |
|
237 | 237 | $ hg ci -m 'mCBm-1 re-add d' |
|
238 | 238 | $ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))' |
|
239 | 239 | @ 16 mCBm-1 re-add d |
|
240 | 240 | | |
|
241 | 241 | o 15 mCBm-0 simple merge - the other way |
|
242 | 242 | |\ |
|
243 | 243 | | | o 14 mBCm-1 re-add d |
|
244 | 244 | | | | |
|
245 | 245 | +---o 13 mBCm-0 simple merge - one way |
|
246 | 246 | | |/ |
|
247 | 247 | | o 6 c-1 delete d |
|
248 | 248 | | | |
|
249 | 249 | o | 5 b-1: b update |
|
250 | 250 | |/ |
|
251 | 251 | o 2 i-2: c -move-> d |
|
252 | 252 | | |
|
253 | 253 | o 1 i-1: a -move-> c |
|
254 | 254 | | |
|
255 | 255 | o 0 i-0 initial commit: a b h |
|
256 | 256 | |
|
257 | 257 | |
|
258 | 258 | Comparing with a merge re-adding the file afterward |
|
259 | 259 | --------------------------------------------------- |
|
260 | 260 | |
|
261 | 261 | Merge: |
|
262 | 262 | - one with change to an unrelated file |
|
263 | 263 | - one deleting and recreating the change |
|
264 | 264 | |
|
265 | 265 | $ hg up 'desc("b-1")' |
|
266 | 266 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
267 | 267 | $ hg merge 'desc("d-2")' |
|
268 | 268 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
269 | 269 | (branch merge, don't forget to commit) |
|
270 | 270 | $ hg ci -m 'mBDm-0 simple merge - one way' |
|
271 | 271 | $ hg up 'desc("d-2")' |
|
272 | 272 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
273 | 273 | $ hg merge 'desc("b-1")' |
|
274 | 274 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
275 | 275 | (branch merge, don't forget to commit) |
|
276 | 276 | $ hg ci -m 'mDBm-0 simple merge - the other way' |
|
277 | 277 | created new head |
|
278 | 278 | $ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))' |
|
279 | 279 | @ 18 mDBm-0 simple merge - the other way |
|
280 | 280 | |\ |
|
281 | 281 | +---o 17 mBDm-0 simple merge - one way |
|
282 | 282 | | |/ |
|
283 | 283 | | o 8 d-2 re-add d |
|
284 | 284 | | | |
|
285 | 285 | | o 7 d-1 delete d |
|
286 | 286 | | | |
|
287 | 287 | o | 5 b-1: b update |
|
288 | 288 | |/ |
|
289 | 289 | o 2 i-2: c -move-> d |
|
290 | 290 | | |
|
291 | 291 | o 1 i-1: a -move-> c |
|
292 | 292 | | |
|
293 | 293 | o 0 i-0 initial commit: a b h |
|
294 | 294 | |
|
295 | 295 | |
|
296 | 296 | |
|
297 | 297 | Comparing with a merge with colliding rename |
|
298 | 298 | -------------------------------------------- |
|
299 | 299 | |
|
300 | 300 | - the "e-" branch renaming b to f (through 'g') |
|
301 | 301 | - the "a-" branch renaming d to f (through e) |
|
302 | 302 | |
|
303 | 303 | $ hg up 'desc("a-2")' |
|
304 | 304 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
305 | 305 | $ hg merge 'desc("e-2")' --tool :union |
|
306 | 306 | merging f |
|
307 | 307 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
308 | 308 | (branch merge, don't forget to commit) |
|
309 | 309 | $ hg ci -m 'mAEm-0 simple merge - one way' |
|
310 | 310 | $ hg up 'desc("e-2")' |
|
311 | 311 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
312 | 312 | $ hg merge 'desc("a-2")' --tool :union |
|
313 | 313 | merging f |
|
314 | 314 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
315 | 315 | (branch merge, don't forget to commit) |
|
316 | 316 | $ hg ci -m 'mEAm-0 simple merge - the other way' |
|
317 | 317 | created new head |
|
318 | 318 | $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' |
|
319 | 319 | @ 20 mEAm-0 simple merge - the other way |
|
320 | 320 | |\ |
|
321 | 321 | +---o 19 mAEm-0 simple merge - one way |
|
322 | 322 | | |/ |
|
323 | 323 | | o 10 e-2 g -move-> f |
|
324 | 324 | | | |
|
325 | 325 | | o 9 e-1 b -move-> g |
|
326 | 326 | | | |
|
327 | 327 | o | 4 a-2: e -move-> f |
|
328 | 328 | | | |
|
329 | 329 | o | 3 a-1: d -move-> e |
|
330 | 330 | |/ |
|
331 | 331 | o 2 i-2: c -move-> d |
|
332 | 332 | | |
|
333 | 333 | o 1 i-1: a -move-> c |
|
334 | 334 | | |
|
335 | 335 | o 0 i-0 initial commit: a b h |
|
336 | 336 | |
|
337 | 337 | |
|
338 | 338 | |
|
339 | 339 | Merge: |
|
340 | 340 | - one with change to an unrelated file (b) |
|
341 | 341 | - one overwriting a file (d) with a rename (from h to i to d) |
|
342 | 342 | |
|
343 | 343 | $ hg up 'desc("i-2")' |
|
344 | 344 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
345 | 345 | $ hg mv h i |
|
346 | 346 | $ hg commit -m "f-1: rename h -> i" |
|
347 | 347 | created new head |
|
348 | 348 | $ hg mv --force i d |
|
349 | 349 | $ hg commit -m "f-2: rename i -> d" |
|
350 | 350 | $ hg debugindex d |
|
351 | 351 | rev linkrev nodeid p1 p2 |
|
352 | 352 | 0 2 169be882533b 000000000000 000000000000 (no-changeset !) |
|
353 | 353 | 0 2 b789fdd96dc2 000000000000 000000000000 (changeset !) |
|
354 | 354 | 1 8 b004912a8510 000000000000 000000000000 |
|
355 | 355 | 2 22 4a067cf8965d 000000000000 000000000000 (no-changeset !) |
|
356 | 356 | 2 22 fe6f8b4f507f 000000000000 000000000000 (changeset !) |
|
357 | 357 | $ hg up 'desc("b-1")' |
|
358 | 358 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
359 | 359 | $ hg merge 'desc("f-2")' |
|
360 | 360 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
361 | 361 | (branch merge, don't forget to commit) |
|
362 | 362 | $ hg ci -m 'mBFm-0 simple merge - one way' |
|
363 | 363 | $ hg up 'desc("f-2")' |
|
364 | 364 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
365 | 365 | $ hg merge 'desc("b-1")' |
|
366 | 366 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
367 | 367 | (branch merge, don't forget to commit) |
|
368 | 368 | $ hg ci -m 'mFBm-0 simple merge - the other way' |
|
369 | 369 | created new head |
|
370 | 370 | $ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))' |
|
371 | 371 | @ 24 mFBm-0 simple merge - the other way |
|
372 | 372 | |\ |
|
373 | 373 | +---o 23 mBFm-0 simple merge - one way |
|
374 | 374 | | |/ |
|
375 | 375 | | o 22 f-2: rename i -> d |
|
376 | 376 | | | |
|
377 | 377 | | o 21 f-1: rename h -> i |
|
378 | 378 | | | |
|
379 | 379 | o | 5 b-1: b update |
|
380 | 380 | |/ |
|
381 | 381 | o 2 i-2: c -move-> d |
|
382 | 382 | | |
|
383 | 383 | o 1 i-1: a -move-> c |
|
384 | 384 | | |
|
385 | 385 | o 0 i-0 initial commit: a b h |
|
386 | 386 | |
|
387 | 387 | |
|
388 | 388 | |
|
389 | 389 | Merge: |
|
390 | 390 | - one with change to a file |
|
391 | 391 | - one deleting and recreating the file |
|
392 | 392 | |
|
393 | 393 | Unlike in the 'BD/DB' cases, an actual merge happened here. So we should |
|
394 | 394 | consider history and rename on both branch of the merge. |
|
395 | 395 | |
|
396 | 396 | $ hg up 'desc("i-2")' |
|
397 | 397 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
398 | 398 | $ echo "some update" >> d |
|
399 | 399 | $ hg commit -m "g-1: update d" |
|
400 | 400 | created new head |
|
401 | 401 | $ hg up 'desc("d-2")' |
|
402 | 402 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
403 | 403 | $ hg merge 'desc("g-1")' --tool :union |
|
404 | 404 | merging d |
|
405 | 405 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
406 | 406 | (branch merge, don't forget to commit) |
|
407 | 407 | $ hg ci -m 'mDGm-0 simple merge - one way' |
|
408 | 408 | $ hg up 'desc("g-1")' |
|
409 | 409 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
410 | 410 | $ hg merge 'desc("d-2")' --tool :union |
|
411 | 411 | merging d |
|
412 | 412 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
413 | 413 | (branch merge, don't forget to commit) |
|
414 | 414 | $ hg ci -m 'mGDm-0 simple merge - the other way' |
|
415 | 415 | created new head |
|
416 | 416 | $ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))' |
|
417 | 417 | @ 27 mGDm-0 simple merge - the other way |
|
418 | 418 | |\ |
|
419 | 419 | +---o 26 mDGm-0 simple merge - one way |
|
420 | 420 | | |/ |
|
421 | 421 | | o 25 g-1: update d |
|
422 | 422 | | | |
|
423 | 423 | o | 8 d-2 re-add d |
|
424 | 424 | | | |
|
425 | 425 | o | 7 d-1 delete d |
|
426 | 426 | |/ |
|
427 | 427 | o 2 i-2: c -move-> d |
|
428 | 428 | | |
|
429 | 429 | o 1 i-1: a -move-> c |
|
430 | 430 | | |
|
431 | 431 | o 0 i-0 initial commit: a b h |
|
432 | 432 | |
|
433 | 433 | |
|
434 | 434 | |
|
435 | 435 | Merge: |
|
436 | 436 | - one with change to a file (d) |
|
437 | 437 | - one overwriting that file with a rename (from h to i, to d) |
|
438 | 438 | |
|
439 | 439 | This case is similar to BF/FB, but an actual merge happens, so both side of the |
|
440 | 440 | history are relevant. |
|
441 | 441 | |
|
442 | 442 | Note: |
|
443 | 443 | | In this case, the merge get conflicting information since on one side we have |
|
444 | 444 | | "a -> c -> d". and one the other one we have "h -> i -> d". |
|
445 | 445 | | |
|
446 | 446 | | The current code arbitrarily pick one side |
|
447 | 447 | |
|
448 | 448 | $ hg up 'desc("f-2")' |
|
449 | 449 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
450 | 450 | $ hg merge 'desc("g-1")' --tool :union |
|
451 | 451 | merging d |
|
452 | 452 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
453 | 453 | (branch merge, don't forget to commit) |
|
454 | 454 | $ hg ci -m 'mFGm-0 simple merge - one way' |
|
455 | 455 | created new head |
|
456 | 456 | $ hg up 'desc("g-1")' |
|
457 | 457 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
458 | 458 | $ hg merge 'desc("f-2")' --tool :union |
|
459 | 459 | merging d |
|
460 | 460 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
461 | 461 | (branch merge, don't forget to commit) |
|
462 | 462 | $ hg ci -m 'mGFm-0 simple merge - the other way' |
|
463 | 463 | created new head |
|
464 | 464 | $ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))' |
|
465 | 465 | @ 29 mGFm-0 simple merge - the other way |
|
466 | 466 | |\ |
|
467 | 467 | +---o 28 mFGm-0 simple merge - one way |
|
468 | 468 | | |/ |
|
469 | 469 | | o 25 g-1: update d |
|
470 | 470 | | | |
|
471 | 471 | o | 22 f-2: rename i -> d |
|
472 | 472 | | | |
|
473 | 473 | o | 21 f-1: rename h -> i |
|
474 | 474 | |/ |
|
475 | 475 | o 2 i-2: c -move-> d |
|
476 | 476 | | |
|
477 | 477 | o 1 i-1: a -move-> c |
|
478 | 478 | | |
|
479 | 479 | o 0 i-0 initial commit: a b h |
|
480 | 480 | |
|
481 | 481 | |
|
482 | 482 | |
|
483 | 483 | Comparing with merging with a deletion (and keeping the file) |
|
484 | 484 | ------------------------------------------------------------- |
|
485 | 485 | |
|
486 | 486 | Merge: |
|
487 | 487 | - one removing a file (d) |
|
488 | 488 | - one updating that file |
|
489 | 489 | - the merge keep the modified version of the file (canceling the delete) |
|
490 | 490 | |
|
491 | 491 | In this case, the file keep on living after the merge. So we should not drop its |
|
492 | 492 | copy tracing chain. |
|
493 | 493 | |
|
494 | 494 | $ hg up 'desc("c-1")' |
|
495 | 495 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
496 | 496 | $ hg merge 'desc("g-1")' |
|
497 | 497 | file 'd' was deleted in local [working copy] but was modified in other [merge rev]. |
|
498 | 498 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
|
499 | 499 | What do you want to do? u |
|
500 | 500 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
501 | 501 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
502 | 502 | [1] |
|
503 | 503 | $ hg resolve -t :other d |
|
504 | 504 | (no more unresolved files) |
|
505 | 505 | $ hg ci -m "mCGm-0" |
|
506 | 506 | created new head |
|
507 | 507 | |
|
508 | 508 | $ hg up 'desc("g-1")' |
|
509 | 509 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
510 | 510 | $ hg merge 'desc("c-1")' |
|
511 | 511 | file 'd' was deleted in other [merge rev] but was modified in local [working copy]. |
|
512 | 512 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. |
|
513 | 513 | What do you want to do? u |
|
514 | 514 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
515 | 515 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
516 | 516 | [1] |
|
517 | 517 | $ hg resolve -t :local d |
|
518 | 518 | (no more unresolved files) |
|
519 | 519 | $ hg ci -m "mGCm-0" |
|
520 | 520 | created new head |
|
521 | 521 | |
|
522 | 522 | $ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))' |
|
523 | 523 | @ 31 mGCm-0 |
|
524 | 524 | |\ |
|
525 | 525 | +---o 30 mCGm-0 |
|
526 | 526 | | |/ |
|
527 | 527 | | o 25 g-1: update d |
|
528 | 528 | | | |
|
529 | 529 | o | 6 c-1 delete d |
|
530 | 530 | |/ |
|
531 | 531 | o 2 i-2: c -move-> d |
|
532 | 532 | | |
|
533 | 533 | o 1 i-1: a -move-> c |
|
534 | 534 | | |
|
535 | 535 | o 0 i-0 initial commit: a b h |
|
536 | 536 | |
|
537 | 537 | |
|
538 | 538 | |
|
539 | 539 | |
|
540 | 540 | Comparing with merge restoring an untouched deleted file |
|
541 | 541 | -------------------------------------------------------- |
|
542 | 542 | |
|
543 | 543 | Merge: |
|
544 | 544 | - one removing a file (d) |
|
545 | 545 | - one leaving the file untouched |
|
546 | 546 | - the merge actively restore the file to the same content. |
|
547 | 547 | |
|
548 | 548 | In this case, the file keep on living after the merge. So we should not drop its |
|
549 | 549 | copy tracing chain. |
|
550 | 550 | |
|
551 | 551 | $ hg up 'desc("c-1")' |
|
552 | 552 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
553 | 553 | $ hg merge 'desc("b-1")' |
|
554 | 554 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
555 | 555 | (branch merge, don't forget to commit) |
|
556 | 556 | $ hg revert --rev 'desc("b-1")' d |
|
557 | 557 | $ hg ci -m "mCB-revert-m-0" |
|
558 | 558 | created new head |
|
559 | 559 | |
|
560 | 560 | $ hg up 'desc("b-1")' |
|
561 | 561 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
562 | 562 | $ hg merge 'desc("c-1")' |
|
563 | 563 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
564 | 564 | (branch merge, don't forget to commit) |
|
565 | 565 | $ hg revert --rev 'desc("b-1")' d |
|
566 | 566 | $ hg ci -m "mBC-revert-m-0" |
|
567 | 567 | created new head |
|
568 | 568 | |
|
569 | 569 | $ hg log -G --rev '::(desc("mCB-revert-m")+desc("mBC-revert-m"))' |
|
570 | 570 | @ 33 mBC-revert-m-0 |
|
571 | 571 | |\ |
|
572 | 572 | +---o 32 mCB-revert-m-0 |
|
573 | 573 | | |/ |
|
574 | 574 | | o 6 c-1 delete d |
|
575 | 575 | | | |
|
576 | 576 | o | 5 b-1: b update |
|
577 | 577 | |/ |
|
578 | 578 | o 2 i-2: c -move-> d |
|
579 | 579 | | |
|
580 | 580 | o 1 i-1: a -move-> c |
|
581 | 581 | | |
|
582 | 582 | o 0 i-0 initial commit: a b h |
|
583 | 583 | |
|
584 | 584 | |
|
585 | 585 | |
|
586 | 586 | $ hg up null --quiet |
|
587 | 587 | |
|
588 | 588 | Merging a branch where a rename was deleted with a branch where the same file was renamed |
|
589 | 589 | ------------------------------------------------------------------------------------------ |
|
590 | 590 | |
|
591 | 591 | Create a "conflicting" merge where `d` get removed on one branch before its |
|
592 | 592 | rename information actually conflict with the other branch. |
|
593 | 593 | |
|
594 | 594 | (the copy information from the branch that was not deleted should win). |
|
595 | 595 | |
|
596 | 596 | $ hg up 'desc("i-0")' |
|
597 | 597 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
598 | 598 | $ hg mv b d |
|
599 | 599 | $ hg ci -m "h-1: b -(move)-> d" |
|
600 | 600 | created new head |
|
601 | 601 | |
|
602 | 602 | $ hg up 'desc("c-1")' |
|
603 | 603 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
604 | 604 | $ hg merge 'desc("h-1")' |
|
605 | 605 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
606 | 606 | (branch merge, don't forget to commit) |
|
607 | 607 | $ hg ci -m "mCH-delete-before-conflict-m-0" |
|
608 | 608 | |
|
609 | 609 | $ hg up 'desc("h-1")' |
|
610 | 610 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
611 | 611 | $ hg merge 'desc("c-1")' |
|
612 | 612 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
613 | 613 | (branch merge, don't forget to commit) |
|
614 | 614 | $ hg ci -m "mHC-delete-before-conflict-m-0" |
|
615 | 615 | created new head |
|
616 | 616 | $ hg log -G --rev '::(desc("mCH-delete-before-conflict-m")+desc("mHC-delete-before-conflict-m"))' |
|
617 | 617 | @ 36 mHC-delete-before-conflict-m-0 |
|
618 | 618 | |\ |
|
619 | 619 | +---o 35 mCH-delete-before-conflict-m-0 |
|
620 | 620 | | |/ |
|
621 | 621 | | o 34 h-1: b -(move)-> d |
|
622 | 622 | | | |
|
623 | 623 | o | 6 c-1 delete d |
|
624 | 624 | | | |
|
625 | 625 | o | 2 i-2: c -move-> d |
|
626 | 626 | | | |
|
627 | 627 | o | 1 i-1: a -move-> c |
|
628 | 628 | |/ |
|
629 | 629 | o 0 i-0 initial commit: a b h |
|
630 | 630 | |
|
631 | 631 | |
|
632 | 632 | |
|
633 | 633 | Summary of all created cases |
|
634 | 634 | ---------------------------- |
|
635 | 635 | |
|
636 | 636 | $ hg up --quiet null |
|
637 | 637 | |
|
638 | 638 | (This exists to help keeping a compact list of the various cases we have built) |
|
639 | 639 | |
|
640 | 640 | $ hg log -T '{desc|firstline}\n'| sort |
|
641 | 641 | a-1: d -move-> e |
|
642 | 642 | a-2: e -move-> f |
|
643 | 643 | b-1: b update |
|
644 | 644 | c-1 delete d |
|
645 | 645 | d-1 delete d |
|
646 | 646 | d-2 re-add d |
|
647 | 647 | e-1 b -move-> g |
|
648 | 648 | e-2 g -move-> f |
|
649 | 649 | f-1: rename h -> i |
|
650 | 650 | f-2: rename i -> d |
|
651 | 651 | g-1: update d |
|
652 | 652 | h-1: b -(move)-> d |
|
653 | 653 | i-0 initial commit: a b h |
|
654 | 654 | i-1: a -move-> c |
|
655 | 655 | i-2: c -move-> d |
|
656 | 656 | mABm-0 simple merge - the other way |
|
657 | 657 | mAEm-0 simple merge - one way |
|
658 | 658 | mBAm-0 simple merge - one way |
|
659 | 659 | mBC-revert-m-0 |
|
660 | 660 | mBCm-0 simple merge - one way |
|
661 | 661 | mBCm-1 re-add d |
|
662 | 662 | mBDm-0 simple merge - one way |
|
663 | 663 | mBFm-0 simple merge - one way |
|
664 | 664 | mCB-revert-m-0 |
|
665 | 665 | mCBm-0 simple merge - the other way |
|
666 | 666 | mCBm-1 re-add d |
|
667 | 667 | mCGm-0 |
|
668 | 668 | mCH-delete-before-conflict-m-0 |
|
669 | 669 | mDBm-0 simple merge - the other way |
|
670 | 670 | mDGm-0 simple merge - one way |
|
671 | 671 | mEAm-0 simple merge - the other way |
|
672 | 672 | mFBm-0 simple merge - the other way |
|
673 | 673 | mFGm-0 simple merge - one way |
|
674 | 674 | mGCm-0 |
|
675 | 675 | mGDm-0 simple merge - the other way |
|
676 | 676 | mGFm-0 simple merge - the other way |
|
677 | 677 | mHC-delete-before-conflict-m-0 |
|
678 | 678 | |
|
679 | 679 | |
|
680 | 680 | Test that sidedata computations during upgrades are correct |
|
681 | 681 | =========================================================== |
|
682 | 682 | |
|
683 | 683 | We upgrade a repository that is not using sidedata (the filelog case) and |
|
684 | 684 | check that the same side data have been generated as if they were computed at |
|
685 | 685 | commit time. |
|
686 | 686 | |
|
687 | 687 | |
|
688 | 688 | #if upgraded |
|
689 | 689 | $ cat >> $HGRCPATH << EOF |
|
690 | 690 | > [format] |
|
691 | 691 | > exp-use-side-data = yes |
|
692 | 692 | > exp-use-copies-side-data-changeset = yes |
|
693 | 693 | > EOF |
|
694 | 694 | $ hg debugformat -v |
|
695 | 695 | format-variant repo config default |
|
696 | 696 | fncache: yes yes yes |
|
697 | 697 | dotencode: yes yes yes |
|
698 | 698 | generaldelta: yes yes yes |
|
699 |
e |
|
|
699 | share-safe: no no no | |
|
700 | 700 | sparserevlog: yes yes yes |
|
701 | 701 | sidedata: no yes no |
|
702 | 702 | persistent-nodemap: no no no |
|
703 | 703 | copies-sdc: no yes no |
|
704 | 704 | plain-cl-delta: yes yes yes |
|
705 | 705 | compression: * (glob) |
|
706 | 706 | compression-level: default default default |
|
707 | 707 | $ hg debugupgraderepo --run --quiet |
|
708 | 708 | upgrade will perform the following actions: |
|
709 | 709 | |
|
710 | 710 | requirements |
|
711 | 711 | preserved: * (glob) |
|
712 | 712 | added: exp-copies-sidedata-changeset, exp-sidedata-flag |
|
713 | 713 | |
|
714 | 714 | processed revlogs: |
|
715 | 715 | - all-filelogs |
|
716 | 716 | - changelog |
|
717 | 717 | - manifest |
|
718 | 718 | |
|
719 | 719 | #endif |
|
720 | 720 | |
|
721 | 721 | |
|
722 | 722 | #if no-compatibility no-filelog no-changeset |
|
723 | 723 | |
|
724 | 724 | $ for rev in `hg log --rev 'all()' -T '{rev}\n'`; do |
|
725 | 725 | > echo "##### revision $rev #####" |
|
726 | 726 | > hg debugsidedata -c -v -- $rev |
|
727 | 727 | > hg debugchangedfiles $rev |
|
728 | 728 | > done |
|
729 | 729 | ##### revision 0 ##### |
|
730 | 730 | 1 sidedata entries |
|
731 | 731 | entry-0014 size 34 |
|
732 | 732 | '\x00\x00\x00\x03\x04\x00\x00\x00\x01\x00\x00\x00\x00\x04\x00\x00\x00\x02\x00\x00\x00\x00\x04\x00\x00\x00\x03\x00\x00\x00\x00abh' |
|
733 | 733 | added : a, ; |
|
734 | 734 | added : b, ; |
|
735 | 735 | added : h, ; |
|
736 | 736 | ##### revision 1 ##### |
|
737 | 737 | 1 sidedata entries |
|
738 | 738 | entry-0014 size 24 |
|
739 | 739 | '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00ac' |
|
740 | 740 | removed : a, ; |
|
741 | 741 | added p1: c, a; |
|
742 | 742 | ##### revision 2 ##### |
|
743 | 743 | 1 sidedata entries |
|
744 | 744 | entry-0014 size 24 |
|
745 | 745 | '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00cd' |
|
746 | 746 | removed : c, ; |
|
747 | 747 | added p1: d, c; |
|
748 | 748 | ##### revision 3 ##### |
|
749 | 749 | 1 sidedata entries |
|
750 | 750 | entry-0014 size 24 |
|
751 | 751 | '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00de' |
|
752 | 752 | removed : d, ; |
|
753 | 753 | added p1: e, d; |
|
754 | 754 | ##### revision 4 ##### |
|
755 | 755 | 1 sidedata entries |
|
756 | 756 | entry-0014 size 24 |
|
757 | 757 | '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00ef' |
|
758 | 758 | removed : e, ; |
|
759 | 759 | added p1: f, e; |
|
760 | 760 | ##### revision 5 ##### |
|
761 | 761 | 1 sidedata entries |
|
762 | 762 | entry-0014 size 14 |
|
763 | 763 | '\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00b' |
|
764 | 764 | touched : b, ; |
|
765 | 765 | ##### revision 6 ##### |
|
766 | 766 | 1 sidedata entries |
|
767 | 767 | entry-0014 size 14 |
|
768 | 768 | '\x00\x00\x00\x01\x0c\x00\x00\x00\x01\x00\x00\x00\x00d' |
|
769 | 769 | removed : d, ; |
|
770 | 770 | ##### revision 7 ##### |
|
771 | 771 | 1 sidedata entries |
|
772 | 772 | entry-0014 size 14 |
|
773 | 773 | '\x00\x00\x00\x01\x0c\x00\x00\x00\x01\x00\x00\x00\x00d' |
|
774 | 774 | removed : d, ; |
|
775 | 775 | ##### revision 8 ##### |
|
776 | 776 | 1 sidedata entries |
|
777 | 777 | entry-0014 size 14 |
|
778 | 778 | '\x00\x00\x00\x01\x04\x00\x00\x00\x01\x00\x00\x00\x00d' |
|
779 | 779 | added : d, ; |
|
780 | 780 | ##### revision 9 ##### |
|
781 | 781 | 1 sidedata entries |
|
782 | 782 | entry-0014 size 24 |
|
783 | 783 | '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00bg' |
|
784 | 784 | removed : b, ; |
|
785 | 785 | added p1: g, b; |
|
786 | 786 | ##### revision 10 ##### |
|
787 | 787 | 1 sidedata entries |
|
788 | 788 | entry-0014 size 24 |
|
789 | 789 | '\x00\x00\x00\x02\x06\x00\x00\x00\x01\x00\x00\x00\x01\x0c\x00\x00\x00\x02\x00\x00\x00\x00fg' |
|
790 | 790 | added p1: f, g; |
|
791 | 791 | removed : g, ; |
|
792 | 792 | ##### revision 11 ##### |
|
793 | 793 | 1 sidedata entries |
|
794 | 794 | entry-0014 size 4 |
|
795 | 795 | '\x00\x00\x00\x00' |
|
796 | 796 | ##### revision 12 ##### |
|
797 | 797 | 1 sidedata entries |
|
798 | 798 | entry-0014 size 4 |
|
799 | 799 | '\x00\x00\x00\x00' |
|
800 | 800 | ##### revision 13 ##### |
|
801 | 801 | 1 sidedata entries |
|
802 | 802 | entry-0014 size 4 |
|
803 | 803 | '\x00\x00\x00\x00' |
|
804 | 804 | ##### revision 14 ##### |
|
805 | 805 | 1 sidedata entries |
|
806 | 806 | entry-0014 size 14 |
|
807 | 807 | '\x00\x00\x00\x01\x04\x00\x00\x00\x01\x00\x00\x00\x00d' |
|
808 | 808 | added : d, ; |
|
809 | 809 | ##### revision 15 ##### |
|
810 | 810 | 1 sidedata entries |
|
811 | 811 | entry-0014 size 4 |
|
812 | 812 | '\x00\x00\x00\x00' |
|
813 | 813 | ##### revision 16 ##### |
|
814 | 814 | 1 sidedata entries |
|
815 | 815 | entry-0014 size 14 |
|
816 | 816 | '\x00\x00\x00\x01\x04\x00\x00\x00\x01\x00\x00\x00\x00d' |
|
817 | 817 | added : d, ; |
|
818 | 818 | ##### revision 17 ##### |
|
819 | 819 | 1 sidedata entries |
|
820 | 820 | entry-0014 size 4 |
|
821 | 821 | '\x00\x00\x00\x00' |
|
822 | 822 | ##### revision 18 ##### |
|
823 | 823 | 1 sidedata entries |
|
824 | 824 | entry-0014 size 4 |
|
825 | 825 | '\x00\x00\x00\x00' |
|
826 | 826 | ##### revision 19 ##### |
|
827 | 827 | 1 sidedata entries |
|
828 | 828 | entry-0014 size 14 |
|
829 | 829 | '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00f' |
|
830 | 830 | merged : f, ; |
|
831 | 831 | ##### revision 20 ##### |
|
832 | 832 | 1 sidedata entries |
|
833 | 833 | entry-0014 size 14 |
|
834 | 834 | '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00f' |
|
835 | 835 | merged : f, ; |
|
836 | 836 | ##### revision 21 ##### |
|
837 | 837 | 1 sidedata entries |
|
838 | 838 | entry-0014 size 24 |
|
839 | 839 | '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00hi' |
|
840 | 840 | removed : h, ; |
|
841 | 841 | added p1: i, h; |
|
842 | 842 | ##### revision 22 ##### |
|
843 | 843 | 1 sidedata entries |
|
844 | 844 | entry-0014 size 24 |
|
845 | 845 | '\x00\x00\x00\x02\x16\x00\x00\x00\x01\x00\x00\x00\x01\x0c\x00\x00\x00\x02\x00\x00\x00\x00di' |
|
846 | 846 | touched p1: d, i; |
|
847 | 847 | removed : i, ; |
|
848 | 848 | ##### revision 23 ##### |
|
849 | 849 | 1 sidedata entries |
|
850 | 850 | entry-0014 size 4 |
|
851 | 851 | '\x00\x00\x00\x00' |
|
852 | 852 | ##### revision 24 ##### |
|
853 | 853 | 1 sidedata entries |
|
854 | 854 | entry-0014 size 4 |
|
855 | 855 | '\x00\x00\x00\x00' |
|
856 | 856 | ##### revision 25 ##### |
|
857 | 857 | 1 sidedata entries |
|
858 | 858 | entry-0014 size 14 |
|
859 | 859 | '\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' |
|
860 | 860 | touched : d, ; |
|
861 | 861 | ##### revision 26 ##### |
|
862 | 862 | 1 sidedata entries |
|
863 | 863 | entry-0014 size 14 |
|
864 | 864 | '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' |
|
865 | 865 | merged : d, ; |
|
866 | 866 | ##### revision 27 ##### |
|
867 | 867 | 1 sidedata entries |
|
868 | 868 | entry-0014 size 14 |
|
869 | 869 | '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' |
|
870 | 870 | merged : d, ; |
|
871 | 871 | ##### revision 28 ##### |
|
872 | 872 | 1 sidedata entries |
|
873 | 873 | entry-0014 size 14 |
|
874 | 874 | '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' |
|
875 | 875 | merged : d, ; |
|
876 | 876 | ##### revision 29 ##### |
|
877 | 877 | 1 sidedata entries |
|
878 | 878 | entry-0014 size 14 |
|
879 | 879 | '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' |
|
880 | 880 | merged : d, ; |
|
881 | 881 | ##### revision 30 ##### |
|
882 | 882 | 1 sidedata entries |
|
883 | 883 | entry-0014 size 14 |
|
884 | 884 | '\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d' |
|
885 | 885 | salvaged : d, ; |
|
886 | 886 | ##### revision 31 ##### |
|
887 | 887 | 1 sidedata entries |
|
888 | 888 | entry-0014 size 14 |
|
889 | 889 | '\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d' |
|
890 | 890 | salvaged : d, ; |
|
891 | 891 | ##### revision 32 ##### |
|
892 | 892 | 1 sidedata entries |
|
893 | 893 | entry-0014 size 14 |
|
894 | 894 | '\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d' |
|
895 | 895 | salvaged : d, ; |
|
896 | 896 | ##### revision 33 ##### |
|
897 | 897 | 1 sidedata entries |
|
898 | 898 | entry-0014 size 14 |
|
899 | 899 | '\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d' |
|
900 | 900 | salvaged : d, ; |
|
901 | 901 | ##### revision 34 ##### |
|
902 | 902 | 1 sidedata entries |
|
903 | 903 | entry-0014 size 24 |
|
904 | 904 | '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00bd' |
|
905 | 905 | removed : b, ; |
|
906 | 906 | added p1: d, b; |
|
907 | 907 | ##### revision 35 ##### |
|
908 | 908 | 1 sidedata entries |
|
909 | 909 | entry-0014 size 4 |
|
910 | 910 | '\x00\x00\x00\x00' |
|
911 | 911 | ##### revision 36 ##### |
|
912 | 912 | 1 sidedata entries |
|
913 | 913 | entry-0014 size 4 |
|
914 | 914 | '\x00\x00\x00\x00' |
|
915 | 915 | |
|
916 | 916 | #endif |
|
917 | 917 | |
|
918 | 918 | |
|
919 | 919 | Test copy information chaining |
|
920 | 920 | ============================== |
|
921 | 921 | |
|
922 | 922 | Check that matching only affect the destination and not intermediate path |
|
923 | 923 | ------------------------------------------------------------------------- |
|
924 | 924 | |
|
925 | 925 | The two status call should give the same value for f |
|
926 | 926 | |
|
927 | 927 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("a-2")' |
|
928 | 928 | A f |
|
929 | 929 | a |
|
930 | 930 | R a |
|
931 | 931 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("a-2")' f |
|
932 | 932 | A f |
|
933 | 933 | a (no-changeset no-compatibility !) |
|
934 | 934 | |
|
935 | 935 | merging with unrelated change does not interfere with the renames |
|
936 | 936 | --------------------------------------------------------------- |
|
937 | 937 | |
|
938 | 938 | - rename on one side |
|
939 | 939 | - unrelated change on the other side |
|
940 | 940 | |
|
941 | 941 | $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))' |
|
942 | 942 | o 12 mABm-0 simple merge - the other way |
|
943 | 943 | |\ |
|
944 | 944 | +---o 11 mBAm-0 simple merge - one way |
|
945 | 945 | | |/ |
|
946 | 946 | | o 5 b-1: b update |
|
947 | 947 | | | |
|
948 | 948 | o | 4 a-2: e -move-> f |
|
949 | 949 | | | |
|
950 | 950 | o | 3 a-1: d -move-> e |
|
951 | 951 | |/ |
|
952 | 952 | o 2 i-2: c -move-> d |
|
953 | 953 | | |
|
954 | 954 | o 1 i-1: a -move-> c |
|
955 | 955 | | |
|
956 | 956 | o 0 i-0 initial commit: a b h |
|
957 | 957 | |
|
958 | 958 | |
|
959 | 959 | $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mABm")' |
|
960 | 960 | A f |
|
961 | 961 | d |
|
962 | 962 | R d |
|
963 | 963 | $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBAm")' |
|
964 | 964 | A f |
|
965 | 965 | d |
|
966 | 966 | R d |
|
967 | 967 | $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mABm")' |
|
968 | 968 | M b |
|
969 | 969 | $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mBAm")' |
|
970 | 970 | M b |
|
971 | 971 | $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mABm")' |
|
972 | 972 | M b |
|
973 | 973 | A f |
|
974 | 974 | d |
|
975 | 975 | R d |
|
976 | 976 | $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBAm")' |
|
977 | 977 | M b |
|
978 | 978 | A f |
|
979 | 979 | d |
|
980 | 980 | R d |
|
981 | 981 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mABm")' |
|
982 | 982 | M b |
|
983 | 983 | A f |
|
984 | 984 | a |
|
985 | 985 | R a |
|
986 | 986 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBAm")' |
|
987 | 987 | M b |
|
988 | 988 | A f |
|
989 | 989 | a |
|
990 | 990 | R a |
|
991 | 991 | |
|
992 | 992 | merging with the side having a delete |
|
993 | 993 | ------------------------------------- |
|
994 | 994 | |
|
995 | 995 | case summary: |
|
996 | 996 | - one with change to an unrelated file |
|
997 | 997 | - one deleting the change |
|
998 | 998 | and recreate an unrelated file after the merge |
|
999 | 999 | |
|
1000 | 1000 | $ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))' |
|
1001 | 1001 | o 16 mCBm-1 re-add d |
|
1002 | 1002 | | |
|
1003 | 1003 | o 15 mCBm-0 simple merge - the other way |
|
1004 | 1004 | |\ |
|
1005 | 1005 | | | o 14 mBCm-1 re-add d |
|
1006 | 1006 | | | | |
|
1007 | 1007 | +---o 13 mBCm-0 simple merge - one way |
|
1008 | 1008 | | |/ |
|
1009 | 1009 | | o 6 c-1 delete d |
|
1010 | 1010 | | | |
|
1011 | 1011 | o | 5 b-1: b update |
|
1012 | 1012 | |/ |
|
1013 | 1013 | o 2 i-2: c -move-> d |
|
1014 | 1014 | | |
|
1015 | 1015 | o 1 i-1: a -move-> c |
|
1016 | 1016 | | |
|
1017 | 1017 | o 0 i-0 initial commit: a b h |
|
1018 | 1018 | |
|
1019 | 1019 | - comparing from the merge |
|
1020 | 1020 | |
|
1021 | 1021 | $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBCm-0")' |
|
1022 | 1022 | R d |
|
1023 | 1023 | $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCBm-0")' |
|
1024 | 1024 | R d |
|
1025 | 1025 | $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBCm-0")' |
|
1026 | 1026 | M b |
|
1027 | 1027 | $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCBm-0")' |
|
1028 | 1028 | M b |
|
1029 | 1029 | $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBCm-0")' |
|
1030 | 1030 | M b |
|
1031 | 1031 | R d |
|
1032 | 1032 | $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mCBm-0")' |
|
1033 | 1033 | M b |
|
1034 | 1034 | R d |
|
1035 | 1035 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBCm-0")' |
|
1036 | 1036 | M b |
|
1037 | 1037 | R a |
|
1038 | 1038 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCBm-0")' |
|
1039 | 1039 | M b |
|
1040 | 1040 | R a |
|
1041 | 1041 | |
|
1042 | 1042 | - comparing with the merge children re-adding the file |
|
1043 | 1043 | |
|
1044 | 1044 | $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBCm-1")' |
|
1045 | 1045 | M d |
|
1046 | 1046 | $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCBm-1")' |
|
1047 | 1047 | M d |
|
1048 | 1048 | $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBCm-1")' |
|
1049 | 1049 | M b |
|
1050 | 1050 | A d |
|
1051 | 1051 | $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCBm-1")' |
|
1052 | 1052 | M b |
|
1053 | 1053 | A d |
|
1054 | 1054 | $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBCm-1")' |
|
1055 | 1055 | M b |
|
1056 | 1056 | M d |
|
1057 | 1057 | $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mCBm-1")' |
|
1058 | 1058 | M b |
|
1059 | 1059 | M d |
|
1060 | 1060 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBCm-1")' |
|
1061 | 1061 | M b |
|
1062 | 1062 | A d |
|
1063 | 1063 | R a |
|
1064 | 1064 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCBm-1")' |
|
1065 | 1065 | M b |
|
1066 | 1066 | A d |
|
1067 | 1067 | R a |
|
1068 | 1068 | |
|
1069 | 1069 | Comparing with a merge re-adding the file afterward |
|
1070 | 1070 | --------------------------------------------------- |
|
1071 | 1071 | |
|
1072 | 1072 | Merge: |
|
1073 | 1073 | - one with change to an unrelated file |
|
1074 | 1074 | - one deleting and recreating the change |
|
1075 | 1075 | |
|
1076 | 1076 | $ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))' |
|
1077 | 1077 | o 18 mDBm-0 simple merge - the other way |
|
1078 | 1078 | |\ |
|
1079 | 1079 | +---o 17 mBDm-0 simple merge - one way |
|
1080 | 1080 | | |/ |
|
1081 | 1081 | | o 8 d-2 re-add d |
|
1082 | 1082 | | | |
|
1083 | 1083 | | o 7 d-1 delete d |
|
1084 | 1084 | | | |
|
1085 | 1085 | o | 5 b-1: b update |
|
1086 | 1086 | |/ |
|
1087 | 1087 | o 2 i-2: c -move-> d |
|
1088 | 1088 | | |
|
1089 | 1089 | o 1 i-1: a -move-> c |
|
1090 | 1090 | | |
|
1091 | 1091 | o 0 i-0 initial commit: a b h |
|
1092 | 1092 | |
|
1093 | 1093 | $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBDm-0")' |
|
1094 | 1094 | M d |
|
1095 | 1095 | $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mDBm-0")' |
|
1096 | 1096 | M d |
|
1097 | 1097 | $ hg status --copies --rev 'desc("d-2")' --rev 'desc("mBDm-0")' |
|
1098 | 1098 | M b |
|
1099 | 1099 | $ hg status --copies --rev 'desc("d-2")' --rev 'desc("mDBm-0")' |
|
1100 | 1100 | M b |
|
1101 | 1101 | $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBDm-0")' |
|
1102 | 1102 | M b |
|
1103 | 1103 | M d |
|
1104 | 1104 | $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mDBm-0")' |
|
1105 | 1105 | M b |
|
1106 | 1106 | M d |
|
1107 | 1107 | |
|
1108 | 1108 | The bugs makes recorded copy is different depending of where we started the merge from since |
|
1109 | 1109 | |
|
1110 | 1110 | $ hg manifest --debug --rev 'desc("mBDm-0")' | grep '644 d' |
|
1111 | 1111 | b004912a8510032a0350a74daa2803dadfb00e12 644 d |
|
1112 | 1112 | $ hg manifest --debug --rev 'desc("mDBm-0")' | grep '644 d' |
|
1113 | 1113 | b004912a8510032a0350a74daa2803dadfb00e12 644 d |
|
1114 | 1114 | |
|
1115 | 1115 | $ hg manifest --debug --rev 'desc("d-2")' | grep '644 d' |
|
1116 | 1116 | b004912a8510032a0350a74daa2803dadfb00e12 644 d |
|
1117 | 1117 | $ hg manifest --debug --rev 'desc("b-1")' | grep '644 d' |
|
1118 | 1118 | 169be882533bc917905d46c0c951aa9a1e288dcf 644 d (no-changeset !) |
|
1119 | 1119 | b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 d (changeset !) |
|
1120 | 1120 | $ hg debugindex d | head -n 4 |
|
1121 | 1121 | rev linkrev nodeid p1 p2 |
|
1122 | 1122 | 0 2 169be882533b 000000000000 000000000000 (no-changeset !) |
|
1123 | 1123 | 0 2 b789fdd96dc2 000000000000 000000000000 (changeset !) |
|
1124 | 1124 | 1 8 b004912a8510 000000000000 000000000000 |
|
1125 | 1125 | 2 22 4a067cf8965d 000000000000 000000000000 (no-changeset !) |
|
1126 | 1126 | 2 22 fe6f8b4f507f 000000000000 000000000000 (changeset !) |
|
1127 | 1127 | |
|
1128 | 1128 | Log output should not include a merge commit as it did not happen |
|
1129 | 1129 | |
|
1130 | 1130 | $ hg log -Gfr 'desc("mBDm-0")' d |
|
1131 | 1131 | o 8 d-2 re-add d |
|
1132 | 1132 | | |
|
1133 | 1133 | ~ |
|
1134 | 1134 | |
|
1135 | 1135 | $ hg log -Gfr 'desc("mDBm-0")' d |
|
1136 | 1136 | o 8 d-2 re-add d |
|
1137 | 1137 | | |
|
1138 | 1138 | ~ |
|
1139 | 1139 | |
|
1140 | 1140 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBDm-0")' |
|
1141 | 1141 | M b |
|
1142 | 1142 | A d |
|
1143 | 1143 | R a |
|
1144 | 1144 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDBm-0")' |
|
1145 | 1145 | M b |
|
1146 | 1146 | A d |
|
1147 | 1147 | R a |
|
1148 | 1148 | |
|
1149 | 1149 | |
|
1150 | 1150 | Comparing with a merge with colliding rename |
|
1151 | 1151 | -------------------------------------------- |
|
1152 | 1152 | |
|
1153 | 1153 | - the "e-" branch renaming b to f (through 'g') |
|
1154 | 1154 | - the "a-" branch renaming d to f (through e) |
|
1155 | 1155 | |
|
1156 | 1156 | $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' |
|
1157 | 1157 | o 20 mEAm-0 simple merge - the other way |
|
1158 | 1158 | |\ |
|
1159 | 1159 | +---o 19 mAEm-0 simple merge - one way |
|
1160 | 1160 | | |/ |
|
1161 | 1161 | | o 10 e-2 g -move-> f |
|
1162 | 1162 | | | |
|
1163 | 1163 | | o 9 e-1 b -move-> g |
|
1164 | 1164 | | | |
|
1165 | 1165 | o | 4 a-2: e -move-> f |
|
1166 | 1166 | | | |
|
1167 | 1167 | o | 3 a-1: d -move-> e |
|
1168 | 1168 | |/ |
|
1169 | 1169 | o 2 i-2: c -move-> d |
|
1170 | 1170 | | |
|
1171 | 1171 | o 1 i-1: a -move-> c |
|
1172 | 1172 | | |
|
1173 | 1173 | o 0 i-0 initial commit: a b h |
|
1174 | 1174 | |
|
1175 | 1175 | #if no-changeset |
|
1176 | 1176 | $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f' |
|
1177 | 1177 | c39c6083dad048d5138618a46f123e2f397f4f18 644 f |
|
1178 | 1178 | $ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 f' |
|
1179 | 1179 | a9a8bc3860c9d8fa5f2f7e6ea8d40498322737fd 644 f |
|
1180 | 1180 | $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' |
|
1181 | 1181 | 263ea25e220aaeb7b9bac551c702037849aa75e8 644 f |
|
1182 | 1182 | $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' |
|
1183 | 1183 | 71b9b7e73d973572ade6dd765477fcee6890e8b1 644 f |
|
1184 | 1184 | $ hg debugindex f |
|
1185 | 1185 | rev linkrev nodeid p1 p2 |
|
1186 | 1186 | 0 4 263ea25e220a 000000000000 000000000000 |
|
1187 | 1187 | 1 10 71b9b7e73d97 000000000000 000000000000 |
|
1188 | 1188 | 2 19 c39c6083dad0 263ea25e220a 71b9b7e73d97 |
|
1189 | 1189 | 3 20 a9a8bc3860c9 71b9b7e73d97 263ea25e220a |
|
1190 | 1190 | #else |
|
1191 | 1191 | $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f' |
|
1192 | 1192 | 498e8799f49f9da1ca06bb2d6d4accf165c5b572 644 f |
|
1193 | 1193 | $ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 f' |
|
1194 | 1194 | c5b506a7118667a38a9c9348a1f63b679e382f57 644 f |
|
1195 | 1195 | $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' |
|
1196 | 1196 | b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 f |
|
1197 | 1197 | $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' |
|
1198 | 1198 | 1e88685f5ddec574a34c70af492f95b6debc8741 644 f |
|
1199 | 1199 | $ hg debugindex f |
|
1200 | 1200 | rev linkrev nodeid p1 p2 |
|
1201 | 1201 | 0 4 b789fdd96dc2 000000000000 000000000000 |
|
1202 | 1202 | 1 10 1e88685f5dde 000000000000 000000000000 |
|
1203 | 1203 | 2 19 498e8799f49f b789fdd96dc2 1e88685f5dde |
|
1204 | 1204 | 3 20 c5b506a71186 1e88685f5dde b789fdd96dc2 |
|
1205 | 1205 | #endif |
|
1206 | 1206 | |
|
1207 | 1207 | # Here the filelog based implementation is not looking at the rename |
|
1208 | 1208 | # information (because the file exist on both side). However the changelog |
|
1209 | 1209 | # based on works fine. We have different output. |
|
1210 | 1210 | |
|
1211 | 1211 | $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mAEm-0")' |
|
1212 | 1212 | M f |
|
1213 | 1213 | b (no-filelog !) |
|
1214 | 1214 | R b |
|
1215 | 1215 | $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mEAm-0")' |
|
1216 | 1216 | M f |
|
1217 | 1217 | b (no-filelog !) |
|
1218 | 1218 | R b |
|
1219 | 1219 | $ hg status --copies --rev 'desc("e-2")' --rev 'desc("mAEm-0")' |
|
1220 | 1220 | M f |
|
1221 | 1221 | d (no-filelog !) |
|
1222 | 1222 | R d |
|
1223 | 1223 | $ hg status --copies --rev 'desc("e-2")' --rev 'desc("mEAm-0")' |
|
1224 | 1224 | M f |
|
1225 | 1225 | d (no-filelog !) |
|
1226 | 1226 | R d |
|
1227 | 1227 | $ hg status --copies --rev 'desc("i-2")' --rev 'desc("a-2")' |
|
1228 | 1228 | A f |
|
1229 | 1229 | d |
|
1230 | 1230 | R d |
|
1231 | 1231 | $ hg status --copies --rev 'desc("i-2")' --rev 'desc("e-2")' |
|
1232 | 1232 | A f |
|
1233 | 1233 | b |
|
1234 | 1234 | R b |
|
1235 | 1235 | |
|
1236 | 1236 | # From here, we run status against revision where both source file exists. |
|
1237 | 1237 | # |
|
1238 | 1238 | # The filelog based implementation picks an arbitrary side based on revision |
|
1239 | 1239 | # numbers. So the same side "wins" whatever the parents order is. This is |
|
1240 | 1240 | # sub-optimal because depending on revision numbers means the result can be |
|
1241 | 1241 | # different from one repository to the next. |
|
1242 | 1242 | # |
|
1243 | 1243 | # The changeset based algorithm use the parent order to break tie on conflicting |
|
1244 | 1244 | # information and will have a different order depending on who is p1 and p2. |
|
1245 | 1245 | # That order is stable accross repositories. (data from p1 prevails) |
|
1246 | 1246 | |
|
1247 | 1247 | $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mAEm-0")' |
|
1248 | 1248 | A f |
|
1249 | 1249 | d |
|
1250 | 1250 | R b |
|
1251 | 1251 | R d |
|
1252 | 1252 | $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mEAm-0")' |
|
1253 | 1253 | A f |
|
1254 | 1254 | d (filelog !) |
|
1255 | 1255 | b (no-filelog !) |
|
1256 | 1256 | R b |
|
1257 | 1257 | R d |
|
1258 | 1258 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mAEm-0")' |
|
1259 | 1259 | A f |
|
1260 | 1260 | a |
|
1261 | 1261 | R a |
|
1262 | 1262 | R b |
|
1263 | 1263 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEAm-0")' |
|
1264 | 1264 | A f |
|
1265 | 1265 | a (filelog !) |
|
1266 | 1266 | b (no-filelog !) |
|
1267 | 1267 | R a |
|
1268 | 1268 | R b |
|
1269 | 1269 | |
|
1270 | 1270 | |
|
1271 | 1271 | Note: |
|
1272 | 1272 | | In this case, one of the merge wrongly record a merge while there is none. |
|
1273 | 1273 | | This lead to bad copy tracing information to be dug up. |
|
1274 | 1274 | |
|
1275 | 1275 | |
|
1276 | 1276 | Merge: |
|
1277 | 1277 | - one with change to an unrelated file (b) |
|
1278 | 1278 | - one overwriting a file (d) with a rename (from h to i to d) |
|
1279 | 1279 | |
|
1280 | 1280 | $ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))' |
|
1281 | 1281 | o 24 mFBm-0 simple merge - the other way |
|
1282 | 1282 | |\ |
|
1283 | 1283 | +---o 23 mBFm-0 simple merge - one way |
|
1284 | 1284 | | |/ |
|
1285 | 1285 | | o 22 f-2: rename i -> d |
|
1286 | 1286 | | | |
|
1287 | 1287 | | o 21 f-1: rename h -> i |
|
1288 | 1288 | | | |
|
1289 | 1289 | o | 5 b-1: b update |
|
1290 | 1290 | |/ |
|
1291 | 1291 | o 2 i-2: c -move-> d |
|
1292 | 1292 | | |
|
1293 | 1293 | o 1 i-1: a -move-> c |
|
1294 | 1294 | | |
|
1295 | 1295 | o 0 i-0 initial commit: a b h |
|
1296 | 1296 | |
|
1297 | 1297 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBFm-0")' |
|
1298 | 1298 | M b |
|
1299 | 1299 | A d |
|
1300 | 1300 | h |
|
1301 | 1301 | R a |
|
1302 | 1302 | R h |
|
1303 | 1303 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFBm-0")' |
|
1304 | 1304 | M b |
|
1305 | 1305 | A d |
|
1306 | 1306 | h |
|
1307 | 1307 | R a |
|
1308 | 1308 | R h |
|
1309 | 1309 | $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBFm-0")' |
|
1310 | 1310 | M d |
|
1311 | 1311 | h (no-filelog !) |
|
1312 | 1312 | R h |
|
1313 | 1313 | $ hg status --copies --rev 'desc("f-2")' --rev 'desc("mBFm-0")' |
|
1314 | 1314 | M b |
|
1315 | 1315 | $ hg status --copies --rev 'desc("f-1")' --rev 'desc("mBFm-0")' |
|
1316 | 1316 | M b |
|
1317 | 1317 | M d |
|
1318 | 1318 | i (no-filelog !) |
|
1319 | 1319 | R i |
|
1320 | 1320 | $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mFBm-0")' |
|
1321 | 1321 | M d |
|
1322 | 1322 | h (no-filelog !) |
|
1323 | 1323 | R h |
|
1324 | 1324 | $ hg status --copies --rev 'desc("f-2")' --rev 'desc("mFBm-0")' |
|
1325 | 1325 | M b |
|
1326 | 1326 | $ hg status --copies --rev 'desc("f-1")' --rev 'desc("mFBm-0")' |
|
1327 | 1327 | M b |
|
1328 | 1328 | M d |
|
1329 | 1329 | i (no-filelog !) |
|
1330 | 1330 | R i |
|
1331 | 1331 | |
|
1332 | 1332 | #if no-changeset |
|
1333 | 1333 | $ hg log -Gfr 'desc("mBFm-0")' d |
|
1334 | 1334 | o 22 f-2: rename i -> d |
|
1335 | 1335 | | |
|
1336 | 1336 | o 21 f-1: rename h -> i |
|
1337 | 1337 | : |
|
1338 | 1338 | o 0 i-0 initial commit: a b h |
|
1339 | 1339 | |
|
1340 | 1340 | #else |
|
1341 | 1341 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
|
1342 | 1342 | $ hg log -Gfr 'desc("mBFm-0")' d |
|
1343 | 1343 | o 22 f-2: rename i -> d |
|
1344 | 1344 | | |
|
1345 | 1345 | ~ |
|
1346 | 1346 | #endif |
|
1347 | 1347 | |
|
1348 | 1348 | #if no-changeset |
|
1349 | 1349 | $ hg log -Gfr 'desc("mFBm-0")' d |
|
1350 | 1350 | o 22 f-2: rename i -> d |
|
1351 | 1351 | | |
|
1352 | 1352 | o 21 f-1: rename h -> i |
|
1353 | 1353 | : |
|
1354 | 1354 | o 0 i-0 initial commit: a b h |
|
1355 | 1355 | |
|
1356 | 1356 | #else |
|
1357 | 1357 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
|
1358 | 1358 | $ hg log -Gfr 'desc("mFBm-0")' d |
|
1359 | 1359 | o 22 f-2: rename i -> d |
|
1360 | 1360 | | |
|
1361 | 1361 | ~ |
|
1362 | 1362 | #endif |
|
1363 | 1363 | |
|
1364 | 1364 | |
|
1365 | 1365 | Merge: |
|
1366 | 1366 | - one with change to a file |
|
1367 | 1367 | - one deleting and recreating the file |
|
1368 | 1368 | |
|
1369 | 1369 | Unlike in the 'BD/DB' cases, an actual merge happened here. So we should |
|
1370 | 1370 | consider history and rename on both branch of the merge. |
|
1371 | 1371 | |
|
1372 | 1372 | $ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))' |
|
1373 | 1373 | o 27 mGDm-0 simple merge - the other way |
|
1374 | 1374 | |\ |
|
1375 | 1375 | +---o 26 mDGm-0 simple merge - one way |
|
1376 | 1376 | | |/ |
|
1377 | 1377 | | o 25 g-1: update d |
|
1378 | 1378 | | | |
|
1379 | 1379 | o | 8 d-2 re-add d |
|
1380 | 1380 | | | |
|
1381 | 1381 | o | 7 d-1 delete d |
|
1382 | 1382 | |/ |
|
1383 | 1383 | o 2 i-2: c -move-> d |
|
1384 | 1384 | | |
|
1385 | 1385 | o 1 i-1: a -move-> c |
|
1386 | 1386 | | |
|
1387 | 1387 | o 0 i-0 initial commit: a b h |
|
1388 | 1388 | |
|
1389 | 1389 | One side of the merge have a long history with rename. The other side of the |
|
1390 | 1390 | merge point to a new file with a smaller history. Each side is "valid". |
|
1391 | 1391 | |
|
1392 | 1392 | (and again the filelog based algorithm only explore one, with a pick based on |
|
1393 | 1393 | revision numbers) |
|
1394 | 1394 | |
|
1395 | 1395 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDGm-0")' |
|
1396 | 1396 | A d |
|
1397 | 1397 | a (filelog !) |
|
1398 | 1398 | R a |
|
1399 | 1399 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGDm-0")' |
|
1400 | 1400 | A d |
|
1401 | 1401 | a |
|
1402 | 1402 | R a |
|
1403 | 1403 | $ hg status --copies --rev 'desc("d-2")' --rev 'desc("mDGm-0")' |
|
1404 | 1404 | M d |
|
1405 | 1405 | $ hg status --copies --rev 'desc("d-2")' --rev 'desc("mGDm-0")' |
|
1406 | 1406 | M d |
|
1407 | 1407 | $ hg status --copies --rev 'desc("g-1")' --rev 'desc("mDGm-0")' |
|
1408 | 1408 | M d |
|
1409 | 1409 | $ hg status --copies --rev 'desc("g-1")' --rev 'desc("mGDm-0")' |
|
1410 | 1410 | M d |
|
1411 | 1411 | |
|
1412 | 1412 | #if no-changeset |
|
1413 | 1413 | $ hg log -Gfr 'desc("mDGm-0")' d |
|
1414 | 1414 | o 26 mDGm-0 simple merge - one way |
|
1415 | 1415 | |\ |
|
1416 | 1416 | | o 25 g-1: update d |
|
1417 | 1417 | | | |
|
1418 | 1418 | o | 8 d-2 re-add d |
|
1419 | 1419 | |/ |
|
1420 | 1420 | o 2 i-2: c -move-> d |
|
1421 | 1421 | | |
|
1422 | 1422 | o 1 i-1: a -move-> c |
|
1423 | 1423 | | |
|
1424 | 1424 | o 0 i-0 initial commit: a b h |
|
1425 | 1425 | |
|
1426 | 1426 | #else |
|
1427 | 1427 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
|
1428 | 1428 | $ hg log -Gfr 'desc("mDGm-0")' d |
|
1429 | 1429 | o 26 mDGm-0 simple merge - one way |
|
1430 | 1430 | |\ |
|
1431 | 1431 | | o 25 g-1: update d |
|
1432 | 1432 | | | |
|
1433 | 1433 | o | 8 d-2 re-add d |
|
1434 | 1434 | |/ |
|
1435 | 1435 | o 2 i-2: c -move-> d |
|
1436 | 1436 | | |
|
1437 | 1437 | ~ |
|
1438 | 1438 | #endif |
|
1439 | 1439 | |
|
1440 | 1440 | |
|
1441 | 1441 | #if no-changeset |
|
1442 | 1442 | $ hg log -Gfr 'desc("mDGm-0")' d |
|
1443 | 1443 | o 26 mDGm-0 simple merge - one way |
|
1444 | 1444 | |\ |
|
1445 | 1445 | | o 25 g-1: update d |
|
1446 | 1446 | | | |
|
1447 | 1447 | o | 8 d-2 re-add d |
|
1448 | 1448 | |/ |
|
1449 | 1449 | o 2 i-2: c -move-> d |
|
1450 | 1450 | | |
|
1451 | 1451 | o 1 i-1: a -move-> c |
|
1452 | 1452 | | |
|
1453 | 1453 | o 0 i-0 initial commit: a b h |
|
1454 | 1454 | |
|
1455 | 1455 | #else |
|
1456 | 1456 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
|
1457 | 1457 | $ hg log -Gfr 'desc("mDGm-0")' d |
|
1458 | 1458 | o 26 mDGm-0 simple merge - one way |
|
1459 | 1459 | |\ |
|
1460 | 1460 | | o 25 g-1: update d |
|
1461 | 1461 | | | |
|
1462 | 1462 | o | 8 d-2 re-add d |
|
1463 | 1463 | |/ |
|
1464 | 1464 | o 2 i-2: c -move-> d |
|
1465 | 1465 | | |
|
1466 | 1466 | ~ |
|
1467 | 1467 | #endif |
|
1468 | 1468 | |
|
1469 | 1469 | |
|
1470 | 1470 | Merge: |
|
1471 | 1471 | - one with change to a file (d) |
|
1472 | 1472 | - one overwriting that file with a rename (from h to i, to d) |
|
1473 | 1473 | |
|
1474 | 1474 | This case is similar to BF/FB, but an actual merge happens, so both side of the |
|
1475 | 1475 | history are relevant. |
|
1476 | 1476 | |
|
1477 | 1477 | |
|
1478 | 1478 | $ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))' |
|
1479 | 1479 | o 29 mGFm-0 simple merge - the other way |
|
1480 | 1480 | |\ |
|
1481 | 1481 | +---o 28 mFGm-0 simple merge - one way |
|
1482 | 1482 | | |/ |
|
1483 | 1483 | | o 25 g-1: update d |
|
1484 | 1484 | | | |
|
1485 | 1485 | o | 22 f-2: rename i -> d |
|
1486 | 1486 | | | |
|
1487 | 1487 | o | 21 f-1: rename h -> i |
|
1488 | 1488 | |/ |
|
1489 | 1489 | o 2 i-2: c -move-> d |
|
1490 | 1490 | | |
|
1491 | 1491 | o 1 i-1: a -move-> c |
|
1492 | 1492 | | |
|
1493 | 1493 | o 0 i-0 initial commit: a b h |
|
1494 | 1494 | |
|
1495 | 1495 | |
|
1496 | 1496 | Note: |
|
1497 | 1497 | | In this case, the merge get conflicting information since on one side we have |
|
1498 | 1498 | | "a -> c -> d". and one the other one we have "h -> i -> d". |
|
1499 | 1499 | | |
|
1500 | 1500 | | The current code arbitrarily pick one side depending the ordering of the merged hash: |
|
1501 | 1501 | |
|
1502 | 1502 | In this case, the file hash from "f-2" is lower, so it will be `p1` of the resulting filenode its copy tracing information will win (and trace back to "h"): |
|
1503 | 1503 | |
|
1504 | 1504 | Details on this hash ordering pick: |
|
1505 | 1505 | |
|
1506 | 1506 | $ hg manifest --debug 'desc("g-1")' | egrep 'd$' |
|
1507 | 1507 | f2b277c39e0d2bbac99d8aae075c0d8b5304d266 644 d (no-changeset !) |
|
1508 | 1508 | 4ff57b4e8dceedb487e70e6965ea188a7c042cca 644 d (changeset !) |
|
1509 | 1509 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("g-1")' d |
|
1510 | 1510 | A d |
|
1511 | 1511 | a (no-changeset no-compatibility !) |
|
1512 | 1512 | |
|
1513 | 1513 | $ hg manifest --debug 'desc("f-2")' | egrep 'd$' |
|
1514 | 1514 | 4a067cf8965d1bfff130057ade26b44f580231be 644 d (no-changeset !) |
|
1515 | 1515 | fe6f8b4f507fe3eb524c527192a84920a4288dac 644 d (changeset !) |
|
1516 | 1516 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("f-2")' d |
|
1517 | 1517 | A d |
|
1518 | 1518 | h (no-changeset no-compatibility !) |
|
1519 | 1519 | |
|
1520 | 1520 | Copy tracing data on the resulting merge: |
|
1521 | 1521 | |
|
1522 | 1522 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFGm-0")' |
|
1523 | 1523 | A d |
|
1524 | 1524 | h |
|
1525 | 1525 | R a |
|
1526 | 1526 | R h |
|
1527 | 1527 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGFm-0")' |
|
1528 | 1528 | A d |
|
1529 | 1529 | a (no-filelog !) |
|
1530 | 1530 | h (filelog !) |
|
1531 | 1531 | R a |
|
1532 | 1532 | R h |
|
1533 | 1533 | $ hg status --copies --rev 'desc("f-2")' --rev 'desc("mFGm-0")' |
|
1534 | 1534 | M d |
|
1535 | 1535 | $ hg status --copies --rev 'desc("f-2")' --rev 'desc("mGFm-0")' |
|
1536 | 1536 | M d |
|
1537 | 1537 | $ hg status --copies --rev 'desc("f-1")' --rev 'desc("mFGm-0")' |
|
1538 | 1538 | M d |
|
1539 | 1539 | i (no-filelog !) |
|
1540 | 1540 | R i |
|
1541 | 1541 | $ hg status --copies --rev 'desc("f-1")' --rev 'desc("mGFm-0")' |
|
1542 | 1542 | M d |
|
1543 | 1543 | i (no-filelog !) |
|
1544 | 1544 | R i |
|
1545 | 1545 | $ hg status --copies --rev 'desc("g-1")' --rev 'desc("mFGm-0")' |
|
1546 | 1546 | M d |
|
1547 | 1547 | h (no-filelog !) |
|
1548 | 1548 | R h |
|
1549 | 1549 | $ hg status --copies --rev 'desc("g-1")' --rev 'desc("mGFm-0")' |
|
1550 | 1550 | M d |
|
1551 | 1551 | h (no-filelog !) |
|
1552 | 1552 | R h |
|
1553 | 1553 | |
|
1554 | 1554 | #if no-changeset |
|
1555 | 1555 | $ hg log -Gfr 'desc("mFGm-0")' d |
|
1556 | 1556 | o 28 mFGm-0 simple merge - one way |
|
1557 | 1557 | |\ |
|
1558 | 1558 | | o 25 g-1: update d |
|
1559 | 1559 | | | |
|
1560 | 1560 | o | 22 f-2: rename i -> d |
|
1561 | 1561 | | | |
|
1562 | 1562 | o | 21 f-1: rename h -> i |
|
1563 | 1563 | |/ |
|
1564 | 1564 | o 2 i-2: c -move-> d |
|
1565 | 1565 | | |
|
1566 | 1566 | o 1 i-1: a -move-> c |
|
1567 | 1567 | | |
|
1568 | 1568 | o 0 i-0 initial commit: a b h |
|
1569 | 1569 | |
|
1570 | 1570 | #else |
|
1571 | 1571 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
|
1572 | 1572 | $ hg log -Gfr 'desc("mFGm-0")' d |
|
1573 | 1573 | o 28 mFGm-0 simple merge - one way |
|
1574 | 1574 | |\ |
|
1575 | 1575 | | o 25 g-1: update d |
|
1576 | 1576 | | | |
|
1577 | 1577 | o | 22 f-2: rename i -> d |
|
1578 | 1578 | |/ |
|
1579 | 1579 | o 2 i-2: c -move-> d |
|
1580 | 1580 | | |
|
1581 | 1581 | ~ |
|
1582 | 1582 | #endif |
|
1583 | 1583 | |
|
1584 | 1584 | #if no-changeset |
|
1585 | 1585 | $ hg log -Gfr 'desc("mGFm-0")' d |
|
1586 | 1586 | o 29 mGFm-0 simple merge - the other way |
|
1587 | 1587 | |\ |
|
1588 | 1588 | | o 25 g-1: update d |
|
1589 | 1589 | | | |
|
1590 | 1590 | o | 22 f-2: rename i -> d |
|
1591 | 1591 | | | |
|
1592 | 1592 | o | 21 f-1: rename h -> i |
|
1593 | 1593 | |/ |
|
1594 | 1594 | o 2 i-2: c -move-> d |
|
1595 | 1595 | | |
|
1596 | 1596 | o 1 i-1: a -move-> c |
|
1597 | 1597 | | |
|
1598 | 1598 | o 0 i-0 initial commit: a b h |
|
1599 | 1599 | |
|
1600 | 1600 | #else |
|
1601 | 1601 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
|
1602 | 1602 | $ hg log -Gfr 'desc("mGFm-0")' d |
|
1603 | 1603 | o 29 mGFm-0 simple merge - the other way |
|
1604 | 1604 | |\ |
|
1605 | 1605 | | o 25 g-1: update d |
|
1606 | 1606 | | | |
|
1607 | 1607 | o | 22 f-2: rename i -> d |
|
1608 | 1608 | |/ |
|
1609 | 1609 | o 2 i-2: c -move-> d |
|
1610 | 1610 | | |
|
1611 | 1611 | ~ |
|
1612 | 1612 | #endif |
|
1613 | 1613 | |
|
1614 | 1614 | |
|
1615 | 1615 | Comparing with merging with a deletion (and keeping the file) |
|
1616 | 1616 | ------------------------------------------------------------- |
|
1617 | 1617 | |
|
1618 | 1618 | Merge: |
|
1619 | 1619 | - one removing a file (d) |
|
1620 | 1620 | - one updating that file |
|
1621 | 1621 | - the merge keep the modified version of the file (canceling the delete) |
|
1622 | 1622 | |
|
1623 | 1623 | In this case, the file keep on living after the merge. So we should not drop its |
|
1624 | 1624 | copy tracing chain. |
|
1625 | 1625 | |
|
1626 | 1626 | $ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))' |
|
1627 | 1627 | o 31 mGCm-0 |
|
1628 | 1628 | |\ |
|
1629 | 1629 | +---o 30 mCGm-0 |
|
1630 | 1630 | | |/ |
|
1631 | 1631 | | o 25 g-1: update d |
|
1632 | 1632 | | | |
|
1633 | 1633 | o | 6 c-1 delete d |
|
1634 | 1634 | |/ |
|
1635 | 1635 | o 2 i-2: c -move-> d |
|
1636 | 1636 | | |
|
1637 | 1637 | o 1 i-1: a -move-> c |
|
1638 | 1638 | | |
|
1639 | 1639 | o 0 i-0 initial commit: a b h |
|
1640 | 1640 | |
|
1641 | 1641 | |
|
1642 | 1642 | 'a' is the copy source of 'd' |
|
1643 | 1643 | |
|
1644 | 1644 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCGm-0")' |
|
1645 | 1645 | A d |
|
1646 | 1646 | a (no-compatibility no-changeset !) |
|
1647 | 1647 | R a |
|
1648 | 1648 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGCm-0")' |
|
1649 | 1649 | A d |
|
1650 | 1650 | a (no-compatibility no-changeset !) |
|
1651 | 1651 | R a |
|
1652 | 1652 | $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCGm-0")' |
|
1653 | 1653 | A d |
|
1654 | 1654 | $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mGCm-0")' |
|
1655 | 1655 | A d |
|
1656 | 1656 | $ hg status --copies --rev 'desc("g-1")' --rev 'desc("mCGm-0")' |
|
1657 | 1657 | $ hg status --copies --rev 'desc("g-1")' --rev 'desc("mGCm-0")' |
|
1658 | 1658 | |
|
1659 | 1659 | |
|
1660 | 1660 | Comparing with merge restoring an untouched deleted file |
|
1661 | 1661 | -------------------------------------------------------- |
|
1662 | 1662 | |
|
1663 | 1663 | Merge: |
|
1664 | 1664 | - one removing a file (d) |
|
1665 | 1665 | - one leaving the file untouched |
|
1666 | 1666 | - the merge actively restore the file to the same content. |
|
1667 | 1667 | |
|
1668 | 1668 | In this case, the file keep on living after the merge. So we should not drop its |
|
1669 | 1669 | copy tracing chain. |
|
1670 | 1670 | |
|
1671 | 1671 | $ hg log -G --rev '::(desc("mCB-revert-m")+desc("mBC-revert-m"))' |
|
1672 | 1672 | o 33 mBC-revert-m-0 |
|
1673 | 1673 | |\ |
|
1674 | 1674 | +---o 32 mCB-revert-m-0 |
|
1675 | 1675 | | |/ |
|
1676 | 1676 | | o 6 c-1 delete d |
|
1677 | 1677 | | | |
|
1678 | 1678 | o | 5 b-1: b update |
|
1679 | 1679 | |/ |
|
1680 | 1680 | o 2 i-2: c -move-> d |
|
1681 | 1681 | | |
|
1682 | 1682 | o 1 i-1: a -move-> c |
|
1683 | 1683 | | |
|
1684 | 1684 | o 0 i-0 initial commit: a b h |
|
1685 | 1685 | |
|
1686 | 1686 | |
|
1687 | 1687 | 'a' is the the copy source of 'd' |
|
1688 | 1688 | |
|
1689 | 1689 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCB-revert-m-0")' |
|
1690 | 1690 | M b |
|
1691 | 1691 | A d |
|
1692 | 1692 | a (no-compatibility no-changeset !) |
|
1693 | 1693 | R a |
|
1694 | 1694 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC-revert-m-0")' |
|
1695 | 1695 | M b |
|
1696 | 1696 | A d |
|
1697 | 1697 | a (no-compatibility no-changeset !) |
|
1698 | 1698 | R a |
|
1699 | 1699 | $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCB-revert-m-0")' |
|
1700 | 1700 | M b |
|
1701 | 1701 | A d |
|
1702 | 1702 | $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBC-revert-m-0")' |
|
1703 | 1703 | M b |
|
1704 | 1704 | A d |
|
1705 | 1705 | $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCB-revert-m-0")' |
|
1706 | 1706 | $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBC-revert-m-0")' |
|
1707 | 1707 | |
|
1708 | 1708 | |
|
1709 | 1709 | Merging a branch where a rename was deleted with a branch where the same file was renamed |
|
1710 | 1710 | ------------------------------------------------------------------------------------------ |
|
1711 | 1711 | |
|
1712 | 1712 | Create a "conflicting" merge where `d` get removed on one branch before its |
|
1713 | 1713 | rename information actually conflict with the other branch. |
|
1714 | 1714 | |
|
1715 | 1715 | (the copy information from the branch that was not deleted should win). |
|
1716 | 1716 | |
|
1717 | 1717 | $ hg log -G --rev '::(desc("mCH-delete-before-conflict-m")+desc("mHC-delete-before-conflict-m"))' |
|
1718 | 1718 | o 36 mHC-delete-before-conflict-m-0 |
|
1719 | 1719 | |\ |
|
1720 | 1720 | +---o 35 mCH-delete-before-conflict-m-0 |
|
1721 | 1721 | | |/ |
|
1722 | 1722 | | o 34 h-1: b -(move)-> d |
|
1723 | 1723 | | | |
|
1724 | 1724 | o | 6 c-1 delete d |
|
1725 | 1725 | | | |
|
1726 | 1726 | o | 2 i-2: c -move-> d |
|
1727 | 1727 | | | |
|
1728 | 1728 | o | 1 i-1: a -move-> c |
|
1729 | 1729 | |/ |
|
1730 | 1730 | o 0 i-0 initial commit: a b h |
|
1731 | 1731 | |
|
1732 | 1732 | |
|
1733 | 1733 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCH-delete-before-conflict-m")' |
|
1734 | 1734 | A d |
|
1735 | 1735 | b (no-compatibility no-changeset !) |
|
1736 | 1736 | R a |
|
1737 | 1737 | R b |
|
1738 | 1738 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mHC-delete-before-conflict-m")' |
|
1739 | 1739 | A d |
|
1740 | 1740 | b |
|
1741 | 1741 | R a |
|
1742 | 1742 | R b |
|
1743 | 1743 | $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCH-delete-before-conflict-m")' |
|
1744 | 1744 | A d |
|
1745 | 1745 | b |
|
1746 | 1746 | R b |
|
1747 | 1747 | $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mHC-delete-before-conflict-m")' |
|
1748 | 1748 | A d |
|
1749 | 1749 | b |
|
1750 | 1750 | R b |
|
1751 | 1751 | $ hg status --copies --rev 'desc("h-1")' --rev 'desc("mCH-delete-before-conflict-m")' |
|
1752 | 1752 | R a |
|
1753 | 1753 | $ hg status --copies --rev 'desc("h-1")' --rev 'desc("mHC-delete-before-conflict-m")' |
|
1754 | 1754 | R a |
@@ -1,494 +1,494 | |||
|
1 | 1 | #testcases extra sidedata |
|
2 | 2 | |
|
3 | 3 | #if extra |
|
4 | 4 | $ cat >> $HGRCPATH << EOF |
|
5 | 5 | > [experimental] |
|
6 | 6 | > copies.write-to=changeset-only |
|
7 | 7 | > copies.read-from=changeset-only |
|
8 | 8 | > [alias] |
|
9 | 9 | > changesetcopies = log -r . -T 'files: {files} |
|
10 | 10 | > {extras % "{ifcontains("files", key, "{key}: {value}\n")}"} |
|
11 | 11 | > {extras % "{ifcontains("copies", key, "{key}: {value}\n")}"}' |
|
12 | 12 | > EOF |
|
13 | 13 | #endif |
|
14 | 14 | |
|
15 | 15 | #if sidedata |
|
16 | 16 | $ cat >> $HGRCPATH << EOF |
|
17 | 17 | > [format] |
|
18 | 18 | > exp-use-copies-side-data-changeset = yes |
|
19 | 19 | > EOF |
|
20 | 20 | #endif |
|
21 | 21 | |
|
22 | 22 | $ cat >> $HGRCPATH << EOF |
|
23 | 23 | > [alias] |
|
24 | 24 | > showcopies = log -r . -T '{file_copies % "{source} -> {name}\n"}' |
|
25 | 25 | > [extensions] |
|
26 | 26 | > rebase = |
|
27 | 27 | > split = |
|
28 | 28 | > EOF |
|
29 | 29 | |
|
30 | 30 | Check that copies are recorded correctly |
|
31 | 31 | |
|
32 | 32 | $ hg init repo |
|
33 | 33 | $ cd repo |
|
34 | 34 | #if sidedata |
|
35 | 35 | $ hg debugformat -v |
|
36 | 36 | format-variant repo config default |
|
37 | 37 | fncache: yes yes yes |
|
38 | 38 | dotencode: yes yes yes |
|
39 | 39 | generaldelta: yes yes yes |
|
40 |
e |
|
|
40 | share-safe: no no no | |
|
41 | 41 | sparserevlog: yes yes yes |
|
42 | 42 | sidedata: yes yes no |
|
43 | 43 | persistent-nodemap: no no no |
|
44 | 44 | copies-sdc: yes yes no |
|
45 | 45 | plain-cl-delta: yes yes yes |
|
46 | 46 | compression: zlib zlib zlib |
|
47 | 47 | compression-level: default default default |
|
48 | 48 | #else |
|
49 | 49 | $ hg debugformat -v |
|
50 | 50 | format-variant repo config default |
|
51 | 51 | fncache: yes yes yes |
|
52 | 52 | dotencode: yes yes yes |
|
53 | 53 | generaldelta: yes yes yes |
|
54 |
e |
|
|
54 | share-safe: no no no | |
|
55 | 55 | sparserevlog: yes yes yes |
|
56 | 56 | sidedata: no no no |
|
57 | 57 | persistent-nodemap: no no no |
|
58 | 58 | copies-sdc: no no no |
|
59 | 59 | plain-cl-delta: yes yes yes |
|
60 | 60 | compression: zlib zlib zlib |
|
61 | 61 | compression-level: default default default |
|
62 | 62 | #endif |
|
63 | 63 | $ echo a > a |
|
64 | 64 | $ hg add a |
|
65 | 65 | $ hg ci -m initial |
|
66 | 66 | $ hg cp a b |
|
67 | 67 | $ hg cp a c |
|
68 | 68 | $ hg cp a d |
|
69 | 69 | $ hg ci -m 'copy a to b, c, and d' |
|
70 | 70 | |
|
71 | 71 | #if extra |
|
72 | 72 | |
|
73 | 73 | $ hg changesetcopies |
|
74 | 74 | files: b c d |
|
75 | 75 | filesadded: 0 |
|
76 | 76 | 1 |
|
77 | 77 | 2 |
|
78 | 78 | |
|
79 | 79 | p1copies: 0\x00a (esc) |
|
80 | 80 | 1\x00a (esc) |
|
81 | 81 | 2\x00a (esc) |
|
82 | 82 | #else |
|
83 | 83 | $ hg debugsidedata -c -v -- -1 |
|
84 | 84 | 1 sidedata entries |
|
85 | 85 | entry-0014 size 44 |
|
86 | 86 | '\x00\x00\x00\x04\x00\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00\x06\x00\x00\x00\x03\x00\x00\x00\x00\x06\x00\x00\x00\x04\x00\x00\x00\x00abcd' |
|
87 | 87 | #endif |
|
88 | 88 | |
|
89 | 89 | $ hg showcopies |
|
90 | 90 | a -> b |
|
91 | 91 | a -> c |
|
92 | 92 | a -> d |
|
93 | 93 | |
|
94 | 94 | #if extra |
|
95 | 95 | |
|
96 | 96 | $ hg showcopies --config experimental.copies.read-from=compatibility |
|
97 | 97 | a -> b |
|
98 | 98 | a -> c |
|
99 | 99 | a -> d |
|
100 | 100 | $ hg showcopies --config experimental.copies.read-from=filelog-only |
|
101 | 101 | |
|
102 | 102 | #endif |
|
103 | 103 | |
|
104 | 104 | Check that renames are recorded correctly |
|
105 | 105 | |
|
106 | 106 | $ hg mv b b2 |
|
107 | 107 | $ hg ci -m 'rename b to b2' |
|
108 | 108 | |
|
109 | 109 | #if extra |
|
110 | 110 | |
|
111 | 111 | $ hg changesetcopies |
|
112 | 112 | files: b b2 |
|
113 | 113 | filesadded: 1 |
|
114 | 114 | filesremoved: 0 |
|
115 | 115 | |
|
116 | 116 | p1copies: 1\x00b (esc) |
|
117 | 117 | |
|
118 | 118 | #else |
|
119 | 119 | $ hg debugsidedata -c -v -- -1 |
|
120 | 120 | 1 sidedata entries |
|
121 | 121 | entry-0014 size 25 |
|
122 | 122 | '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x03\x00\x00\x00\x00bb2' |
|
123 | 123 | #endif |
|
124 | 124 | |
|
125 | 125 | $ hg showcopies |
|
126 | 126 | b -> b2 |
|
127 | 127 | |
|
128 | 128 | |
|
129 | 129 | Rename onto existing file. This should get recorded in the changeset files list and in the extras, |
|
130 | 130 | even though there is no filelog entry. |
|
131 | 131 | |
|
132 | 132 | $ hg cp b2 c --force |
|
133 | 133 | $ hg st --copies |
|
134 | 134 | M c |
|
135 | 135 | b2 |
|
136 | 136 | |
|
137 | 137 | #if extra |
|
138 | 138 | |
|
139 | 139 | $ hg debugindex c |
|
140 | 140 | rev linkrev nodeid p1 p2 |
|
141 | 141 | 0 1 b789fdd96dc2 000000000000 000000000000 |
|
142 | 142 | |
|
143 | 143 | #else |
|
144 | 144 | |
|
145 | 145 | $ hg debugindex c |
|
146 | 146 | rev linkrev nodeid p1 p2 |
|
147 | 147 | 0 1 37d9b5d994ea 000000000000 000000000000 |
|
148 | 148 | |
|
149 | 149 | #endif |
|
150 | 150 | |
|
151 | 151 | |
|
152 | 152 | $ hg ci -m 'move b onto d' |
|
153 | 153 | |
|
154 | 154 | #if extra |
|
155 | 155 | |
|
156 | 156 | $ hg changesetcopies |
|
157 | 157 | files: c |
|
158 | 158 | |
|
159 | 159 | p1copies: 0\x00b2 (esc) |
|
160 | 160 | |
|
161 | 161 | #else |
|
162 | 162 | $ hg debugsidedata -c -v -- -1 |
|
163 | 163 | 1 sidedata entries |
|
164 | 164 | entry-0014 size 25 |
|
165 | 165 | '\x00\x00\x00\x02\x00\x00\x00\x00\x02\x00\x00\x00\x00\x16\x00\x00\x00\x03\x00\x00\x00\x00b2c' |
|
166 | 166 | #endif |
|
167 | 167 | |
|
168 | 168 | $ hg showcopies |
|
169 | 169 | b2 -> c |
|
170 | 170 | |
|
171 | 171 | #if extra |
|
172 | 172 | |
|
173 | 173 | $ hg debugindex c |
|
174 | 174 | rev linkrev nodeid p1 p2 |
|
175 | 175 | 0 1 b789fdd96dc2 000000000000 000000000000 |
|
176 | 176 | |
|
177 | 177 | #else |
|
178 | 178 | |
|
179 | 179 | $ hg debugindex c |
|
180 | 180 | rev linkrev nodeid p1 p2 |
|
181 | 181 | 0 1 37d9b5d994ea 000000000000 000000000000 |
|
182 | 182 | 1 3 029625640347 000000000000 000000000000 |
|
183 | 183 | |
|
184 | 184 | #endif |
|
185 | 185 | |
|
186 | 186 | Create a merge commit with copying done during merge. |
|
187 | 187 | |
|
188 | 188 | $ hg co 0 |
|
189 | 189 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
190 | 190 | $ hg cp a e |
|
191 | 191 | $ hg cp a f |
|
192 | 192 | $ hg ci -m 'copy a to e and f' |
|
193 | 193 | created new head |
|
194 | 194 | $ hg merge 3 |
|
195 | 195 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
196 | 196 | (branch merge, don't forget to commit) |
|
197 | 197 | File 'a' exists on both sides, so 'g' could be recorded as being from p1 or p2, but we currently |
|
198 | 198 | always record it as being from p1 |
|
199 | 199 | $ hg cp a g |
|
200 | 200 | File 'd' exists only in p2, so 'h' should be from p2 |
|
201 | 201 | $ hg cp d h |
|
202 | 202 | File 'f' exists only in p1, so 'i' should be from p1 |
|
203 | 203 | $ hg cp f i |
|
204 | 204 | $ hg ci -m 'merge' |
|
205 | 205 | |
|
206 | 206 | #if extra |
|
207 | 207 | |
|
208 | 208 | $ hg changesetcopies |
|
209 | 209 | files: g h i |
|
210 | 210 | filesadded: 0 |
|
211 | 211 | 1 |
|
212 | 212 | 2 |
|
213 | 213 | |
|
214 | 214 | p1copies: 0\x00a (esc) |
|
215 | 215 | 2\x00f (esc) |
|
216 | 216 | p2copies: 1\x00d (esc) |
|
217 | 217 | |
|
218 | 218 | #else |
|
219 | 219 | $ hg debugsidedata -c -v -- -1 |
|
220 | 220 | 1 sidedata entries |
|
221 | 221 | entry-0014 size 64 |
|
222 | 222 | '\x00\x00\x00\x06\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\x06\x00\x00\x00\x04\x00\x00\x00\x00\x07\x00\x00\x00\x05\x00\x00\x00\x01\x06\x00\x00\x00\x06\x00\x00\x00\x02adfghi' |
|
223 | 223 | #endif |
|
224 | 224 | |
|
225 | 225 | $ hg showcopies |
|
226 | 226 | a -> g |
|
227 | 227 | d -> h |
|
228 | 228 | f -> i |
|
229 | 229 | |
|
230 | 230 | Test writing to both changeset and filelog |
|
231 | 231 | |
|
232 | 232 | $ hg cp a j |
|
233 | 233 | #if extra |
|
234 | 234 | $ hg ci -m 'copy a to j' --config experimental.copies.write-to=compatibility |
|
235 | 235 | $ hg changesetcopies |
|
236 | 236 | files: j |
|
237 | 237 | filesadded: 0 |
|
238 | 238 | filesremoved: |
|
239 | 239 | |
|
240 | 240 | p1copies: 0\x00a (esc) |
|
241 | 241 | p2copies: |
|
242 | 242 | #else |
|
243 | 243 | $ hg ci -m 'copy a to j' |
|
244 | 244 | $ hg debugsidedata -c -v -- -1 |
|
245 | 245 | 1 sidedata entries |
|
246 | 246 | entry-0014 size 24 |
|
247 | 247 | '\x00\x00\x00\x02\x00\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00aj' |
|
248 | 248 | #endif |
|
249 | 249 | $ hg debugdata j 0 |
|
250 | 250 | \x01 (esc) |
|
251 | 251 | copy: a |
|
252 | 252 | copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
|
253 | 253 | \x01 (esc) |
|
254 | 254 | a |
|
255 | 255 | $ hg showcopies |
|
256 | 256 | a -> j |
|
257 | 257 | $ hg showcopies --config experimental.copies.read-from=compatibility |
|
258 | 258 | a -> j |
|
259 | 259 | $ hg showcopies --config experimental.copies.read-from=filelog-only |
|
260 | 260 | a -> j |
|
261 | 261 | Existing copy information in the changeset gets removed on amend and writing |
|
262 | 262 | copy information on to the filelog |
|
263 | 263 | #if extra |
|
264 | 264 | $ hg ci --amend -m 'copy a to j, v2' \ |
|
265 | 265 | > --config experimental.copies.write-to=filelog-only |
|
266 | 266 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-*-amend.hg (glob) |
|
267 | 267 | $ hg changesetcopies |
|
268 | 268 | files: j |
|
269 | 269 | |
|
270 | 270 | #else |
|
271 | 271 | $ hg ci --amend -m 'copy a to j, v2' |
|
272 | 272 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-*-amend.hg (glob) |
|
273 | 273 | $ hg debugsidedata -c -v -- -1 |
|
274 | 274 | 1 sidedata entries |
|
275 | 275 | entry-0014 size 24 |
|
276 | 276 | '\x00\x00\x00\x02\x00\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00aj' |
|
277 | 277 | #endif |
|
278 | 278 | $ hg showcopies --config experimental.copies.read-from=filelog-only |
|
279 | 279 | a -> j |
|
280 | 280 | The entries should be written to extras even if they're empty (so the client |
|
281 | 281 | won't have to fall back to reading from filelogs) |
|
282 | 282 | $ echo x >> j |
|
283 | 283 | #if extra |
|
284 | 284 | $ hg ci -m 'modify j' --config experimental.copies.write-to=compatibility |
|
285 | 285 | $ hg changesetcopies |
|
286 | 286 | files: j |
|
287 | 287 | filesadded: |
|
288 | 288 | filesremoved: |
|
289 | 289 | |
|
290 | 290 | p1copies: |
|
291 | 291 | p2copies: |
|
292 | 292 | #else |
|
293 | 293 | $ hg ci -m 'modify j' |
|
294 | 294 | $ hg debugsidedata -c -v -- -1 |
|
295 | 295 | 1 sidedata entries |
|
296 | 296 | entry-0014 size 14 |
|
297 | 297 | '\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00j' |
|
298 | 298 | #endif |
|
299 | 299 | |
|
300 | 300 | Test writing only to filelog |
|
301 | 301 | |
|
302 | 302 | $ hg cp a k |
|
303 | 303 | #if extra |
|
304 | 304 | $ hg ci -m 'copy a to k' --config experimental.copies.write-to=filelog-only |
|
305 | 305 | |
|
306 | 306 | $ hg changesetcopies |
|
307 | 307 | files: k |
|
308 | 308 | |
|
309 | 309 | #else |
|
310 | 310 | $ hg ci -m 'copy a to k' |
|
311 | 311 | $ hg debugsidedata -c -v -- -1 |
|
312 | 312 | 1 sidedata entries |
|
313 | 313 | entry-0014 size 24 |
|
314 | 314 | '\x00\x00\x00\x02\x00\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00ak' |
|
315 | 315 | #endif |
|
316 | 316 | |
|
317 | 317 | $ hg debugdata k 0 |
|
318 | 318 | \x01 (esc) |
|
319 | 319 | copy: a |
|
320 | 320 | copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
|
321 | 321 | \x01 (esc) |
|
322 | 322 | a |
|
323 | 323 | #if extra |
|
324 | 324 | $ hg showcopies |
|
325 | 325 | |
|
326 | 326 | $ hg showcopies --config experimental.copies.read-from=compatibility |
|
327 | 327 | a -> k |
|
328 | 328 | $ hg showcopies --config experimental.copies.read-from=filelog-only |
|
329 | 329 | a -> k |
|
330 | 330 | #else |
|
331 | 331 | $ hg showcopies |
|
332 | 332 | a -> k |
|
333 | 333 | #endif |
|
334 | 334 | |
|
335 | 335 | $ cd .. |
|
336 | 336 | |
|
337 | 337 | Test rebasing a commit with copy information |
|
338 | 338 | |
|
339 | 339 | $ hg init rebase-rename |
|
340 | 340 | $ cd rebase-rename |
|
341 | 341 | $ echo a > a |
|
342 | 342 | $ hg ci -Aqm 'add a' |
|
343 | 343 | $ echo a2 > a |
|
344 | 344 | $ hg ci -m 'modify a' |
|
345 | 345 | $ hg co -q 0 |
|
346 | 346 | $ hg mv a b |
|
347 | 347 | $ hg ci -qm 'rename a to b' |
|
348 | 348 | $ hg rebase -d 1 --config rebase.experimental.inmemory=yes |
|
349 | 349 | rebasing 2:* tip "rename a to b" (glob) |
|
350 | 350 | merging a and b to b |
|
351 | 351 | saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/*-*-rebase.hg (glob) |
|
352 | 352 | $ hg st --change . --copies |
|
353 | 353 | A b |
|
354 | 354 | a |
|
355 | 355 | R a |
|
356 | 356 | $ cd .. |
|
357 | 357 | |
|
358 | 358 | Test splitting a commit |
|
359 | 359 | |
|
360 | 360 | $ hg init split |
|
361 | 361 | $ cd split |
|
362 | 362 | $ echo a > a |
|
363 | 363 | $ echo b > b |
|
364 | 364 | $ hg ci -Aqm 'add a and b' |
|
365 | 365 | $ echo a2 > a |
|
366 | 366 | $ hg mv b c |
|
367 | 367 | $ hg ci -m 'modify a, move b to c' |
|
368 | 368 | $ hg --config ui.interactive=yes split <<EOF |
|
369 | 369 | > y |
|
370 | 370 | > y |
|
371 | 371 | > n |
|
372 | 372 | > y |
|
373 | 373 | > EOF |
|
374 | 374 | diff --git a/a b/a |
|
375 | 375 | 1 hunks, 1 lines changed |
|
376 | 376 | examine changes to 'a'? |
|
377 | 377 | (enter ? for help) [Ynesfdaq?] y |
|
378 | 378 | |
|
379 | 379 | @@ -1,1 +1,1 @@ |
|
380 | 380 | -a |
|
381 | 381 | +a2 |
|
382 | 382 | record this change to 'a'? |
|
383 | 383 | (enter ? for help) [Ynesfdaq?] y |
|
384 | 384 | |
|
385 | 385 | diff --git a/b b/c |
|
386 | 386 | rename from b |
|
387 | 387 | rename to c |
|
388 | 388 | examine changes to 'b' and 'c'? |
|
389 | 389 | (enter ? for help) [Ynesfdaq?] n |
|
390 | 390 | |
|
391 | 391 | created new head |
|
392 | 392 | diff --git a/b b/c |
|
393 | 393 | rename from b |
|
394 | 394 | rename to c |
|
395 | 395 | examine changes to 'b' and 'c'? |
|
396 | 396 | (enter ? for help) [Ynesfdaq?] y |
|
397 | 397 | |
|
398 | 398 | saved backup bundle to $TESTTMP/split/.hg/strip-backup/*-*-split.hg (glob) |
|
399 | 399 | $ cd .. |
|
400 | 400 | |
|
401 | 401 | Test committing half a rename |
|
402 | 402 | |
|
403 | 403 | $ hg init partial |
|
404 | 404 | $ cd partial |
|
405 | 405 | $ echo a > a |
|
406 | 406 | $ hg ci -Aqm 'add a' |
|
407 | 407 | $ hg mv a b |
|
408 | 408 | $ hg ci -m 'remove a' a |
|
409 | 409 | |
|
410 | 410 | #if sidedata |
|
411 | 411 | |
|
412 | 412 | Test upgrading/downgrading to sidedata storage |
|
413 | 413 | ============================================== |
|
414 | 414 | |
|
415 | 415 | downgrading (keeping some sidedata) |
|
416 | 416 | |
|
417 | 417 | $ hg debugformat -v |
|
418 | 418 | format-variant repo config default |
|
419 | 419 | fncache: yes yes yes |
|
420 | 420 | dotencode: yes yes yes |
|
421 | 421 | generaldelta: yes yes yes |
|
422 |
e |
|
|
422 | share-safe: no no no | |
|
423 | 423 | sparserevlog: yes yes yes |
|
424 | 424 | sidedata: yes yes no |
|
425 | 425 | persistent-nodemap: no no no |
|
426 | 426 | copies-sdc: yes yes no |
|
427 | 427 | plain-cl-delta: yes yes yes |
|
428 | 428 | compression: zlib zlib zlib |
|
429 | 429 | compression-level: default default default |
|
430 | 430 | $ hg debugsidedata -c -- 0 |
|
431 | 431 | 1 sidedata entries |
|
432 | 432 | entry-0014 size 14 |
|
433 | 433 | $ hg debugsidedata -c -- 1 |
|
434 | 434 | 1 sidedata entries |
|
435 | 435 | entry-0014 size 14 |
|
436 | 436 | $ hg debugsidedata -m -- 0 |
|
437 | 437 | $ cat << EOF > .hg/hgrc |
|
438 | 438 | > [format] |
|
439 | 439 | > exp-use-side-data = yes |
|
440 | 440 | > exp-use-copies-side-data-changeset = no |
|
441 | 441 | > EOF |
|
442 | 442 | $ hg debugupgraderepo --run --quiet --no-backup > /dev/null |
|
443 | 443 | $ hg debugformat -v |
|
444 | 444 | format-variant repo config default |
|
445 | 445 | fncache: yes yes yes |
|
446 | 446 | dotencode: yes yes yes |
|
447 | 447 | generaldelta: yes yes yes |
|
448 |
e |
|
|
448 | share-safe: no no no | |
|
449 | 449 | sparserevlog: yes yes yes |
|
450 | 450 | sidedata: yes yes no |
|
451 | 451 | persistent-nodemap: no no no |
|
452 | 452 | copies-sdc: no no no |
|
453 | 453 | plain-cl-delta: yes yes yes |
|
454 | 454 | compression: zlib zlib zlib |
|
455 | 455 | compression-level: default default default |
|
456 | 456 | $ hg debugsidedata -c -- 0 |
|
457 | 457 | 1 sidedata entries |
|
458 | 458 | entry-0014 size 14 |
|
459 | 459 | $ hg debugsidedata -c -- 1 |
|
460 | 460 | 1 sidedata entries |
|
461 | 461 | entry-0014 size 14 |
|
462 | 462 | $ hg debugsidedata -m -- 0 |
|
463 | 463 | |
|
464 | 464 | upgrading |
|
465 | 465 | |
|
466 | 466 | $ cat << EOF > .hg/hgrc |
|
467 | 467 | > [format] |
|
468 | 468 | > exp-use-copies-side-data-changeset = yes |
|
469 | 469 | > EOF |
|
470 | 470 | $ hg debugupgraderepo --run --quiet --no-backup > /dev/null |
|
471 | 471 | $ hg debugformat -v |
|
472 | 472 | format-variant repo config default |
|
473 | 473 | fncache: yes yes yes |
|
474 | 474 | dotencode: yes yes yes |
|
475 | 475 | generaldelta: yes yes yes |
|
476 |
e |
|
|
476 | share-safe: no no no | |
|
477 | 477 | sparserevlog: yes yes yes |
|
478 | 478 | sidedata: yes yes no |
|
479 | 479 | persistent-nodemap: no no no |
|
480 | 480 | copies-sdc: yes yes no |
|
481 | 481 | plain-cl-delta: yes yes yes |
|
482 | 482 | compression: zlib zlib zlib |
|
483 | 483 | compression-level: default default default |
|
484 | 484 | $ hg debugsidedata -c -- 0 |
|
485 | 485 | 1 sidedata entries |
|
486 | 486 | entry-0014 size 14 |
|
487 | 487 | $ hg debugsidedata -c -- 1 |
|
488 | 488 | 1 sidedata entries |
|
489 | 489 | entry-0014 size 14 |
|
490 | 490 | $ hg debugsidedata -m -- 0 |
|
491 | 491 | |
|
492 | 492 | #endif |
|
493 | 493 | |
|
494 | 494 | $ cd .. |
|
1 | NO CONTENT: modified file | |
The requested commit or file is too big and content was truncated. Show full diff |
|
1 | NO CONTENT: modified file | |
The requested commit or file is too big and content was truncated. Show full diff |
|
1 | NO CONTENT: modified file | |
The requested commit or file is too big and content was truncated. Show full diff |
|
1 | NO CONTENT: modified file | |
The requested commit or file is too big and content was truncated. Show full diff |
|
1 | NO CONTENT: modified file | |
The requested commit or file is too big and content was truncated. Show full diff |
|
1 | NO CONTENT: modified file | |
The requested commit or file is too big and content was truncated. Show full diff |
|
1 | NO CONTENT: modified file | |
The requested commit or file is too big and content was truncated. Show full diff |
General Comments 0
You need to be logged in to leave comments.
Login now