Show More
@@ -1,2582 +1,2594 b'' | |||
|
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 | # Control the initial size of the discovery sample | |
|
733 | coreconfigitem( | |
|
734 | b'devel', | |
|
735 | b'discovery.sample-size', | |
|
736 | default=200, | |
|
737 | ) | |
|
738 | # Control the initial size of the discovery for initial change | |
|
739 | coreconfigitem( | |
|
740 | b'devel', | |
|
741 | b'discovery.sample-size.initial', | |
|
742 | default=100, | |
|
743 | ) | |
|
732 | 744 | _registerdiffopts(section=b'diff') |
|
733 | 745 | coreconfigitem( |
|
734 | 746 | b'email', |
|
735 | 747 | b'bcc', |
|
736 | 748 | default=None, |
|
737 | 749 | ) |
|
738 | 750 | coreconfigitem( |
|
739 | 751 | b'email', |
|
740 | 752 | b'cc', |
|
741 | 753 | default=None, |
|
742 | 754 | ) |
|
743 | 755 | coreconfigitem( |
|
744 | 756 | b'email', |
|
745 | 757 | b'charsets', |
|
746 | 758 | default=list, |
|
747 | 759 | ) |
|
748 | 760 | coreconfigitem( |
|
749 | 761 | b'email', |
|
750 | 762 | b'from', |
|
751 | 763 | default=None, |
|
752 | 764 | ) |
|
753 | 765 | coreconfigitem( |
|
754 | 766 | b'email', |
|
755 | 767 | b'method', |
|
756 | 768 | default=b'smtp', |
|
757 | 769 | ) |
|
758 | 770 | coreconfigitem( |
|
759 | 771 | b'email', |
|
760 | 772 | b'reply-to', |
|
761 | 773 | default=None, |
|
762 | 774 | ) |
|
763 | 775 | coreconfigitem( |
|
764 | 776 | b'email', |
|
765 | 777 | b'to', |
|
766 | 778 | default=None, |
|
767 | 779 | ) |
|
768 | 780 | coreconfigitem( |
|
769 | 781 | b'experimental', |
|
770 | 782 | b'archivemetatemplate', |
|
771 | 783 | default=dynamicdefault, |
|
772 | 784 | ) |
|
773 | 785 | coreconfigitem( |
|
774 | 786 | b'experimental', |
|
775 | 787 | b'auto-publish', |
|
776 | 788 | default=b'publish', |
|
777 | 789 | ) |
|
778 | 790 | coreconfigitem( |
|
779 | 791 | b'experimental', |
|
780 | 792 | b'bundle-phases', |
|
781 | 793 | default=False, |
|
782 | 794 | ) |
|
783 | 795 | coreconfigitem( |
|
784 | 796 | b'experimental', |
|
785 | 797 | b'bundle2-advertise', |
|
786 | 798 | default=True, |
|
787 | 799 | ) |
|
788 | 800 | coreconfigitem( |
|
789 | 801 | b'experimental', |
|
790 | 802 | b'bundle2-output-capture', |
|
791 | 803 | default=False, |
|
792 | 804 | ) |
|
793 | 805 | coreconfigitem( |
|
794 | 806 | b'experimental', |
|
795 | 807 | b'bundle2.pushback', |
|
796 | 808 | default=False, |
|
797 | 809 | ) |
|
798 | 810 | coreconfigitem( |
|
799 | 811 | b'experimental', |
|
800 | 812 | b'bundle2lazylocking', |
|
801 | 813 | default=False, |
|
802 | 814 | ) |
|
803 | 815 | coreconfigitem( |
|
804 | 816 | b'experimental', |
|
805 | 817 | b'bundlecomplevel', |
|
806 | 818 | default=None, |
|
807 | 819 | ) |
|
808 | 820 | coreconfigitem( |
|
809 | 821 | b'experimental', |
|
810 | 822 | b'bundlecomplevel.bzip2', |
|
811 | 823 | default=None, |
|
812 | 824 | ) |
|
813 | 825 | coreconfigitem( |
|
814 | 826 | b'experimental', |
|
815 | 827 | b'bundlecomplevel.gzip', |
|
816 | 828 | default=None, |
|
817 | 829 | ) |
|
818 | 830 | coreconfigitem( |
|
819 | 831 | b'experimental', |
|
820 | 832 | b'bundlecomplevel.none', |
|
821 | 833 | default=None, |
|
822 | 834 | ) |
|
823 | 835 | coreconfigitem( |
|
824 | 836 | b'experimental', |
|
825 | 837 | b'bundlecomplevel.zstd', |
|
826 | 838 | default=None, |
|
827 | 839 | ) |
|
828 | 840 | coreconfigitem( |
|
829 | 841 | b'experimental', |
|
830 | 842 | b'changegroup3', |
|
831 | 843 | default=False, |
|
832 | 844 | ) |
|
833 | 845 | coreconfigitem( |
|
834 | 846 | b'experimental', |
|
835 | 847 | b'cleanup-as-archived', |
|
836 | 848 | default=False, |
|
837 | 849 | ) |
|
838 | 850 | coreconfigitem( |
|
839 | 851 | b'experimental', |
|
840 | 852 | b'clientcompressionengines', |
|
841 | 853 | default=list, |
|
842 | 854 | ) |
|
843 | 855 | coreconfigitem( |
|
844 | 856 | b'experimental', |
|
845 | 857 | b'copytrace', |
|
846 | 858 | default=b'on', |
|
847 | 859 | ) |
|
848 | 860 | coreconfigitem( |
|
849 | 861 | b'experimental', |
|
850 | 862 | b'copytrace.movecandidateslimit', |
|
851 | 863 | default=100, |
|
852 | 864 | ) |
|
853 | 865 | coreconfigitem( |
|
854 | 866 | b'experimental', |
|
855 | 867 | b'copytrace.sourcecommitlimit', |
|
856 | 868 | default=100, |
|
857 | 869 | ) |
|
858 | 870 | coreconfigitem( |
|
859 | 871 | b'experimental', |
|
860 | 872 | b'copies.read-from', |
|
861 | 873 | default=b"filelog-only", |
|
862 | 874 | ) |
|
863 | 875 | coreconfigitem( |
|
864 | 876 | b'experimental', |
|
865 | 877 | b'copies.write-to', |
|
866 | 878 | default=b'filelog-only', |
|
867 | 879 | ) |
|
868 | 880 | coreconfigitem( |
|
869 | 881 | b'experimental', |
|
870 | 882 | b'crecordtest', |
|
871 | 883 | default=None, |
|
872 | 884 | ) |
|
873 | 885 | coreconfigitem( |
|
874 | 886 | b'experimental', |
|
875 | 887 | b'directaccess', |
|
876 | 888 | default=False, |
|
877 | 889 | ) |
|
878 | 890 | coreconfigitem( |
|
879 | 891 | b'experimental', |
|
880 | 892 | b'directaccess.revnums', |
|
881 | 893 | default=False, |
|
882 | 894 | ) |
|
883 | 895 | coreconfigitem( |
|
884 | 896 | b'experimental', |
|
885 | 897 | b'editortmpinhg', |
|
886 | 898 | default=False, |
|
887 | 899 | ) |
|
888 | 900 | coreconfigitem( |
|
889 | 901 | b'experimental', |
|
890 | 902 | b'evolution', |
|
891 | 903 | default=list, |
|
892 | 904 | ) |
|
893 | 905 | coreconfigitem( |
|
894 | 906 | b'experimental', |
|
895 | 907 | b'evolution.allowdivergence', |
|
896 | 908 | default=False, |
|
897 | 909 | alias=[(b'experimental', b'allowdivergence')], |
|
898 | 910 | ) |
|
899 | 911 | coreconfigitem( |
|
900 | 912 | b'experimental', |
|
901 | 913 | b'evolution.allowunstable', |
|
902 | 914 | default=None, |
|
903 | 915 | ) |
|
904 | 916 | coreconfigitem( |
|
905 | 917 | b'experimental', |
|
906 | 918 | b'evolution.createmarkers', |
|
907 | 919 | default=None, |
|
908 | 920 | ) |
|
909 | 921 | coreconfigitem( |
|
910 | 922 | b'experimental', |
|
911 | 923 | b'evolution.effect-flags', |
|
912 | 924 | default=True, |
|
913 | 925 | alias=[(b'experimental', b'effect-flags')], |
|
914 | 926 | ) |
|
915 | 927 | coreconfigitem( |
|
916 | 928 | b'experimental', |
|
917 | 929 | b'evolution.exchange', |
|
918 | 930 | default=None, |
|
919 | 931 | ) |
|
920 | 932 | coreconfigitem( |
|
921 | 933 | b'experimental', |
|
922 | 934 | b'evolution.bundle-obsmarker', |
|
923 | 935 | default=False, |
|
924 | 936 | ) |
|
925 | 937 | coreconfigitem( |
|
926 | 938 | b'experimental', |
|
927 | 939 | b'evolution.bundle-obsmarker:mandatory', |
|
928 | 940 | default=True, |
|
929 | 941 | ) |
|
930 | 942 | coreconfigitem( |
|
931 | 943 | b'experimental', |
|
932 | 944 | b'log.topo', |
|
933 | 945 | default=False, |
|
934 | 946 | ) |
|
935 | 947 | coreconfigitem( |
|
936 | 948 | b'experimental', |
|
937 | 949 | b'evolution.report-instabilities', |
|
938 | 950 | default=True, |
|
939 | 951 | ) |
|
940 | 952 | coreconfigitem( |
|
941 | 953 | b'experimental', |
|
942 | 954 | b'evolution.track-operation', |
|
943 | 955 | default=True, |
|
944 | 956 | ) |
|
945 | 957 | # repo-level config to exclude a revset visibility |
|
946 | 958 | # |
|
947 | 959 | # The target use case is to use `share` to expose different subset of the same |
|
948 | 960 | # repository, especially server side. See also `server.view`. |
|
949 | 961 | coreconfigitem( |
|
950 | 962 | b'experimental', |
|
951 | 963 | b'extra-filter-revs', |
|
952 | 964 | default=None, |
|
953 | 965 | ) |
|
954 | 966 | coreconfigitem( |
|
955 | 967 | b'experimental', |
|
956 | 968 | b'maxdeltachainspan', |
|
957 | 969 | default=-1, |
|
958 | 970 | ) |
|
959 | 971 | # tracks files which were undeleted (merge might delete them but we explicitly |
|
960 | 972 | # kept/undeleted them) and creates new filenodes for them |
|
961 | 973 | coreconfigitem( |
|
962 | 974 | b'experimental', |
|
963 | 975 | b'merge-track-salvaged', |
|
964 | 976 | default=False, |
|
965 | 977 | ) |
|
966 | 978 | coreconfigitem( |
|
967 | 979 | b'experimental', |
|
968 | 980 | b'mergetempdirprefix', |
|
969 | 981 | default=None, |
|
970 | 982 | ) |
|
971 | 983 | coreconfigitem( |
|
972 | 984 | b'experimental', |
|
973 | 985 | b'mmapindexthreshold', |
|
974 | 986 | default=None, |
|
975 | 987 | ) |
|
976 | 988 | coreconfigitem( |
|
977 | 989 | b'experimental', |
|
978 | 990 | b'narrow', |
|
979 | 991 | default=False, |
|
980 | 992 | ) |
|
981 | 993 | coreconfigitem( |
|
982 | 994 | b'experimental', |
|
983 | 995 | b'nonnormalparanoidcheck', |
|
984 | 996 | default=False, |
|
985 | 997 | ) |
|
986 | 998 | coreconfigitem( |
|
987 | 999 | b'experimental', |
|
988 | 1000 | b'exportableenviron', |
|
989 | 1001 | default=list, |
|
990 | 1002 | ) |
|
991 | 1003 | coreconfigitem( |
|
992 | 1004 | b'experimental', |
|
993 | 1005 | b'extendedheader.index', |
|
994 | 1006 | default=None, |
|
995 | 1007 | ) |
|
996 | 1008 | coreconfigitem( |
|
997 | 1009 | b'experimental', |
|
998 | 1010 | b'extendedheader.similarity', |
|
999 | 1011 | default=False, |
|
1000 | 1012 | ) |
|
1001 | 1013 | coreconfigitem( |
|
1002 | 1014 | b'experimental', |
|
1003 | 1015 | b'graphshorten', |
|
1004 | 1016 | default=False, |
|
1005 | 1017 | ) |
|
1006 | 1018 | coreconfigitem( |
|
1007 | 1019 | b'experimental', |
|
1008 | 1020 | b'graphstyle.parent', |
|
1009 | 1021 | default=dynamicdefault, |
|
1010 | 1022 | ) |
|
1011 | 1023 | coreconfigitem( |
|
1012 | 1024 | b'experimental', |
|
1013 | 1025 | b'graphstyle.missing', |
|
1014 | 1026 | default=dynamicdefault, |
|
1015 | 1027 | ) |
|
1016 | 1028 | coreconfigitem( |
|
1017 | 1029 | b'experimental', |
|
1018 | 1030 | b'graphstyle.grandparent', |
|
1019 | 1031 | default=dynamicdefault, |
|
1020 | 1032 | ) |
|
1021 | 1033 | coreconfigitem( |
|
1022 | 1034 | b'experimental', |
|
1023 | 1035 | b'hook-track-tags', |
|
1024 | 1036 | default=False, |
|
1025 | 1037 | ) |
|
1026 | 1038 | coreconfigitem( |
|
1027 | 1039 | b'experimental', |
|
1028 | 1040 | b'httppeer.advertise-v2', |
|
1029 | 1041 | default=False, |
|
1030 | 1042 | ) |
|
1031 | 1043 | coreconfigitem( |
|
1032 | 1044 | b'experimental', |
|
1033 | 1045 | b'httppeer.v2-encoder-order', |
|
1034 | 1046 | default=None, |
|
1035 | 1047 | ) |
|
1036 | 1048 | coreconfigitem( |
|
1037 | 1049 | b'experimental', |
|
1038 | 1050 | b'httppostargs', |
|
1039 | 1051 | default=False, |
|
1040 | 1052 | ) |
|
1041 | 1053 | coreconfigitem(b'experimental', b'nointerrupt', default=False) |
|
1042 | 1054 | coreconfigitem(b'experimental', b'nointerrupt-interactiveonly', default=True) |
|
1043 | 1055 | |
|
1044 | 1056 | coreconfigitem( |
|
1045 | 1057 | b'experimental', |
|
1046 | 1058 | b'obsmarkers-exchange-debug', |
|
1047 | 1059 | default=False, |
|
1048 | 1060 | ) |
|
1049 | 1061 | coreconfigitem( |
|
1050 | 1062 | b'experimental', |
|
1051 | 1063 | b'remotenames', |
|
1052 | 1064 | default=False, |
|
1053 | 1065 | ) |
|
1054 | 1066 | coreconfigitem( |
|
1055 | 1067 | b'experimental', |
|
1056 | 1068 | b'removeemptydirs', |
|
1057 | 1069 | default=True, |
|
1058 | 1070 | ) |
|
1059 | 1071 | coreconfigitem( |
|
1060 | 1072 | b'experimental', |
|
1061 | 1073 | b'revert.interactive.select-to-keep', |
|
1062 | 1074 | default=False, |
|
1063 | 1075 | ) |
|
1064 | 1076 | coreconfigitem( |
|
1065 | 1077 | b'experimental', |
|
1066 | 1078 | b'revisions.prefixhexnode', |
|
1067 | 1079 | default=False, |
|
1068 | 1080 | ) |
|
1069 | 1081 | coreconfigitem( |
|
1070 | 1082 | b'experimental', |
|
1071 | 1083 | b'revlogv2', |
|
1072 | 1084 | default=None, |
|
1073 | 1085 | ) |
|
1074 | 1086 | coreconfigitem( |
|
1075 | 1087 | b'experimental', |
|
1076 | 1088 | b'revisions.disambiguatewithin', |
|
1077 | 1089 | default=None, |
|
1078 | 1090 | ) |
|
1079 | 1091 | coreconfigitem( |
|
1080 | 1092 | b'experimental', |
|
1081 | 1093 | b'rust.index', |
|
1082 | 1094 | default=False, |
|
1083 | 1095 | ) |
|
1084 | 1096 | coreconfigitem( |
|
1085 | 1097 | b'experimental', |
|
1086 | 1098 | b'server.filesdata.recommended-batch-size', |
|
1087 | 1099 | default=50000, |
|
1088 | 1100 | ) |
|
1089 | 1101 | coreconfigitem( |
|
1090 | 1102 | b'experimental', |
|
1091 | 1103 | b'server.manifestdata.recommended-batch-size', |
|
1092 | 1104 | default=100000, |
|
1093 | 1105 | ) |
|
1094 | 1106 | coreconfigitem( |
|
1095 | 1107 | b'experimental', |
|
1096 | 1108 | b'server.stream-narrow-clones', |
|
1097 | 1109 | default=False, |
|
1098 | 1110 | ) |
|
1099 | 1111 | coreconfigitem( |
|
1100 | 1112 | b'experimental', |
|
1101 | 1113 | b'single-head-per-branch', |
|
1102 | 1114 | default=False, |
|
1103 | 1115 | ) |
|
1104 | 1116 | coreconfigitem( |
|
1105 | 1117 | b'experimental', |
|
1106 | 1118 | b'single-head-per-branch:account-closed-heads', |
|
1107 | 1119 | default=False, |
|
1108 | 1120 | ) |
|
1109 | 1121 | coreconfigitem( |
|
1110 | 1122 | b'experimental', |
|
1111 | 1123 | b'single-head-per-branch:public-changes-only', |
|
1112 | 1124 | default=False, |
|
1113 | 1125 | ) |
|
1114 | 1126 | coreconfigitem( |
|
1115 | 1127 | b'experimental', |
|
1116 | 1128 | b'sshserver.support-v2', |
|
1117 | 1129 | default=False, |
|
1118 | 1130 | ) |
|
1119 | 1131 | coreconfigitem( |
|
1120 | 1132 | b'experimental', |
|
1121 | 1133 | b'sparse-read', |
|
1122 | 1134 | default=False, |
|
1123 | 1135 | ) |
|
1124 | 1136 | coreconfigitem( |
|
1125 | 1137 | b'experimental', |
|
1126 | 1138 | b'sparse-read.density-threshold', |
|
1127 | 1139 | default=0.50, |
|
1128 | 1140 | ) |
|
1129 | 1141 | coreconfigitem( |
|
1130 | 1142 | b'experimental', |
|
1131 | 1143 | b'sparse-read.min-gap-size', |
|
1132 | 1144 | default=b'65K', |
|
1133 | 1145 | ) |
|
1134 | 1146 | coreconfigitem( |
|
1135 | 1147 | b'experimental', |
|
1136 | 1148 | b'treemanifest', |
|
1137 | 1149 | default=False, |
|
1138 | 1150 | ) |
|
1139 | 1151 | coreconfigitem( |
|
1140 | 1152 | b'experimental', |
|
1141 | 1153 | b'update.atomic-file', |
|
1142 | 1154 | default=False, |
|
1143 | 1155 | ) |
|
1144 | 1156 | coreconfigitem( |
|
1145 | 1157 | b'experimental', |
|
1146 | 1158 | b'sshpeer.advertise-v2', |
|
1147 | 1159 | default=False, |
|
1148 | 1160 | ) |
|
1149 | 1161 | coreconfigitem( |
|
1150 | 1162 | b'experimental', |
|
1151 | 1163 | b'web.apiserver', |
|
1152 | 1164 | default=False, |
|
1153 | 1165 | ) |
|
1154 | 1166 | coreconfigitem( |
|
1155 | 1167 | b'experimental', |
|
1156 | 1168 | b'web.api.http-v2', |
|
1157 | 1169 | default=False, |
|
1158 | 1170 | ) |
|
1159 | 1171 | coreconfigitem( |
|
1160 | 1172 | b'experimental', |
|
1161 | 1173 | b'web.api.debugreflect', |
|
1162 | 1174 | default=False, |
|
1163 | 1175 | ) |
|
1164 | 1176 | coreconfigitem( |
|
1165 | 1177 | b'experimental', |
|
1166 | 1178 | b'worker.wdir-get-thread-safe', |
|
1167 | 1179 | default=False, |
|
1168 | 1180 | ) |
|
1169 | 1181 | coreconfigitem( |
|
1170 | 1182 | b'experimental', |
|
1171 | 1183 | b'worker.repository-upgrade', |
|
1172 | 1184 | default=False, |
|
1173 | 1185 | ) |
|
1174 | 1186 | coreconfigitem( |
|
1175 | 1187 | b'experimental', |
|
1176 | 1188 | b'xdiff', |
|
1177 | 1189 | default=False, |
|
1178 | 1190 | ) |
|
1179 | 1191 | coreconfigitem( |
|
1180 | 1192 | b'extensions', |
|
1181 | 1193 | b'.*', |
|
1182 | 1194 | default=None, |
|
1183 | 1195 | generic=True, |
|
1184 | 1196 | ) |
|
1185 | 1197 | coreconfigitem( |
|
1186 | 1198 | b'extdata', |
|
1187 | 1199 | b'.*', |
|
1188 | 1200 | default=None, |
|
1189 | 1201 | generic=True, |
|
1190 | 1202 | ) |
|
1191 | 1203 | coreconfigitem( |
|
1192 | 1204 | b'format', |
|
1193 | 1205 | b'bookmarks-in-store', |
|
1194 | 1206 | default=False, |
|
1195 | 1207 | ) |
|
1196 | 1208 | coreconfigitem( |
|
1197 | 1209 | b'format', |
|
1198 | 1210 | b'chunkcachesize', |
|
1199 | 1211 | default=None, |
|
1200 | 1212 | experimental=True, |
|
1201 | 1213 | ) |
|
1202 | 1214 | coreconfigitem( |
|
1203 | 1215 | b'format', |
|
1204 | 1216 | b'dotencode', |
|
1205 | 1217 | default=True, |
|
1206 | 1218 | ) |
|
1207 | 1219 | coreconfigitem( |
|
1208 | 1220 | b'format', |
|
1209 | 1221 | b'generaldelta', |
|
1210 | 1222 | default=False, |
|
1211 | 1223 | experimental=True, |
|
1212 | 1224 | ) |
|
1213 | 1225 | coreconfigitem( |
|
1214 | 1226 | b'format', |
|
1215 | 1227 | b'manifestcachesize', |
|
1216 | 1228 | default=None, |
|
1217 | 1229 | experimental=True, |
|
1218 | 1230 | ) |
|
1219 | 1231 | coreconfigitem( |
|
1220 | 1232 | b'format', |
|
1221 | 1233 | b'maxchainlen', |
|
1222 | 1234 | default=dynamicdefault, |
|
1223 | 1235 | experimental=True, |
|
1224 | 1236 | ) |
|
1225 | 1237 | coreconfigitem( |
|
1226 | 1238 | b'format', |
|
1227 | 1239 | b'obsstore-version', |
|
1228 | 1240 | default=None, |
|
1229 | 1241 | ) |
|
1230 | 1242 | coreconfigitem( |
|
1231 | 1243 | b'format', |
|
1232 | 1244 | b'sparse-revlog', |
|
1233 | 1245 | default=True, |
|
1234 | 1246 | ) |
|
1235 | 1247 | coreconfigitem( |
|
1236 | 1248 | b'format', |
|
1237 | 1249 | b'revlog-compression', |
|
1238 | 1250 | default=lambda: [b'zlib'], |
|
1239 | 1251 | alias=[(b'experimental', b'format.compression')], |
|
1240 | 1252 | ) |
|
1241 | 1253 | coreconfigitem( |
|
1242 | 1254 | b'format', |
|
1243 | 1255 | b'usefncache', |
|
1244 | 1256 | default=True, |
|
1245 | 1257 | ) |
|
1246 | 1258 | coreconfigitem( |
|
1247 | 1259 | b'format', |
|
1248 | 1260 | b'usegeneraldelta', |
|
1249 | 1261 | default=True, |
|
1250 | 1262 | ) |
|
1251 | 1263 | coreconfigitem( |
|
1252 | 1264 | b'format', |
|
1253 | 1265 | b'usestore', |
|
1254 | 1266 | default=True, |
|
1255 | 1267 | ) |
|
1256 | 1268 | coreconfigitem( |
|
1257 | 1269 | b'format', |
|
1258 | 1270 | b'use-persistent-nodemap', |
|
1259 | 1271 | default=False, |
|
1260 | 1272 | ) |
|
1261 | 1273 | coreconfigitem( |
|
1262 | 1274 | b'format', |
|
1263 | 1275 | b'exp-use-copies-side-data-changeset', |
|
1264 | 1276 | default=False, |
|
1265 | 1277 | experimental=True, |
|
1266 | 1278 | ) |
|
1267 | 1279 | coreconfigitem( |
|
1268 | 1280 | b'format', |
|
1269 | 1281 | b'exp-use-side-data', |
|
1270 | 1282 | default=False, |
|
1271 | 1283 | experimental=True, |
|
1272 | 1284 | ) |
|
1273 | 1285 | coreconfigitem( |
|
1274 | 1286 | b'format', |
|
1275 | 1287 | b'use-share-safe', |
|
1276 | 1288 | default=False, |
|
1277 | 1289 | ) |
|
1278 | 1290 | coreconfigitem( |
|
1279 | 1291 | b'format', |
|
1280 | 1292 | b'internal-phase', |
|
1281 | 1293 | default=False, |
|
1282 | 1294 | experimental=True, |
|
1283 | 1295 | ) |
|
1284 | 1296 | coreconfigitem( |
|
1285 | 1297 | b'fsmonitor', |
|
1286 | 1298 | b'warn_when_unused', |
|
1287 | 1299 | default=True, |
|
1288 | 1300 | ) |
|
1289 | 1301 | coreconfigitem( |
|
1290 | 1302 | b'fsmonitor', |
|
1291 | 1303 | b'warn_update_file_count', |
|
1292 | 1304 | default=50000, |
|
1293 | 1305 | ) |
|
1294 | 1306 | coreconfigitem( |
|
1295 | 1307 | b'fsmonitor', |
|
1296 | 1308 | b'warn_update_file_count_rust', |
|
1297 | 1309 | default=400000, |
|
1298 | 1310 | ) |
|
1299 | 1311 | coreconfigitem( |
|
1300 | 1312 | b'help', |
|
1301 | 1313 | br'hidden-command\..*', |
|
1302 | 1314 | default=False, |
|
1303 | 1315 | generic=True, |
|
1304 | 1316 | ) |
|
1305 | 1317 | coreconfigitem( |
|
1306 | 1318 | b'help', |
|
1307 | 1319 | br'hidden-topic\..*', |
|
1308 | 1320 | default=False, |
|
1309 | 1321 | generic=True, |
|
1310 | 1322 | ) |
|
1311 | 1323 | coreconfigitem( |
|
1312 | 1324 | b'hooks', |
|
1313 | 1325 | b'.*', |
|
1314 | 1326 | default=dynamicdefault, |
|
1315 | 1327 | generic=True, |
|
1316 | 1328 | ) |
|
1317 | 1329 | coreconfigitem( |
|
1318 | 1330 | b'hgweb-paths', |
|
1319 | 1331 | b'.*', |
|
1320 | 1332 | default=list, |
|
1321 | 1333 | generic=True, |
|
1322 | 1334 | ) |
|
1323 | 1335 | coreconfigitem( |
|
1324 | 1336 | b'hostfingerprints', |
|
1325 | 1337 | b'.*', |
|
1326 | 1338 | default=list, |
|
1327 | 1339 | generic=True, |
|
1328 | 1340 | ) |
|
1329 | 1341 | coreconfigitem( |
|
1330 | 1342 | b'hostsecurity', |
|
1331 | 1343 | b'ciphers', |
|
1332 | 1344 | default=None, |
|
1333 | 1345 | ) |
|
1334 | 1346 | coreconfigitem( |
|
1335 | 1347 | b'hostsecurity', |
|
1336 | 1348 | b'minimumprotocol', |
|
1337 | 1349 | default=dynamicdefault, |
|
1338 | 1350 | ) |
|
1339 | 1351 | coreconfigitem( |
|
1340 | 1352 | b'hostsecurity', |
|
1341 | 1353 | b'.*:minimumprotocol$', |
|
1342 | 1354 | default=dynamicdefault, |
|
1343 | 1355 | generic=True, |
|
1344 | 1356 | ) |
|
1345 | 1357 | coreconfigitem( |
|
1346 | 1358 | b'hostsecurity', |
|
1347 | 1359 | b'.*:ciphers$', |
|
1348 | 1360 | default=dynamicdefault, |
|
1349 | 1361 | generic=True, |
|
1350 | 1362 | ) |
|
1351 | 1363 | coreconfigitem( |
|
1352 | 1364 | b'hostsecurity', |
|
1353 | 1365 | b'.*:fingerprints$', |
|
1354 | 1366 | default=list, |
|
1355 | 1367 | generic=True, |
|
1356 | 1368 | ) |
|
1357 | 1369 | coreconfigitem( |
|
1358 | 1370 | b'hostsecurity', |
|
1359 | 1371 | b'.*:verifycertsfile$', |
|
1360 | 1372 | default=None, |
|
1361 | 1373 | generic=True, |
|
1362 | 1374 | ) |
|
1363 | 1375 | |
|
1364 | 1376 | coreconfigitem( |
|
1365 | 1377 | b'http_proxy', |
|
1366 | 1378 | b'always', |
|
1367 | 1379 | default=False, |
|
1368 | 1380 | ) |
|
1369 | 1381 | coreconfigitem( |
|
1370 | 1382 | b'http_proxy', |
|
1371 | 1383 | b'host', |
|
1372 | 1384 | default=None, |
|
1373 | 1385 | ) |
|
1374 | 1386 | coreconfigitem( |
|
1375 | 1387 | b'http_proxy', |
|
1376 | 1388 | b'no', |
|
1377 | 1389 | default=list, |
|
1378 | 1390 | ) |
|
1379 | 1391 | coreconfigitem( |
|
1380 | 1392 | b'http_proxy', |
|
1381 | 1393 | b'passwd', |
|
1382 | 1394 | default=None, |
|
1383 | 1395 | ) |
|
1384 | 1396 | coreconfigitem( |
|
1385 | 1397 | b'http_proxy', |
|
1386 | 1398 | b'user', |
|
1387 | 1399 | default=None, |
|
1388 | 1400 | ) |
|
1389 | 1401 | |
|
1390 | 1402 | coreconfigitem( |
|
1391 | 1403 | b'http', |
|
1392 | 1404 | b'timeout', |
|
1393 | 1405 | default=None, |
|
1394 | 1406 | ) |
|
1395 | 1407 | |
|
1396 | 1408 | coreconfigitem( |
|
1397 | 1409 | b'logtoprocess', |
|
1398 | 1410 | b'commandexception', |
|
1399 | 1411 | default=None, |
|
1400 | 1412 | ) |
|
1401 | 1413 | coreconfigitem( |
|
1402 | 1414 | b'logtoprocess', |
|
1403 | 1415 | b'commandfinish', |
|
1404 | 1416 | default=None, |
|
1405 | 1417 | ) |
|
1406 | 1418 | coreconfigitem( |
|
1407 | 1419 | b'logtoprocess', |
|
1408 | 1420 | b'command', |
|
1409 | 1421 | default=None, |
|
1410 | 1422 | ) |
|
1411 | 1423 | coreconfigitem( |
|
1412 | 1424 | b'logtoprocess', |
|
1413 | 1425 | b'develwarn', |
|
1414 | 1426 | default=None, |
|
1415 | 1427 | ) |
|
1416 | 1428 | coreconfigitem( |
|
1417 | 1429 | b'logtoprocess', |
|
1418 | 1430 | b'uiblocked', |
|
1419 | 1431 | default=None, |
|
1420 | 1432 | ) |
|
1421 | 1433 | coreconfigitem( |
|
1422 | 1434 | b'merge', |
|
1423 | 1435 | b'checkunknown', |
|
1424 | 1436 | default=b'abort', |
|
1425 | 1437 | ) |
|
1426 | 1438 | coreconfigitem( |
|
1427 | 1439 | b'merge', |
|
1428 | 1440 | b'checkignored', |
|
1429 | 1441 | default=b'abort', |
|
1430 | 1442 | ) |
|
1431 | 1443 | coreconfigitem( |
|
1432 | 1444 | b'experimental', |
|
1433 | 1445 | b'merge.checkpathconflicts', |
|
1434 | 1446 | default=False, |
|
1435 | 1447 | ) |
|
1436 | 1448 | coreconfigitem( |
|
1437 | 1449 | b'merge', |
|
1438 | 1450 | b'followcopies', |
|
1439 | 1451 | default=True, |
|
1440 | 1452 | ) |
|
1441 | 1453 | coreconfigitem( |
|
1442 | 1454 | b'merge', |
|
1443 | 1455 | b'on-failure', |
|
1444 | 1456 | default=b'continue', |
|
1445 | 1457 | ) |
|
1446 | 1458 | coreconfigitem( |
|
1447 | 1459 | b'merge', |
|
1448 | 1460 | b'preferancestor', |
|
1449 | 1461 | default=lambda: [b'*'], |
|
1450 | 1462 | experimental=True, |
|
1451 | 1463 | ) |
|
1452 | 1464 | coreconfigitem( |
|
1453 | 1465 | b'merge', |
|
1454 | 1466 | b'strict-capability-check', |
|
1455 | 1467 | default=False, |
|
1456 | 1468 | ) |
|
1457 | 1469 | coreconfigitem( |
|
1458 | 1470 | b'merge-tools', |
|
1459 | 1471 | b'.*', |
|
1460 | 1472 | default=None, |
|
1461 | 1473 | generic=True, |
|
1462 | 1474 | ) |
|
1463 | 1475 | coreconfigitem( |
|
1464 | 1476 | b'merge-tools', |
|
1465 | 1477 | br'.*\.args$', |
|
1466 | 1478 | default=b"$local $base $other", |
|
1467 | 1479 | generic=True, |
|
1468 | 1480 | priority=-1, |
|
1469 | 1481 | ) |
|
1470 | 1482 | coreconfigitem( |
|
1471 | 1483 | b'merge-tools', |
|
1472 | 1484 | br'.*\.binary$', |
|
1473 | 1485 | default=False, |
|
1474 | 1486 | generic=True, |
|
1475 | 1487 | priority=-1, |
|
1476 | 1488 | ) |
|
1477 | 1489 | coreconfigitem( |
|
1478 | 1490 | b'merge-tools', |
|
1479 | 1491 | br'.*\.check$', |
|
1480 | 1492 | default=list, |
|
1481 | 1493 | generic=True, |
|
1482 | 1494 | priority=-1, |
|
1483 | 1495 | ) |
|
1484 | 1496 | coreconfigitem( |
|
1485 | 1497 | b'merge-tools', |
|
1486 | 1498 | br'.*\.checkchanged$', |
|
1487 | 1499 | default=False, |
|
1488 | 1500 | generic=True, |
|
1489 | 1501 | priority=-1, |
|
1490 | 1502 | ) |
|
1491 | 1503 | coreconfigitem( |
|
1492 | 1504 | b'merge-tools', |
|
1493 | 1505 | br'.*\.executable$', |
|
1494 | 1506 | default=dynamicdefault, |
|
1495 | 1507 | generic=True, |
|
1496 | 1508 | priority=-1, |
|
1497 | 1509 | ) |
|
1498 | 1510 | coreconfigitem( |
|
1499 | 1511 | b'merge-tools', |
|
1500 | 1512 | br'.*\.fixeol$', |
|
1501 | 1513 | default=False, |
|
1502 | 1514 | generic=True, |
|
1503 | 1515 | priority=-1, |
|
1504 | 1516 | ) |
|
1505 | 1517 | coreconfigitem( |
|
1506 | 1518 | b'merge-tools', |
|
1507 | 1519 | br'.*\.gui$', |
|
1508 | 1520 | default=False, |
|
1509 | 1521 | generic=True, |
|
1510 | 1522 | priority=-1, |
|
1511 | 1523 | ) |
|
1512 | 1524 | coreconfigitem( |
|
1513 | 1525 | b'merge-tools', |
|
1514 | 1526 | br'.*\.mergemarkers$', |
|
1515 | 1527 | default=b'basic', |
|
1516 | 1528 | generic=True, |
|
1517 | 1529 | priority=-1, |
|
1518 | 1530 | ) |
|
1519 | 1531 | coreconfigitem( |
|
1520 | 1532 | b'merge-tools', |
|
1521 | 1533 | br'.*\.mergemarkertemplate$', |
|
1522 | 1534 | default=dynamicdefault, # take from command-templates.mergemarker |
|
1523 | 1535 | generic=True, |
|
1524 | 1536 | priority=-1, |
|
1525 | 1537 | ) |
|
1526 | 1538 | coreconfigitem( |
|
1527 | 1539 | b'merge-tools', |
|
1528 | 1540 | br'.*\.priority$', |
|
1529 | 1541 | default=0, |
|
1530 | 1542 | generic=True, |
|
1531 | 1543 | priority=-1, |
|
1532 | 1544 | ) |
|
1533 | 1545 | coreconfigitem( |
|
1534 | 1546 | b'merge-tools', |
|
1535 | 1547 | br'.*\.premerge$', |
|
1536 | 1548 | default=dynamicdefault, |
|
1537 | 1549 | generic=True, |
|
1538 | 1550 | priority=-1, |
|
1539 | 1551 | ) |
|
1540 | 1552 | coreconfigitem( |
|
1541 | 1553 | b'merge-tools', |
|
1542 | 1554 | br'.*\.symlink$', |
|
1543 | 1555 | default=False, |
|
1544 | 1556 | generic=True, |
|
1545 | 1557 | priority=-1, |
|
1546 | 1558 | ) |
|
1547 | 1559 | coreconfigitem( |
|
1548 | 1560 | b'pager', |
|
1549 | 1561 | b'attend-.*', |
|
1550 | 1562 | default=dynamicdefault, |
|
1551 | 1563 | generic=True, |
|
1552 | 1564 | ) |
|
1553 | 1565 | coreconfigitem( |
|
1554 | 1566 | b'pager', |
|
1555 | 1567 | b'ignore', |
|
1556 | 1568 | default=list, |
|
1557 | 1569 | ) |
|
1558 | 1570 | coreconfigitem( |
|
1559 | 1571 | b'pager', |
|
1560 | 1572 | b'pager', |
|
1561 | 1573 | default=dynamicdefault, |
|
1562 | 1574 | ) |
|
1563 | 1575 | coreconfigitem( |
|
1564 | 1576 | b'patch', |
|
1565 | 1577 | b'eol', |
|
1566 | 1578 | default=b'strict', |
|
1567 | 1579 | ) |
|
1568 | 1580 | coreconfigitem( |
|
1569 | 1581 | b'patch', |
|
1570 | 1582 | b'fuzz', |
|
1571 | 1583 | default=2, |
|
1572 | 1584 | ) |
|
1573 | 1585 | coreconfigitem( |
|
1574 | 1586 | b'paths', |
|
1575 | 1587 | b'default', |
|
1576 | 1588 | default=None, |
|
1577 | 1589 | ) |
|
1578 | 1590 | coreconfigitem( |
|
1579 | 1591 | b'paths', |
|
1580 | 1592 | b'default-push', |
|
1581 | 1593 | default=None, |
|
1582 | 1594 | ) |
|
1583 | 1595 | coreconfigitem( |
|
1584 | 1596 | b'paths', |
|
1585 | 1597 | b'.*', |
|
1586 | 1598 | default=None, |
|
1587 | 1599 | generic=True, |
|
1588 | 1600 | ) |
|
1589 | 1601 | coreconfigitem( |
|
1590 | 1602 | b'phases', |
|
1591 | 1603 | b'checksubrepos', |
|
1592 | 1604 | default=b'follow', |
|
1593 | 1605 | ) |
|
1594 | 1606 | coreconfigitem( |
|
1595 | 1607 | b'phases', |
|
1596 | 1608 | b'new-commit', |
|
1597 | 1609 | default=b'draft', |
|
1598 | 1610 | ) |
|
1599 | 1611 | coreconfigitem( |
|
1600 | 1612 | b'phases', |
|
1601 | 1613 | b'publish', |
|
1602 | 1614 | default=True, |
|
1603 | 1615 | ) |
|
1604 | 1616 | coreconfigitem( |
|
1605 | 1617 | b'profiling', |
|
1606 | 1618 | b'enabled', |
|
1607 | 1619 | default=False, |
|
1608 | 1620 | ) |
|
1609 | 1621 | coreconfigitem( |
|
1610 | 1622 | b'profiling', |
|
1611 | 1623 | b'format', |
|
1612 | 1624 | default=b'text', |
|
1613 | 1625 | ) |
|
1614 | 1626 | coreconfigitem( |
|
1615 | 1627 | b'profiling', |
|
1616 | 1628 | b'freq', |
|
1617 | 1629 | default=1000, |
|
1618 | 1630 | ) |
|
1619 | 1631 | coreconfigitem( |
|
1620 | 1632 | b'profiling', |
|
1621 | 1633 | b'limit', |
|
1622 | 1634 | default=30, |
|
1623 | 1635 | ) |
|
1624 | 1636 | coreconfigitem( |
|
1625 | 1637 | b'profiling', |
|
1626 | 1638 | b'nested', |
|
1627 | 1639 | default=0, |
|
1628 | 1640 | ) |
|
1629 | 1641 | coreconfigitem( |
|
1630 | 1642 | b'profiling', |
|
1631 | 1643 | b'output', |
|
1632 | 1644 | default=None, |
|
1633 | 1645 | ) |
|
1634 | 1646 | coreconfigitem( |
|
1635 | 1647 | b'profiling', |
|
1636 | 1648 | b'showmax', |
|
1637 | 1649 | default=0.999, |
|
1638 | 1650 | ) |
|
1639 | 1651 | coreconfigitem( |
|
1640 | 1652 | b'profiling', |
|
1641 | 1653 | b'showmin', |
|
1642 | 1654 | default=dynamicdefault, |
|
1643 | 1655 | ) |
|
1644 | 1656 | coreconfigitem( |
|
1645 | 1657 | b'profiling', |
|
1646 | 1658 | b'showtime', |
|
1647 | 1659 | default=True, |
|
1648 | 1660 | ) |
|
1649 | 1661 | coreconfigitem( |
|
1650 | 1662 | b'profiling', |
|
1651 | 1663 | b'sort', |
|
1652 | 1664 | default=b'inlinetime', |
|
1653 | 1665 | ) |
|
1654 | 1666 | coreconfigitem( |
|
1655 | 1667 | b'profiling', |
|
1656 | 1668 | b'statformat', |
|
1657 | 1669 | default=b'hotpath', |
|
1658 | 1670 | ) |
|
1659 | 1671 | coreconfigitem( |
|
1660 | 1672 | b'profiling', |
|
1661 | 1673 | b'time-track', |
|
1662 | 1674 | default=dynamicdefault, |
|
1663 | 1675 | ) |
|
1664 | 1676 | coreconfigitem( |
|
1665 | 1677 | b'profiling', |
|
1666 | 1678 | b'type', |
|
1667 | 1679 | default=b'stat', |
|
1668 | 1680 | ) |
|
1669 | 1681 | coreconfigitem( |
|
1670 | 1682 | b'progress', |
|
1671 | 1683 | b'assume-tty', |
|
1672 | 1684 | default=False, |
|
1673 | 1685 | ) |
|
1674 | 1686 | coreconfigitem( |
|
1675 | 1687 | b'progress', |
|
1676 | 1688 | b'changedelay', |
|
1677 | 1689 | default=1, |
|
1678 | 1690 | ) |
|
1679 | 1691 | coreconfigitem( |
|
1680 | 1692 | b'progress', |
|
1681 | 1693 | b'clear-complete', |
|
1682 | 1694 | default=True, |
|
1683 | 1695 | ) |
|
1684 | 1696 | coreconfigitem( |
|
1685 | 1697 | b'progress', |
|
1686 | 1698 | b'debug', |
|
1687 | 1699 | default=False, |
|
1688 | 1700 | ) |
|
1689 | 1701 | coreconfigitem( |
|
1690 | 1702 | b'progress', |
|
1691 | 1703 | b'delay', |
|
1692 | 1704 | default=3, |
|
1693 | 1705 | ) |
|
1694 | 1706 | coreconfigitem( |
|
1695 | 1707 | b'progress', |
|
1696 | 1708 | b'disable', |
|
1697 | 1709 | default=False, |
|
1698 | 1710 | ) |
|
1699 | 1711 | coreconfigitem( |
|
1700 | 1712 | b'progress', |
|
1701 | 1713 | b'estimateinterval', |
|
1702 | 1714 | default=60.0, |
|
1703 | 1715 | ) |
|
1704 | 1716 | coreconfigitem( |
|
1705 | 1717 | b'progress', |
|
1706 | 1718 | b'format', |
|
1707 | 1719 | default=lambda: [b'topic', b'bar', b'number', b'estimate'], |
|
1708 | 1720 | ) |
|
1709 | 1721 | coreconfigitem( |
|
1710 | 1722 | b'progress', |
|
1711 | 1723 | b'refresh', |
|
1712 | 1724 | default=0.1, |
|
1713 | 1725 | ) |
|
1714 | 1726 | coreconfigitem( |
|
1715 | 1727 | b'progress', |
|
1716 | 1728 | b'width', |
|
1717 | 1729 | default=dynamicdefault, |
|
1718 | 1730 | ) |
|
1719 | 1731 | coreconfigitem( |
|
1720 | 1732 | b'pull', |
|
1721 | 1733 | b'confirm', |
|
1722 | 1734 | default=False, |
|
1723 | 1735 | ) |
|
1724 | 1736 | coreconfigitem( |
|
1725 | 1737 | b'push', |
|
1726 | 1738 | b'pushvars.server', |
|
1727 | 1739 | default=False, |
|
1728 | 1740 | ) |
|
1729 | 1741 | coreconfigitem( |
|
1730 | 1742 | b'rewrite', |
|
1731 | 1743 | b'backup-bundle', |
|
1732 | 1744 | default=True, |
|
1733 | 1745 | alias=[(b'ui', b'history-editing-backup')], |
|
1734 | 1746 | ) |
|
1735 | 1747 | coreconfigitem( |
|
1736 | 1748 | b'rewrite', |
|
1737 | 1749 | b'update-timestamp', |
|
1738 | 1750 | default=False, |
|
1739 | 1751 | ) |
|
1740 | 1752 | coreconfigitem( |
|
1741 | 1753 | b'rewrite', |
|
1742 | 1754 | b'empty-successor', |
|
1743 | 1755 | default=b'skip', |
|
1744 | 1756 | experimental=True, |
|
1745 | 1757 | ) |
|
1746 | 1758 | coreconfigitem( |
|
1747 | 1759 | b'storage', |
|
1748 | 1760 | b'new-repo-backend', |
|
1749 | 1761 | default=b'revlogv1', |
|
1750 | 1762 | experimental=True, |
|
1751 | 1763 | ) |
|
1752 | 1764 | coreconfigitem( |
|
1753 | 1765 | b'storage', |
|
1754 | 1766 | b'revlog.optimize-delta-parent-choice', |
|
1755 | 1767 | default=True, |
|
1756 | 1768 | alias=[(b'format', b'aggressivemergedeltas')], |
|
1757 | 1769 | ) |
|
1758 | 1770 | # experimental as long as rust is experimental (or a C version is implemented) |
|
1759 | 1771 | coreconfigitem( |
|
1760 | 1772 | b'storage', |
|
1761 | 1773 | b'revlog.persistent-nodemap.mmap', |
|
1762 | 1774 | default=True, |
|
1763 | 1775 | ) |
|
1764 | 1776 | # experimental as long as format.use-persistent-nodemap is. |
|
1765 | 1777 | coreconfigitem( |
|
1766 | 1778 | b'storage', |
|
1767 | 1779 | b'revlog.persistent-nodemap.slow-path', |
|
1768 | 1780 | default=b"abort", |
|
1769 | 1781 | ) |
|
1770 | 1782 | |
|
1771 | 1783 | coreconfigitem( |
|
1772 | 1784 | b'storage', |
|
1773 | 1785 | b'revlog.reuse-external-delta', |
|
1774 | 1786 | default=True, |
|
1775 | 1787 | ) |
|
1776 | 1788 | coreconfigitem( |
|
1777 | 1789 | b'storage', |
|
1778 | 1790 | b'revlog.reuse-external-delta-parent', |
|
1779 | 1791 | default=None, |
|
1780 | 1792 | ) |
|
1781 | 1793 | coreconfigitem( |
|
1782 | 1794 | b'storage', |
|
1783 | 1795 | b'revlog.zlib.level', |
|
1784 | 1796 | default=None, |
|
1785 | 1797 | ) |
|
1786 | 1798 | coreconfigitem( |
|
1787 | 1799 | b'storage', |
|
1788 | 1800 | b'revlog.zstd.level', |
|
1789 | 1801 | default=None, |
|
1790 | 1802 | ) |
|
1791 | 1803 | coreconfigitem( |
|
1792 | 1804 | b'server', |
|
1793 | 1805 | b'bookmarks-pushkey-compat', |
|
1794 | 1806 | default=True, |
|
1795 | 1807 | ) |
|
1796 | 1808 | coreconfigitem( |
|
1797 | 1809 | b'server', |
|
1798 | 1810 | b'bundle1', |
|
1799 | 1811 | default=True, |
|
1800 | 1812 | ) |
|
1801 | 1813 | coreconfigitem( |
|
1802 | 1814 | b'server', |
|
1803 | 1815 | b'bundle1gd', |
|
1804 | 1816 | default=None, |
|
1805 | 1817 | ) |
|
1806 | 1818 | coreconfigitem( |
|
1807 | 1819 | b'server', |
|
1808 | 1820 | b'bundle1.pull', |
|
1809 | 1821 | default=None, |
|
1810 | 1822 | ) |
|
1811 | 1823 | coreconfigitem( |
|
1812 | 1824 | b'server', |
|
1813 | 1825 | b'bundle1gd.pull', |
|
1814 | 1826 | default=None, |
|
1815 | 1827 | ) |
|
1816 | 1828 | coreconfigitem( |
|
1817 | 1829 | b'server', |
|
1818 | 1830 | b'bundle1.push', |
|
1819 | 1831 | default=None, |
|
1820 | 1832 | ) |
|
1821 | 1833 | coreconfigitem( |
|
1822 | 1834 | b'server', |
|
1823 | 1835 | b'bundle1gd.push', |
|
1824 | 1836 | default=None, |
|
1825 | 1837 | ) |
|
1826 | 1838 | coreconfigitem( |
|
1827 | 1839 | b'server', |
|
1828 | 1840 | b'bundle2.stream', |
|
1829 | 1841 | default=True, |
|
1830 | 1842 | alias=[(b'experimental', b'bundle2.stream')], |
|
1831 | 1843 | ) |
|
1832 | 1844 | coreconfigitem( |
|
1833 | 1845 | b'server', |
|
1834 | 1846 | b'compressionengines', |
|
1835 | 1847 | default=list, |
|
1836 | 1848 | ) |
|
1837 | 1849 | coreconfigitem( |
|
1838 | 1850 | b'server', |
|
1839 | 1851 | b'concurrent-push-mode', |
|
1840 | 1852 | default=b'check-related', |
|
1841 | 1853 | ) |
|
1842 | 1854 | coreconfigitem( |
|
1843 | 1855 | b'server', |
|
1844 | 1856 | b'disablefullbundle', |
|
1845 | 1857 | default=False, |
|
1846 | 1858 | ) |
|
1847 | 1859 | coreconfigitem( |
|
1848 | 1860 | b'server', |
|
1849 | 1861 | b'maxhttpheaderlen', |
|
1850 | 1862 | default=1024, |
|
1851 | 1863 | ) |
|
1852 | 1864 | coreconfigitem( |
|
1853 | 1865 | b'server', |
|
1854 | 1866 | b'pullbundle', |
|
1855 | 1867 | default=False, |
|
1856 | 1868 | ) |
|
1857 | 1869 | coreconfigitem( |
|
1858 | 1870 | b'server', |
|
1859 | 1871 | b'preferuncompressed', |
|
1860 | 1872 | default=False, |
|
1861 | 1873 | ) |
|
1862 | 1874 | coreconfigitem( |
|
1863 | 1875 | b'server', |
|
1864 | 1876 | b'streamunbundle', |
|
1865 | 1877 | default=False, |
|
1866 | 1878 | ) |
|
1867 | 1879 | coreconfigitem( |
|
1868 | 1880 | b'server', |
|
1869 | 1881 | b'uncompressed', |
|
1870 | 1882 | default=True, |
|
1871 | 1883 | ) |
|
1872 | 1884 | coreconfigitem( |
|
1873 | 1885 | b'server', |
|
1874 | 1886 | b'uncompressedallowsecret', |
|
1875 | 1887 | default=False, |
|
1876 | 1888 | ) |
|
1877 | 1889 | coreconfigitem( |
|
1878 | 1890 | b'server', |
|
1879 | 1891 | b'view', |
|
1880 | 1892 | default=b'served', |
|
1881 | 1893 | ) |
|
1882 | 1894 | coreconfigitem( |
|
1883 | 1895 | b'server', |
|
1884 | 1896 | b'validate', |
|
1885 | 1897 | default=False, |
|
1886 | 1898 | ) |
|
1887 | 1899 | coreconfigitem( |
|
1888 | 1900 | b'server', |
|
1889 | 1901 | b'zliblevel', |
|
1890 | 1902 | default=-1, |
|
1891 | 1903 | ) |
|
1892 | 1904 | coreconfigitem( |
|
1893 | 1905 | b'server', |
|
1894 | 1906 | b'zstdlevel', |
|
1895 | 1907 | default=3, |
|
1896 | 1908 | ) |
|
1897 | 1909 | coreconfigitem( |
|
1898 | 1910 | b'share', |
|
1899 | 1911 | b'pool', |
|
1900 | 1912 | default=None, |
|
1901 | 1913 | ) |
|
1902 | 1914 | coreconfigitem( |
|
1903 | 1915 | b'share', |
|
1904 | 1916 | b'poolnaming', |
|
1905 | 1917 | default=b'identity', |
|
1906 | 1918 | ) |
|
1907 | 1919 | coreconfigitem( |
|
1908 | 1920 | b'share', |
|
1909 | 1921 | b'safe-mismatch.source-not-safe', |
|
1910 | 1922 | default=b'abort', |
|
1911 | 1923 | ) |
|
1912 | 1924 | coreconfigitem( |
|
1913 | 1925 | b'share', |
|
1914 | 1926 | b'safe-mismatch.source-safe', |
|
1915 | 1927 | default=b'abort', |
|
1916 | 1928 | ) |
|
1917 | 1929 | coreconfigitem( |
|
1918 | 1930 | b'share', |
|
1919 | 1931 | b'safe-mismatch.source-not-safe.warn', |
|
1920 | 1932 | default=True, |
|
1921 | 1933 | ) |
|
1922 | 1934 | coreconfigitem( |
|
1923 | 1935 | b'share', |
|
1924 | 1936 | b'safe-mismatch.source-safe.warn', |
|
1925 | 1937 | default=True, |
|
1926 | 1938 | ) |
|
1927 | 1939 | coreconfigitem( |
|
1928 | 1940 | b'shelve', |
|
1929 | 1941 | b'maxbackups', |
|
1930 | 1942 | default=10, |
|
1931 | 1943 | ) |
|
1932 | 1944 | coreconfigitem( |
|
1933 | 1945 | b'smtp', |
|
1934 | 1946 | b'host', |
|
1935 | 1947 | default=None, |
|
1936 | 1948 | ) |
|
1937 | 1949 | coreconfigitem( |
|
1938 | 1950 | b'smtp', |
|
1939 | 1951 | b'local_hostname', |
|
1940 | 1952 | default=None, |
|
1941 | 1953 | ) |
|
1942 | 1954 | coreconfigitem( |
|
1943 | 1955 | b'smtp', |
|
1944 | 1956 | b'password', |
|
1945 | 1957 | default=None, |
|
1946 | 1958 | ) |
|
1947 | 1959 | coreconfigitem( |
|
1948 | 1960 | b'smtp', |
|
1949 | 1961 | b'port', |
|
1950 | 1962 | default=dynamicdefault, |
|
1951 | 1963 | ) |
|
1952 | 1964 | coreconfigitem( |
|
1953 | 1965 | b'smtp', |
|
1954 | 1966 | b'tls', |
|
1955 | 1967 | default=b'none', |
|
1956 | 1968 | ) |
|
1957 | 1969 | coreconfigitem( |
|
1958 | 1970 | b'smtp', |
|
1959 | 1971 | b'username', |
|
1960 | 1972 | default=None, |
|
1961 | 1973 | ) |
|
1962 | 1974 | coreconfigitem( |
|
1963 | 1975 | b'sparse', |
|
1964 | 1976 | b'missingwarning', |
|
1965 | 1977 | default=True, |
|
1966 | 1978 | experimental=True, |
|
1967 | 1979 | ) |
|
1968 | 1980 | coreconfigitem( |
|
1969 | 1981 | b'subrepos', |
|
1970 | 1982 | b'allowed', |
|
1971 | 1983 | default=dynamicdefault, # to make backporting simpler |
|
1972 | 1984 | ) |
|
1973 | 1985 | coreconfigitem( |
|
1974 | 1986 | b'subrepos', |
|
1975 | 1987 | b'hg:allowed', |
|
1976 | 1988 | default=dynamicdefault, |
|
1977 | 1989 | ) |
|
1978 | 1990 | coreconfigitem( |
|
1979 | 1991 | b'subrepos', |
|
1980 | 1992 | b'git:allowed', |
|
1981 | 1993 | default=dynamicdefault, |
|
1982 | 1994 | ) |
|
1983 | 1995 | coreconfigitem( |
|
1984 | 1996 | b'subrepos', |
|
1985 | 1997 | b'svn:allowed', |
|
1986 | 1998 | default=dynamicdefault, |
|
1987 | 1999 | ) |
|
1988 | 2000 | coreconfigitem( |
|
1989 | 2001 | b'templates', |
|
1990 | 2002 | b'.*', |
|
1991 | 2003 | default=None, |
|
1992 | 2004 | generic=True, |
|
1993 | 2005 | ) |
|
1994 | 2006 | coreconfigitem( |
|
1995 | 2007 | b'templateconfig', |
|
1996 | 2008 | b'.*', |
|
1997 | 2009 | default=dynamicdefault, |
|
1998 | 2010 | generic=True, |
|
1999 | 2011 | ) |
|
2000 | 2012 | coreconfigitem( |
|
2001 | 2013 | b'trusted', |
|
2002 | 2014 | b'groups', |
|
2003 | 2015 | default=list, |
|
2004 | 2016 | ) |
|
2005 | 2017 | coreconfigitem( |
|
2006 | 2018 | b'trusted', |
|
2007 | 2019 | b'users', |
|
2008 | 2020 | default=list, |
|
2009 | 2021 | ) |
|
2010 | 2022 | coreconfigitem( |
|
2011 | 2023 | b'ui', |
|
2012 | 2024 | b'_usedassubrepo', |
|
2013 | 2025 | default=False, |
|
2014 | 2026 | ) |
|
2015 | 2027 | coreconfigitem( |
|
2016 | 2028 | b'ui', |
|
2017 | 2029 | b'allowemptycommit', |
|
2018 | 2030 | default=False, |
|
2019 | 2031 | ) |
|
2020 | 2032 | coreconfigitem( |
|
2021 | 2033 | b'ui', |
|
2022 | 2034 | b'archivemeta', |
|
2023 | 2035 | default=True, |
|
2024 | 2036 | ) |
|
2025 | 2037 | coreconfigitem( |
|
2026 | 2038 | b'ui', |
|
2027 | 2039 | b'askusername', |
|
2028 | 2040 | default=False, |
|
2029 | 2041 | ) |
|
2030 | 2042 | coreconfigitem( |
|
2031 | 2043 | b'ui', |
|
2032 | 2044 | b'available-memory', |
|
2033 | 2045 | default=None, |
|
2034 | 2046 | ) |
|
2035 | 2047 | |
|
2036 | 2048 | coreconfigitem( |
|
2037 | 2049 | b'ui', |
|
2038 | 2050 | b'clonebundlefallback', |
|
2039 | 2051 | default=False, |
|
2040 | 2052 | ) |
|
2041 | 2053 | coreconfigitem( |
|
2042 | 2054 | b'ui', |
|
2043 | 2055 | b'clonebundleprefers', |
|
2044 | 2056 | default=list, |
|
2045 | 2057 | ) |
|
2046 | 2058 | coreconfigitem( |
|
2047 | 2059 | b'ui', |
|
2048 | 2060 | b'clonebundles', |
|
2049 | 2061 | default=True, |
|
2050 | 2062 | ) |
|
2051 | 2063 | coreconfigitem( |
|
2052 | 2064 | b'ui', |
|
2053 | 2065 | b'color', |
|
2054 | 2066 | default=b'auto', |
|
2055 | 2067 | ) |
|
2056 | 2068 | coreconfigitem( |
|
2057 | 2069 | b'ui', |
|
2058 | 2070 | b'commitsubrepos', |
|
2059 | 2071 | default=False, |
|
2060 | 2072 | ) |
|
2061 | 2073 | coreconfigitem( |
|
2062 | 2074 | b'ui', |
|
2063 | 2075 | b'debug', |
|
2064 | 2076 | default=False, |
|
2065 | 2077 | ) |
|
2066 | 2078 | coreconfigitem( |
|
2067 | 2079 | b'ui', |
|
2068 | 2080 | b'debugger', |
|
2069 | 2081 | default=None, |
|
2070 | 2082 | ) |
|
2071 | 2083 | coreconfigitem( |
|
2072 | 2084 | b'ui', |
|
2073 | 2085 | b'editor', |
|
2074 | 2086 | default=dynamicdefault, |
|
2075 | 2087 | ) |
|
2076 | 2088 | coreconfigitem( |
|
2077 | 2089 | b'ui', |
|
2078 | 2090 | b'detailed-exit-code', |
|
2079 | 2091 | default=False, |
|
2080 | 2092 | experimental=True, |
|
2081 | 2093 | ) |
|
2082 | 2094 | coreconfigitem( |
|
2083 | 2095 | b'ui', |
|
2084 | 2096 | b'fallbackencoding', |
|
2085 | 2097 | default=None, |
|
2086 | 2098 | ) |
|
2087 | 2099 | coreconfigitem( |
|
2088 | 2100 | b'ui', |
|
2089 | 2101 | b'forcecwd', |
|
2090 | 2102 | default=None, |
|
2091 | 2103 | ) |
|
2092 | 2104 | coreconfigitem( |
|
2093 | 2105 | b'ui', |
|
2094 | 2106 | b'forcemerge', |
|
2095 | 2107 | default=None, |
|
2096 | 2108 | ) |
|
2097 | 2109 | coreconfigitem( |
|
2098 | 2110 | b'ui', |
|
2099 | 2111 | b'formatdebug', |
|
2100 | 2112 | default=False, |
|
2101 | 2113 | ) |
|
2102 | 2114 | coreconfigitem( |
|
2103 | 2115 | b'ui', |
|
2104 | 2116 | b'formatjson', |
|
2105 | 2117 | default=False, |
|
2106 | 2118 | ) |
|
2107 | 2119 | coreconfigitem( |
|
2108 | 2120 | b'ui', |
|
2109 | 2121 | b'formatted', |
|
2110 | 2122 | default=None, |
|
2111 | 2123 | ) |
|
2112 | 2124 | coreconfigitem( |
|
2113 | 2125 | b'ui', |
|
2114 | 2126 | b'interactive', |
|
2115 | 2127 | default=None, |
|
2116 | 2128 | ) |
|
2117 | 2129 | coreconfigitem( |
|
2118 | 2130 | b'ui', |
|
2119 | 2131 | b'interface', |
|
2120 | 2132 | default=None, |
|
2121 | 2133 | ) |
|
2122 | 2134 | coreconfigitem( |
|
2123 | 2135 | b'ui', |
|
2124 | 2136 | b'interface.chunkselector', |
|
2125 | 2137 | default=None, |
|
2126 | 2138 | ) |
|
2127 | 2139 | coreconfigitem( |
|
2128 | 2140 | b'ui', |
|
2129 | 2141 | b'large-file-limit', |
|
2130 | 2142 | default=10000000, |
|
2131 | 2143 | ) |
|
2132 | 2144 | coreconfigitem( |
|
2133 | 2145 | b'ui', |
|
2134 | 2146 | b'logblockedtimes', |
|
2135 | 2147 | default=False, |
|
2136 | 2148 | ) |
|
2137 | 2149 | coreconfigitem( |
|
2138 | 2150 | b'ui', |
|
2139 | 2151 | b'merge', |
|
2140 | 2152 | default=None, |
|
2141 | 2153 | ) |
|
2142 | 2154 | coreconfigitem( |
|
2143 | 2155 | b'ui', |
|
2144 | 2156 | b'mergemarkers', |
|
2145 | 2157 | default=b'basic', |
|
2146 | 2158 | ) |
|
2147 | 2159 | coreconfigitem( |
|
2148 | 2160 | b'ui', |
|
2149 | 2161 | b'message-output', |
|
2150 | 2162 | default=b'stdio', |
|
2151 | 2163 | ) |
|
2152 | 2164 | coreconfigitem( |
|
2153 | 2165 | b'ui', |
|
2154 | 2166 | b'nontty', |
|
2155 | 2167 | default=False, |
|
2156 | 2168 | ) |
|
2157 | 2169 | coreconfigitem( |
|
2158 | 2170 | b'ui', |
|
2159 | 2171 | b'origbackuppath', |
|
2160 | 2172 | default=None, |
|
2161 | 2173 | ) |
|
2162 | 2174 | coreconfigitem( |
|
2163 | 2175 | b'ui', |
|
2164 | 2176 | b'paginate', |
|
2165 | 2177 | default=True, |
|
2166 | 2178 | ) |
|
2167 | 2179 | coreconfigitem( |
|
2168 | 2180 | b'ui', |
|
2169 | 2181 | b'patch', |
|
2170 | 2182 | default=None, |
|
2171 | 2183 | ) |
|
2172 | 2184 | coreconfigitem( |
|
2173 | 2185 | b'ui', |
|
2174 | 2186 | b'portablefilenames', |
|
2175 | 2187 | default=b'warn', |
|
2176 | 2188 | ) |
|
2177 | 2189 | coreconfigitem( |
|
2178 | 2190 | b'ui', |
|
2179 | 2191 | b'promptecho', |
|
2180 | 2192 | default=False, |
|
2181 | 2193 | ) |
|
2182 | 2194 | coreconfigitem( |
|
2183 | 2195 | b'ui', |
|
2184 | 2196 | b'quiet', |
|
2185 | 2197 | default=False, |
|
2186 | 2198 | ) |
|
2187 | 2199 | coreconfigitem( |
|
2188 | 2200 | b'ui', |
|
2189 | 2201 | b'quietbookmarkmove', |
|
2190 | 2202 | default=False, |
|
2191 | 2203 | ) |
|
2192 | 2204 | coreconfigitem( |
|
2193 | 2205 | b'ui', |
|
2194 | 2206 | b'relative-paths', |
|
2195 | 2207 | default=b'legacy', |
|
2196 | 2208 | ) |
|
2197 | 2209 | coreconfigitem( |
|
2198 | 2210 | b'ui', |
|
2199 | 2211 | b'remotecmd', |
|
2200 | 2212 | default=b'hg', |
|
2201 | 2213 | ) |
|
2202 | 2214 | coreconfigitem( |
|
2203 | 2215 | b'ui', |
|
2204 | 2216 | b'report_untrusted', |
|
2205 | 2217 | default=True, |
|
2206 | 2218 | ) |
|
2207 | 2219 | coreconfigitem( |
|
2208 | 2220 | b'ui', |
|
2209 | 2221 | b'rollback', |
|
2210 | 2222 | default=True, |
|
2211 | 2223 | ) |
|
2212 | 2224 | coreconfigitem( |
|
2213 | 2225 | b'ui', |
|
2214 | 2226 | b'signal-safe-lock', |
|
2215 | 2227 | default=True, |
|
2216 | 2228 | ) |
|
2217 | 2229 | coreconfigitem( |
|
2218 | 2230 | b'ui', |
|
2219 | 2231 | b'slash', |
|
2220 | 2232 | default=False, |
|
2221 | 2233 | ) |
|
2222 | 2234 | coreconfigitem( |
|
2223 | 2235 | b'ui', |
|
2224 | 2236 | b'ssh', |
|
2225 | 2237 | default=b'ssh', |
|
2226 | 2238 | ) |
|
2227 | 2239 | coreconfigitem( |
|
2228 | 2240 | b'ui', |
|
2229 | 2241 | b'ssherrorhint', |
|
2230 | 2242 | default=None, |
|
2231 | 2243 | ) |
|
2232 | 2244 | coreconfigitem( |
|
2233 | 2245 | b'ui', |
|
2234 | 2246 | b'statuscopies', |
|
2235 | 2247 | default=False, |
|
2236 | 2248 | ) |
|
2237 | 2249 | coreconfigitem( |
|
2238 | 2250 | b'ui', |
|
2239 | 2251 | b'strict', |
|
2240 | 2252 | default=False, |
|
2241 | 2253 | ) |
|
2242 | 2254 | coreconfigitem( |
|
2243 | 2255 | b'ui', |
|
2244 | 2256 | b'style', |
|
2245 | 2257 | default=b'', |
|
2246 | 2258 | ) |
|
2247 | 2259 | coreconfigitem( |
|
2248 | 2260 | b'ui', |
|
2249 | 2261 | b'supportcontact', |
|
2250 | 2262 | default=None, |
|
2251 | 2263 | ) |
|
2252 | 2264 | coreconfigitem( |
|
2253 | 2265 | b'ui', |
|
2254 | 2266 | b'textwidth', |
|
2255 | 2267 | default=78, |
|
2256 | 2268 | ) |
|
2257 | 2269 | coreconfigitem( |
|
2258 | 2270 | b'ui', |
|
2259 | 2271 | b'timeout', |
|
2260 | 2272 | default=b'600', |
|
2261 | 2273 | ) |
|
2262 | 2274 | coreconfigitem( |
|
2263 | 2275 | b'ui', |
|
2264 | 2276 | b'timeout.warn', |
|
2265 | 2277 | default=0, |
|
2266 | 2278 | ) |
|
2267 | 2279 | coreconfigitem( |
|
2268 | 2280 | b'ui', |
|
2269 | 2281 | b'timestamp-output', |
|
2270 | 2282 | default=False, |
|
2271 | 2283 | ) |
|
2272 | 2284 | coreconfigitem( |
|
2273 | 2285 | b'ui', |
|
2274 | 2286 | b'traceback', |
|
2275 | 2287 | default=False, |
|
2276 | 2288 | ) |
|
2277 | 2289 | coreconfigitem( |
|
2278 | 2290 | b'ui', |
|
2279 | 2291 | b'tweakdefaults', |
|
2280 | 2292 | default=False, |
|
2281 | 2293 | ) |
|
2282 | 2294 | coreconfigitem(b'ui', b'username', alias=[(b'ui', b'user')]) |
|
2283 | 2295 | coreconfigitem( |
|
2284 | 2296 | b'ui', |
|
2285 | 2297 | b'verbose', |
|
2286 | 2298 | default=False, |
|
2287 | 2299 | ) |
|
2288 | 2300 | coreconfigitem( |
|
2289 | 2301 | b'verify', |
|
2290 | 2302 | b'skipflags', |
|
2291 | 2303 | default=None, |
|
2292 | 2304 | ) |
|
2293 | 2305 | coreconfigitem( |
|
2294 | 2306 | b'web', |
|
2295 | 2307 | b'allowbz2', |
|
2296 | 2308 | default=False, |
|
2297 | 2309 | ) |
|
2298 | 2310 | coreconfigitem( |
|
2299 | 2311 | b'web', |
|
2300 | 2312 | b'allowgz', |
|
2301 | 2313 | default=False, |
|
2302 | 2314 | ) |
|
2303 | 2315 | coreconfigitem( |
|
2304 | 2316 | b'web', |
|
2305 | 2317 | b'allow-pull', |
|
2306 | 2318 | alias=[(b'web', b'allowpull')], |
|
2307 | 2319 | default=True, |
|
2308 | 2320 | ) |
|
2309 | 2321 | coreconfigitem( |
|
2310 | 2322 | b'web', |
|
2311 | 2323 | b'allow-push', |
|
2312 | 2324 | alias=[(b'web', b'allow_push')], |
|
2313 | 2325 | default=list, |
|
2314 | 2326 | ) |
|
2315 | 2327 | coreconfigitem( |
|
2316 | 2328 | b'web', |
|
2317 | 2329 | b'allowzip', |
|
2318 | 2330 | default=False, |
|
2319 | 2331 | ) |
|
2320 | 2332 | coreconfigitem( |
|
2321 | 2333 | b'web', |
|
2322 | 2334 | b'archivesubrepos', |
|
2323 | 2335 | default=False, |
|
2324 | 2336 | ) |
|
2325 | 2337 | coreconfigitem( |
|
2326 | 2338 | b'web', |
|
2327 | 2339 | b'cache', |
|
2328 | 2340 | default=True, |
|
2329 | 2341 | ) |
|
2330 | 2342 | coreconfigitem( |
|
2331 | 2343 | b'web', |
|
2332 | 2344 | b'comparisoncontext', |
|
2333 | 2345 | default=5, |
|
2334 | 2346 | ) |
|
2335 | 2347 | coreconfigitem( |
|
2336 | 2348 | b'web', |
|
2337 | 2349 | b'contact', |
|
2338 | 2350 | default=None, |
|
2339 | 2351 | ) |
|
2340 | 2352 | coreconfigitem( |
|
2341 | 2353 | b'web', |
|
2342 | 2354 | b'deny_push', |
|
2343 | 2355 | default=list, |
|
2344 | 2356 | ) |
|
2345 | 2357 | coreconfigitem( |
|
2346 | 2358 | b'web', |
|
2347 | 2359 | b'guessmime', |
|
2348 | 2360 | default=False, |
|
2349 | 2361 | ) |
|
2350 | 2362 | coreconfigitem( |
|
2351 | 2363 | b'web', |
|
2352 | 2364 | b'hidden', |
|
2353 | 2365 | default=False, |
|
2354 | 2366 | ) |
|
2355 | 2367 | coreconfigitem( |
|
2356 | 2368 | b'web', |
|
2357 | 2369 | b'labels', |
|
2358 | 2370 | default=list, |
|
2359 | 2371 | ) |
|
2360 | 2372 | coreconfigitem( |
|
2361 | 2373 | b'web', |
|
2362 | 2374 | b'logoimg', |
|
2363 | 2375 | default=b'hglogo.png', |
|
2364 | 2376 | ) |
|
2365 | 2377 | coreconfigitem( |
|
2366 | 2378 | b'web', |
|
2367 | 2379 | b'logourl', |
|
2368 | 2380 | default=b'https://mercurial-scm.org/', |
|
2369 | 2381 | ) |
|
2370 | 2382 | coreconfigitem( |
|
2371 | 2383 | b'web', |
|
2372 | 2384 | b'accesslog', |
|
2373 | 2385 | default=b'-', |
|
2374 | 2386 | ) |
|
2375 | 2387 | coreconfigitem( |
|
2376 | 2388 | b'web', |
|
2377 | 2389 | b'address', |
|
2378 | 2390 | default=b'', |
|
2379 | 2391 | ) |
|
2380 | 2392 | coreconfigitem( |
|
2381 | 2393 | b'web', |
|
2382 | 2394 | b'allow-archive', |
|
2383 | 2395 | alias=[(b'web', b'allow_archive')], |
|
2384 | 2396 | default=list, |
|
2385 | 2397 | ) |
|
2386 | 2398 | coreconfigitem( |
|
2387 | 2399 | b'web', |
|
2388 | 2400 | b'allow_read', |
|
2389 | 2401 | default=list, |
|
2390 | 2402 | ) |
|
2391 | 2403 | coreconfigitem( |
|
2392 | 2404 | b'web', |
|
2393 | 2405 | b'baseurl', |
|
2394 | 2406 | default=None, |
|
2395 | 2407 | ) |
|
2396 | 2408 | coreconfigitem( |
|
2397 | 2409 | b'web', |
|
2398 | 2410 | b'cacerts', |
|
2399 | 2411 | default=None, |
|
2400 | 2412 | ) |
|
2401 | 2413 | coreconfigitem( |
|
2402 | 2414 | b'web', |
|
2403 | 2415 | b'certificate', |
|
2404 | 2416 | default=None, |
|
2405 | 2417 | ) |
|
2406 | 2418 | coreconfigitem( |
|
2407 | 2419 | b'web', |
|
2408 | 2420 | b'collapse', |
|
2409 | 2421 | default=False, |
|
2410 | 2422 | ) |
|
2411 | 2423 | coreconfigitem( |
|
2412 | 2424 | b'web', |
|
2413 | 2425 | b'csp', |
|
2414 | 2426 | default=None, |
|
2415 | 2427 | ) |
|
2416 | 2428 | coreconfigitem( |
|
2417 | 2429 | b'web', |
|
2418 | 2430 | b'deny_read', |
|
2419 | 2431 | default=list, |
|
2420 | 2432 | ) |
|
2421 | 2433 | coreconfigitem( |
|
2422 | 2434 | b'web', |
|
2423 | 2435 | b'descend', |
|
2424 | 2436 | default=True, |
|
2425 | 2437 | ) |
|
2426 | 2438 | coreconfigitem( |
|
2427 | 2439 | b'web', |
|
2428 | 2440 | b'description', |
|
2429 | 2441 | default=b"", |
|
2430 | 2442 | ) |
|
2431 | 2443 | coreconfigitem( |
|
2432 | 2444 | b'web', |
|
2433 | 2445 | b'encoding', |
|
2434 | 2446 | default=lambda: encoding.encoding, |
|
2435 | 2447 | ) |
|
2436 | 2448 | coreconfigitem( |
|
2437 | 2449 | b'web', |
|
2438 | 2450 | b'errorlog', |
|
2439 | 2451 | default=b'-', |
|
2440 | 2452 | ) |
|
2441 | 2453 | coreconfigitem( |
|
2442 | 2454 | b'web', |
|
2443 | 2455 | b'ipv6', |
|
2444 | 2456 | default=False, |
|
2445 | 2457 | ) |
|
2446 | 2458 | coreconfigitem( |
|
2447 | 2459 | b'web', |
|
2448 | 2460 | b'maxchanges', |
|
2449 | 2461 | default=10, |
|
2450 | 2462 | ) |
|
2451 | 2463 | coreconfigitem( |
|
2452 | 2464 | b'web', |
|
2453 | 2465 | b'maxfiles', |
|
2454 | 2466 | default=10, |
|
2455 | 2467 | ) |
|
2456 | 2468 | coreconfigitem( |
|
2457 | 2469 | b'web', |
|
2458 | 2470 | b'maxshortchanges', |
|
2459 | 2471 | default=60, |
|
2460 | 2472 | ) |
|
2461 | 2473 | coreconfigitem( |
|
2462 | 2474 | b'web', |
|
2463 | 2475 | b'motd', |
|
2464 | 2476 | default=b'', |
|
2465 | 2477 | ) |
|
2466 | 2478 | coreconfigitem( |
|
2467 | 2479 | b'web', |
|
2468 | 2480 | b'name', |
|
2469 | 2481 | default=dynamicdefault, |
|
2470 | 2482 | ) |
|
2471 | 2483 | coreconfigitem( |
|
2472 | 2484 | b'web', |
|
2473 | 2485 | b'port', |
|
2474 | 2486 | default=8000, |
|
2475 | 2487 | ) |
|
2476 | 2488 | coreconfigitem( |
|
2477 | 2489 | b'web', |
|
2478 | 2490 | b'prefix', |
|
2479 | 2491 | default=b'', |
|
2480 | 2492 | ) |
|
2481 | 2493 | coreconfigitem( |
|
2482 | 2494 | b'web', |
|
2483 | 2495 | b'push_ssl', |
|
2484 | 2496 | default=True, |
|
2485 | 2497 | ) |
|
2486 | 2498 | coreconfigitem( |
|
2487 | 2499 | b'web', |
|
2488 | 2500 | b'refreshinterval', |
|
2489 | 2501 | default=20, |
|
2490 | 2502 | ) |
|
2491 | 2503 | coreconfigitem( |
|
2492 | 2504 | b'web', |
|
2493 | 2505 | b'server-header', |
|
2494 | 2506 | default=None, |
|
2495 | 2507 | ) |
|
2496 | 2508 | coreconfigitem( |
|
2497 | 2509 | b'web', |
|
2498 | 2510 | b'static', |
|
2499 | 2511 | default=None, |
|
2500 | 2512 | ) |
|
2501 | 2513 | coreconfigitem( |
|
2502 | 2514 | b'web', |
|
2503 | 2515 | b'staticurl', |
|
2504 | 2516 | default=None, |
|
2505 | 2517 | ) |
|
2506 | 2518 | coreconfigitem( |
|
2507 | 2519 | b'web', |
|
2508 | 2520 | b'stripes', |
|
2509 | 2521 | default=1, |
|
2510 | 2522 | ) |
|
2511 | 2523 | coreconfigitem( |
|
2512 | 2524 | b'web', |
|
2513 | 2525 | b'style', |
|
2514 | 2526 | default=b'paper', |
|
2515 | 2527 | ) |
|
2516 | 2528 | coreconfigitem( |
|
2517 | 2529 | b'web', |
|
2518 | 2530 | b'templates', |
|
2519 | 2531 | default=None, |
|
2520 | 2532 | ) |
|
2521 | 2533 | coreconfigitem( |
|
2522 | 2534 | b'web', |
|
2523 | 2535 | b'view', |
|
2524 | 2536 | default=b'served', |
|
2525 | 2537 | experimental=True, |
|
2526 | 2538 | ) |
|
2527 | 2539 | coreconfigitem( |
|
2528 | 2540 | b'worker', |
|
2529 | 2541 | b'backgroundclose', |
|
2530 | 2542 | default=dynamicdefault, |
|
2531 | 2543 | ) |
|
2532 | 2544 | # Windows defaults to a limit of 512 open files. A buffer of 128 |
|
2533 | 2545 | # should give us enough headway. |
|
2534 | 2546 | coreconfigitem( |
|
2535 | 2547 | b'worker', |
|
2536 | 2548 | b'backgroundclosemaxqueue', |
|
2537 | 2549 | default=384, |
|
2538 | 2550 | ) |
|
2539 | 2551 | coreconfigitem( |
|
2540 | 2552 | b'worker', |
|
2541 | 2553 | b'backgroundcloseminfilecount', |
|
2542 | 2554 | default=2048, |
|
2543 | 2555 | ) |
|
2544 | 2556 | coreconfigitem( |
|
2545 | 2557 | b'worker', |
|
2546 | 2558 | b'backgroundclosethreadcount', |
|
2547 | 2559 | default=4, |
|
2548 | 2560 | ) |
|
2549 | 2561 | coreconfigitem( |
|
2550 | 2562 | b'worker', |
|
2551 | 2563 | b'enabled', |
|
2552 | 2564 | default=True, |
|
2553 | 2565 | ) |
|
2554 | 2566 | coreconfigitem( |
|
2555 | 2567 | b'worker', |
|
2556 | 2568 | b'numcpus', |
|
2557 | 2569 | default=None, |
|
2558 | 2570 | ) |
|
2559 | 2571 | |
|
2560 | 2572 | # Rebase related configuration moved to core because other extension are doing |
|
2561 | 2573 | # strange things. For example, shelve import the extensions to reuse some bit |
|
2562 | 2574 | # without formally loading it. |
|
2563 | 2575 | coreconfigitem( |
|
2564 | 2576 | b'commands', |
|
2565 | 2577 | b'rebase.requiredest', |
|
2566 | 2578 | default=False, |
|
2567 | 2579 | ) |
|
2568 | 2580 | coreconfigitem( |
|
2569 | 2581 | b'experimental', |
|
2570 | 2582 | b'rebaseskipobsolete', |
|
2571 | 2583 | default=True, |
|
2572 | 2584 | ) |
|
2573 | 2585 | coreconfigitem( |
|
2574 | 2586 | b'rebase', |
|
2575 | 2587 | b'singletransaction', |
|
2576 | 2588 | default=False, |
|
2577 | 2589 | ) |
|
2578 | 2590 | coreconfigitem( |
|
2579 | 2591 | b'rebase', |
|
2580 | 2592 | b'experimental.inmemory', |
|
2581 | 2593 | default=False, |
|
2582 | 2594 | ) |
@@ -1,517 +1,516 b'' | |||
|
1 | 1 | # setdiscovery.py - improved discovery of common nodeset for mercurial |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2010 Benoit Boissinot <bboissin@gmail.com> |
|
4 | 4 | # and Peter Arrenbrecht <peter@arrenbrecht.ch> |
|
5 | 5 | # |
|
6 | 6 | # This software may be used and distributed according to the terms of the |
|
7 | 7 | # GNU General Public License version 2 or any later version. |
|
8 | 8 | """ |
|
9 | 9 | Algorithm works in the following way. You have two repository: local and |
|
10 | 10 | remote. They both contains a DAG of changelists. |
|
11 | 11 | |
|
12 | 12 | The goal of the discovery protocol is to find one set of node *common*, |
|
13 | 13 | the set of nodes shared by local and remote. |
|
14 | 14 | |
|
15 | 15 | One of the issue with the original protocol was latency, it could |
|
16 | 16 | potentially require lots of roundtrips to discover that the local repo was a |
|
17 | 17 | subset of remote (which is a very common case, you usually have few changes |
|
18 | 18 | compared to upstream, while upstream probably had lots of development). |
|
19 | 19 | |
|
20 | 20 | The new protocol only requires one interface for the remote repo: `known()`, |
|
21 | 21 | which given a set of changelists tells you if they are present in the DAG. |
|
22 | 22 | |
|
23 | 23 | The algorithm then works as follow: |
|
24 | 24 | |
|
25 | 25 | - We will be using three sets, `common`, `missing`, `unknown`. Originally |
|
26 | 26 | all nodes are in `unknown`. |
|
27 | 27 | - Take a sample from `unknown`, call `remote.known(sample)` |
|
28 | 28 | - For each node that remote knows, move it and all its ancestors to `common` |
|
29 | 29 | - For each node that remote doesn't know, move it and all its descendants |
|
30 | 30 | to `missing` |
|
31 | 31 | - Iterate until `unknown` is empty |
|
32 | 32 | |
|
33 | 33 | There are a couple optimizations, first is instead of starting with a random |
|
34 | 34 | sample of missing, start by sending all heads, in the case where the local |
|
35 | 35 | repo is a subset, you computed the answer in one round trip. |
|
36 | 36 | |
|
37 | 37 | Then you can do something similar to the bisecting strategy used when |
|
38 | 38 | finding faulty changesets. Instead of random samples, you can try picking |
|
39 | 39 | nodes that will maximize the number of nodes that will be |
|
40 | 40 | classified with it (since all ancestors or descendants will be marked as well). |
|
41 | 41 | """ |
|
42 | 42 | |
|
43 | 43 | from __future__ import absolute_import |
|
44 | 44 | |
|
45 | 45 | import collections |
|
46 | 46 | import random |
|
47 | 47 | |
|
48 | 48 | from .i18n import _ |
|
49 | 49 | from .node import ( |
|
50 | 50 | nullid, |
|
51 | 51 | nullrev, |
|
52 | 52 | ) |
|
53 | 53 | from . import ( |
|
54 | 54 | error, |
|
55 | 55 | policy, |
|
56 | 56 | util, |
|
57 | 57 | ) |
|
58 | 58 | |
|
59 | 59 | |
|
60 | 60 | def _updatesample(revs, heads, sample, parentfn, quicksamplesize=0): |
|
61 | 61 | """update an existing sample to match the expected size |
|
62 | 62 | |
|
63 | 63 | The sample is updated with revs exponentially distant from each head of the |
|
64 | 64 | <revs> set. (H~1, H~2, H~4, H~8, etc). |
|
65 | 65 | |
|
66 | 66 | If a target size is specified, the sampling will stop once this size is |
|
67 | 67 | reached. Otherwise sampling will happen until roots of the <revs> set are |
|
68 | 68 | reached. |
|
69 | 69 | |
|
70 | 70 | :revs: set of revs we want to discover (if None, assume the whole dag) |
|
71 | 71 | :heads: set of DAG head revs |
|
72 | 72 | :sample: a sample to update |
|
73 | 73 | :parentfn: a callable to resolve parents for a revision |
|
74 | 74 | :quicksamplesize: optional target size of the sample""" |
|
75 | 75 | dist = {} |
|
76 | 76 | visit = collections.deque(heads) |
|
77 | 77 | seen = set() |
|
78 | 78 | factor = 1 |
|
79 | 79 | while visit: |
|
80 | 80 | curr = visit.popleft() |
|
81 | 81 | if curr in seen: |
|
82 | 82 | continue |
|
83 | 83 | d = dist.setdefault(curr, 1) |
|
84 | 84 | if d > factor: |
|
85 | 85 | factor *= 2 |
|
86 | 86 | if d == factor: |
|
87 | 87 | sample.add(curr) |
|
88 | 88 | if quicksamplesize and (len(sample) >= quicksamplesize): |
|
89 | 89 | return |
|
90 | 90 | seen.add(curr) |
|
91 | 91 | |
|
92 | 92 | for p in parentfn(curr): |
|
93 | 93 | if p != nullrev and (not revs or p in revs): |
|
94 | 94 | dist.setdefault(p, d + 1) |
|
95 | 95 | visit.append(p) |
|
96 | 96 | |
|
97 | 97 | |
|
98 | 98 | def _limitsample(sample, desiredlen, randomize=True): |
|
99 | 99 | """return a random subset of sample of at most desiredlen item. |
|
100 | 100 | |
|
101 | 101 | If randomize is False, though, a deterministic subset is returned. |
|
102 | 102 | This is meant for integration tests. |
|
103 | 103 | """ |
|
104 | 104 | if len(sample) <= desiredlen: |
|
105 | 105 | return sample |
|
106 | 106 | if randomize: |
|
107 | 107 | return set(random.sample(sample, desiredlen)) |
|
108 | 108 | sample = list(sample) |
|
109 | 109 | sample.sort() |
|
110 | 110 | return set(sample[:desiredlen]) |
|
111 | 111 | |
|
112 | 112 | |
|
113 | 113 | class partialdiscovery(object): |
|
114 | 114 | """an object representing ongoing discovery |
|
115 | 115 | |
|
116 | 116 | Feed with data from the remote repository, this object keep track of the |
|
117 | 117 | current set of changeset in various states: |
|
118 | 118 | |
|
119 | 119 | - common: revs also known remotely |
|
120 | 120 | - undecided: revs we don't have information on yet |
|
121 | 121 | - missing: revs missing remotely |
|
122 | 122 | (all tracked revisions are known locally) |
|
123 | 123 | """ |
|
124 | 124 | |
|
125 | 125 | def __init__(self, repo, targetheads, respectsize, randomize=True): |
|
126 | 126 | self._repo = repo |
|
127 | 127 | self._targetheads = targetheads |
|
128 | 128 | self._common = repo.changelog.incrementalmissingrevs() |
|
129 | 129 | self._undecided = None |
|
130 | 130 | self.missing = set() |
|
131 | 131 | self._childrenmap = None |
|
132 | 132 | self._respectsize = respectsize |
|
133 | 133 | self.randomize = randomize |
|
134 | 134 | |
|
135 | 135 | def addcommons(self, commons): |
|
136 | 136 | """register nodes known as common""" |
|
137 | 137 | self._common.addbases(commons) |
|
138 | 138 | if self._undecided is not None: |
|
139 | 139 | self._common.removeancestorsfrom(self._undecided) |
|
140 | 140 | |
|
141 | 141 | def addmissings(self, missings): |
|
142 | 142 | """register some nodes as missing""" |
|
143 | 143 | newmissing = self._repo.revs(b'%ld::%ld', missings, self.undecided) |
|
144 | 144 | if newmissing: |
|
145 | 145 | self.missing.update(newmissing) |
|
146 | 146 | self.undecided.difference_update(newmissing) |
|
147 | 147 | |
|
148 | 148 | def addinfo(self, sample): |
|
149 | 149 | """consume an iterable of (rev, known) tuples""" |
|
150 | 150 | common = set() |
|
151 | 151 | missing = set() |
|
152 | 152 | for rev, known in sample: |
|
153 | 153 | if known: |
|
154 | 154 | common.add(rev) |
|
155 | 155 | else: |
|
156 | 156 | missing.add(rev) |
|
157 | 157 | if common: |
|
158 | 158 | self.addcommons(common) |
|
159 | 159 | if missing: |
|
160 | 160 | self.addmissings(missing) |
|
161 | 161 | |
|
162 | 162 | def hasinfo(self): |
|
163 | 163 | """return True is we have any clue about the remote state""" |
|
164 | 164 | return self._common.hasbases() |
|
165 | 165 | |
|
166 | 166 | def iscomplete(self): |
|
167 | 167 | """True if all the necessary data have been gathered""" |
|
168 | 168 | return self._undecided is not None and not self._undecided |
|
169 | 169 | |
|
170 | 170 | @property |
|
171 | 171 | def undecided(self): |
|
172 | 172 | if self._undecided is not None: |
|
173 | 173 | return self._undecided |
|
174 | 174 | self._undecided = set(self._common.missingancestors(self._targetheads)) |
|
175 | 175 | return self._undecided |
|
176 | 176 | |
|
177 | 177 | def stats(self): |
|
178 | 178 | return { |
|
179 | 179 | 'undecided': len(self.undecided), |
|
180 | 180 | } |
|
181 | 181 | |
|
182 | 182 | def commonheads(self): |
|
183 | 183 | """the heads of the known common set""" |
|
184 | 184 | # heads(common) == heads(common.bases) since common represents |
|
185 | 185 | # common.bases and all its ancestors |
|
186 | 186 | return self._common.basesheads() |
|
187 | 187 | |
|
188 | 188 | def _parentsgetter(self): |
|
189 | 189 | getrev = self._repo.changelog.index.__getitem__ |
|
190 | 190 | |
|
191 | 191 | def getparents(r): |
|
192 | 192 | return getrev(r)[5:7] |
|
193 | 193 | |
|
194 | 194 | return getparents |
|
195 | 195 | |
|
196 | 196 | def _childrengetter(self): |
|
197 | 197 | |
|
198 | 198 | if self._childrenmap is not None: |
|
199 | 199 | # During discovery, the `undecided` set keep shrinking. |
|
200 | 200 | # Therefore, the map computed for an iteration N will be |
|
201 | 201 | # valid for iteration N+1. Instead of computing the same |
|
202 | 202 | # data over and over we cached it the first time. |
|
203 | 203 | return self._childrenmap.__getitem__ |
|
204 | 204 | |
|
205 | 205 | # _updatesample() essentially does interaction over revisions to look |
|
206 | 206 | # up their children. This lookup is expensive and doing it in a loop is |
|
207 | 207 | # quadratic. We precompute the children for all relevant revisions and |
|
208 | 208 | # make the lookup in _updatesample() a simple dict lookup. |
|
209 | 209 | self._childrenmap = children = {} |
|
210 | 210 | |
|
211 | 211 | parentrevs = self._parentsgetter() |
|
212 | 212 | revs = self.undecided |
|
213 | 213 | |
|
214 | 214 | for rev in sorted(revs): |
|
215 | 215 | # Always ensure revision has an entry so we don't need to worry |
|
216 | 216 | # about missing keys. |
|
217 | 217 | children[rev] = [] |
|
218 | 218 | for prev in parentrevs(rev): |
|
219 | 219 | if prev == nullrev: |
|
220 | 220 | continue |
|
221 | 221 | c = children.get(prev) |
|
222 | 222 | if c is not None: |
|
223 | 223 | c.append(rev) |
|
224 | 224 | return children.__getitem__ |
|
225 | 225 | |
|
226 | 226 | def takequicksample(self, headrevs, size): |
|
227 | 227 | """takes a quick sample of size <size> |
|
228 | 228 | |
|
229 | 229 | It is meant for initial sampling and focuses on querying heads and close |
|
230 | 230 | ancestors of heads. |
|
231 | 231 | |
|
232 | 232 | :headrevs: set of head revisions in local DAG to consider |
|
233 | 233 | :size: the maximum size of the sample""" |
|
234 | 234 | revs = self.undecided |
|
235 | 235 | if len(revs) <= size: |
|
236 | 236 | return list(revs) |
|
237 | 237 | sample = set(self._repo.revs(b'heads(%ld)', revs)) |
|
238 | 238 | |
|
239 | 239 | if len(sample) >= size: |
|
240 | 240 | return _limitsample(sample, size, randomize=self.randomize) |
|
241 | 241 | |
|
242 | 242 | _updatesample( |
|
243 | 243 | None, headrevs, sample, self._parentsgetter(), quicksamplesize=size |
|
244 | 244 | ) |
|
245 | 245 | return sample |
|
246 | 246 | |
|
247 | 247 | def takefullsample(self, headrevs, size): |
|
248 | 248 | revs = self.undecided |
|
249 | 249 | if len(revs) <= size: |
|
250 | 250 | return list(revs) |
|
251 | 251 | repo = self._repo |
|
252 | 252 | sample = set(repo.revs(b'heads(%ld)', revs)) |
|
253 | 253 | parentrevs = self._parentsgetter() |
|
254 | 254 | |
|
255 | 255 | # update from heads |
|
256 | 256 | revsheads = sample.copy() |
|
257 | 257 | _updatesample(revs, revsheads, sample, parentrevs) |
|
258 | 258 | |
|
259 | 259 | # update from roots |
|
260 | 260 | revsroots = set(repo.revs(b'roots(%ld)', revs)) |
|
261 | 261 | childrenrevs = self._childrengetter() |
|
262 | 262 | _updatesample(revs, revsroots, sample, childrenrevs) |
|
263 | 263 | assert sample |
|
264 | 264 | |
|
265 | 265 | if not self._respectsize: |
|
266 | 266 | size = max(size, min(len(revsroots), len(revsheads))) |
|
267 | 267 | |
|
268 | 268 | sample = _limitsample(sample, size, randomize=self.randomize) |
|
269 | 269 | if len(sample) < size: |
|
270 | 270 | more = size - len(sample) |
|
271 | 271 | takefrom = list(revs - sample) |
|
272 | 272 | if self.randomize: |
|
273 | 273 | sample.update(random.sample(takefrom, more)) |
|
274 | 274 | else: |
|
275 | 275 | takefrom.sort() |
|
276 | 276 | sample.update(takefrom[:more]) |
|
277 | 277 | return sample |
|
278 | 278 | |
|
279 | 279 | |
|
280 | 280 | partialdiscovery = policy.importrust( |
|
281 | 281 | 'discovery', member='PartialDiscovery', default=partialdiscovery |
|
282 | 282 | ) |
|
283 | 283 | |
|
284 | 284 | |
|
285 | 285 | def findcommonheads( |
|
286 | 286 | ui, |
|
287 | 287 | local, |
|
288 | 288 | remote, |
|
289 | initialsamplesize=100, | |
|
290 | fullsamplesize=200, | |
|
291 | 289 | abortwhenunrelated=True, |
|
292 | 290 | ancestorsof=None, |
|
293 | 291 | audit=None, |
|
294 | 292 | ): |
|
295 | 293 | """Return a tuple (common, anyincoming, remoteheads) used to identify |
|
296 | 294 | missing nodes from or in remote. |
|
297 | 295 | |
|
298 | 296 | The audit argument is an optional dictionnary that a caller can pass. it |
|
299 | 297 | will be updated with extra data about the discovery, this is useful for |
|
300 | 298 | debug. |
|
301 | 299 | """ |
|
302 | 300 | |
|
303 | 301 | samplegrowth = float(ui.config(b'devel', b'discovery.grow-sample.rate')) |
|
304 | 302 | |
|
305 | 303 | start = util.timer() |
|
306 | 304 | |
|
307 | 305 | roundtrips = 0 |
|
308 | 306 | cl = local.changelog |
|
309 | 307 | clnode = cl.node |
|
310 | 308 | clrev = cl.rev |
|
311 | 309 | |
|
312 | 310 | if ancestorsof is not None: |
|
313 | 311 | ownheads = [clrev(n) for n in ancestorsof] |
|
314 | 312 | else: |
|
315 | 313 | ownheads = [rev for rev in cl.headrevs() if rev != nullrev] |
|
316 | 314 | |
|
317 | 315 | initial_head_exchange = ui.configbool(b'devel', b'discovery.exchange-heads') |
|
318 | ||
|
316 | initialsamplesize = ui.configint(b'devel', b'discovery.sample-size.initial') | |
|
317 | fullsamplesize = ui.configint(b'devel', b'discovery.sample-size') | |
|
319 | 318 | # We also ask remote about all the local heads. That set can be arbitrarily |
|
320 | 319 | # large, so we used to limit it size to `initialsamplesize`. We no longer |
|
321 | 320 | # do as it proved counter productive. The skipped heads could lead to a |
|
322 | 321 | # large "undecided" set, slower to be clarified than if we asked the |
|
323 | 322 | # question for all heads right away. |
|
324 | 323 | # |
|
325 | 324 | # We are already fetching all server heads using the `heads` commands, |
|
326 | 325 | # sending a equivalent number of heads the other way should not have a |
|
327 | 326 | # significant impact. In addition, it is very likely that we are going to |
|
328 | 327 | # have to issue "known" request for an equivalent amount of revisions in |
|
329 | 328 | # order to decide if theses heads are common or missing. |
|
330 | 329 | # |
|
331 | 330 | # find a detailled analysis below. |
|
332 | 331 | # |
|
333 | 332 | # Case A: local and server both has few heads |
|
334 | 333 | # |
|
335 | 334 | # Ownheads is below initialsamplesize, limit would not have any effect. |
|
336 | 335 | # |
|
337 | 336 | # Case B: local has few heads and server has many |
|
338 | 337 | # |
|
339 | 338 | # Ownheads is below initialsamplesize, limit would not have any effect. |
|
340 | 339 | # |
|
341 | 340 | # Case C: local and server both has many heads |
|
342 | 341 | # |
|
343 | 342 | # We now transfert some more data, but not significantly more than is |
|
344 | 343 | # already transfered to carry the server heads. |
|
345 | 344 | # |
|
346 | 345 | # Case D: local has many heads, server has few |
|
347 | 346 | # |
|
348 | 347 | # D.1 local heads are mostly known remotely |
|
349 | 348 | # |
|
350 | 349 | # All the known head will have be part of a `known` request at some |
|
351 | 350 | # point for the discovery to finish. Sending them all earlier is |
|
352 | 351 | # actually helping. |
|
353 | 352 | # |
|
354 | 353 | # (This case is fairly unlikely, it requires the numerous heads to all |
|
355 | 354 | # be merged server side in only a few heads) |
|
356 | 355 | # |
|
357 | 356 | # D.2 local heads are mostly missing remotely |
|
358 | 357 | # |
|
359 | 358 | # To determine that the heads are missing, we'll have to issue `known` |
|
360 | 359 | # request for them or one of their ancestors. This amount of `known` |
|
361 | 360 | # request will likely be in the same order of magnitude than the amount |
|
362 | 361 | # of local heads. |
|
363 | 362 | # |
|
364 | 363 | # The only case where we can be more efficient using `known` request on |
|
365 | 364 | # ancestors are case were all the "missing" local heads are based on a |
|
366 | 365 | # few changeset, also "missing". This means we would have a "complex" |
|
367 | 366 | # graph (with many heads) attached to, but very independant to a the |
|
368 | 367 | # "simple" graph on the server. This is a fairly usual case and have |
|
369 | 368 | # not been met in the wild so far. |
|
370 | 369 | if initial_head_exchange: |
|
371 | 370 | if remote.limitedarguments: |
|
372 | 371 | sample = _limitsample(ownheads, initialsamplesize) |
|
373 | 372 | # indices between sample and externalized version must match |
|
374 | 373 | sample = list(sample) |
|
375 | 374 | else: |
|
376 | 375 | sample = ownheads |
|
377 | 376 | |
|
378 | 377 | ui.debug(b"query 1; heads\n") |
|
379 | 378 | roundtrips += 1 |
|
380 | 379 | with remote.commandexecutor() as e: |
|
381 | 380 | fheads = e.callcommand(b'heads', {}) |
|
382 | 381 | fknown = e.callcommand( |
|
383 | 382 | b'known', |
|
384 | 383 | { |
|
385 | 384 | b'nodes': [clnode(r) for r in sample], |
|
386 | 385 | }, |
|
387 | 386 | ) |
|
388 | 387 | |
|
389 | 388 | srvheadhashes, yesno = fheads.result(), fknown.result() |
|
390 | 389 | |
|
391 | 390 | if audit is not None: |
|
392 | 391 | audit[b'total-roundtrips'] = 1 |
|
393 | 392 | |
|
394 | 393 | if cl.tip() == nullid: |
|
395 | 394 | if srvheadhashes != [nullid]: |
|
396 | 395 | return [nullid], True, srvheadhashes |
|
397 | 396 | return [nullid], False, [] |
|
398 | 397 | else: |
|
399 | 398 | # we still need the remote head for the function return |
|
400 | 399 | with remote.commandexecutor() as e: |
|
401 | 400 | fheads = e.callcommand(b'heads', {}) |
|
402 | 401 | srvheadhashes = fheads.result() |
|
403 | 402 | |
|
404 | 403 | # start actual discovery (we note this before the next "if" for |
|
405 | 404 | # compatibility reasons) |
|
406 | 405 | ui.status(_(b"searching for changes\n")) |
|
407 | 406 | |
|
408 | 407 | knownsrvheads = [] # revnos of remote heads that are known locally |
|
409 | 408 | for node in srvheadhashes: |
|
410 | 409 | if node == nullid: |
|
411 | 410 | continue |
|
412 | 411 | |
|
413 | 412 | try: |
|
414 | 413 | knownsrvheads.append(clrev(node)) |
|
415 | 414 | # Catches unknown and filtered nodes. |
|
416 | 415 | except error.LookupError: |
|
417 | 416 | continue |
|
418 | 417 | |
|
419 | 418 | if initial_head_exchange: |
|
420 | 419 | # early exit if we know all the specified remote heads already |
|
421 | 420 | if len(knownsrvheads) == len(srvheadhashes): |
|
422 | 421 | ui.debug(b"all remote heads known locally\n") |
|
423 | 422 | return srvheadhashes, False, srvheadhashes |
|
424 | 423 | |
|
425 | 424 | if len(sample) == len(ownheads) and all(yesno): |
|
426 | 425 | ui.note(_(b"all local changesets known remotely\n")) |
|
427 | 426 | ownheadhashes = [clnode(r) for r in ownheads] |
|
428 | 427 | return ownheadhashes, True, srvheadhashes |
|
429 | 428 | |
|
430 | 429 | # full blown discovery |
|
431 | 430 | |
|
432 | 431 | # if the server has a limit to its arguments size, we can't grow the sample. |
|
433 | 432 | hard_limit_sample = remote.limitedarguments |
|
434 | 433 | grow_sample = local.ui.configbool(b'devel', b'discovery.grow-sample') |
|
435 | 434 | hard_limit_sample = hard_limit_sample and grow_sample |
|
436 | 435 | |
|
437 | 436 | randomize = ui.configbool(b'devel', b'discovery.randomize') |
|
438 | 437 | disco = partialdiscovery( |
|
439 | 438 | local, ownheads, hard_limit_sample, randomize=randomize |
|
440 | 439 | ) |
|
441 | 440 | if initial_head_exchange: |
|
442 | 441 | # treat remote heads (and maybe own heads) as a first implicit sample |
|
443 | 442 | # response |
|
444 | 443 | disco.addcommons(knownsrvheads) |
|
445 | 444 | disco.addinfo(zip(sample, yesno)) |
|
446 | 445 | |
|
447 | 446 | full = not initial_head_exchange |
|
448 | 447 | progress = ui.makeprogress(_(b'searching'), unit=_(b'queries')) |
|
449 | 448 | while not disco.iscomplete(): |
|
450 | 449 | |
|
451 | 450 | if full or disco.hasinfo(): |
|
452 | 451 | if full: |
|
453 | 452 | ui.note(_(b"sampling from both directions\n")) |
|
454 | 453 | else: |
|
455 | 454 | ui.debug(b"taking initial sample\n") |
|
456 | 455 | samplefunc = disco.takefullsample |
|
457 | 456 | targetsize = fullsamplesize |
|
458 | 457 | if not hard_limit_sample: |
|
459 | 458 | fullsamplesize = int(fullsamplesize * samplegrowth) |
|
460 | 459 | else: |
|
461 | 460 | # use even cheaper initial sample |
|
462 | 461 | ui.debug(b"taking quick initial sample\n") |
|
463 | 462 | samplefunc = disco.takequicksample |
|
464 | 463 | targetsize = initialsamplesize |
|
465 | 464 | sample = samplefunc(ownheads, targetsize) |
|
466 | 465 | |
|
467 | 466 | roundtrips += 1 |
|
468 | 467 | progress.update(roundtrips) |
|
469 | 468 | stats = disco.stats() |
|
470 | 469 | ui.debug( |
|
471 | 470 | b"query %i; still undecided: %i, sample size is: %i\n" |
|
472 | 471 | % (roundtrips, stats['undecided'], len(sample)) |
|
473 | 472 | ) |
|
474 | 473 | |
|
475 | 474 | # indices between sample and externalized version must match |
|
476 | 475 | sample = list(sample) |
|
477 | 476 | |
|
478 | 477 | with remote.commandexecutor() as e: |
|
479 | 478 | yesno = e.callcommand( |
|
480 | 479 | b'known', |
|
481 | 480 | { |
|
482 | 481 | b'nodes': [clnode(r) for r in sample], |
|
483 | 482 | }, |
|
484 | 483 | ).result() |
|
485 | 484 | |
|
486 | 485 | full = True |
|
487 | 486 | |
|
488 | 487 | disco.addinfo(zip(sample, yesno)) |
|
489 | 488 | |
|
490 | 489 | result = disco.commonheads() |
|
491 | 490 | elapsed = util.timer() - start |
|
492 | 491 | progress.complete() |
|
493 | 492 | ui.debug(b"%d total queries in %.4fs\n" % (roundtrips, elapsed)) |
|
494 | 493 | msg = ( |
|
495 | 494 | b'found %d common and %d unknown server heads,' |
|
496 | 495 | b' %d roundtrips in %.4fs\n' |
|
497 | 496 | ) |
|
498 | 497 | missing = set(result) - set(knownsrvheads) |
|
499 | 498 | ui.log(b'discovery', msg, len(result), len(missing), roundtrips, elapsed) |
|
500 | 499 | |
|
501 | 500 | if audit is not None: |
|
502 | 501 | audit[b'total-roundtrips'] = roundtrips |
|
503 | 502 | |
|
504 | 503 | if not result and srvheadhashes != [nullid]: |
|
505 | 504 | if abortwhenunrelated: |
|
506 | 505 | raise error.Abort(_(b"repository is unrelated")) |
|
507 | 506 | else: |
|
508 | 507 | ui.warn(_(b"warning: repository is unrelated\n")) |
|
509 | 508 | return ( |
|
510 | 509 | {nullid}, |
|
511 | 510 | True, |
|
512 | 511 | srvheadhashes, |
|
513 | 512 | ) |
|
514 | 513 | |
|
515 | 514 | anyincoming = srvheadhashes != [nullid] |
|
516 | 515 | result = {clnode(r) for r in result} |
|
517 | 516 | return result, anyincoming, srvheadhashes |
@@ -1,1582 +1,1590 b'' | |||
|
1 | 1 | |
|
2 | 2 | Function to test discovery between two repos in both directions, using both the local shortcut |
|
3 | 3 | (which is currently not activated by default) and the full remotable protocol: |
|
4 | 4 | |
|
5 | 5 | $ testdesc() { # revs_a, revs_b, dagdesc |
|
6 | 6 | > if [ -d foo ]; then rm -rf foo; fi |
|
7 | 7 | > hg init foo |
|
8 | 8 | > cd foo |
|
9 | 9 | > hg debugbuilddag "$3" |
|
10 | 10 | > hg clone . a $1 --quiet |
|
11 | 11 | > hg clone . b $2 --quiet |
|
12 | 12 | > echo |
|
13 | 13 | > echo "% -- a -> b tree" |
|
14 | 14 | > hg -R a debugdiscovery b --verbose --old |
|
15 | 15 | > echo |
|
16 | 16 | > echo "% -- a -> b set" |
|
17 | 17 | > hg -R a debugdiscovery b --verbose --debug --config progress.debug=true |
|
18 | 18 | > echo |
|
19 | 19 | > echo "% -- a -> b set (tip only)" |
|
20 | 20 | > hg -R a debugdiscovery b --verbose --debug --config progress.debug=true --rev tip |
|
21 | 21 | > echo |
|
22 | 22 | > echo "% -- b -> a tree" |
|
23 | 23 | > hg -R b debugdiscovery a --verbose --old |
|
24 | 24 | > echo |
|
25 | 25 | > echo "% -- b -> a set" |
|
26 | 26 | > hg -R b debugdiscovery a --verbose --debug --config progress.debug=true |
|
27 | 27 | > echo |
|
28 | 28 | > echo "% -- b -> a set (tip only)" |
|
29 | 29 | > hg -R b debugdiscovery a --verbose --debug --config progress.debug=true --rev tip |
|
30 | 30 | > cd .. |
|
31 | 31 | > } |
|
32 | 32 | |
|
33 | 33 | |
|
34 | 34 | Small superset: |
|
35 | 35 | |
|
36 | 36 | $ testdesc '-ra1 -ra2' '-rb1 -rb2 -rb3' ' |
|
37 | 37 | > +2:f +1:a1:b1 |
|
38 | 38 | > <f +4 :a2 |
|
39 | 39 | > +5 :b2 |
|
40 | 40 | > <f +3 :b3' |
|
41 | 41 | |
|
42 | 42 | % -- a -> b tree |
|
43 | 43 | comparing with b |
|
44 | 44 | searching for changes |
|
45 | 45 | unpruned common: 01241442b3c2 66f7d451a68b b5714e113bc0 |
|
46 | 46 | elapsed time: * seconds (glob) |
|
47 | 47 | round-trips: 2 |
|
48 | 48 | heads summary: |
|
49 | 49 | total common heads: 2 |
|
50 | 50 | also local heads: 2 |
|
51 | 51 | also remote heads: 1 |
|
52 | 52 | both: 1 |
|
53 | 53 | local heads: 2 |
|
54 | 54 | common: 2 |
|
55 | 55 | missing: 0 |
|
56 | 56 | remote heads: 3 |
|
57 | 57 | common: 1 |
|
58 | 58 | unknown: 2 |
|
59 | 59 | local changesets: 7 |
|
60 | 60 | common: 7 |
|
61 | 61 | heads: 2 |
|
62 | 62 | roots: 1 |
|
63 | 63 | missing: 0 |
|
64 | 64 | heads: 0 |
|
65 | 65 | roots: 0 |
|
66 | 66 | first undecided set: 3 |
|
67 | 67 | heads: 1 |
|
68 | 68 | roots: 1 |
|
69 | 69 | common: 3 |
|
70 | 70 | missing: 0 |
|
71 | 71 | common heads: 01241442b3c2 b5714e113bc0 |
|
72 | 72 | |
|
73 | 73 | % -- a -> b set |
|
74 | 74 | comparing with b |
|
75 | 75 | query 1; heads |
|
76 | 76 | searching for changes |
|
77 | 77 | all local changesets known remotely |
|
78 | 78 | elapsed time: * seconds (glob) |
|
79 | 79 | round-trips: 1 |
|
80 | 80 | heads summary: |
|
81 | 81 | total common heads: 2 |
|
82 | 82 | also local heads: 2 |
|
83 | 83 | also remote heads: 1 |
|
84 | 84 | both: 1 |
|
85 | 85 | local heads: 2 |
|
86 | 86 | common: 2 |
|
87 | 87 | missing: 0 |
|
88 | 88 | remote heads: 3 |
|
89 | 89 | common: 1 |
|
90 | 90 | unknown: 2 |
|
91 | 91 | local changesets: 7 |
|
92 | 92 | common: 7 |
|
93 | 93 | heads: 2 |
|
94 | 94 | roots: 1 |
|
95 | 95 | missing: 0 |
|
96 | 96 | heads: 0 |
|
97 | 97 | roots: 0 |
|
98 | 98 | first undecided set: 3 |
|
99 | 99 | heads: 1 |
|
100 | 100 | roots: 1 |
|
101 | 101 | common: 3 |
|
102 | 102 | missing: 0 |
|
103 | 103 | common heads: 01241442b3c2 b5714e113bc0 |
|
104 | 104 | |
|
105 | 105 | % -- a -> b set (tip only) |
|
106 | 106 | comparing with b |
|
107 | 107 | query 1; heads |
|
108 | 108 | searching for changes |
|
109 | 109 | all local changesets known remotely |
|
110 | 110 | elapsed time: * seconds (glob) |
|
111 | 111 | round-trips: 1 |
|
112 | 112 | heads summary: |
|
113 | 113 | total common heads: 1 |
|
114 | 114 | also local heads: 1 |
|
115 | 115 | also remote heads: 0 |
|
116 | 116 | both: 0 |
|
117 | 117 | local heads: 2 |
|
118 | 118 | common: 1 |
|
119 | 119 | missing: 1 |
|
120 | 120 | remote heads: 3 |
|
121 | 121 | common: 0 |
|
122 | 122 | unknown: 3 |
|
123 | 123 | local changesets: 7 |
|
124 | 124 | common: 6 |
|
125 | 125 | heads: 1 |
|
126 | 126 | roots: 1 |
|
127 | 127 | missing: 1 |
|
128 | 128 | heads: 1 |
|
129 | 129 | roots: 1 |
|
130 | 130 | first undecided set: 6 |
|
131 | 131 | heads: 2 |
|
132 | 132 | roots: 1 |
|
133 | 133 | common: 5 |
|
134 | 134 | missing: 1 |
|
135 | 135 | common heads: b5714e113bc0 |
|
136 | 136 | |
|
137 | 137 | % -- b -> a tree |
|
138 | 138 | comparing with a |
|
139 | 139 | searching for changes |
|
140 | 140 | unpruned common: 01241442b3c2 b5714e113bc0 |
|
141 | 141 | elapsed time: * seconds (glob) |
|
142 | 142 | round-trips: 1 |
|
143 | 143 | heads summary: |
|
144 | 144 | total common heads: 2 |
|
145 | 145 | also local heads: 1 |
|
146 | 146 | also remote heads: 2 |
|
147 | 147 | both: 1 |
|
148 | 148 | local heads: 3 |
|
149 | 149 | common: 1 |
|
150 | 150 | missing: 2 |
|
151 | 151 | remote heads: 2 |
|
152 | 152 | common: 2 |
|
153 | 153 | unknown: 0 |
|
154 | 154 | local changesets: 15 |
|
155 | 155 | common: 7 |
|
156 | 156 | heads: 2 |
|
157 | 157 | roots: 1 |
|
158 | 158 | missing: 8 |
|
159 | 159 | heads: 2 |
|
160 | 160 | roots: 2 |
|
161 | 161 | first undecided set: 8 |
|
162 | 162 | heads: 2 |
|
163 | 163 | roots: 2 |
|
164 | 164 | common: 0 |
|
165 | 165 | missing: 8 |
|
166 | 166 | common heads: 01241442b3c2 b5714e113bc0 |
|
167 | 167 | |
|
168 | 168 | % -- b -> a set |
|
169 | 169 | comparing with a |
|
170 | 170 | query 1; heads |
|
171 | 171 | searching for changes |
|
172 | 172 | all remote heads known locally |
|
173 | 173 | elapsed time: * seconds (glob) |
|
174 | 174 | round-trips: 1 |
|
175 | 175 | heads summary: |
|
176 | 176 | total common heads: 2 |
|
177 | 177 | also local heads: 1 |
|
178 | 178 | also remote heads: 2 |
|
179 | 179 | both: 1 |
|
180 | 180 | local heads: 3 |
|
181 | 181 | common: 1 |
|
182 | 182 | missing: 2 |
|
183 | 183 | remote heads: 2 |
|
184 | 184 | common: 2 |
|
185 | 185 | unknown: 0 |
|
186 | 186 | local changesets: 15 |
|
187 | 187 | common: 7 |
|
188 | 188 | heads: 2 |
|
189 | 189 | roots: 1 |
|
190 | 190 | missing: 8 |
|
191 | 191 | heads: 2 |
|
192 | 192 | roots: 2 |
|
193 | 193 | first undecided set: 8 |
|
194 | 194 | heads: 2 |
|
195 | 195 | roots: 2 |
|
196 | 196 | common: 0 |
|
197 | 197 | missing: 8 |
|
198 | 198 | common heads: 01241442b3c2 b5714e113bc0 |
|
199 | 199 | |
|
200 | 200 | % -- b -> a set (tip only) |
|
201 | 201 | comparing with a |
|
202 | 202 | query 1; heads |
|
203 | 203 | searching for changes |
|
204 | 204 | all remote heads known locally |
|
205 | 205 | elapsed time: * seconds (glob) |
|
206 | 206 | round-trips: 1 |
|
207 | 207 | heads summary: |
|
208 | 208 | total common heads: 2 |
|
209 | 209 | also local heads: 1 |
|
210 | 210 | also remote heads: 2 |
|
211 | 211 | both: 1 |
|
212 | 212 | local heads: 3 |
|
213 | 213 | common: 1 |
|
214 | 214 | missing: 2 |
|
215 | 215 | remote heads: 2 |
|
216 | 216 | common: 2 |
|
217 | 217 | unknown: 0 |
|
218 | 218 | local changesets: 15 |
|
219 | 219 | common: 7 |
|
220 | 220 | heads: 2 |
|
221 | 221 | roots: 1 |
|
222 | 222 | missing: 8 |
|
223 | 223 | heads: 2 |
|
224 | 224 | roots: 2 |
|
225 | 225 | first undecided set: 8 |
|
226 | 226 | heads: 2 |
|
227 | 227 | roots: 2 |
|
228 | 228 | common: 0 |
|
229 | 229 | missing: 8 |
|
230 | 230 | common heads: 01241442b3c2 b5714e113bc0 |
|
231 | 231 | |
|
232 | 232 | |
|
233 | 233 | Many new: |
|
234 | 234 | |
|
235 | 235 | $ testdesc '-ra1 -ra2' '-rb' ' |
|
236 | 236 | > +2:f +3:a1 +3:b |
|
237 | 237 | > <f +30 :a2' |
|
238 | 238 | |
|
239 | 239 | % -- a -> b tree |
|
240 | 240 | comparing with b |
|
241 | 241 | searching for changes |
|
242 | 242 | unpruned common: bebd167eb94d |
|
243 | 243 | elapsed time: * seconds (glob) |
|
244 | 244 | round-trips: 2 |
|
245 | 245 | heads summary: |
|
246 | 246 | total common heads: 1 |
|
247 | 247 | also local heads: 1 |
|
248 | 248 | also remote heads: 0 |
|
249 | 249 | both: 0 |
|
250 | 250 | local heads: 2 |
|
251 | 251 | common: 1 |
|
252 | 252 | missing: 1 |
|
253 | 253 | remote heads: 1 |
|
254 | 254 | common: 0 |
|
255 | 255 | unknown: 1 |
|
256 | 256 | local changesets: 35 |
|
257 | 257 | common: 5 |
|
258 | 258 | heads: 1 |
|
259 | 259 | roots: 1 |
|
260 | 260 | missing: 30 |
|
261 | 261 | heads: 1 |
|
262 | 262 | roots: 1 |
|
263 | 263 | first undecided set: 34 |
|
264 | 264 | heads: 2 |
|
265 | 265 | roots: 1 |
|
266 | 266 | common: 4 |
|
267 | 267 | missing: 30 |
|
268 | 268 | common heads: bebd167eb94d |
|
269 | 269 | |
|
270 | 270 | % -- a -> b set |
|
271 | 271 | comparing with b |
|
272 | 272 | query 1; heads |
|
273 | 273 | searching for changes |
|
274 | 274 | taking initial sample |
|
275 | 275 | searching: 2 queries |
|
276 | 276 | query 2; still undecided: 29, sample size is: 29 |
|
277 | 277 | 2 total queries in *.????s (glob) |
|
278 | 278 | elapsed time: * seconds (glob) |
|
279 | 279 | round-trips: 2 |
|
280 | 280 | heads summary: |
|
281 | 281 | total common heads: 1 |
|
282 | 282 | also local heads: 1 |
|
283 | 283 | also remote heads: 0 |
|
284 | 284 | both: 0 |
|
285 | 285 | local heads: 2 |
|
286 | 286 | common: 1 |
|
287 | 287 | missing: 1 |
|
288 | 288 | remote heads: 1 |
|
289 | 289 | common: 0 |
|
290 | 290 | unknown: 1 |
|
291 | 291 | local changesets: 35 |
|
292 | 292 | common: 5 |
|
293 | 293 | heads: 1 |
|
294 | 294 | roots: 1 |
|
295 | 295 | missing: 30 |
|
296 | 296 | heads: 1 |
|
297 | 297 | roots: 1 |
|
298 | 298 | first undecided set: 34 |
|
299 | 299 | heads: 2 |
|
300 | 300 | roots: 1 |
|
301 | 301 | common: 4 |
|
302 | 302 | missing: 30 |
|
303 | 303 | common heads: bebd167eb94d |
|
304 | 304 | |
|
305 | 305 | % -- a -> b set (tip only) |
|
306 | 306 | comparing with b |
|
307 | 307 | query 1; heads |
|
308 | 308 | searching for changes |
|
309 | 309 | taking quick initial sample |
|
310 | 310 | searching: 2 queries |
|
311 | 311 | query 2; still undecided: 31, sample size is: 31 |
|
312 | 312 | 2 total queries in *.????s (glob) |
|
313 | 313 | elapsed time: * seconds (glob) |
|
314 | 314 | round-trips: 2 |
|
315 | 315 | heads summary: |
|
316 | 316 | total common heads: 1 |
|
317 | 317 | also local heads: 0 |
|
318 | 318 | also remote heads: 0 |
|
319 | 319 | both: 0 |
|
320 | 320 | local heads: 2 |
|
321 | 321 | common: 0 |
|
322 | 322 | missing: 2 |
|
323 | 323 | remote heads: 1 |
|
324 | 324 | common: 0 |
|
325 | 325 | unknown: 1 |
|
326 | 326 | local changesets: 35 |
|
327 | 327 | common: 2 |
|
328 | 328 | heads: 1 |
|
329 | 329 | roots: 1 |
|
330 | 330 | missing: 33 |
|
331 | 331 | heads: 2 |
|
332 | 332 | roots: 2 |
|
333 | 333 | first undecided set: 35 |
|
334 | 334 | heads: 2 |
|
335 | 335 | roots: 1 |
|
336 | 336 | common: 2 |
|
337 | 337 | missing: 33 |
|
338 | 338 | common heads: 66f7d451a68b |
|
339 | 339 | |
|
340 | 340 | % -- b -> a tree |
|
341 | 341 | comparing with a |
|
342 | 342 | searching for changes |
|
343 | 343 | unpruned common: 66f7d451a68b bebd167eb94d |
|
344 | 344 | elapsed time: * seconds (glob) |
|
345 | 345 | round-trips: 4 |
|
346 | 346 | heads summary: |
|
347 | 347 | total common heads: 1 |
|
348 | 348 | also local heads: 0 |
|
349 | 349 | also remote heads: 1 |
|
350 | 350 | both: 0 |
|
351 | 351 | local heads: 1 |
|
352 | 352 | common: 0 |
|
353 | 353 | missing: 1 |
|
354 | 354 | remote heads: 2 |
|
355 | 355 | common: 1 |
|
356 | 356 | unknown: 1 |
|
357 | 357 | local changesets: 8 |
|
358 | 358 | common: 5 |
|
359 | 359 | heads: 1 |
|
360 | 360 | roots: 1 |
|
361 | 361 | missing: 3 |
|
362 | 362 | heads: 1 |
|
363 | 363 | roots: 1 |
|
364 | 364 | first undecided set: 3 |
|
365 | 365 | heads: 1 |
|
366 | 366 | roots: 1 |
|
367 | 367 | common: 0 |
|
368 | 368 | missing: 3 |
|
369 | 369 | common heads: bebd167eb94d |
|
370 | 370 | |
|
371 | 371 | % -- b -> a set |
|
372 | 372 | comparing with a |
|
373 | 373 | query 1; heads |
|
374 | 374 | searching for changes |
|
375 | 375 | taking initial sample |
|
376 | 376 | searching: 2 queries |
|
377 | 377 | query 2; still undecided: 2, sample size is: 2 |
|
378 | 378 | 2 total queries in *.????s (glob) |
|
379 | 379 | elapsed time: * seconds (glob) |
|
380 | 380 | round-trips: 2 |
|
381 | 381 | heads summary: |
|
382 | 382 | total common heads: 1 |
|
383 | 383 | also local heads: 0 |
|
384 | 384 | also remote heads: 1 |
|
385 | 385 | both: 0 |
|
386 | 386 | local heads: 1 |
|
387 | 387 | common: 0 |
|
388 | 388 | missing: 1 |
|
389 | 389 | remote heads: 2 |
|
390 | 390 | common: 1 |
|
391 | 391 | unknown: 1 |
|
392 | 392 | local changesets: 8 |
|
393 | 393 | common: 5 |
|
394 | 394 | heads: 1 |
|
395 | 395 | roots: 1 |
|
396 | 396 | missing: 3 |
|
397 | 397 | heads: 1 |
|
398 | 398 | roots: 1 |
|
399 | 399 | first undecided set: 3 |
|
400 | 400 | heads: 1 |
|
401 | 401 | roots: 1 |
|
402 | 402 | common: 0 |
|
403 | 403 | missing: 3 |
|
404 | 404 | common heads: bebd167eb94d |
|
405 | 405 | |
|
406 | 406 | % -- b -> a set (tip only) |
|
407 | 407 | comparing with a |
|
408 | 408 | query 1; heads |
|
409 | 409 | searching for changes |
|
410 | 410 | taking initial sample |
|
411 | 411 | searching: 2 queries |
|
412 | 412 | query 2; still undecided: 2, sample size is: 2 |
|
413 | 413 | 2 total queries in *.????s (glob) |
|
414 | 414 | elapsed time: * seconds (glob) |
|
415 | 415 | round-trips: 2 |
|
416 | 416 | heads summary: |
|
417 | 417 | total common heads: 1 |
|
418 | 418 | also local heads: 0 |
|
419 | 419 | also remote heads: 1 |
|
420 | 420 | both: 0 |
|
421 | 421 | local heads: 1 |
|
422 | 422 | common: 0 |
|
423 | 423 | missing: 1 |
|
424 | 424 | remote heads: 2 |
|
425 | 425 | common: 1 |
|
426 | 426 | unknown: 1 |
|
427 | 427 | local changesets: 8 |
|
428 | 428 | common: 5 |
|
429 | 429 | heads: 1 |
|
430 | 430 | roots: 1 |
|
431 | 431 | missing: 3 |
|
432 | 432 | heads: 1 |
|
433 | 433 | roots: 1 |
|
434 | 434 | first undecided set: 3 |
|
435 | 435 | heads: 1 |
|
436 | 436 | roots: 1 |
|
437 | 437 | common: 0 |
|
438 | 438 | missing: 3 |
|
439 | 439 | common heads: bebd167eb94d |
|
440 | 440 | |
|
441 | 441 | Both sides many new with stub: |
|
442 | 442 | |
|
443 | 443 | $ testdesc '-ra1 -ra2' '-rb' ' |
|
444 | 444 | > +2:f +2:a1 +30 :b |
|
445 | 445 | > <f +30 :a2' |
|
446 | 446 | |
|
447 | 447 | % -- a -> b tree |
|
448 | 448 | comparing with b |
|
449 | 449 | searching for changes |
|
450 | 450 | unpruned common: 2dc09a01254d |
|
451 | 451 | elapsed time: * seconds (glob) |
|
452 | 452 | round-trips: 4 |
|
453 | 453 | heads summary: |
|
454 | 454 | total common heads: 1 |
|
455 | 455 | also local heads: 1 |
|
456 | 456 | also remote heads: 0 |
|
457 | 457 | both: 0 |
|
458 | 458 | local heads: 2 |
|
459 | 459 | common: 1 |
|
460 | 460 | missing: 1 |
|
461 | 461 | remote heads: 1 |
|
462 | 462 | common: 0 |
|
463 | 463 | unknown: 1 |
|
464 | 464 | local changesets: 34 |
|
465 | 465 | common: 4 |
|
466 | 466 | heads: 1 |
|
467 | 467 | roots: 1 |
|
468 | 468 | missing: 30 |
|
469 | 469 | heads: 1 |
|
470 | 470 | roots: 1 |
|
471 | 471 | first undecided set: 33 |
|
472 | 472 | heads: 2 |
|
473 | 473 | roots: 1 |
|
474 | 474 | common: 3 |
|
475 | 475 | missing: 30 |
|
476 | 476 | common heads: 2dc09a01254d |
|
477 | 477 | |
|
478 | 478 | % -- a -> b set |
|
479 | 479 | comparing with b |
|
480 | 480 | query 1; heads |
|
481 | 481 | searching for changes |
|
482 | 482 | taking initial sample |
|
483 | 483 | searching: 2 queries |
|
484 | 484 | query 2; still undecided: 29, sample size is: 29 |
|
485 | 485 | 2 total queries in *.????s (glob) |
|
486 | 486 | elapsed time: * seconds (glob) |
|
487 | 487 | round-trips: 2 |
|
488 | 488 | heads summary: |
|
489 | 489 | total common heads: 1 |
|
490 | 490 | also local heads: 1 |
|
491 | 491 | also remote heads: 0 |
|
492 | 492 | both: 0 |
|
493 | 493 | local heads: 2 |
|
494 | 494 | common: 1 |
|
495 | 495 | missing: 1 |
|
496 | 496 | remote heads: 1 |
|
497 | 497 | common: 0 |
|
498 | 498 | unknown: 1 |
|
499 | 499 | local changesets: 34 |
|
500 | 500 | common: 4 |
|
501 | 501 | heads: 1 |
|
502 | 502 | roots: 1 |
|
503 | 503 | missing: 30 |
|
504 | 504 | heads: 1 |
|
505 | 505 | roots: 1 |
|
506 | 506 | first undecided set: 33 |
|
507 | 507 | heads: 2 |
|
508 | 508 | roots: 1 |
|
509 | 509 | common: 3 |
|
510 | 510 | missing: 30 |
|
511 | 511 | common heads: 2dc09a01254d |
|
512 | 512 | |
|
513 | 513 | % -- a -> b set (tip only) |
|
514 | 514 | comparing with b |
|
515 | 515 | query 1; heads |
|
516 | 516 | searching for changes |
|
517 | 517 | taking quick initial sample |
|
518 | 518 | searching: 2 queries |
|
519 | 519 | query 2; still undecided: 31, sample size is: 31 |
|
520 | 520 | 2 total queries in *.????s (glob) |
|
521 | 521 | elapsed time: * seconds (glob) |
|
522 | 522 | round-trips: 2 |
|
523 | 523 | heads summary: |
|
524 | 524 | total common heads: 1 |
|
525 | 525 | also local heads: 0 |
|
526 | 526 | also remote heads: 0 |
|
527 | 527 | both: 0 |
|
528 | 528 | local heads: 2 |
|
529 | 529 | common: 0 |
|
530 | 530 | missing: 2 |
|
531 | 531 | remote heads: 1 |
|
532 | 532 | common: 0 |
|
533 | 533 | unknown: 1 |
|
534 | 534 | local changesets: 34 |
|
535 | 535 | common: 2 |
|
536 | 536 | heads: 1 |
|
537 | 537 | roots: 1 |
|
538 | 538 | missing: 32 |
|
539 | 539 | heads: 2 |
|
540 | 540 | roots: 2 |
|
541 | 541 | first undecided set: 34 |
|
542 | 542 | heads: 2 |
|
543 | 543 | roots: 1 |
|
544 | 544 | common: 2 |
|
545 | 545 | missing: 32 |
|
546 | 546 | common heads: 66f7d451a68b |
|
547 | 547 | |
|
548 | 548 | % -- b -> a tree |
|
549 | 549 | comparing with a |
|
550 | 550 | searching for changes |
|
551 | 551 | unpruned common: 2dc09a01254d 66f7d451a68b |
|
552 | 552 | elapsed time: * seconds (glob) |
|
553 | 553 | round-trips: 4 |
|
554 | 554 | heads summary: |
|
555 | 555 | total common heads: 1 |
|
556 | 556 | also local heads: 0 |
|
557 | 557 | also remote heads: 1 |
|
558 | 558 | both: 0 |
|
559 | 559 | local heads: 1 |
|
560 | 560 | common: 0 |
|
561 | 561 | missing: 1 |
|
562 | 562 | remote heads: 2 |
|
563 | 563 | common: 1 |
|
564 | 564 | unknown: 1 |
|
565 | 565 | local changesets: 34 |
|
566 | 566 | common: 4 |
|
567 | 567 | heads: 1 |
|
568 | 568 | roots: 1 |
|
569 | 569 | missing: 30 |
|
570 | 570 | heads: 1 |
|
571 | 571 | roots: 1 |
|
572 | 572 | first undecided set: 30 |
|
573 | 573 | heads: 1 |
|
574 | 574 | roots: 1 |
|
575 | 575 | common: 0 |
|
576 | 576 | missing: 30 |
|
577 | 577 | common heads: 2dc09a01254d |
|
578 | 578 | |
|
579 | 579 | % -- b -> a set |
|
580 | 580 | comparing with a |
|
581 | 581 | query 1; heads |
|
582 | 582 | searching for changes |
|
583 | 583 | taking initial sample |
|
584 | 584 | searching: 2 queries |
|
585 | 585 | query 2; still undecided: 29, sample size is: 29 |
|
586 | 586 | 2 total queries in *.????s (glob) |
|
587 | 587 | elapsed time: * seconds (glob) |
|
588 | 588 | round-trips: 2 |
|
589 | 589 | heads summary: |
|
590 | 590 | total common heads: 1 |
|
591 | 591 | also local heads: 0 |
|
592 | 592 | also remote heads: 1 |
|
593 | 593 | both: 0 |
|
594 | 594 | local heads: 1 |
|
595 | 595 | common: 0 |
|
596 | 596 | missing: 1 |
|
597 | 597 | remote heads: 2 |
|
598 | 598 | common: 1 |
|
599 | 599 | unknown: 1 |
|
600 | 600 | local changesets: 34 |
|
601 | 601 | common: 4 |
|
602 | 602 | heads: 1 |
|
603 | 603 | roots: 1 |
|
604 | 604 | missing: 30 |
|
605 | 605 | heads: 1 |
|
606 | 606 | roots: 1 |
|
607 | 607 | first undecided set: 30 |
|
608 | 608 | heads: 1 |
|
609 | 609 | roots: 1 |
|
610 | 610 | common: 0 |
|
611 | 611 | missing: 30 |
|
612 | 612 | common heads: 2dc09a01254d |
|
613 | 613 | |
|
614 | 614 | % -- b -> a set (tip only) |
|
615 | 615 | comparing with a |
|
616 | 616 | query 1; heads |
|
617 | 617 | searching for changes |
|
618 | 618 | taking initial sample |
|
619 | 619 | searching: 2 queries |
|
620 | 620 | query 2; still undecided: 29, sample size is: 29 |
|
621 | 621 | 2 total queries in *.????s (glob) |
|
622 | 622 | elapsed time: * seconds (glob) |
|
623 | 623 | round-trips: 2 |
|
624 | 624 | heads summary: |
|
625 | 625 | total common heads: 1 |
|
626 | 626 | also local heads: 0 |
|
627 | 627 | also remote heads: 1 |
|
628 | 628 | both: 0 |
|
629 | 629 | local heads: 1 |
|
630 | 630 | common: 0 |
|
631 | 631 | missing: 1 |
|
632 | 632 | remote heads: 2 |
|
633 | 633 | common: 1 |
|
634 | 634 | unknown: 1 |
|
635 | 635 | local changesets: 34 |
|
636 | 636 | common: 4 |
|
637 | 637 | heads: 1 |
|
638 | 638 | roots: 1 |
|
639 | 639 | missing: 30 |
|
640 | 640 | heads: 1 |
|
641 | 641 | roots: 1 |
|
642 | 642 | first undecided set: 30 |
|
643 | 643 | heads: 1 |
|
644 | 644 | roots: 1 |
|
645 | 645 | common: 0 |
|
646 | 646 | missing: 30 |
|
647 | 647 | common heads: 2dc09a01254d |
|
648 | 648 | |
|
649 | 649 | |
|
650 | 650 | Both many new: |
|
651 | 651 | |
|
652 | 652 | $ testdesc '-ra' '-rb' ' |
|
653 | 653 | > +2:f +30 :b |
|
654 | 654 | > <f +30 :a' |
|
655 | 655 | |
|
656 | 656 | % -- a -> b tree |
|
657 | 657 | comparing with b |
|
658 | 658 | searching for changes |
|
659 | 659 | unpruned common: 66f7d451a68b |
|
660 | 660 | elapsed time: * seconds (glob) |
|
661 | 661 | round-trips: 4 |
|
662 | 662 | heads summary: |
|
663 | 663 | total common heads: 1 |
|
664 | 664 | also local heads: 0 |
|
665 | 665 | also remote heads: 0 |
|
666 | 666 | both: 0 |
|
667 | 667 | local heads: 1 |
|
668 | 668 | common: 0 |
|
669 | 669 | missing: 1 |
|
670 | 670 | remote heads: 1 |
|
671 | 671 | common: 0 |
|
672 | 672 | unknown: 1 |
|
673 | 673 | local changesets: 32 |
|
674 | 674 | common: 2 |
|
675 | 675 | heads: 1 |
|
676 | 676 | roots: 1 |
|
677 | 677 | missing: 30 |
|
678 | 678 | heads: 1 |
|
679 | 679 | roots: 1 |
|
680 | 680 | first undecided set: 32 |
|
681 | 681 | heads: 1 |
|
682 | 682 | roots: 1 |
|
683 | 683 | common: 2 |
|
684 | 684 | missing: 30 |
|
685 | 685 | common heads: 66f7d451a68b |
|
686 | 686 | |
|
687 | 687 | % -- a -> b set |
|
688 | 688 | comparing with b |
|
689 | 689 | query 1; heads |
|
690 | 690 | searching for changes |
|
691 | 691 | taking quick initial sample |
|
692 | 692 | searching: 2 queries |
|
693 | 693 | query 2; still undecided: 31, sample size is: 31 |
|
694 | 694 | 2 total queries in *.????s (glob) |
|
695 | 695 | elapsed time: * seconds (glob) |
|
696 | 696 | round-trips: 2 |
|
697 | 697 | heads summary: |
|
698 | 698 | total common heads: 1 |
|
699 | 699 | also local heads: 0 |
|
700 | 700 | also remote heads: 0 |
|
701 | 701 | both: 0 |
|
702 | 702 | local heads: 1 |
|
703 | 703 | common: 0 |
|
704 | 704 | missing: 1 |
|
705 | 705 | remote heads: 1 |
|
706 | 706 | common: 0 |
|
707 | 707 | unknown: 1 |
|
708 | 708 | local changesets: 32 |
|
709 | 709 | common: 2 |
|
710 | 710 | heads: 1 |
|
711 | 711 | roots: 1 |
|
712 | 712 | missing: 30 |
|
713 | 713 | heads: 1 |
|
714 | 714 | roots: 1 |
|
715 | 715 | first undecided set: 32 |
|
716 | 716 | heads: 1 |
|
717 | 717 | roots: 1 |
|
718 | 718 | common: 2 |
|
719 | 719 | missing: 30 |
|
720 | 720 | common heads: 66f7d451a68b |
|
721 | 721 | |
|
722 | 722 | % -- a -> b set (tip only) |
|
723 | 723 | comparing with b |
|
724 | 724 | query 1; heads |
|
725 | 725 | searching for changes |
|
726 | 726 | taking quick initial sample |
|
727 | 727 | searching: 2 queries |
|
728 | 728 | query 2; still undecided: 31, sample size is: 31 |
|
729 | 729 | 2 total queries in *.????s (glob) |
|
730 | 730 | elapsed time: * seconds (glob) |
|
731 | 731 | round-trips: 2 |
|
732 | 732 | heads summary: |
|
733 | 733 | total common heads: 1 |
|
734 | 734 | also local heads: 0 |
|
735 | 735 | also remote heads: 0 |
|
736 | 736 | both: 0 |
|
737 | 737 | local heads: 1 |
|
738 | 738 | common: 0 |
|
739 | 739 | missing: 1 |
|
740 | 740 | remote heads: 1 |
|
741 | 741 | common: 0 |
|
742 | 742 | unknown: 1 |
|
743 | 743 | local changesets: 32 |
|
744 | 744 | common: 2 |
|
745 | 745 | heads: 1 |
|
746 | 746 | roots: 1 |
|
747 | 747 | missing: 30 |
|
748 | 748 | heads: 1 |
|
749 | 749 | roots: 1 |
|
750 | 750 | first undecided set: 32 |
|
751 | 751 | heads: 1 |
|
752 | 752 | roots: 1 |
|
753 | 753 | common: 2 |
|
754 | 754 | missing: 30 |
|
755 | 755 | common heads: 66f7d451a68b |
|
756 | 756 | |
|
757 | 757 | % -- b -> a tree |
|
758 | 758 | comparing with a |
|
759 | 759 | searching for changes |
|
760 | 760 | unpruned common: 66f7d451a68b |
|
761 | 761 | elapsed time: * seconds (glob) |
|
762 | 762 | round-trips: 4 |
|
763 | 763 | heads summary: |
|
764 | 764 | total common heads: 1 |
|
765 | 765 | also local heads: 0 |
|
766 | 766 | also remote heads: 0 |
|
767 | 767 | both: 0 |
|
768 | 768 | local heads: 1 |
|
769 | 769 | common: 0 |
|
770 | 770 | missing: 1 |
|
771 | 771 | remote heads: 1 |
|
772 | 772 | common: 0 |
|
773 | 773 | unknown: 1 |
|
774 | 774 | local changesets: 32 |
|
775 | 775 | common: 2 |
|
776 | 776 | heads: 1 |
|
777 | 777 | roots: 1 |
|
778 | 778 | missing: 30 |
|
779 | 779 | heads: 1 |
|
780 | 780 | roots: 1 |
|
781 | 781 | first undecided set: 32 |
|
782 | 782 | heads: 1 |
|
783 | 783 | roots: 1 |
|
784 | 784 | common: 2 |
|
785 | 785 | missing: 30 |
|
786 | 786 | common heads: 66f7d451a68b |
|
787 | 787 | |
|
788 | 788 | % -- b -> a set |
|
789 | 789 | comparing with a |
|
790 | 790 | query 1; heads |
|
791 | 791 | searching for changes |
|
792 | 792 | taking quick initial sample |
|
793 | 793 | searching: 2 queries |
|
794 | 794 | query 2; still undecided: 31, sample size is: 31 |
|
795 | 795 | 2 total queries in *.????s (glob) |
|
796 | 796 | elapsed time: * seconds (glob) |
|
797 | 797 | round-trips: 2 |
|
798 | 798 | heads summary: |
|
799 | 799 | total common heads: 1 |
|
800 | 800 | also local heads: 0 |
|
801 | 801 | also remote heads: 0 |
|
802 | 802 | both: 0 |
|
803 | 803 | local heads: 1 |
|
804 | 804 | common: 0 |
|
805 | 805 | missing: 1 |
|
806 | 806 | remote heads: 1 |
|
807 | 807 | common: 0 |
|
808 | 808 | unknown: 1 |
|
809 | 809 | local changesets: 32 |
|
810 | 810 | common: 2 |
|
811 | 811 | heads: 1 |
|
812 | 812 | roots: 1 |
|
813 | 813 | missing: 30 |
|
814 | 814 | heads: 1 |
|
815 | 815 | roots: 1 |
|
816 | 816 | first undecided set: 32 |
|
817 | 817 | heads: 1 |
|
818 | 818 | roots: 1 |
|
819 | 819 | common: 2 |
|
820 | 820 | missing: 30 |
|
821 | 821 | common heads: 66f7d451a68b |
|
822 | 822 | |
|
823 | 823 | % -- b -> a set (tip only) |
|
824 | 824 | comparing with a |
|
825 | 825 | query 1; heads |
|
826 | 826 | searching for changes |
|
827 | 827 | taking quick initial sample |
|
828 | 828 | searching: 2 queries |
|
829 | 829 | query 2; still undecided: 31, sample size is: 31 |
|
830 | 830 | 2 total queries in *.????s (glob) |
|
831 | 831 | elapsed time: * seconds (glob) |
|
832 | 832 | round-trips: 2 |
|
833 | 833 | heads summary: |
|
834 | 834 | total common heads: 1 |
|
835 | 835 | also local heads: 0 |
|
836 | 836 | also remote heads: 0 |
|
837 | 837 | both: 0 |
|
838 | 838 | local heads: 1 |
|
839 | 839 | common: 0 |
|
840 | 840 | missing: 1 |
|
841 | 841 | remote heads: 1 |
|
842 | 842 | common: 0 |
|
843 | 843 | unknown: 1 |
|
844 | 844 | local changesets: 32 |
|
845 | 845 | common: 2 |
|
846 | 846 | heads: 1 |
|
847 | 847 | roots: 1 |
|
848 | 848 | missing: 30 |
|
849 | 849 | heads: 1 |
|
850 | 850 | roots: 1 |
|
851 | 851 | first undecided set: 32 |
|
852 | 852 | heads: 1 |
|
853 | 853 | roots: 1 |
|
854 | 854 | common: 2 |
|
855 | 855 | missing: 30 |
|
856 | 856 | common heads: 66f7d451a68b |
|
857 | 857 | |
|
858 | 858 | |
|
859 | 859 | Both many new skewed: |
|
860 | 860 | |
|
861 | 861 | $ testdesc '-ra' '-rb' ' |
|
862 | 862 | > +2:f +30 :b |
|
863 | 863 | > <f +50 :a' |
|
864 | 864 | |
|
865 | 865 | % -- a -> b tree |
|
866 | 866 | comparing with b |
|
867 | 867 | searching for changes |
|
868 | 868 | unpruned common: 66f7d451a68b |
|
869 | 869 | elapsed time: * seconds (glob) |
|
870 | 870 | round-trips: 4 |
|
871 | 871 | heads summary: |
|
872 | 872 | total common heads: 1 |
|
873 | 873 | also local heads: 0 |
|
874 | 874 | also remote heads: 0 |
|
875 | 875 | both: 0 |
|
876 | 876 | local heads: 1 |
|
877 | 877 | common: 0 |
|
878 | 878 | missing: 1 |
|
879 | 879 | remote heads: 1 |
|
880 | 880 | common: 0 |
|
881 | 881 | unknown: 1 |
|
882 | 882 | local changesets: 52 |
|
883 | 883 | common: 2 |
|
884 | 884 | heads: 1 |
|
885 | 885 | roots: 1 |
|
886 | 886 | missing: 50 |
|
887 | 887 | heads: 1 |
|
888 | 888 | roots: 1 |
|
889 | 889 | first undecided set: 52 |
|
890 | 890 | heads: 1 |
|
891 | 891 | roots: 1 |
|
892 | 892 | common: 2 |
|
893 | 893 | missing: 50 |
|
894 | 894 | common heads: 66f7d451a68b |
|
895 | 895 | |
|
896 | 896 | % -- a -> b set |
|
897 | 897 | comparing with b |
|
898 | 898 | query 1; heads |
|
899 | 899 | searching for changes |
|
900 | 900 | taking quick initial sample |
|
901 | 901 | searching: 2 queries |
|
902 | 902 | query 2; still undecided: 51, sample size is: 51 |
|
903 | 903 | 2 total queries in *.????s (glob) |
|
904 | 904 | elapsed time: * seconds (glob) |
|
905 | 905 | round-trips: 2 |
|
906 | 906 | heads summary: |
|
907 | 907 | total common heads: 1 |
|
908 | 908 | also local heads: 0 |
|
909 | 909 | also remote heads: 0 |
|
910 | 910 | both: 0 |
|
911 | 911 | local heads: 1 |
|
912 | 912 | common: 0 |
|
913 | 913 | missing: 1 |
|
914 | 914 | remote heads: 1 |
|
915 | 915 | common: 0 |
|
916 | 916 | unknown: 1 |
|
917 | 917 | local changesets: 52 |
|
918 | 918 | common: 2 |
|
919 | 919 | heads: 1 |
|
920 | 920 | roots: 1 |
|
921 | 921 | missing: 50 |
|
922 | 922 | heads: 1 |
|
923 | 923 | roots: 1 |
|
924 | 924 | first undecided set: 52 |
|
925 | 925 | heads: 1 |
|
926 | 926 | roots: 1 |
|
927 | 927 | common: 2 |
|
928 | 928 | missing: 50 |
|
929 | 929 | common heads: 66f7d451a68b |
|
930 | 930 | |
|
931 | 931 | % -- a -> b set (tip only) |
|
932 | 932 | comparing with b |
|
933 | 933 | query 1; heads |
|
934 | 934 | searching for changes |
|
935 | 935 | taking quick initial sample |
|
936 | 936 | searching: 2 queries |
|
937 | 937 | query 2; still undecided: 51, sample size is: 51 |
|
938 | 938 | 2 total queries in *.????s (glob) |
|
939 | 939 | elapsed time: * seconds (glob) |
|
940 | 940 | round-trips: 2 |
|
941 | 941 | heads summary: |
|
942 | 942 | total common heads: 1 |
|
943 | 943 | also local heads: 0 |
|
944 | 944 | also remote heads: 0 |
|
945 | 945 | both: 0 |
|
946 | 946 | local heads: 1 |
|
947 | 947 | common: 0 |
|
948 | 948 | missing: 1 |
|
949 | 949 | remote heads: 1 |
|
950 | 950 | common: 0 |
|
951 | 951 | unknown: 1 |
|
952 | 952 | local changesets: 52 |
|
953 | 953 | common: 2 |
|
954 | 954 | heads: 1 |
|
955 | 955 | roots: 1 |
|
956 | 956 | missing: 50 |
|
957 | 957 | heads: 1 |
|
958 | 958 | roots: 1 |
|
959 | 959 | first undecided set: 52 |
|
960 | 960 | heads: 1 |
|
961 | 961 | roots: 1 |
|
962 | 962 | common: 2 |
|
963 | 963 | missing: 50 |
|
964 | 964 | common heads: 66f7d451a68b |
|
965 | 965 | |
|
966 | 966 | % -- b -> a tree |
|
967 | 967 | comparing with a |
|
968 | 968 | searching for changes |
|
969 | 969 | unpruned common: 66f7d451a68b |
|
970 | 970 | elapsed time: * seconds (glob) |
|
971 | 971 | round-trips: 3 |
|
972 | 972 | heads summary: |
|
973 | 973 | total common heads: 1 |
|
974 | 974 | also local heads: 0 |
|
975 | 975 | also remote heads: 0 |
|
976 | 976 | both: 0 |
|
977 | 977 | local heads: 1 |
|
978 | 978 | common: 0 |
|
979 | 979 | missing: 1 |
|
980 | 980 | remote heads: 1 |
|
981 | 981 | common: 0 |
|
982 | 982 | unknown: 1 |
|
983 | 983 | local changesets: 32 |
|
984 | 984 | common: 2 |
|
985 | 985 | heads: 1 |
|
986 | 986 | roots: 1 |
|
987 | 987 | missing: 30 |
|
988 | 988 | heads: 1 |
|
989 | 989 | roots: 1 |
|
990 | 990 | first undecided set: 32 |
|
991 | 991 | heads: 1 |
|
992 | 992 | roots: 1 |
|
993 | 993 | common: 2 |
|
994 | 994 | missing: 30 |
|
995 | 995 | common heads: 66f7d451a68b |
|
996 | 996 | |
|
997 | 997 | % -- b -> a set |
|
998 | 998 | comparing with a |
|
999 | 999 | query 1; heads |
|
1000 | 1000 | searching for changes |
|
1001 | 1001 | taking quick initial sample |
|
1002 | 1002 | searching: 2 queries |
|
1003 | 1003 | query 2; still undecided: 31, sample size is: 31 |
|
1004 | 1004 | 2 total queries in *.????s (glob) |
|
1005 | 1005 | elapsed time: * seconds (glob) |
|
1006 | 1006 | round-trips: 2 |
|
1007 | 1007 | heads summary: |
|
1008 | 1008 | total common heads: 1 |
|
1009 | 1009 | also local heads: 0 |
|
1010 | 1010 | also remote heads: 0 |
|
1011 | 1011 | both: 0 |
|
1012 | 1012 | local heads: 1 |
|
1013 | 1013 | common: 0 |
|
1014 | 1014 | missing: 1 |
|
1015 | 1015 | remote heads: 1 |
|
1016 | 1016 | common: 0 |
|
1017 | 1017 | unknown: 1 |
|
1018 | 1018 | local changesets: 32 |
|
1019 | 1019 | common: 2 |
|
1020 | 1020 | heads: 1 |
|
1021 | 1021 | roots: 1 |
|
1022 | 1022 | missing: 30 |
|
1023 | 1023 | heads: 1 |
|
1024 | 1024 | roots: 1 |
|
1025 | 1025 | first undecided set: 32 |
|
1026 | 1026 | heads: 1 |
|
1027 | 1027 | roots: 1 |
|
1028 | 1028 | common: 2 |
|
1029 | 1029 | missing: 30 |
|
1030 | 1030 | common heads: 66f7d451a68b |
|
1031 | 1031 | |
|
1032 | 1032 | % -- b -> a set (tip only) |
|
1033 | 1033 | comparing with a |
|
1034 | 1034 | query 1; heads |
|
1035 | 1035 | searching for changes |
|
1036 | 1036 | taking quick initial sample |
|
1037 | 1037 | searching: 2 queries |
|
1038 | 1038 | query 2; still undecided: 31, sample size is: 31 |
|
1039 | 1039 | 2 total queries in *.????s (glob) |
|
1040 | 1040 | elapsed time: * seconds (glob) |
|
1041 | 1041 | round-trips: 2 |
|
1042 | 1042 | heads summary: |
|
1043 | 1043 | total common heads: 1 |
|
1044 | 1044 | also local heads: 0 |
|
1045 | 1045 | also remote heads: 0 |
|
1046 | 1046 | both: 0 |
|
1047 | 1047 | local heads: 1 |
|
1048 | 1048 | common: 0 |
|
1049 | 1049 | missing: 1 |
|
1050 | 1050 | remote heads: 1 |
|
1051 | 1051 | common: 0 |
|
1052 | 1052 | unknown: 1 |
|
1053 | 1053 | local changesets: 32 |
|
1054 | 1054 | common: 2 |
|
1055 | 1055 | heads: 1 |
|
1056 | 1056 | roots: 1 |
|
1057 | 1057 | missing: 30 |
|
1058 | 1058 | heads: 1 |
|
1059 | 1059 | roots: 1 |
|
1060 | 1060 | first undecided set: 32 |
|
1061 | 1061 | heads: 1 |
|
1062 | 1062 | roots: 1 |
|
1063 | 1063 | common: 2 |
|
1064 | 1064 | missing: 30 |
|
1065 | 1065 | common heads: 66f7d451a68b |
|
1066 | 1066 | |
|
1067 | 1067 | |
|
1068 | 1068 | Both many new on top of long history: |
|
1069 | 1069 | |
|
1070 | 1070 | $ testdesc '-ra' '-rb' ' |
|
1071 | 1071 | > +1000:f +30 :b |
|
1072 | 1072 | > <f +50 :a' |
|
1073 | 1073 | |
|
1074 | 1074 | % -- a -> b tree |
|
1075 | 1075 | comparing with b |
|
1076 | 1076 | searching for changes |
|
1077 | 1077 | unpruned common: 7ead0cba2838 |
|
1078 | 1078 | elapsed time: * seconds (glob) |
|
1079 | 1079 | round-trips: 4 |
|
1080 | 1080 | heads summary: |
|
1081 | 1081 | total common heads: 1 |
|
1082 | 1082 | also local heads: 0 |
|
1083 | 1083 | also remote heads: 0 |
|
1084 | 1084 | both: 0 |
|
1085 | 1085 | local heads: 1 |
|
1086 | 1086 | common: 0 |
|
1087 | 1087 | missing: 1 |
|
1088 | 1088 | remote heads: 1 |
|
1089 | 1089 | common: 0 |
|
1090 | 1090 | unknown: 1 |
|
1091 | 1091 | local changesets: 1050 |
|
1092 | 1092 | common: 1000 |
|
1093 | 1093 | heads: 1 |
|
1094 | 1094 | roots: 1 |
|
1095 | 1095 | missing: 50 |
|
1096 | 1096 | heads: 1 |
|
1097 | 1097 | roots: 1 |
|
1098 | 1098 | first undecided set: 1050 |
|
1099 | 1099 | heads: 1 |
|
1100 | 1100 | roots: 1 |
|
1101 | 1101 | common: 1000 |
|
1102 | 1102 | missing: 50 |
|
1103 | 1103 | common heads: 7ead0cba2838 |
|
1104 | 1104 | |
|
1105 | 1105 | % -- a -> b set |
|
1106 | 1106 | comparing with b |
|
1107 | 1107 | query 1; heads |
|
1108 | 1108 | searching for changes |
|
1109 | 1109 | taking quick initial sample |
|
1110 | 1110 | searching: 2 queries |
|
1111 | 1111 | query 2; still undecided: 1049, sample size is: 11 |
|
1112 | 1112 | sampling from both directions |
|
1113 | 1113 | searching: 3 queries |
|
1114 | 1114 | query 3; still undecided: 31, sample size is: 31 |
|
1115 | 1115 | 3 total queries in *.????s (glob) |
|
1116 | 1116 | elapsed time: * seconds (glob) |
|
1117 | 1117 | round-trips: 3 |
|
1118 | 1118 | heads summary: |
|
1119 | 1119 | total common heads: 1 |
|
1120 | 1120 | also local heads: 0 |
|
1121 | 1121 | also remote heads: 0 |
|
1122 | 1122 | both: 0 |
|
1123 | 1123 | local heads: 1 |
|
1124 | 1124 | common: 0 |
|
1125 | 1125 | missing: 1 |
|
1126 | 1126 | remote heads: 1 |
|
1127 | 1127 | common: 0 |
|
1128 | 1128 | unknown: 1 |
|
1129 | 1129 | local changesets: 1050 |
|
1130 | 1130 | common: 1000 |
|
1131 | 1131 | heads: 1 |
|
1132 | 1132 | roots: 1 |
|
1133 | 1133 | missing: 50 |
|
1134 | 1134 | heads: 1 |
|
1135 | 1135 | roots: 1 |
|
1136 | 1136 | first undecided set: 1050 |
|
1137 | 1137 | heads: 1 |
|
1138 | 1138 | roots: 1 |
|
1139 | 1139 | common: 1000 |
|
1140 | 1140 | missing: 50 |
|
1141 | 1141 | common heads: 7ead0cba2838 |
|
1142 | 1142 | |
|
1143 | 1143 | % -- a -> b set (tip only) |
|
1144 | 1144 | comparing with b |
|
1145 | 1145 | query 1; heads |
|
1146 | 1146 | searching for changes |
|
1147 | 1147 | taking quick initial sample |
|
1148 | 1148 | searching: 2 queries |
|
1149 | 1149 | query 2; still undecided: 1049, sample size is: 11 |
|
1150 | 1150 | sampling from both directions |
|
1151 | 1151 | searching: 3 queries |
|
1152 | 1152 | query 3; still undecided: 31, sample size is: 31 |
|
1153 | 1153 | 3 total queries in *.????s (glob) |
|
1154 | 1154 | elapsed time: * seconds (glob) |
|
1155 | 1155 | round-trips: 3 |
|
1156 | 1156 | heads summary: |
|
1157 | 1157 | total common heads: 1 |
|
1158 | 1158 | also local heads: 0 |
|
1159 | 1159 | also remote heads: 0 |
|
1160 | 1160 | both: 0 |
|
1161 | 1161 | local heads: 1 |
|
1162 | 1162 | common: 0 |
|
1163 | 1163 | missing: 1 |
|
1164 | 1164 | remote heads: 1 |
|
1165 | 1165 | common: 0 |
|
1166 | 1166 | unknown: 1 |
|
1167 | 1167 | local changesets: 1050 |
|
1168 | 1168 | common: 1000 |
|
1169 | 1169 | heads: 1 |
|
1170 | 1170 | roots: 1 |
|
1171 | 1171 | missing: 50 |
|
1172 | 1172 | heads: 1 |
|
1173 | 1173 | roots: 1 |
|
1174 | 1174 | first undecided set: 1050 |
|
1175 | 1175 | heads: 1 |
|
1176 | 1176 | roots: 1 |
|
1177 | 1177 | common: 1000 |
|
1178 | 1178 | missing: 50 |
|
1179 | 1179 | common heads: 7ead0cba2838 |
|
1180 | 1180 | |
|
1181 | 1181 | % -- b -> a tree |
|
1182 | 1182 | comparing with a |
|
1183 | 1183 | searching for changes |
|
1184 | 1184 | unpruned common: 7ead0cba2838 |
|
1185 | 1185 | elapsed time: * seconds (glob) |
|
1186 | 1186 | round-trips: 3 |
|
1187 | 1187 | heads summary: |
|
1188 | 1188 | total common heads: 1 |
|
1189 | 1189 | also local heads: 0 |
|
1190 | 1190 | also remote heads: 0 |
|
1191 | 1191 | both: 0 |
|
1192 | 1192 | local heads: 1 |
|
1193 | 1193 | common: 0 |
|
1194 | 1194 | missing: 1 |
|
1195 | 1195 | remote heads: 1 |
|
1196 | 1196 | common: 0 |
|
1197 | 1197 | unknown: 1 |
|
1198 | 1198 | local changesets: 1030 |
|
1199 | 1199 | common: 1000 |
|
1200 | 1200 | heads: 1 |
|
1201 | 1201 | roots: 1 |
|
1202 | 1202 | missing: 30 |
|
1203 | 1203 | heads: 1 |
|
1204 | 1204 | roots: 1 |
|
1205 | 1205 | first undecided set: 1030 |
|
1206 | 1206 | heads: 1 |
|
1207 | 1207 | roots: 1 |
|
1208 | 1208 | common: 1000 |
|
1209 | 1209 | missing: 30 |
|
1210 | 1210 | common heads: 7ead0cba2838 |
|
1211 | 1211 | |
|
1212 | 1212 | % -- b -> a set |
|
1213 | 1213 | comparing with a |
|
1214 | 1214 | query 1; heads |
|
1215 | 1215 | searching for changes |
|
1216 | 1216 | taking quick initial sample |
|
1217 | 1217 | searching: 2 queries |
|
1218 | 1218 | query 2; still undecided: 1029, sample size is: 11 |
|
1219 | 1219 | sampling from both directions |
|
1220 | 1220 | searching: 3 queries |
|
1221 | 1221 | query 3; still undecided: 15, sample size is: 15 |
|
1222 | 1222 | 3 total queries in *.????s (glob) |
|
1223 | 1223 | elapsed time: * seconds (glob) |
|
1224 | 1224 | round-trips: 3 |
|
1225 | 1225 | heads summary: |
|
1226 | 1226 | total common heads: 1 |
|
1227 | 1227 | also local heads: 0 |
|
1228 | 1228 | also remote heads: 0 |
|
1229 | 1229 | both: 0 |
|
1230 | 1230 | local heads: 1 |
|
1231 | 1231 | common: 0 |
|
1232 | 1232 | missing: 1 |
|
1233 | 1233 | remote heads: 1 |
|
1234 | 1234 | common: 0 |
|
1235 | 1235 | unknown: 1 |
|
1236 | 1236 | local changesets: 1030 |
|
1237 | 1237 | common: 1000 |
|
1238 | 1238 | heads: 1 |
|
1239 | 1239 | roots: 1 |
|
1240 | 1240 | missing: 30 |
|
1241 | 1241 | heads: 1 |
|
1242 | 1242 | roots: 1 |
|
1243 | 1243 | first undecided set: 1030 |
|
1244 | 1244 | heads: 1 |
|
1245 | 1245 | roots: 1 |
|
1246 | 1246 | common: 1000 |
|
1247 | 1247 | missing: 30 |
|
1248 | 1248 | common heads: 7ead0cba2838 |
|
1249 | 1249 | |
|
1250 | 1250 | % -- b -> a set (tip only) |
|
1251 | 1251 | comparing with a |
|
1252 | 1252 | query 1; heads |
|
1253 | 1253 | searching for changes |
|
1254 | 1254 | taking quick initial sample |
|
1255 | 1255 | searching: 2 queries |
|
1256 | 1256 | query 2; still undecided: 1029, sample size is: 11 |
|
1257 | 1257 | sampling from both directions |
|
1258 | 1258 | searching: 3 queries |
|
1259 | 1259 | query 3; still undecided: 15, sample size is: 15 |
|
1260 | 1260 | 3 total queries in *.????s (glob) |
|
1261 | 1261 | elapsed time: * seconds (glob) |
|
1262 | 1262 | round-trips: 3 |
|
1263 | 1263 | heads summary: |
|
1264 | 1264 | total common heads: 1 |
|
1265 | 1265 | also local heads: 0 |
|
1266 | 1266 | also remote heads: 0 |
|
1267 | 1267 | both: 0 |
|
1268 | 1268 | local heads: 1 |
|
1269 | 1269 | common: 0 |
|
1270 | 1270 | missing: 1 |
|
1271 | 1271 | remote heads: 1 |
|
1272 | 1272 | common: 0 |
|
1273 | 1273 | unknown: 1 |
|
1274 | 1274 | local changesets: 1030 |
|
1275 | 1275 | common: 1000 |
|
1276 | 1276 | heads: 1 |
|
1277 | 1277 | roots: 1 |
|
1278 | 1278 | missing: 30 |
|
1279 | 1279 | heads: 1 |
|
1280 | 1280 | roots: 1 |
|
1281 | 1281 | first undecided set: 1030 |
|
1282 | 1282 | heads: 1 |
|
1283 | 1283 | roots: 1 |
|
1284 | 1284 | common: 1000 |
|
1285 | 1285 | missing: 30 |
|
1286 | 1286 | common heads: 7ead0cba2838 |
|
1287 | 1287 | |
|
1288 | 1288 | |
|
1289 | 1289 | One with >200 heads. We now switch to send them all in the initial roundtrip, but still do sampling for the later request. |
|
1290 | 1290 | |
|
1291 | 1291 | $ hg init manyheads |
|
1292 | 1292 | $ cd manyheads |
|
1293 | 1293 | $ echo "+300:r @a" >dagdesc |
|
1294 | 1294 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
1295 | 1295 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
1296 | 1296 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
1297 | 1297 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
1298 | 1298 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
1299 | 1299 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
1300 | 1300 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
1301 | 1301 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
1302 | 1302 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
1303 | 1303 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
1304 | 1304 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
1305 | 1305 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
1306 | 1306 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
1307 | 1307 | $ echo "@b *r+3" >>dagdesc # one more head |
|
1308 | 1308 | $ hg debugbuilddag <dagdesc |
|
1309 | 1309 | reading DAG from stdin |
|
1310 | 1310 | |
|
1311 | 1311 | $ hg heads -t --template . | wc -c |
|
1312 | 1312 | \s*261 (re) |
|
1313 | 1313 | |
|
1314 | 1314 | $ hg clone -b a . a |
|
1315 | 1315 | adding changesets |
|
1316 | 1316 | adding manifests |
|
1317 | 1317 | adding file changes |
|
1318 | 1318 | added 1340 changesets with 0 changes to 0 files (+259 heads) |
|
1319 | 1319 | new changesets 1ea73414a91b:1c51e2c80832 |
|
1320 | 1320 | updating to branch a |
|
1321 | 1321 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1322 | 1322 | $ hg clone -b b . b |
|
1323 | 1323 | adding changesets |
|
1324 | 1324 | adding manifests |
|
1325 | 1325 | adding file changes |
|
1326 | 1326 | added 304 changesets with 0 changes to 0 files |
|
1327 | 1327 | new changesets 1ea73414a91b:513314ca8b3a |
|
1328 | 1328 | updating to branch b |
|
1329 | 1329 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1330 | 1330 | |
|
1331 | $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true --config devel.discovery.randomize=false | |
|
1331 | $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true --config devel.discovery.randomize=false --config devel.discovery.sample-size.initial=50 | |
|
1332 | 1332 | comparing with b |
|
1333 | 1333 | query 1; heads |
|
1334 | 1334 | searching for changes |
|
1335 | 1335 | taking quick initial sample |
|
1336 | 1336 | searching: 2 queries |
|
1337 |
query 2; still undecided: 1080, sample size is: |
|
|
1337 | query 2; still undecided: 1080, sample size is: 50 | |
|
1338 | 1338 | sampling from both directions |
|
1339 | 1339 | searching: 3 queries |
|
1340 |
query 3; still undecided: |
|
|
1340 | query 3; still undecided: 1030, sample size is: 200 | |
|
1341 | 1341 | sampling from both directions |
|
1342 | 1342 | searching: 4 queries |
|
1343 |
query 4; still undecided: 4 |
|
|
1343 | query 4; still undecided: 547, sample size is: 210 | |
|
1344 | 1344 | sampling from both directions |
|
1345 | 1345 | searching: 5 queries |
|
1346 |
query 5; still undecided: |
|
|
1346 | query 5; still undecided: 336, sample size is: 220 | |
|
1347 | 1347 | sampling from both directions |
|
1348 | 1348 | searching: 6 queries |
|
1349 |
query 6; still undecided: |
|
|
1349 | query 6; still undecided: 114, sample size is: 114 | |
|
1350 | 1350 | 6 total queries in *.????s (glob) |
|
1351 | 1351 | elapsed time: * seconds (glob) |
|
1352 | 1352 | round-trips: 6 |
|
1353 | 1353 | heads summary: |
|
1354 | 1354 | total common heads: 1 |
|
1355 | 1355 | also local heads: 0 |
|
1356 | 1356 | also remote heads: 0 |
|
1357 | 1357 | both: 0 |
|
1358 | 1358 | local heads: 260 |
|
1359 | 1359 | common: 0 |
|
1360 | 1360 | missing: 260 |
|
1361 | 1361 | remote heads: 1 |
|
1362 | 1362 | common: 0 |
|
1363 | 1363 | unknown: 1 |
|
1364 | 1364 | local changesets: 1340 |
|
1365 | 1365 | common: 300 |
|
1366 | 1366 | heads: 1 |
|
1367 | 1367 | roots: 1 |
|
1368 | 1368 | missing: 1040 |
|
1369 | 1369 | heads: 260 |
|
1370 | 1370 | roots: 260 |
|
1371 | 1371 | first undecided set: 1340 |
|
1372 | 1372 | heads: 260 |
|
1373 | 1373 | roots: 1 |
|
1374 | 1374 | common: 300 |
|
1375 | 1375 | missing: 1040 |
|
1376 | 1376 | common heads: 3ee37d65064a |
|
1377 | 1377 | $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true --rev tip |
|
1378 | 1378 | comparing with b |
|
1379 | 1379 | query 1; heads |
|
1380 | 1380 | searching for changes |
|
1381 | 1381 | taking quick initial sample |
|
1382 | 1382 | searching: 2 queries |
|
1383 | 1383 | query 2; still undecided: 303, sample size is: 9 |
|
1384 | 1384 | sampling from both directions |
|
1385 | 1385 | searching: 3 queries |
|
1386 | 1386 | query 3; still undecided: 3, sample size is: 3 |
|
1387 | 1387 | 3 total queries in *.????s (glob) |
|
1388 | 1388 | elapsed time: * seconds (glob) |
|
1389 | 1389 | round-trips: 3 |
|
1390 | 1390 | heads summary: |
|
1391 | 1391 | total common heads: 1 |
|
1392 | 1392 | also local heads: 0 |
|
1393 | 1393 | also remote heads: 0 |
|
1394 | 1394 | both: 0 |
|
1395 | 1395 | local heads: 260 |
|
1396 | 1396 | common: 0 |
|
1397 | 1397 | missing: 260 |
|
1398 | 1398 | remote heads: 1 |
|
1399 | 1399 | common: 0 |
|
1400 | 1400 | unknown: 1 |
|
1401 | 1401 | local changesets: 1340 |
|
1402 | 1402 | common: 300 |
|
1403 | 1403 | heads: 1 |
|
1404 | 1404 | roots: 1 |
|
1405 | 1405 | missing: 1040 |
|
1406 | 1406 | heads: 260 |
|
1407 | 1407 | roots: 260 |
|
1408 | 1408 | first undecided set: 1340 |
|
1409 | 1409 | heads: 260 |
|
1410 | 1410 | roots: 1 |
|
1411 | 1411 | common: 300 |
|
1412 | 1412 | missing: 1040 |
|
1413 | 1413 | common heads: 3ee37d65064a |
|
1414 | 1414 | |
|
1415 |
$ hg -R a debugdiscovery b --debug --config devel.discovery.exchange-heads=false --config devel.discovery.randomize=false --config devel.discovery.grow-sample.rate=1. |
|
|
1415 | $ hg -R a debugdiscovery b --debug --config devel.discovery.exchange-heads=false --config devel.discovery.randomize=false --config devel.discovery.grow-sample.rate=1.20 --config devel.discovery.sample-size=50 | |
|
1416 | 1416 | comparing with b |
|
1417 | 1417 | searching for changes |
|
1418 | 1418 | sampling from both directions |
|
1419 |
query 1; still undecided: 1340, sample size is: |
|
|
1419 | query 1; still undecided: 1340, sample size is: 50 | |
|
1420 | sampling from both directions | |
|
1421 | query 2; still undecided: 995, sample size is: 60 | |
|
1420 | 1422 | sampling from both directions |
|
1421 |
query |
|
|
1423 | query 3; still undecided: 913, sample size is: 72 | |
|
1422 | 1424 | sampling from both directions |
|
1423 |
query |
|
|
1425 | query 4; still undecided: 816, sample size is: 204 | |
|
1426 | sampling from both directions | |
|
1427 | query 5; still undecided: 612, sample size is: 153 | |
|
1424 | 1428 | sampling from both directions |
|
1425 |
query |
|
|
1429 | query 6; still undecided: 456, sample size is: 123 | |
|
1430 | sampling from both directions | |
|
1431 | query 7; still undecided: 332, sample size is: 147 | |
|
1426 | 1432 | sampling from both directions |
|
1427 |
query |
|
|
1428 | 5 total queries in *s (glob) | |
|
1429 | elapsed time: * seconds (glob) | |
|
1430 | round-trips: 5 | |
|
1433 | query 8; still undecided: 184, sample size is: 176 | |
|
1434 | sampling from both directions | |
|
1435 | query 9; still undecided: 8, sample size is: 8 | |
|
1436 | 9 total queries in *s (glob) | |
|
1437 | elapsed time: * seconds (glob) | |
|
1438 | round-trips: 9 | |
|
1431 | 1439 | heads summary: |
|
1432 | 1440 | total common heads: 1 |
|
1433 | 1441 | also local heads: 0 |
|
1434 | 1442 | also remote heads: 0 |
|
1435 | 1443 | both: 0 |
|
1436 | 1444 | local heads: 260 |
|
1437 | 1445 | common: 0 |
|
1438 | 1446 | missing: 260 |
|
1439 | 1447 | remote heads: 1 |
|
1440 | 1448 | common: 0 |
|
1441 | 1449 | unknown: 1 |
|
1442 | 1450 | local changesets: 1340 |
|
1443 | 1451 | common: 300 |
|
1444 | 1452 | heads: 1 |
|
1445 | 1453 | roots: 1 |
|
1446 | 1454 | missing: 1040 |
|
1447 | 1455 | heads: 260 |
|
1448 | 1456 | roots: 260 |
|
1449 | 1457 | first undecided set: 1340 |
|
1450 | 1458 | heads: 260 |
|
1451 | 1459 | roots: 1 |
|
1452 | 1460 | common: 300 |
|
1453 | 1461 | missing: 1040 |
|
1454 | 1462 | common heads: 3ee37d65064a |
|
1455 | 1463 | |
|
1456 | 1464 | Test actual protocol when pulling one new head in addition to common heads |
|
1457 | 1465 | |
|
1458 | 1466 | $ hg clone -U b c |
|
1459 | 1467 | $ hg -R c id -ir tip |
|
1460 | 1468 | 513314ca8b3a |
|
1461 | 1469 | $ hg -R c up -qr default |
|
1462 | 1470 | $ touch c/f |
|
1463 | 1471 | $ hg -R c ci -Aqm "extra head" |
|
1464 | 1472 | $ hg -R c id -i |
|
1465 | 1473 | e64a39e7da8b |
|
1466 | 1474 | |
|
1467 | 1475 | $ hg serve -R c -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
1468 | 1476 | $ cat hg.pid >> $DAEMON_PIDS |
|
1469 | 1477 | |
|
1470 | 1478 | $ hg -R b incoming http://localhost:$HGPORT/ -T '{node|short}\n' |
|
1471 | 1479 | comparing with http://localhost:$HGPORT/ |
|
1472 | 1480 | searching for changes |
|
1473 | 1481 | e64a39e7da8b |
|
1474 | 1482 | |
|
1475 | 1483 | $ killdaemons.py |
|
1476 | 1484 | $ cut -d' ' -f6- access.log | grep -v cmd=known # cmd=known uses random sampling |
|
1477 | 1485 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
1478 | 1486 | "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D513314ca8b3ae4dac8eec56966265b00fcf866db x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull |
|
1479 | 1487 | "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:$USUAL_BUNDLE_CAPS$&cg=1&common=513314ca8b3ae4dac8eec56966265b00fcf866db&heads=e64a39e7da8b0d54bc63e81169aff001c13b3477 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull |
|
1480 | 1488 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull |
|
1481 | 1489 | $ cat errors.log |
|
1482 | 1490 | |
|
1483 | 1491 | $ cd .. |
|
1484 | 1492 | |
|
1485 | 1493 | |
|
1486 | 1494 | Issue 4438 - test coverage for 3ef893520a85 issues. |
|
1487 | 1495 | |
|
1488 | 1496 | $ mkdir issue4438 |
|
1489 | 1497 | $ cd issue4438 |
|
1490 | 1498 | #if false |
|
1491 | 1499 | generate new bundles: |
|
1492 | 1500 | $ hg init r1 |
|
1493 | 1501 | $ for i in `"$PYTHON" $TESTDIR/seq.py 101`; do hg -R r1 up -qr null && hg -R r1 branch -q b$i && hg -R r1 ci -qmb$i; done |
|
1494 | 1502 | $ hg clone -q r1 r2 |
|
1495 | 1503 | $ for i in `"$PYTHON" $TESTDIR/seq.py 10`; do hg -R r1 up -qr null && hg -R r1 branch -q c$i && hg -R r1 ci -qmc$i; done |
|
1496 | 1504 | $ hg -R r2 branch -q r2change && hg -R r2 ci -qmr2change |
|
1497 | 1505 | $ hg -R r1 bundle -qa $TESTDIR/bundles/issue4438-r1.hg |
|
1498 | 1506 | $ hg -R r2 bundle -qa $TESTDIR/bundles/issue4438-r2.hg |
|
1499 | 1507 | #else |
|
1500 | 1508 | use existing bundles: |
|
1501 | 1509 | $ hg init r1 |
|
1502 | 1510 | $ hg -R r1 -q unbundle $TESTDIR/bundles/issue4438-r1.hg |
|
1503 | 1511 | $ hg -R r1 -q up |
|
1504 | 1512 | $ hg init r2 |
|
1505 | 1513 | $ hg -R r2 -q unbundle $TESTDIR/bundles/issue4438-r2.hg |
|
1506 | 1514 | $ hg -R r2 -q up |
|
1507 | 1515 | #endif |
|
1508 | 1516 | |
|
1509 | 1517 | Set iteration order could cause wrong and unstable results - fixed in 73cfaa348650: |
|
1510 | 1518 | |
|
1511 | 1519 | $ hg -R r1 outgoing r2 -T'{rev} ' |
|
1512 | 1520 | comparing with r2 |
|
1513 | 1521 | searching for changes |
|
1514 | 1522 | 101 102 103 104 105 106 107 108 109 110 (no-eol) |
|
1515 | 1523 | |
|
1516 | 1524 | The case where all the 'initialsamplesize' samples already were common would |
|
1517 | 1525 | give 'all remote heads known locally' without checking the remaining heads - |
|
1518 | 1526 | fixed in 86c35b7ae300: |
|
1519 | 1527 | |
|
1520 | 1528 | $ cat >> r1/.hg/hgrc << EOF |
|
1521 | 1529 | > [devel] |
|
1522 | 1530 | > discovery.randomize = False |
|
1523 | 1531 | > EOF |
|
1524 | 1532 | |
|
1525 | 1533 | $ hg -R r1 outgoing r2 -T'{rev} ' --config extensions.blackbox= \ |
|
1526 | 1534 | > --config blackbox.track='command commandfinish discovery' |
|
1527 | 1535 | comparing with r2 |
|
1528 | 1536 | searching for changes |
|
1529 | 1537 | 101 102 103 104 105 106 107 108 109 110 (no-eol) |
|
1530 | 1538 | $ hg -R r1 --config extensions.blackbox= blackbox --config blackbox.track= |
|
1531 | 1539 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> serve --cmdserver chgunix * (glob) (chg !) |
|
1532 | 1540 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* (glob) |
|
1533 | 1541 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> found 101 common and 1 unknown server heads, 1 roundtrips in *.????s (glob) |
|
1534 | 1542 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* exited 0 after *.?? seconds (glob) |
|
1535 | 1543 | $ cd .. |
|
1536 | 1544 | |
|
1537 | 1545 | Even if the set of revs to discover is restricted, unrelated revs may be |
|
1538 | 1546 | returned as common heads. |
|
1539 | 1547 | |
|
1540 | 1548 | $ mkdir ancestorsof |
|
1541 | 1549 | $ cd ancestorsof |
|
1542 | 1550 | $ hg init a |
|
1543 | 1551 | $ hg clone a b -q |
|
1544 | 1552 | $ cd b |
|
1545 | 1553 | $ hg debugbuilddag '.:root *root *root' |
|
1546 | 1554 | $ hg log -G -T '{node|short}' |
|
1547 | 1555 | o fa942426a6fd |
|
1548 | 1556 | | |
|
1549 | 1557 | | o 66f7d451a68b |
|
1550 | 1558 | |/ |
|
1551 | 1559 | o 1ea73414a91b |
|
1552 | 1560 | |
|
1553 | 1561 | $ hg push -r 66f7d451a68b -q |
|
1554 | 1562 | $ hg debugdiscovery --verbose --rev fa942426a6fd |
|
1555 | 1563 | comparing with $TESTTMP/ancestorsof/a |
|
1556 | 1564 | searching for changes |
|
1557 | 1565 | elapsed time: * seconds (glob) |
|
1558 | 1566 | round-trips: 1 |
|
1559 | 1567 | heads summary: |
|
1560 | 1568 | total common heads: 1 |
|
1561 | 1569 | also local heads: 1 |
|
1562 | 1570 | also remote heads: 1 |
|
1563 | 1571 | both: 1 |
|
1564 | 1572 | local heads: 2 |
|
1565 | 1573 | common: 1 |
|
1566 | 1574 | missing: 1 |
|
1567 | 1575 | remote heads: 1 |
|
1568 | 1576 | common: 1 |
|
1569 | 1577 | unknown: 0 |
|
1570 | 1578 | local changesets: 3 |
|
1571 | 1579 | common: 2 |
|
1572 | 1580 | heads: 1 |
|
1573 | 1581 | roots: 1 |
|
1574 | 1582 | missing: 1 |
|
1575 | 1583 | heads: 1 |
|
1576 | 1584 | roots: 1 |
|
1577 | 1585 | first undecided set: 1 |
|
1578 | 1586 | heads: 1 |
|
1579 | 1587 | roots: 1 |
|
1580 | 1588 | common: 0 |
|
1581 | 1589 | missing: 1 |
|
1582 | 1590 | common heads: 66f7d451a68b |
General Comments 0
You need to be logged in to leave comments.
Login now