##// END OF EJS Templates
phase: rename the requirement for internal-phase (BC)...
marmoute -
r50347:74fb1842 default
parent child Browse files
Show More
@@ -1,2874 +1,2877 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
9 9 import functools
10 10 import re
11 11
12 12 from . import (
13 13 encoding,
14 14 error,
15 15 )
16 16
17 17
18 18 def loadconfigtable(ui, extname, configtable):
19 19 """update config item known to the ui with the extension ones"""
20 20 for section, items in sorted(configtable.items()):
21 21 knownitems = ui._knownconfig.setdefault(section, itemregister())
22 22 knownkeys = set(knownitems)
23 23 newkeys = set(items)
24 24 for key in sorted(knownkeys & newkeys):
25 25 msg = b"extension '%s' overwrite config item '%s.%s'"
26 26 msg %= (extname, section, key)
27 27 ui.develwarn(msg, config=b'warn-config')
28 28
29 29 knownitems.update(items)
30 30
31 31
32 32 class configitem:
33 33 """represent a known config item
34 34
35 35 :section: the official config section where to find this item,
36 36 :name: the official name within the section,
37 37 :default: default value for this item,
38 38 :alias: optional list of tuples as alternatives,
39 39 :generic: this is a generic definition, match name using regular expression.
40 40 """
41 41
42 42 def __init__(
43 43 self,
44 44 section,
45 45 name,
46 46 default=None,
47 47 alias=(),
48 48 generic=False,
49 49 priority=0,
50 50 experimental=False,
51 51 ):
52 52 self.section = section
53 53 self.name = name
54 54 self.default = default
55 55 self.alias = list(alias)
56 56 self.generic = generic
57 57 self.priority = priority
58 58 self.experimental = experimental
59 59 self._re = None
60 60 if generic:
61 61 self._re = re.compile(self.name)
62 62
63 63
64 64 class itemregister(dict):
65 65 """A specialized dictionary that can handle wild-card selection"""
66 66
67 67 def __init__(self):
68 68 super(itemregister, self).__init__()
69 69 self._generics = set()
70 70
71 71 def update(self, other):
72 72 super(itemregister, self).update(other)
73 73 self._generics.update(other._generics)
74 74
75 75 def __setitem__(self, key, item):
76 76 super(itemregister, self).__setitem__(key, item)
77 77 if item.generic:
78 78 self._generics.add(item)
79 79
80 80 def get(self, key):
81 81 baseitem = super(itemregister, self).get(key)
82 82 if baseitem is not None and not baseitem.generic:
83 83 return baseitem
84 84
85 85 # search for a matching generic item
86 86 generics = sorted(self._generics, key=(lambda x: (x.priority, x.name)))
87 87 for item in generics:
88 88 # we use 'match' instead of 'search' to make the matching simpler
89 89 # for people unfamiliar with regular expression. Having the match
90 90 # rooted to the start of the string will produce less surprising
91 91 # result for user writing simple regex for sub-attribute.
92 92 #
93 93 # For example using "color\..*" match produces an unsurprising
94 94 # result, while using search could suddenly match apparently
95 95 # unrelated configuration that happens to contains "color."
96 96 # anywhere. This is a tradeoff where we favor requiring ".*" on
97 97 # some match to avoid the need to prefix most pattern with "^".
98 98 # The "^" seems more error prone.
99 99 if item._re.match(key):
100 100 return item
101 101
102 102 return None
103 103
104 104
105 105 coreitems = {}
106 106
107 107
108 108 def _register(configtable, *args, **kwargs):
109 109 item = configitem(*args, **kwargs)
110 110 section = configtable.setdefault(item.section, itemregister())
111 111 if item.name in section:
112 112 msg = b"duplicated config item registration for '%s.%s'"
113 113 raise error.ProgrammingError(msg % (item.section, item.name))
114 114 section[item.name] = item
115 115
116 116
117 117 # special value for case where the default is derived from other values
118 118 dynamicdefault = object()
119 119
120 120 # Registering actual config items
121 121
122 122
123 123 def getitemregister(configtable):
124 124 f = functools.partial(_register, configtable)
125 125 # export pseudo enum as configitem.*
126 126 f.dynamicdefault = dynamicdefault
127 127 return f
128 128
129 129
130 130 coreconfigitem = getitemregister(coreitems)
131 131
132 132
133 133 def _registerdiffopts(section, configprefix=b''):
134 134 coreconfigitem(
135 135 section,
136 136 configprefix + b'nodates',
137 137 default=False,
138 138 )
139 139 coreconfigitem(
140 140 section,
141 141 configprefix + b'showfunc',
142 142 default=False,
143 143 )
144 144 coreconfigitem(
145 145 section,
146 146 configprefix + b'unified',
147 147 default=None,
148 148 )
149 149 coreconfigitem(
150 150 section,
151 151 configprefix + b'git',
152 152 default=False,
153 153 )
154 154 coreconfigitem(
155 155 section,
156 156 configprefix + b'ignorews',
157 157 default=False,
158 158 )
159 159 coreconfigitem(
160 160 section,
161 161 configprefix + b'ignorewsamount',
162 162 default=False,
163 163 )
164 164 coreconfigitem(
165 165 section,
166 166 configprefix + b'ignoreblanklines',
167 167 default=False,
168 168 )
169 169 coreconfigitem(
170 170 section,
171 171 configprefix + b'ignorewseol',
172 172 default=False,
173 173 )
174 174 coreconfigitem(
175 175 section,
176 176 configprefix + b'nobinary',
177 177 default=False,
178 178 )
179 179 coreconfigitem(
180 180 section,
181 181 configprefix + b'noprefix',
182 182 default=False,
183 183 )
184 184 coreconfigitem(
185 185 section,
186 186 configprefix + b'word-diff',
187 187 default=False,
188 188 )
189 189
190 190
191 191 coreconfigitem(
192 192 b'alias',
193 193 b'.*',
194 194 default=dynamicdefault,
195 195 generic=True,
196 196 )
197 197 coreconfigitem(
198 198 b'auth',
199 199 b'cookiefile',
200 200 default=None,
201 201 )
202 202 _registerdiffopts(section=b'annotate')
203 203 # bookmarks.pushing: internal hack for discovery
204 204 coreconfigitem(
205 205 b'bookmarks',
206 206 b'pushing',
207 207 default=list,
208 208 )
209 209 # bundle.mainreporoot: internal hack for bundlerepo
210 210 coreconfigitem(
211 211 b'bundle',
212 212 b'mainreporoot',
213 213 default=b'',
214 214 )
215 215 coreconfigitem(
216 216 b'censor',
217 217 b'policy',
218 218 default=b'abort',
219 219 experimental=True,
220 220 )
221 221 coreconfigitem(
222 222 b'chgserver',
223 223 b'idletimeout',
224 224 default=3600,
225 225 )
226 226 coreconfigitem(
227 227 b'chgserver',
228 228 b'skiphash',
229 229 default=False,
230 230 )
231 231 coreconfigitem(
232 232 b'cmdserver',
233 233 b'log',
234 234 default=None,
235 235 )
236 236 coreconfigitem(
237 237 b'cmdserver',
238 238 b'max-log-files',
239 239 default=7,
240 240 )
241 241 coreconfigitem(
242 242 b'cmdserver',
243 243 b'max-log-size',
244 244 default=b'1 MB',
245 245 )
246 246 coreconfigitem(
247 247 b'cmdserver',
248 248 b'max-repo-cache',
249 249 default=0,
250 250 experimental=True,
251 251 )
252 252 coreconfigitem(
253 253 b'cmdserver',
254 254 b'message-encodings',
255 255 default=list,
256 256 )
257 257 coreconfigitem(
258 258 b'cmdserver',
259 259 b'track-log',
260 260 default=lambda: [b'chgserver', b'cmdserver', b'repocache'],
261 261 )
262 262 coreconfigitem(
263 263 b'cmdserver',
264 264 b'shutdown-on-interrupt',
265 265 default=True,
266 266 )
267 267 coreconfigitem(
268 268 b'color',
269 269 b'.*',
270 270 default=None,
271 271 generic=True,
272 272 )
273 273 coreconfigitem(
274 274 b'color',
275 275 b'mode',
276 276 default=b'auto',
277 277 )
278 278 coreconfigitem(
279 279 b'color',
280 280 b'pagermode',
281 281 default=dynamicdefault,
282 282 )
283 283 coreconfigitem(
284 284 b'command-templates',
285 285 b'graphnode',
286 286 default=None,
287 287 alias=[(b'ui', b'graphnodetemplate')],
288 288 )
289 289 coreconfigitem(
290 290 b'command-templates',
291 291 b'log',
292 292 default=None,
293 293 alias=[(b'ui', b'logtemplate')],
294 294 )
295 295 coreconfigitem(
296 296 b'command-templates',
297 297 b'mergemarker',
298 298 default=(
299 299 b'{node|short} '
300 300 b'{ifeq(tags, "tip", "", '
301 301 b'ifeq(tags, "", "", "{tags} "))}'
302 302 b'{if(bookmarks, "{bookmarks} ")}'
303 303 b'{ifeq(branch, "default", "", "{branch} ")}'
304 304 b'- {author|user}: {desc|firstline}'
305 305 ),
306 306 alias=[(b'ui', b'mergemarkertemplate')],
307 307 )
308 308 coreconfigitem(
309 309 b'command-templates',
310 310 b'pre-merge-tool-output',
311 311 default=None,
312 312 alias=[(b'ui', b'pre-merge-tool-output-template')],
313 313 )
314 314 coreconfigitem(
315 315 b'command-templates',
316 316 b'oneline-summary',
317 317 default=None,
318 318 )
319 319 coreconfigitem(
320 320 b'command-templates',
321 321 b'oneline-summary.*',
322 322 default=dynamicdefault,
323 323 generic=True,
324 324 )
325 325 _registerdiffopts(section=b'commands', configprefix=b'commit.interactive.')
326 326 coreconfigitem(
327 327 b'commands',
328 328 b'commit.post-status',
329 329 default=False,
330 330 )
331 331 coreconfigitem(
332 332 b'commands',
333 333 b'grep.all-files',
334 334 default=False,
335 335 experimental=True,
336 336 )
337 337 coreconfigitem(
338 338 b'commands',
339 339 b'merge.require-rev',
340 340 default=False,
341 341 )
342 342 coreconfigitem(
343 343 b'commands',
344 344 b'push.require-revs',
345 345 default=False,
346 346 )
347 347 coreconfigitem(
348 348 b'commands',
349 349 b'resolve.confirm',
350 350 default=False,
351 351 )
352 352 coreconfigitem(
353 353 b'commands',
354 354 b'resolve.explicit-re-merge',
355 355 default=False,
356 356 )
357 357 coreconfigitem(
358 358 b'commands',
359 359 b'resolve.mark-check',
360 360 default=b'none',
361 361 )
362 362 _registerdiffopts(section=b'commands', configprefix=b'revert.interactive.')
363 363 coreconfigitem(
364 364 b'commands',
365 365 b'show.aliasprefix',
366 366 default=list,
367 367 )
368 368 coreconfigitem(
369 369 b'commands',
370 370 b'status.relative',
371 371 default=False,
372 372 )
373 373 coreconfigitem(
374 374 b'commands',
375 375 b'status.skipstates',
376 376 default=[],
377 377 experimental=True,
378 378 )
379 379 coreconfigitem(
380 380 b'commands',
381 381 b'status.terse',
382 382 default=b'',
383 383 )
384 384 coreconfigitem(
385 385 b'commands',
386 386 b'status.verbose',
387 387 default=False,
388 388 )
389 389 coreconfigitem(
390 390 b'commands',
391 391 b'update.check',
392 392 default=None,
393 393 )
394 394 coreconfigitem(
395 395 b'commands',
396 396 b'update.requiredest',
397 397 default=False,
398 398 )
399 399 coreconfigitem(
400 400 b'committemplate',
401 401 b'.*',
402 402 default=None,
403 403 generic=True,
404 404 )
405 405 coreconfigitem(
406 406 b'convert',
407 407 b'bzr.saverev',
408 408 default=True,
409 409 )
410 410 coreconfigitem(
411 411 b'convert',
412 412 b'cvsps.cache',
413 413 default=True,
414 414 )
415 415 coreconfigitem(
416 416 b'convert',
417 417 b'cvsps.fuzz',
418 418 default=60,
419 419 )
420 420 coreconfigitem(
421 421 b'convert',
422 422 b'cvsps.logencoding',
423 423 default=None,
424 424 )
425 425 coreconfigitem(
426 426 b'convert',
427 427 b'cvsps.mergefrom',
428 428 default=None,
429 429 )
430 430 coreconfigitem(
431 431 b'convert',
432 432 b'cvsps.mergeto',
433 433 default=None,
434 434 )
435 435 coreconfigitem(
436 436 b'convert',
437 437 b'git.committeractions',
438 438 default=lambda: [b'messagedifferent'],
439 439 )
440 440 coreconfigitem(
441 441 b'convert',
442 442 b'git.extrakeys',
443 443 default=list,
444 444 )
445 445 coreconfigitem(
446 446 b'convert',
447 447 b'git.findcopiesharder',
448 448 default=False,
449 449 )
450 450 coreconfigitem(
451 451 b'convert',
452 452 b'git.remoteprefix',
453 453 default=b'remote',
454 454 )
455 455 coreconfigitem(
456 456 b'convert',
457 457 b'git.renamelimit',
458 458 default=400,
459 459 )
460 460 coreconfigitem(
461 461 b'convert',
462 462 b'git.saverev',
463 463 default=True,
464 464 )
465 465 coreconfigitem(
466 466 b'convert',
467 467 b'git.similarity',
468 468 default=50,
469 469 )
470 470 coreconfigitem(
471 471 b'convert',
472 472 b'git.skipsubmodules',
473 473 default=False,
474 474 )
475 475 coreconfigitem(
476 476 b'convert',
477 477 b'hg.clonebranches',
478 478 default=False,
479 479 )
480 480 coreconfigitem(
481 481 b'convert',
482 482 b'hg.ignoreerrors',
483 483 default=False,
484 484 )
485 485 coreconfigitem(
486 486 b'convert',
487 487 b'hg.preserve-hash',
488 488 default=False,
489 489 )
490 490 coreconfigitem(
491 491 b'convert',
492 492 b'hg.revs',
493 493 default=None,
494 494 )
495 495 coreconfigitem(
496 496 b'convert',
497 497 b'hg.saverev',
498 498 default=False,
499 499 )
500 500 coreconfigitem(
501 501 b'convert',
502 502 b'hg.sourcename',
503 503 default=None,
504 504 )
505 505 coreconfigitem(
506 506 b'convert',
507 507 b'hg.startrev',
508 508 default=None,
509 509 )
510 510 coreconfigitem(
511 511 b'convert',
512 512 b'hg.tagsbranch',
513 513 default=b'default',
514 514 )
515 515 coreconfigitem(
516 516 b'convert',
517 517 b'hg.usebranchnames',
518 518 default=True,
519 519 )
520 520 coreconfigitem(
521 521 b'convert',
522 522 b'ignoreancestorcheck',
523 523 default=False,
524 524 experimental=True,
525 525 )
526 526 coreconfigitem(
527 527 b'convert',
528 528 b'localtimezone',
529 529 default=False,
530 530 )
531 531 coreconfigitem(
532 532 b'convert',
533 533 b'p4.encoding',
534 534 default=dynamicdefault,
535 535 )
536 536 coreconfigitem(
537 537 b'convert',
538 538 b'p4.startrev',
539 539 default=0,
540 540 )
541 541 coreconfigitem(
542 542 b'convert',
543 543 b'skiptags',
544 544 default=False,
545 545 )
546 546 coreconfigitem(
547 547 b'convert',
548 548 b'svn.debugsvnlog',
549 549 default=True,
550 550 )
551 551 coreconfigitem(
552 552 b'convert',
553 553 b'svn.trunk',
554 554 default=None,
555 555 )
556 556 coreconfigitem(
557 557 b'convert',
558 558 b'svn.tags',
559 559 default=None,
560 560 )
561 561 coreconfigitem(
562 562 b'convert',
563 563 b'svn.branches',
564 564 default=None,
565 565 )
566 566 coreconfigitem(
567 567 b'convert',
568 568 b'svn.startrev',
569 569 default=0,
570 570 )
571 571 coreconfigitem(
572 572 b'convert',
573 573 b'svn.dangerous-set-commit-dates',
574 574 default=False,
575 575 )
576 576 coreconfigitem(
577 577 b'debug',
578 578 b'dirstate.delaywrite',
579 579 default=0,
580 580 )
581 581 coreconfigitem(
582 582 b'debug',
583 583 b'revlog.verifyposition.changelog',
584 584 default=b'',
585 585 )
586 586 coreconfigitem(
587 587 b'debug',
588 588 b'revlog.debug-delta',
589 589 default=False,
590 590 )
591 591 coreconfigitem(
592 592 b'defaults',
593 593 b'.*',
594 594 default=None,
595 595 generic=True,
596 596 )
597 597 coreconfigitem(
598 598 b'devel',
599 599 b'all-warnings',
600 600 default=False,
601 601 )
602 602 coreconfigitem(
603 603 b'devel',
604 604 b'bundle2.debug',
605 605 default=False,
606 606 )
607 607 coreconfigitem(
608 608 b'devel',
609 609 b'bundle.delta',
610 610 default=b'',
611 611 )
612 612 coreconfigitem(
613 613 b'devel',
614 614 b'cache-vfs',
615 615 default=None,
616 616 )
617 617 coreconfigitem(
618 618 b'devel',
619 619 b'check-locks',
620 620 default=False,
621 621 )
622 622 coreconfigitem(
623 623 b'devel',
624 624 b'check-relroot',
625 625 default=False,
626 626 )
627 627 # Track copy information for all file, not just "added" one (very slow)
628 628 coreconfigitem(
629 629 b'devel',
630 630 b'copy-tracing.trace-all-files',
631 631 default=False,
632 632 )
633 633 coreconfigitem(
634 634 b'devel',
635 635 b'default-date',
636 636 default=None,
637 637 )
638 638 coreconfigitem(
639 639 b'devel',
640 640 b'deprec-warn',
641 641 default=False,
642 642 )
643 643 coreconfigitem(
644 644 b'devel',
645 645 b'disableloaddefaultcerts',
646 646 default=False,
647 647 )
648 648 coreconfigitem(
649 649 b'devel',
650 650 b'warn-empty-changegroup',
651 651 default=False,
652 652 )
653 653 coreconfigitem(
654 654 b'devel',
655 655 b'legacy.exchange',
656 656 default=list,
657 657 )
658 658 # When True, revlogs use a special reference version of the nodemap, that is not
659 659 # performant but is "known" to behave properly.
660 660 coreconfigitem(
661 661 b'devel',
662 662 b'persistent-nodemap',
663 663 default=False,
664 664 )
665 665 coreconfigitem(
666 666 b'devel',
667 667 b'servercafile',
668 668 default=b'',
669 669 )
670 670 coreconfigitem(
671 671 b'devel',
672 672 b'serverexactprotocol',
673 673 default=b'',
674 674 )
675 675 coreconfigitem(
676 676 b'devel',
677 677 b'serverrequirecert',
678 678 default=False,
679 679 )
680 680 coreconfigitem(
681 681 b'devel',
682 682 b'strip-obsmarkers',
683 683 default=True,
684 684 )
685 685 coreconfigitem(
686 686 b'devel',
687 687 b'warn-config',
688 688 default=None,
689 689 )
690 690 coreconfigitem(
691 691 b'devel',
692 692 b'warn-config-default',
693 693 default=None,
694 694 )
695 695 coreconfigitem(
696 696 b'devel',
697 697 b'user.obsmarker',
698 698 default=None,
699 699 )
700 700 coreconfigitem(
701 701 b'devel',
702 702 b'warn-config-unknown',
703 703 default=None,
704 704 )
705 705 coreconfigitem(
706 706 b'devel',
707 707 b'debug.copies',
708 708 default=False,
709 709 )
710 710 coreconfigitem(
711 711 b'devel',
712 712 b'copy-tracing.multi-thread',
713 713 default=True,
714 714 )
715 715 coreconfigitem(
716 716 b'devel',
717 717 b'debug.extensions',
718 718 default=False,
719 719 )
720 720 coreconfigitem(
721 721 b'devel',
722 722 b'debug.repo-filters',
723 723 default=False,
724 724 )
725 725 coreconfigitem(
726 726 b'devel',
727 727 b'debug.peer-request',
728 728 default=False,
729 729 )
730 730 # If discovery.exchange-heads is False, the discovery will not start with
731 731 # remote head fetching and local head querying.
732 732 coreconfigitem(
733 733 b'devel',
734 734 b'discovery.exchange-heads',
735 735 default=True,
736 736 )
737 737 # If discovery.grow-sample is False, the sample size used in set discovery will
738 738 # not be increased through the process
739 739 coreconfigitem(
740 740 b'devel',
741 741 b'discovery.grow-sample',
742 742 default=True,
743 743 )
744 744 # When discovery.grow-sample.dynamic is True, the default, the sample size is
745 745 # adapted to the shape of the undecided set (it is set to the max of:
746 746 # <target-size>, len(roots(undecided)), len(heads(undecided)
747 747 coreconfigitem(
748 748 b'devel',
749 749 b'discovery.grow-sample.dynamic',
750 750 default=True,
751 751 )
752 752 # discovery.grow-sample.rate control the rate at which the sample grow
753 753 coreconfigitem(
754 754 b'devel',
755 755 b'discovery.grow-sample.rate',
756 756 default=1.05,
757 757 )
758 758 # If discovery.randomize is False, random sampling during discovery are
759 759 # deterministic. It is meant for integration tests.
760 760 coreconfigitem(
761 761 b'devel',
762 762 b'discovery.randomize',
763 763 default=True,
764 764 )
765 765 # Control the initial size of the discovery sample
766 766 coreconfigitem(
767 767 b'devel',
768 768 b'discovery.sample-size',
769 769 default=200,
770 770 )
771 771 # Control the initial size of the discovery for initial change
772 772 coreconfigitem(
773 773 b'devel',
774 774 b'discovery.sample-size.initial',
775 775 default=100,
776 776 )
777 777 _registerdiffopts(section=b'diff')
778 778 coreconfigitem(
779 779 b'diff',
780 780 b'merge',
781 781 default=False,
782 782 experimental=True,
783 783 )
784 784 coreconfigitem(
785 785 b'email',
786 786 b'bcc',
787 787 default=None,
788 788 )
789 789 coreconfigitem(
790 790 b'email',
791 791 b'cc',
792 792 default=None,
793 793 )
794 794 coreconfigitem(
795 795 b'email',
796 796 b'charsets',
797 797 default=list,
798 798 )
799 799 coreconfigitem(
800 800 b'email',
801 801 b'from',
802 802 default=None,
803 803 )
804 804 coreconfigitem(
805 805 b'email',
806 806 b'method',
807 807 default=b'smtp',
808 808 )
809 809 coreconfigitem(
810 810 b'email',
811 811 b'reply-to',
812 812 default=None,
813 813 )
814 814 coreconfigitem(
815 815 b'email',
816 816 b'to',
817 817 default=None,
818 818 )
819 819 coreconfigitem(
820 820 b'experimental',
821 821 b'archivemetatemplate',
822 822 default=dynamicdefault,
823 823 )
824 824 coreconfigitem(
825 825 b'experimental',
826 826 b'auto-publish',
827 827 default=b'publish',
828 828 )
829 829 coreconfigitem(
830 830 b'experimental',
831 831 b'bundle-phases',
832 832 default=False,
833 833 )
834 834 coreconfigitem(
835 835 b'experimental',
836 836 b'bundle2-advertise',
837 837 default=True,
838 838 )
839 839 coreconfigitem(
840 840 b'experimental',
841 841 b'bundle2-output-capture',
842 842 default=False,
843 843 )
844 844 coreconfigitem(
845 845 b'experimental',
846 846 b'bundle2.pushback',
847 847 default=False,
848 848 )
849 849 coreconfigitem(
850 850 b'experimental',
851 851 b'bundle2lazylocking',
852 852 default=False,
853 853 )
854 854 coreconfigitem(
855 855 b'experimental',
856 856 b'bundlecomplevel',
857 857 default=None,
858 858 )
859 859 coreconfigitem(
860 860 b'experimental',
861 861 b'bundlecomplevel.bzip2',
862 862 default=None,
863 863 )
864 864 coreconfigitem(
865 865 b'experimental',
866 866 b'bundlecomplevel.gzip',
867 867 default=None,
868 868 )
869 869 coreconfigitem(
870 870 b'experimental',
871 871 b'bundlecomplevel.none',
872 872 default=None,
873 873 )
874 874 coreconfigitem(
875 875 b'experimental',
876 876 b'bundlecomplevel.zstd',
877 877 default=None,
878 878 )
879 879 coreconfigitem(
880 880 b'experimental',
881 881 b'bundlecompthreads',
882 882 default=None,
883 883 )
884 884 coreconfigitem(
885 885 b'experimental',
886 886 b'bundlecompthreads.bzip2',
887 887 default=None,
888 888 )
889 889 coreconfigitem(
890 890 b'experimental',
891 891 b'bundlecompthreads.gzip',
892 892 default=None,
893 893 )
894 894 coreconfigitem(
895 895 b'experimental',
896 896 b'bundlecompthreads.none',
897 897 default=None,
898 898 )
899 899 coreconfigitem(
900 900 b'experimental',
901 901 b'bundlecompthreads.zstd',
902 902 default=None,
903 903 )
904 904 coreconfigitem(
905 905 b'experimental',
906 906 b'changegroup3',
907 907 default=False,
908 908 )
909 909 coreconfigitem(
910 910 b'experimental',
911 911 b'changegroup4',
912 912 default=False,
913 913 )
914 914 coreconfigitem(
915 915 b'experimental',
916 916 b'cleanup-as-archived',
917 917 default=False,
918 918 )
919 919 coreconfigitem(
920 920 b'experimental',
921 921 b'clientcompressionengines',
922 922 default=list,
923 923 )
924 924 coreconfigitem(
925 925 b'experimental',
926 926 b'copytrace',
927 927 default=b'on',
928 928 )
929 929 coreconfigitem(
930 930 b'experimental',
931 931 b'copytrace.movecandidateslimit',
932 932 default=100,
933 933 )
934 934 coreconfigitem(
935 935 b'experimental',
936 936 b'copytrace.sourcecommitlimit',
937 937 default=100,
938 938 )
939 939 coreconfigitem(
940 940 b'experimental',
941 941 b'copies.read-from',
942 942 default=b"filelog-only",
943 943 )
944 944 coreconfigitem(
945 945 b'experimental',
946 946 b'copies.write-to',
947 947 default=b'filelog-only',
948 948 )
949 949 coreconfigitem(
950 950 b'experimental',
951 951 b'crecordtest',
952 952 default=None,
953 953 )
954 954 coreconfigitem(
955 955 b'experimental',
956 956 b'directaccess',
957 957 default=False,
958 958 )
959 959 coreconfigitem(
960 960 b'experimental',
961 961 b'directaccess.revnums',
962 962 default=False,
963 963 )
964 964 coreconfigitem(
965 965 b'experimental',
966 966 b'editortmpinhg',
967 967 default=False,
968 968 )
969 969 coreconfigitem(
970 970 b'experimental',
971 971 b'evolution',
972 972 default=list,
973 973 )
974 974 coreconfigitem(
975 975 b'experimental',
976 976 b'evolution.allowdivergence',
977 977 default=False,
978 978 alias=[(b'experimental', b'allowdivergence')],
979 979 )
980 980 coreconfigitem(
981 981 b'experimental',
982 982 b'evolution.allowunstable',
983 983 default=None,
984 984 )
985 985 coreconfigitem(
986 986 b'experimental',
987 987 b'evolution.createmarkers',
988 988 default=None,
989 989 )
990 990 coreconfigitem(
991 991 b'experimental',
992 992 b'evolution.effect-flags',
993 993 default=True,
994 994 alias=[(b'experimental', b'effect-flags')],
995 995 )
996 996 coreconfigitem(
997 997 b'experimental',
998 998 b'evolution.exchange',
999 999 default=None,
1000 1000 )
1001 1001 coreconfigitem(
1002 1002 b'experimental',
1003 1003 b'evolution.bundle-obsmarker',
1004 1004 default=False,
1005 1005 )
1006 1006 coreconfigitem(
1007 1007 b'experimental',
1008 1008 b'evolution.bundle-obsmarker:mandatory',
1009 1009 default=True,
1010 1010 )
1011 1011 coreconfigitem(
1012 1012 b'experimental',
1013 1013 b'log.topo',
1014 1014 default=False,
1015 1015 )
1016 1016 coreconfigitem(
1017 1017 b'experimental',
1018 1018 b'evolution.report-instabilities',
1019 1019 default=True,
1020 1020 )
1021 1021 coreconfigitem(
1022 1022 b'experimental',
1023 1023 b'evolution.track-operation',
1024 1024 default=True,
1025 1025 )
1026 1026 # repo-level config to exclude a revset visibility
1027 1027 #
1028 1028 # The target use case is to use `share` to expose different subset of the same
1029 1029 # repository, especially server side. See also `server.view`.
1030 1030 coreconfigitem(
1031 1031 b'experimental',
1032 1032 b'extra-filter-revs',
1033 1033 default=None,
1034 1034 )
1035 1035 coreconfigitem(
1036 1036 b'experimental',
1037 1037 b'maxdeltachainspan',
1038 1038 default=-1,
1039 1039 )
1040 1040 # tracks files which were undeleted (merge might delete them but we explicitly
1041 1041 # kept/undeleted them) and creates new filenodes for them
1042 1042 coreconfigitem(
1043 1043 b'experimental',
1044 1044 b'merge-track-salvaged',
1045 1045 default=False,
1046 1046 )
1047 1047 coreconfigitem(
1048 1048 b'experimental',
1049 1049 b'mmapindexthreshold',
1050 1050 default=None,
1051 1051 )
1052 1052 coreconfigitem(
1053 1053 b'experimental',
1054 1054 b'narrow',
1055 1055 default=False,
1056 1056 )
1057 1057 coreconfigitem(
1058 1058 b'experimental',
1059 1059 b'nonnormalparanoidcheck',
1060 1060 default=False,
1061 1061 )
1062 1062 coreconfigitem(
1063 1063 b'experimental',
1064 1064 b'exportableenviron',
1065 1065 default=list,
1066 1066 )
1067 1067 coreconfigitem(
1068 1068 b'experimental',
1069 1069 b'extendedheader.index',
1070 1070 default=None,
1071 1071 )
1072 1072 coreconfigitem(
1073 1073 b'experimental',
1074 1074 b'extendedheader.similarity',
1075 1075 default=False,
1076 1076 )
1077 1077 coreconfigitem(
1078 1078 b'experimental',
1079 1079 b'graphshorten',
1080 1080 default=False,
1081 1081 )
1082 1082 coreconfigitem(
1083 1083 b'experimental',
1084 1084 b'graphstyle.parent',
1085 1085 default=dynamicdefault,
1086 1086 )
1087 1087 coreconfigitem(
1088 1088 b'experimental',
1089 1089 b'graphstyle.missing',
1090 1090 default=dynamicdefault,
1091 1091 )
1092 1092 coreconfigitem(
1093 1093 b'experimental',
1094 1094 b'graphstyle.grandparent',
1095 1095 default=dynamicdefault,
1096 1096 )
1097 1097 coreconfigitem(
1098 1098 b'experimental',
1099 1099 b'hook-track-tags',
1100 1100 default=False,
1101 1101 )
1102 1102 coreconfigitem(
1103 1103 b'experimental',
1104 1104 b'httppostargs',
1105 1105 default=False,
1106 1106 )
1107 1107 coreconfigitem(b'experimental', b'nointerrupt', default=False)
1108 1108 coreconfigitem(b'experimental', b'nointerrupt-interactiveonly', default=True)
1109 1109
1110 1110 coreconfigitem(
1111 1111 b'experimental',
1112 1112 b'obsmarkers-exchange-debug',
1113 1113 default=False,
1114 1114 )
1115 1115 coreconfigitem(
1116 1116 b'experimental',
1117 1117 b'remotenames',
1118 1118 default=False,
1119 1119 )
1120 1120 coreconfigitem(
1121 1121 b'experimental',
1122 1122 b'removeemptydirs',
1123 1123 default=True,
1124 1124 )
1125 1125 coreconfigitem(
1126 1126 b'experimental',
1127 1127 b'revert.interactive.select-to-keep',
1128 1128 default=False,
1129 1129 )
1130 1130 coreconfigitem(
1131 1131 b'experimental',
1132 1132 b'revisions.prefixhexnode',
1133 1133 default=False,
1134 1134 )
1135 1135 # "out of experimental" todo list.
1136 1136 #
1137 1137 # * include management of a persistent nodemap in the main docket
1138 1138 # * enforce a "no-truncate" policy for mmap safety
1139 1139 # - for censoring operation
1140 1140 # - for stripping operation
1141 1141 # - for rollback operation
1142 1142 # * proper streaming (race free) of the docket file
1143 1143 # * track garbage data to evemtually allow rewriting -existing- sidedata.
1144 1144 # * Exchange-wise, we will also need to do something more efficient than
1145 1145 # keeping references to the affected revlogs, especially memory-wise when
1146 1146 # rewriting sidedata.
1147 1147 # * introduce a proper solution to reduce the number of filelog related files.
1148 1148 # * use caching for reading sidedata (similar to what we do for data).
1149 1149 # * no longer set offset=0 if sidedata_size=0 (simplify cutoff computation).
1150 1150 # * Improvement to consider
1151 1151 # - avoid compression header in chunk using the default compression?
1152 1152 # - forbid "inline" compression mode entirely?
1153 1153 # - split the data offset and flag field (the 2 bytes save are mostly trouble)
1154 1154 # - keep track of uncompressed -chunk- size (to preallocate memory better)
1155 1155 # - keep track of chain base or size (probably not that useful anymore)
1156 1156 coreconfigitem(
1157 1157 b'experimental',
1158 1158 b'revlogv2',
1159 1159 default=None,
1160 1160 )
1161 1161 coreconfigitem(
1162 1162 b'experimental',
1163 1163 b'revisions.disambiguatewithin',
1164 1164 default=None,
1165 1165 )
1166 1166 coreconfigitem(
1167 1167 b'experimental',
1168 1168 b'rust.index',
1169 1169 default=False,
1170 1170 )
1171 1171 coreconfigitem(
1172 1172 b'experimental',
1173 1173 b'server.filesdata.recommended-batch-size',
1174 1174 default=50000,
1175 1175 )
1176 1176 coreconfigitem(
1177 1177 b'experimental',
1178 1178 b'server.manifestdata.recommended-batch-size',
1179 1179 default=100000,
1180 1180 )
1181 1181 coreconfigitem(
1182 1182 b'experimental',
1183 1183 b'server.stream-narrow-clones',
1184 1184 default=False,
1185 1185 )
1186 1186 coreconfigitem(
1187 1187 b'experimental',
1188 1188 b'single-head-per-branch',
1189 1189 default=False,
1190 1190 )
1191 1191 coreconfigitem(
1192 1192 b'experimental',
1193 1193 b'single-head-per-branch:account-closed-heads',
1194 1194 default=False,
1195 1195 )
1196 1196 coreconfigitem(
1197 1197 b'experimental',
1198 1198 b'single-head-per-branch:public-changes-only',
1199 1199 default=False,
1200 1200 )
1201 1201 coreconfigitem(
1202 1202 b'experimental',
1203 1203 b'sparse-read',
1204 1204 default=False,
1205 1205 )
1206 1206 coreconfigitem(
1207 1207 b'experimental',
1208 1208 b'sparse-read.density-threshold',
1209 1209 default=0.50,
1210 1210 )
1211 1211 coreconfigitem(
1212 1212 b'experimental',
1213 1213 b'sparse-read.min-gap-size',
1214 1214 default=b'65K',
1215 1215 )
1216 1216 coreconfigitem(
1217 1217 b'experimental',
1218 1218 b'treemanifest',
1219 1219 default=False,
1220 1220 )
1221 1221 coreconfigitem(
1222 1222 b'experimental',
1223 1223 b'update.atomic-file',
1224 1224 default=False,
1225 1225 )
1226 1226 coreconfigitem(
1227 1227 b'experimental',
1228 1228 b'web.full-garbage-collection-rate',
1229 1229 default=1, # still forcing a full collection on each request
1230 1230 )
1231 1231 coreconfigitem(
1232 1232 b'experimental',
1233 1233 b'worker.wdir-get-thread-safe',
1234 1234 default=False,
1235 1235 )
1236 1236 coreconfigitem(
1237 1237 b'experimental',
1238 1238 b'worker.repository-upgrade',
1239 1239 default=False,
1240 1240 )
1241 1241 coreconfigitem(
1242 1242 b'experimental',
1243 1243 b'xdiff',
1244 1244 default=False,
1245 1245 )
1246 1246 coreconfigitem(
1247 1247 b'extensions',
1248 1248 b'[^:]*',
1249 1249 default=None,
1250 1250 generic=True,
1251 1251 )
1252 1252 coreconfigitem(
1253 1253 b'extensions',
1254 1254 b'[^:]*:required',
1255 1255 default=False,
1256 1256 generic=True,
1257 1257 )
1258 1258 coreconfigitem(
1259 1259 b'extdata',
1260 1260 b'.*',
1261 1261 default=None,
1262 1262 generic=True,
1263 1263 )
1264 1264 coreconfigitem(
1265 1265 b'format',
1266 1266 b'bookmarks-in-store',
1267 1267 default=False,
1268 1268 )
1269 1269 coreconfigitem(
1270 1270 b'format',
1271 1271 b'chunkcachesize',
1272 1272 default=None,
1273 1273 experimental=True,
1274 1274 )
1275 1275 coreconfigitem(
1276 1276 # Enable this dirstate format *when creating a new repository*.
1277 1277 # Which format to use for existing repos is controlled by .hg/requires
1278 1278 b'format',
1279 1279 b'use-dirstate-v2',
1280 1280 default=False,
1281 1281 experimental=True,
1282 1282 alias=[(b'format', b'exp-rc-dirstate-v2')],
1283 1283 )
1284 1284 coreconfigitem(
1285 1285 b'format',
1286 1286 b'use-dirstate-v2.automatic-upgrade-of-mismatching-repositories',
1287 1287 default=False,
1288 1288 experimental=True,
1289 1289 )
1290 1290 coreconfigitem(
1291 1291 b'format',
1292 1292 b'use-dirstate-v2.automatic-upgrade-of-mismatching-repositories:quiet',
1293 1293 default=False,
1294 1294 experimental=True,
1295 1295 )
1296 1296 coreconfigitem(
1297 1297 b'format',
1298 1298 b'use-dirstate-tracked-hint',
1299 1299 default=False,
1300 1300 experimental=True,
1301 1301 )
1302 1302 coreconfigitem(
1303 1303 b'format',
1304 1304 b'use-dirstate-tracked-hint.version',
1305 1305 default=1,
1306 1306 experimental=True,
1307 1307 )
1308 1308 coreconfigitem(
1309 1309 b'format',
1310 1310 b'use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories',
1311 1311 default=False,
1312 1312 experimental=True,
1313 1313 )
1314 1314 coreconfigitem(
1315 1315 b'format',
1316 1316 b'use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories:quiet',
1317 1317 default=False,
1318 1318 experimental=True,
1319 1319 )
1320 1320 coreconfigitem(
1321 1321 b'format',
1322 1322 b'dotencode',
1323 1323 default=True,
1324 1324 )
1325 1325 coreconfigitem(
1326 1326 b'format',
1327 1327 b'generaldelta',
1328 1328 default=False,
1329 1329 experimental=True,
1330 1330 )
1331 1331 coreconfigitem(
1332 1332 b'format',
1333 1333 b'manifestcachesize',
1334 1334 default=None,
1335 1335 experimental=True,
1336 1336 )
1337 1337 coreconfigitem(
1338 1338 b'format',
1339 1339 b'maxchainlen',
1340 1340 default=dynamicdefault,
1341 1341 experimental=True,
1342 1342 )
1343 1343 coreconfigitem(
1344 1344 b'format',
1345 1345 b'obsstore-version',
1346 1346 default=None,
1347 1347 )
1348 1348 coreconfigitem(
1349 1349 b'format',
1350 1350 b'sparse-revlog',
1351 1351 default=True,
1352 1352 )
1353 1353 coreconfigitem(
1354 1354 b'format',
1355 1355 b'revlog-compression',
1356 1356 default=lambda: [b'zstd', b'zlib'],
1357 1357 alias=[(b'experimental', b'format.compression')],
1358 1358 )
1359 1359 # Experimental TODOs:
1360 1360 #
1361 1361 # * Same as for revlogv2 (but for the reduction of the number of files)
1362 1362 # * Actually computing the rank of changesets
1363 1363 # * Improvement to investigate
1364 1364 # - storing .hgtags fnode
1365 1365 # - storing branch related identifier
1366 1366
1367 1367 coreconfigitem(
1368 1368 b'format',
1369 1369 b'exp-use-changelog-v2',
1370 1370 default=None,
1371 1371 experimental=True,
1372 1372 )
1373 1373 coreconfigitem(
1374 1374 b'format',
1375 1375 b'usefncache',
1376 1376 default=True,
1377 1377 )
1378 1378 coreconfigitem(
1379 1379 b'format',
1380 1380 b'usegeneraldelta',
1381 1381 default=True,
1382 1382 )
1383 1383 coreconfigitem(
1384 1384 b'format',
1385 1385 b'usestore',
1386 1386 default=True,
1387 1387 )
1388 1388
1389 1389
1390 1390 def _persistent_nodemap_default():
1391 1391 """compute `use-persistent-nodemap` default value
1392 1392
1393 1393 The feature is disabled unless a fast implementation is available.
1394 1394 """
1395 1395 from . import policy
1396 1396
1397 1397 return policy.importrust('revlog') is not None
1398 1398
1399 1399
1400 1400 coreconfigitem(
1401 1401 b'format',
1402 1402 b'use-persistent-nodemap',
1403 1403 default=_persistent_nodemap_default,
1404 1404 )
1405 1405 coreconfigitem(
1406 1406 b'format',
1407 1407 b'exp-use-copies-side-data-changeset',
1408 1408 default=False,
1409 1409 experimental=True,
1410 1410 )
1411 1411 coreconfigitem(
1412 1412 b'format',
1413 1413 b'use-share-safe',
1414 1414 default=True,
1415 1415 )
1416 1416 coreconfigitem(
1417 1417 b'format',
1418 1418 b'use-share-safe.automatic-upgrade-of-mismatching-repositories',
1419 1419 default=False,
1420 1420 experimental=True,
1421 1421 )
1422 1422 coreconfigitem(
1423 1423 b'format',
1424 1424 b'use-share-safe.automatic-upgrade-of-mismatching-repositories:quiet',
1425 1425 default=False,
1426 1426 experimental=True,
1427 1427 )
1428
1429 # Moving this on by default means we are confident about the scaling of phases.
1430 # This is not garanteed to be the case at the time this message is written.
1428 1431 coreconfigitem(
1429 1432 b'format',
1430 b'internal-phase',
1433 b'use-internal-phase',
1431 1434 default=False,
1432 1435 experimental=True,
1433 1436 )
1434 1437 # The interaction between the archived phase and obsolescence markers needs to
1435 1438 # be sorted out before wider usage of this are to be considered.
1436 1439 #
1437 1440 # At the time this message is written, behavior when archiving obsolete
1438 1441 # changeset differ significantly from stripping. As part of stripping, we also
1439 1442 # remove the obsolescence marker associated to the stripped changesets,
1440 1443 # revealing the precedecessors changesets when applicable. When archiving, we
1441 1444 # don't touch the obsolescence markers, keeping everything hidden. This can
1442 1445 # result in quite confusing situation for people combining exchanging draft
1443 1446 # with the archived phases. As some markers needed by others may be skipped
1444 1447 # during exchange.
1445 1448 coreconfigitem(
1446 1449 b'format',
1447 1450 b'exp-archived-phase',
1448 1451 default=False,
1449 1452 experimental=True,
1450 1453 )
1451 1454 coreconfigitem(
1452 1455 b'shelve',
1453 1456 b'store',
1454 1457 default='internal',
1455 1458 experimental=True,
1456 1459 )
1457 1460 coreconfigitem(
1458 1461 b'fsmonitor',
1459 1462 b'warn_when_unused',
1460 1463 default=True,
1461 1464 )
1462 1465 coreconfigitem(
1463 1466 b'fsmonitor',
1464 1467 b'warn_update_file_count',
1465 1468 default=50000,
1466 1469 )
1467 1470 coreconfigitem(
1468 1471 b'fsmonitor',
1469 1472 b'warn_update_file_count_rust',
1470 1473 default=400000,
1471 1474 )
1472 1475 coreconfigitem(
1473 1476 b'help',
1474 1477 br'hidden-command\..*',
1475 1478 default=False,
1476 1479 generic=True,
1477 1480 )
1478 1481 coreconfigitem(
1479 1482 b'help',
1480 1483 br'hidden-topic\..*',
1481 1484 default=False,
1482 1485 generic=True,
1483 1486 )
1484 1487 coreconfigitem(
1485 1488 b'hooks',
1486 1489 b'[^:]*',
1487 1490 default=dynamicdefault,
1488 1491 generic=True,
1489 1492 )
1490 1493 coreconfigitem(
1491 1494 b'hooks',
1492 1495 b'.*:run-with-plain',
1493 1496 default=True,
1494 1497 generic=True,
1495 1498 )
1496 1499 coreconfigitem(
1497 1500 b'hgweb-paths',
1498 1501 b'.*',
1499 1502 default=list,
1500 1503 generic=True,
1501 1504 )
1502 1505 coreconfigitem(
1503 1506 b'hostfingerprints',
1504 1507 b'.*',
1505 1508 default=list,
1506 1509 generic=True,
1507 1510 )
1508 1511 coreconfigitem(
1509 1512 b'hostsecurity',
1510 1513 b'ciphers',
1511 1514 default=None,
1512 1515 )
1513 1516 coreconfigitem(
1514 1517 b'hostsecurity',
1515 1518 b'minimumprotocol',
1516 1519 default=dynamicdefault,
1517 1520 )
1518 1521 coreconfigitem(
1519 1522 b'hostsecurity',
1520 1523 b'.*:minimumprotocol$',
1521 1524 default=dynamicdefault,
1522 1525 generic=True,
1523 1526 )
1524 1527 coreconfigitem(
1525 1528 b'hostsecurity',
1526 1529 b'.*:ciphers$',
1527 1530 default=dynamicdefault,
1528 1531 generic=True,
1529 1532 )
1530 1533 coreconfigitem(
1531 1534 b'hostsecurity',
1532 1535 b'.*:fingerprints$',
1533 1536 default=list,
1534 1537 generic=True,
1535 1538 )
1536 1539 coreconfigitem(
1537 1540 b'hostsecurity',
1538 1541 b'.*:verifycertsfile$',
1539 1542 default=None,
1540 1543 generic=True,
1541 1544 )
1542 1545
1543 1546 coreconfigitem(
1544 1547 b'http_proxy',
1545 1548 b'always',
1546 1549 default=False,
1547 1550 )
1548 1551 coreconfigitem(
1549 1552 b'http_proxy',
1550 1553 b'host',
1551 1554 default=None,
1552 1555 )
1553 1556 coreconfigitem(
1554 1557 b'http_proxy',
1555 1558 b'no',
1556 1559 default=list,
1557 1560 )
1558 1561 coreconfigitem(
1559 1562 b'http_proxy',
1560 1563 b'passwd',
1561 1564 default=None,
1562 1565 )
1563 1566 coreconfigitem(
1564 1567 b'http_proxy',
1565 1568 b'user',
1566 1569 default=None,
1567 1570 )
1568 1571
1569 1572 coreconfigitem(
1570 1573 b'http',
1571 1574 b'timeout',
1572 1575 default=None,
1573 1576 )
1574 1577
1575 1578 coreconfigitem(
1576 1579 b'logtoprocess',
1577 1580 b'commandexception',
1578 1581 default=None,
1579 1582 )
1580 1583 coreconfigitem(
1581 1584 b'logtoprocess',
1582 1585 b'commandfinish',
1583 1586 default=None,
1584 1587 )
1585 1588 coreconfigitem(
1586 1589 b'logtoprocess',
1587 1590 b'command',
1588 1591 default=None,
1589 1592 )
1590 1593 coreconfigitem(
1591 1594 b'logtoprocess',
1592 1595 b'develwarn',
1593 1596 default=None,
1594 1597 )
1595 1598 coreconfigitem(
1596 1599 b'logtoprocess',
1597 1600 b'uiblocked',
1598 1601 default=None,
1599 1602 )
1600 1603 coreconfigitem(
1601 1604 b'merge',
1602 1605 b'checkunknown',
1603 1606 default=b'abort',
1604 1607 )
1605 1608 coreconfigitem(
1606 1609 b'merge',
1607 1610 b'checkignored',
1608 1611 default=b'abort',
1609 1612 )
1610 1613 coreconfigitem(
1611 1614 b'experimental',
1612 1615 b'merge.checkpathconflicts',
1613 1616 default=False,
1614 1617 )
1615 1618 coreconfigitem(
1616 1619 b'merge',
1617 1620 b'followcopies',
1618 1621 default=True,
1619 1622 )
1620 1623 coreconfigitem(
1621 1624 b'merge',
1622 1625 b'on-failure',
1623 1626 default=b'continue',
1624 1627 )
1625 1628 coreconfigitem(
1626 1629 b'merge',
1627 1630 b'preferancestor',
1628 1631 default=lambda: [b'*'],
1629 1632 experimental=True,
1630 1633 )
1631 1634 coreconfigitem(
1632 1635 b'merge',
1633 1636 b'strict-capability-check',
1634 1637 default=False,
1635 1638 )
1636 1639 coreconfigitem(
1637 1640 b'merge',
1638 1641 b'disable-partial-tools',
1639 1642 default=False,
1640 1643 experimental=True,
1641 1644 )
1642 1645 coreconfigitem(
1643 1646 b'partial-merge-tools',
1644 1647 b'.*',
1645 1648 default=None,
1646 1649 generic=True,
1647 1650 experimental=True,
1648 1651 )
1649 1652 coreconfigitem(
1650 1653 b'partial-merge-tools',
1651 1654 br'.*\.patterns',
1652 1655 default=dynamicdefault,
1653 1656 generic=True,
1654 1657 priority=-1,
1655 1658 experimental=True,
1656 1659 )
1657 1660 coreconfigitem(
1658 1661 b'partial-merge-tools',
1659 1662 br'.*\.executable$',
1660 1663 default=dynamicdefault,
1661 1664 generic=True,
1662 1665 priority=-1,
1663 1666 experimental=True,
1664 1667 )
1665 1668 coreconfigitem(
1666 1669 b'partial-merge-tools',
1667 1670 br'.*\.order',
1668 1671 default=0,
1669 1672 generic=True,
1670 1673 priority=-1,
1671 1674 experimental=True,
1672 1675 )
1673 1676 coreconfigitem(
1674 1677 b'partial-merge-tools',
1675 1678 br'.*\.args',
1676 1679 default=b"$local $base $other",
1677 1680 generic=True,
1678 1681 priority=-1,
1679 1682 experimental=True,
1680 1683 )
1681 1684 coreconfigitem(
1682 1685 b'partial-merge-tools',
1683 1686 br'.*\.disable',
1684 1687 default=False,
1685 1688 generic=True,
1686 1689 priority=-1,
1687 1690 experimental=True,
1688 1691 )
1689 1692 coreconfigitem(
1690 1693 b'merge-tools',
1691 1694 b'.*',
1692 1695 default=None,
1693 1696 generic=True,
1694 1697 )
1695 1698 coreconfigitem(
1696 1699 b'merge-tools',
1697 1700 br'.*\.args$',
1698 1701 default=b"$local $base $other",
1699 1702 generic=True,
1700 1703 priority=-1,
1701 1704 )
1702 1705 coreconfigitem(
1703 1706 b'merge-tools',
1704 1707 br'.*\.binary$',
1705 1708 default=False,
1706 1709 generic=True,
1707 1710 priority=-1,
1708 1711 )
1709 1712 coreconfigitem(
1710 1713 b'merge-tools',
1711 1714 br'.*\.check$',
1712 1715 default=list,
1713 1716 generic=True,
1714 1717 priority=-1,
1715 1718 )
1716 1719 coreconfigitem(
1717 1720 b'merge-tools',
1718 1721 br'.*\.checkchanged$',
1719 1722 default=False,
1720 1723 generic=True,
1721 1724 priority=-1,
1722 1725 )
1723 1726 coreconfigitem(
1724 1727 b'merge-tools',
1725 1728 br'.*\.executable$',
1726 1729 default=dynamicdefault,
1727 1730 generic=True,
1728 1731 priority=-1,
1729 1732 )
1730 1733 coreconfigitem(
1731 1734 b'merge-tools',
1732 1735 br'.*\.fixeol$',
1733 1736 default=False,
1734 1737 generic=True,
1735 1738 priority=-1,
1736 1739 )
1737 1740 coreconfigitem(
1738 1741 b'merge-tools',
1739 1742 br'.*\.gui$',
1740 1743 default=False,
1741 1744 generic=True,
1742 1745 priority=-1,
1743 1746 )
1744 1747 coreconfigitem(
1745 1748 b'merge-tools',
1746 1749 br'.*\.mergemarkers$',
1747 1750 default=b'basic',
1748 1751 generic=True,
1749 1752 priority=-1,
1750 1753 )
1751 1754 coreconfigitem(
1752 1755 b'merge-tools',
1753 1756 br'.*\.mergemarkertemplate$',
1754 1757 default=dynamicdefault, # take from command-templates.mergemarker
1755 1758 generic=True,
1756 1759 priority=-1,
1757 1760 )
1758 1761 coreconfigitem(
1759 1762 b'merge-tools',
1760 1763 br'.*\.priority$',
1761 1764 default=0,
1762 1765 generic=True,
1763 1766 priority=-1,
1764 1767 )
1765 1768 coreconfigitem(
1766 1769 b'merge-tools',
1767 1770 br'.*\.premerge$',
1768 1771 default=dynamicdefault,
1769 1772 generic=True,
1770 1773 priority=-1,
1771 1774 )
1772 1775 coreconfigitem(
1773 1776 b'merge-tools',
1774 1777 br'.*\.symlink$',
1775 1778 default=False,
1776 1779 generic=True,
1777 1780 priority=-1,
1778 1781 )
1779 1782 coreconfigitem(
1780 1783 b'pager',
1781 1784 b'attend-.*',
1782 1785 default=dynamicdefault,
1783 1786 generic=True,
1784 1787 )
1785 1788 coreconfigitem(
1786 1789 b'pager',
1787 1790 b'ignore',
1788 1791 default=list,
1789 1792 )
1790 1793 coreconfigitem(
1791 1794 b'pager',
1792 1795 b'pager',
1793 1796 default=dynamicdefault,
1794 1797 )
1795 1798 coreconfigitem(
1796 1799 b'patch',
1797 1800 b'eol',
1798 1801 default=b'strict',
1799 1802 )
1800 1803 coreconfigitem(
1801 1804 b'patch',
1802 1805 b'fuzz',
1803 1806 default=2,
1804 1807 )
1805 1808 coreconfigitem(
1806 1809 b'paths',
1807 1810 b'default',
1808 1811 default=None,
1809 1812 )
1810 1813 coreconfigitem(
1811 1814 b'paths',
1812 1815 b'default-push',
1813 1816 default=None,
1814 1817 )
1815 1818 coreconfigitem(
1816 1819 b'paths',
1817 1820 b'.*',
1818 1821 default=None,
1819 1822 generic=True,
1820 1823 )
1821 1824 coreconfigitem(
1822 1825 b'paths',
1823 1826 b'.*:bookmarks.mode',
1824 1827 default='default',
1825 1828 generic=True,
1826 1829 )
1827 1830 coreconfigitem(
1828 1831 b'paths',
1829 1832 b'.*:multi-urls',
1830 1833 default=False,
1831 1834 generic=True,
1832 1835 )
1833 1836 coreconfigitem(
1834 1837 b'paths',
1835 1838 b'.*:pushrev',
1836 1839 default=None,
1837 1840 generic=True,
1838 1841 )
1839 1842 coreconfigitem(
1840 1843 b'paths',
1841 1844 b'.*:pushurl',
1842 1845 default=None,
1843 1846 generic=True,
1844 1847 )
1845 1848 coreconfigitem(
1846 1849 b'phases',
1847 1850 b'checksubrepos',
1848 1851 default=b'follow',
1849 1852 )
1850 1853 coreconfigitem(
1851 1854 b'phases',
1852 1855 b'new-commit',
1853 1856 default=b'draft',
1854 1857 )
1855 1858 coreconfigitem(
1856 1859 b'phases',
1857 1860 b'publish',
1858 1861 default=True,
1859 1862 )
1860 1863 coreconfigitem(
1861 1864 b'profiling',
1862 1865 b'enabled',
1863 1866 default=False,
1864 1867 )
1865 1868 coreconfigitem(
1866 1869 b'profiling',
1867 1870 b'format',
1868 1871 default=b'text',
1869 1872 )
1870 1873 coreconfigitem(
1871 1874 b'profiling',
1872 1875 b'freq',
1873 1876 default=1000,
1874 1877 )
1875 1878 coreconfigitem(
1876 1879 b'profiling',
1877 1880 b'limit',
1878 1881 default=30,
1879 1882 )
1880 1883 coreconfigitem(
1881 1884 b'profiling',
1882 1885 b'nested',
1883 1886 default=0,
1884 1887 )
1885 1888 coreconfigitem(
1886 1889 b'profiling',
1887 1890 b'output',
1888 1891 default=None,
1889 1892 )
1890 1893 coreconfigitem(
1891 1894 b'profiling',
1892 1895 b'showmax',
1893 1896 default=0.999,
1894 1897 )
1895 1898 coreconfigitem(
1896 1899 b'profiling',
1897 1900 b'showmin',
1898 1901 default=dynamicdefault,
1899 1902 )
1900 1903 coreconfigitem(
1901 1904 b'profiling',
1902 1905 b'showtime',
1903 1906 default=True,
1904 1907 )
1905 1908 coreconfigitem(
1906 1909 b'profiling',
1907 1910 b'sort',
1908 1911 default=b'inlinetime',
1909 1912 )
1910 1913 coreconfigitem(
1911 1914 b'profiling',
1912 1915 b'statformat',
1913 1916 default=b'hotpath',
1914 1917 )
1915 1918 coreconfigitem(
1916 1919 b'profiling',
1917 1920 b'time-track',
1918 1921 default=dynamicdefault,
1919 1922 )
1920 1923 coreconfigitem(
1921 1924 b'profiling',
1922 1925 b'type',
1923 1926 default=b'stat',
1924 1927 )
1925 1928 coreconfigitem(
1926 1929 b'progress',
1927 1930 b'assume-tty',
1928 1931 default=False,
1929 1932 )
1930 1933 coreconfigitem(
1931 1934 b'progress',
1932 1935 b'changedelay',
1933 1936 default=1,
1934 1937 )
1935 1938 coreconfigitem(
1936 1939 b'progress',
1937 1940 b'clear-complete',
1938 1941 default=True,
1939 1942 )
1940 1943 coreconfigitem(
1941 1944 b'progress',
1942 1945 b'debug',
1943 1946 default=False,
1944 1947 )
1945 1948 coreconfigitem(
1946 1949 b'progress',
1947 1950 b'delay',
1948 1951 default=3,
1949 1952 )
1950 1953 coreconfigitem(
1951 1954 b'progress',
1952 1955 b'disable',
1953 1956 default=False,
1954 1957 )
1955 1958 coreconfigitem(
1956 1959 b'progress',
1957 1960 b'estimateinterval',
1958 1961 default=60.0,
1959 1962 )
1960 1963 coreconfigitem(
1961 1964 b'progress',
1962 1965 b'format',
1963 1966 default=lambda: [b'topic', b'bar', b'number', b'estimate'],
1964 1967 )
1965 1968 coreconfigitem(
1966 1969 b'progress',
1967 1970 b'refresh',
1968 1971 default=0.1,
1969 1972 )
1970 1973 coreconfigitem(
1971 1974 b'progress',
1972 1975 b'width',
1973 1976 default=dynamicdefault,
1974 1977 )
1975 1978 coreconfigitem(
1976 1979 b'pull',
1977 1980 b'confirm',
1978 1981 default=False,
1979 1982 )
1980 1983 coreconfigitem(
1981 1984 b'push',
1982 1985 b'pushvars.server',
1983 1986 default=False,
1984 1987 )
1985 1988 coreconfigitem(
1986 1989 b'rewrite',
1987 1990 b'backup-bundle',
1988 1991 default=True,
1989 1992 alias=[(b'ui', b'history-editing-backup')],
1990 1993 )
1991 1994 coreconfigitem(
1992 1995 b'rewrite',
1993 1996 b'update-timestamp',
1994 1997 default=False,
1995 1998 )
1996 1999 coreconfigitem(
1997 2000 b'rewrite',
1998 2001 b'empty-successor',
1999 2002 default=b'skip',
2000 2003 experimental=True,
2001 2004 )
2002 2005 # experimental as long as format.use-dirstate-v2 is.
2003 2006 coreconfigitem(
2004 2007 b'storage',
2005 2008 b'dirstate-v2.slow-path',
2006 2009 default=b"abort",
2007 2010 experimental=True,
2008 2011 )
2009 2012 coreconfigitem(
2010 2013 b'storage',
2011 2014 b'new-repo-backend',
2012 2015 default=b'revlogv1',
2013 2016 experimental=True,
2014 2017 )
2015 2018 coreconfigitem(
2016 2019 b'storage',
2017 2020 b'revlog.optimize-delta-parent-choice',
2018 2021 default=True,
2019 2022 alias=[(b'format', b'aggressivemergedeltas')],
2020 2023 )
2021 2024 coreconfigitem(
2022 2025 b'storage',
2023 2026 b'revlog.issue6528.fix-incoming',
2024 2027 default=True,
2025 2028 )
2026 2029 # experimental as long as rust is experimental (or a C version is implemented)
2027 2030 coreconfigitem(
2028 2031 b'storage',
2029 2032 b'revlog.persistent-nodemap.mmap',
2030 2033 default=True,
2031 2034 )
2032 2035 # experimental as long as format.use-persistent-nodemap is.
2033 2036 coreconfigitem(
2034 2037 b'storage',
2035 2038 b'revlog.persistent-nodemap.slow-path',
2036 2039 default=b"abort",
2037 2040 )
2038 2041
2039 2042 coreconfigitem(
2040 2043 b'storage',
2041 2044 b'revlog.reuse-external-delta',
2042 2045 default=True,
2043 2046 )
2044 2047 coreconfigitem(
2045 2048 b'storage',
2046 2049 b'revlog.reuse-external-delta-parent',
2047 2050 default=None,
2048 2051 )
2049 2052 coreconfigitem(
2050 2053 b'storage',
2051 2054 b'revlog.zlib.level',
2052 2055 default=None,
2053 2056 )
2054 2057 coreconfigitem(
2055 2058 b'storage',
2056 2059 b'revlog.zstd.level',
2057 2060 default=None,
2058 2061 )
2059 2062 coreconfigitem(
2060 2063 b'server',
2061 2064 b'bookmarks-pushkey-compat',
2062 2065 default=True,
2063 2066 )
2064 2067 coreconfigitem(
2065 2068 b'server',
2066 2069 b'bundle1',
2067 2070 default=True,
2068 2071 )
2069 2072 coreconfigitem(
2070 2073 b'server',
2071 2074 b'bundle1gd',
2072 2075 default=None,
2073 2076 )
2074 2077 coreconfigitem(
2075 2078 b'server',
2076 2079 b'bundle1.pull',
2077 2080 default=None,
2078 2081 )
2079 2082 coreconfigitem(
2080 2083 b'server',
2081 2084 b'bundle1gd.pull',
2082 2085 default=None,
2083 2086 )
2084 2087 coreconfigitem(
2085 2088 b'server',
2086 2089 b'bundle1.push',
2087 2090 default=None,
2088 2091 )
2089 2092 coreconfigitem(
2090 2093 b'server',
2091 2094 b'bundle1gd.push',
2092 2095 default=None,
2093 2096 )
2094 2097 coreconfigitem(
2095 2098 b'server',
2096 2099 b'bundle2.stream',
2097 2100 default=True,
2098 2101 alias=[(b'experimental', b'bundle2.stream')],
2099 2102 )
2100 2103 coreconfigitem(
2101 2104 b'server',
2102 2105 b'compressionengines',
2103 2106 default=list,
2104 2107 )
2105 2108 coreconfigitem(
2106 2109 b'server',
2107 2110 b'concurrent-push-mode',
2108 2111 default=b'check-related',
2109 2112 )
2110 2113 coreconfigitem(
2111 2114 b'server',
2112 2115 b'disablefullbundle',
2113 2116 default=False,
2114 2117 )
2115 2118 coreconfigitem(
2116 2119 b'server',
2117 2120 b'maxhttpheaderlen',
2118 2121 default=1024,
2119 2122 )
2120 2123 coreconfigitem(
2121 2124 b'server',
2122 2125 b'pullbundle',
2123 2126 default=False,
2124 2127 )
2125 2128 coreconfigitem(
2126 2129 b'server',
2127 2130 b'preferuncompressed',
2128 2131 default=False,
2129 2132 )
2130 2133 coreconfigitem(
2131 2134 b'server',
2132 2135 b'streamunbundle',
2133 2136 default=False,
2134 2137 )
2135 2138 coreconfigitem(
2136 2139 b'server',
2137 2140 b'uncompressed',
2138 2141 default=True,
2139 2142 )
2140 2143 coreconfigitem(
2141 2144 b'server',
2142 2145 b'uncompressedallowsecret',
2143 2146 default=False,
2144 2147 )
2145 2148 coreconfigitem(
2146 2149 b'server',
2147 2150 b'view',
2148 2151 default=b'served',
2149 2152 )
2150 2153 coreconfigitem(
2151 2154 b'server',
2152 2155 b'validate',
2153 2156 default=False,
2154 2157 )
2155 2158 coreconfigitem(
2156 2159 b'server',
2157 2160 b'zliblevel',
2158 2161 default=-1,
2159 2162 )
2160 2163 coreconfigitem(
2161 2164 b'server',
2162 2165 b'zstdlevel',
2163 2166 default=3,
2164 2167 )
2165 2168 coreconfigitem(
2166 2169 b'share',
2167 2170 b'pool',
2168 2171 default=None,
2169 2172 )
2170 2173 coreconfigitem(
2171 2174 b'share',
2172 2175 b'poolnaming',
2173 2176 default=b'identity',
2174 2177 )
2175 2178 coreconfigitem(
2176 2179 b'share',
2177 2180 b'safe-mismatch.source-not-safe',
2178 2181 default=b'abort',
2179 2182 )
2180 2183 coreconfigitem(
2181 2184 b'share',
2182 2185 b'safe-mismatch.source-safe',
2183 2186 default=b'abort',
2184 2187 )
2185 2188 coreconfigitem(
2186 2189 b'share',
2187 2190 b'safe-mismatch.source-not-safe.warn',
2188 2191 default=True,
2189 2192 )
2190 2193 coreconfigitem(
2191 2194 b'share',
2192 2195 b'safe-mismatch.source-safe.warn',
2193 2196 default=True,
2194 2197 )
2195 2198 coreconfigitem(
2196 2199 b'share',
2197 2200 b'safe-mismatch.source-not-safe:verbose-upgrade',
2198 2201 default=True,
2199 2202 )
2200 2203 coreconfigitem(
2201 2204 b'share',
2202 2205 b'safe-mismatch.source-safe:verbose-upgrade',
2203 2206 default=True,
2204 2207 )
2205 2208 coreconfigitem(
2206 2209 b'shelve',
2207 2210 b'maxbackups',
2208 2211 default=10,
2209 2212 )
2210 2213 coreconfigitem(
2211 2214 b'smtp',
2212 2215 b'host',
2213 2216 default=None,
2214 2217 )
2215 2218 coreconfigitem(
2216 2219 b'smtp',
2217 2220 b'local_hostname',
2218 2221 default=None,
2219 2222 )
2220 2223 coreconfigitem(
2221 2224 b'smtp',
2222 2225 b'password',
2223 2226 default=None,
2224 2227 )
2225 2228 coreconfigitem(
2226 2229 b'smtp',
2227 2230 b'port',
2228 2231 default=dynamicdefault,
2229 2232 )
2230 2233 coreconfigitem(
2231 2234 b'smtp',
2232 2235 b'tls',
2233 2236 default=b'none',
2234 2237 )
2235 2238 coreconfigitem(
2236 2239 b'smtp',
2237 2240 b'username',
2238 2241 default=None,
2239 2242 )
2240 2243 coreconfigitem(
2241 2244 b'sparse',
2242 2245 b'missingwarning',
2243 2246 default=True,
2244 2247 experimental=True,
2245 2248 )
2246 2249 coreconfigitem(
2247 2250 b'subrepos',
2248 2251 b'allowed',
2249 2252 default=dynamicdefault, # to make backporting simpler
2250 2253 )
2251 2254 coreconfigitem(
2252 2255 b'subrepos',
2253 2256 b'hg:allowed',
2254 2257 default=dynamicdefault,
2255 2258 )
2256 2259 coreconfigitem(
2257 2260 b'subrepos',
2258 2261 b'git:allowed',
2259 2262 default=dynamicdefault,
2260 2263 )
2261 2264 coreconfigitem(
2262 2265 b'subrepos',
2263 2266 b'svn:allowed',
2264 2267 default=dynamicdefault,
2265 2268 )
2266 2269 coreconfigitem(
2267 2270 b'templates',
2268 2271 b'.*',
2269 2272 default=None,
2270 2273 generic=True,
2271 2274 )
2272 2275 coreconfigitem(
2273 2276 b'templateconfig',
2274 2277 b'.*',
2275 2278 default=dynamicdefault,
2276 2279 generic=True,
2277 2280 )
2278 2281 coreconfigitem(
2279 2282 b'trusted',
2280 2283 b'groups',
2281 2284 default=list,
2282 2285 )
2283 2286 coreconfigitem(
2284 2287 b'trusted',
2285 2288 b'users',
2286 2289 default=list,
2287 2290 )
2288 2291 coreconfigitem(
2289 2292 b'ui',
2290 2293 b'_usedassubrepo',
2291 2294 default=False,
2292 2295 )
2293 2296 coreconfigitem(
2294 2297 b'ui',
2295 2298 b'allowemptycommit',
2296 2299 default=False,
2297 2300 )
2298 2301 coreconfigitem(
2299 2302 b'ui',
2300 2303 b'archivemeta',
2301 2304 default=True,
2302 2305 )
2303 2306 coreconfigitem(
2304 2307 b'ui',
2305 2308 b'askusername',
2306 2309 default=False,
2307 2310 )
2308 2311 coreconfigitem(
2309 2312 b'ui',
2310 2313 b'available-memory',
2311 2314 default=None,
2312 2315 )
2313 2316
2314 2317 coreconfigitem(
2315 2318 b'ui',
2316 2319 b'clonebundlefallback',
2317 2320 default=False,
2318 2321 )
2319 2322 coreconfigitem(
2320 2323 b'ui',
2321 2324 b'clonebundleprefers',
2322 2325 default=list,
2323 2326 )
2324 2327 coreconfigitem(
2325 2328 b'ui',
2326 2329 b'clonebundles',
2327 2330 default=True,
2328 2331 )
2329 2332 coreconfigitem(
2330 2333 b'ui',
2331 2334 b'color',
2332 2335 default=b'auto',
2333 2336 )
2334 2337 coreconfigitem(
2335 2338 b'ui',
2336 2339 b'commitsubrepos',
2337 2340 default=False,
2338 2341 )
2339 2342 coreconfigitem(
2340 2343 b'ui',
2341 2344 b'debug',
2342 2345 default=False,
2343 2346 )
2344 2347 coreconfigitem(
2345 2348 b'ui',
2346 2349 b'debugger',
2347 2350 default=None,
2348 2351 )
2349 2352 coreconfigitem(
2350 2353 b'ui',
2351 2354 b'editor',
2352 2355 default=dynamicdefault,
2353 2356 )
2354 2357 coreconfigitem(
2355 2358 b'ui',
2356 2359 b'detailed-exit-code',
2357 2360 default=False,
2358 2361 experimental=True,
2359 2362 )
2360 2363 coreconfigitem(
2361 2364 b'ui',
2362 2365 b'fallbackencoding',
2363 2366 default=None,
2364 2367 )
2365 2368 coreconfigitem(
2366 2369 b'ui',
2367 2370 b'forcecwd',
2368 2371 default=None,
2369 2372 )
2370 2373 coreconfigitem(
2371 2374 b'ui',
2372 2375 b'forcemerge',
2373 2376 default=None,
2374 2377 )
2375 2378 coreconfigitem(
2376 2379 b'ui',
2377 2380 b'formatdebug',
2378 2381 default=False,
2379 2382 )
2380 2383 coreconfigitem(
2381 2384 b'ui',
2382 2385 b'formatjson',
2383 2386 default=False,
2384 2387 )
2385 2388 coreconfigitem(
2386 2389 b'ui',
2387 2390 b'formatted',
2388 2391 default=None,
2389 2392 )
2390 2393 coreconfigitem(
2391 2394 b'ui',
2392 2395 b'interactive',
2393 2396 default=None,
2394 2397 )
2395 2398 coreconfigitem(
2396 2399 b'ui',
2397 2400 b'interface',
2398 2401 default=None,
2399 2402 )
2400 2403 coreconfigitem(
2401 2404 b'ui',
2402 2405 b'interface.chunkselector',
2403 2406 default=None,
2404 2407 )
2405 2408 coreconfigitem(
2406 2409 b'ui',
2407 2410 b'large-file-limit',
2408 2411 default=10 * (2 ** 20),
2409 2412 )
2410 2413 coreconfigitem(
2411 2414 b'ui',
2412 2415 b'logblockedtimes',
2413 2416 default=False,
2414 2417 )
2415 2418 coreconfigitem(
2416 2419 b'ui',
2417 2420 b'merge',
2418 2421 default=None,
2419 2422 )
2420 2423 coreconfigitem(
2421 2424 b'ui',
2422 2425 b'mergemarkers',
2423 2426 default=b'basic',
2424 2427 )
2425 2428 coreconfigitem(
2426 2429 b'ui',
2427 2430 b'message-output',
2428 2431 default=b'stdio',
2429 2432 )
2430 2433 coreconfigitem(
2431 2434 b'ui',
2432 2435 b'nontty',
2433 2436 default=False,
2434 2437 )
2435 2438 coreconfigitem(
2436 2439 b'ui',
2437 2440 b'origbackuppath',
2438 2441 default=None,
2439 2442 )
2440 2443 coreconfigitem(
2441 2444 b'ui',
2442 2445 b'paginate',
2443 2446 default=True,
2444 2447 )
2445 2448 coreconfigitem(
2446 2449 b'ui',
2447 2450 b'patch',
2448 2451 default=None,
2449 2452 )
2450 2453 coreconfigitem(
2451 2454 b'ui',
2452 2455 b'portablefilenames',
2453 2456 default=b'warn',
2454 2457 )
2455 2458 coreconfigitem(
2456 2459 b'ui',
2457 2460 b'promptecho',
2458 2461 default=False,
2459 2462 )
2460 2463 coreconfigitem(
2461 2464 b'ui',
2462 2465 b'quiet',
2463 2466 default=False,
2464 2467 )
2465 2468 coreconfigitem(
2466 2469 b'ui',
2467 2470 b'quietbookmarkmove',
2468 2471 default=False,
2469 2472 )
2470 2473 coreconfigitem(
2471 2474 b'ui',
2472 2475 b'relative-paths',
2473 2476 default=b'legacy',
2474 2477 )
2475 2478 coreconfigitem(
2476 2479 b'ui',
2477 2480 b'remotecmd',
2478 2481 default=b'hg',
2479 2482 )
2480 2483 coreconfigitem(
2481 2484 b'ui',
2482 2485 b'report_untrusted',
2483 2486 default=True,
2484 2487 )
2485 2488 coreconfigitem(
2486 2489 b'ui',
2487 2490 b'rollback',
2488 2491 default=True,
2489 2492 )
2490 2493 coreconfigitem(
2491 2494 b'ui',
2492 2495 b'signal-safe-lock',
2493 2496 default=True,
2494 2497 )
2495 2498 coreconfigitem(
2496 2499 b'ui',
2497 2500 b'slash',
2498 2501 default=False,
2499 2502 )
2500 2503 coreconfigitem(
2501 2504 b'ui',
2502 2505 b'ssh',
2503 2506 default=b'ssh',
2504 2507 )
2505 2508 coreconfigitem(
2506 2509 b'ui',
2507 2510 b'ssherrorhint',
2508 2511 default=None,
2509 2512 )
2510 2513 coreconfigitem(
2511 2514 b'ui',
2512 2515 b'statuscopies',
2513 2516 default=False,
2514 2517 )
2515 2518 coreconfigitem(
2516 2519 b'ui',
2517 2520 b'strict',
2518 2521 default=False,
2519 2522 )
2520 2523 coreconfigitem(
2521 2524 b'ui',
2522 2525 b'style',
2523 2526 default=b'',
2524 2527 )
2525 2528 coreconfigitem(
2526 2529 b'ui',
2527 2530 b'supportcontact',
2528 2531 default=None,
2529 2532 )
2530 2533 coreconfigitem(
2531 2534 b'ui',
2532 2535 b'textwidth',
2533 2536 default=78,
2534 2537 )
2535 2538 coreconfigitem(
2536 2539 b'ui',
2537 2540 b'timeout',
2538 2541 default=b'600',
2539 2542 )
2540 2543 coreconfigitem(
2541 2544 b'ui',
2542 2545 b'timeout.warn',
2543 2546 default=0,
2544 2547 )
2545 2548 coreconfigitem(
2546 2549 b'ui',
2547 2550 b'timestamp-output',
2548 2551 default=False,
2549 2552 )
2550 2553 coreconfigitem(
2551 2554 b'ui',
2552 2555 b'traceback',
2553 2556 default=False,
2554 2557 )
2555 2558 coreconfigitem(
2556 2559 b'ui',
2557 2560 b'tweakdefaults',
2558 2561 default=False,
2559 2562 )
2560 2563 coreconfigitem(b'ui', b'username', alias=[(b'ui', b'user')])
2561 2564 coreconfigitem(
2562 2565 b'ui',
2563 2566 b'verbose',
2564 2567 default=False,
2565 2568 )
2566 2569 coreconfigitem(
2567 2570 b'verify',
2568 2571 b'skipflags',
2569 2572 default=None,
2570 2573 )
2571 2574 coreconfigitem(
2572 2575 b'web',
2573 2576 b'allowbz2',
2574 2577 default=False,
2575 2578 )
2576 2579 coreconfigitem(
2577 2580 b'web',
2578 2581 b'allowgz',
2579 2582 default=False,
2580 2583 )
2581 2584 coreconfigitem(
2582 2585 b'web',
2583 2586 b'allow-pull',
2584 2587 alias=[(b'web', b'allowpull')],
2585 2588 default=True,
2586 2589 )
2587 2590 coreconfigitem(
2588 2591 b'web',
2589 2592 b'allow-push',
2590 2593 alias=[(b'web', b'allow_push')],
2591 2594 default=list,
2592 2595 )
2593 2596 coreconfigitem(
2594 2597 b'web',
2595 2598 b'allowzip',
2596 2599 default=False,
2597 2600 )
2598 2601 coreconfigitem(
2599 2602 b'web',
2600 2603 b'archivesubrepos',
2601 2604 default=False,
2602 2605 )
2603 2606 coreconfigitem(
2604 2607 b'web',
2605 2608 b'cache',
2606 2609 default=True,
2607 2610 )
2608 2611 coreconfigitem(
2609 2612 b'web',
2610 2613 b'comparisoncontext',
2611 2614 default=5,
2612 2615 )
2613 2616 coreconfigitem(
2614 2617 b'web',
2615 2618 b'contact',
2616 2619 default=None,
2617 2620 )
2618 2621 coreconfigitem(
2619 2622 b'web',
2620 2623 b'deny_push',
2621 2624 default=list,
2622 2625 )
2623 2626 coreconfigitem(
2624 2627 b'web',
2625 2628 b'guessmime',
2626 2629 default=False,
2627 2630 )
2628 2631 coreconfigitem(
2629 2632 b'web',
2630 2633 b'hidden',
2631 2634 default=False,
2632 2635 )
2633 2636 coreconfigitem(
2634 2637 b'web',
2635 2638 b'labels',
2636 2639 default=list,
2637 2640 )
2638 2641 coreconfigitem(
2639 2642 b'web',
2640 2643 b'logoimg',
2641 2644 default=b'hglogo.png',
2642 2645 )
2643 2646 coreconfigitem(
2644 2647 b'web',
2645 2648 b'logourl',
2646 2649 default=b'https://mercurial-scm.org/',
2647 2650 )
2648 2651 coreconfigitem(
2649 2652 b'web',
2650 2653 b'accesslog',
2651 2654 default=b'-',
2652 2655 )
2653 2656 coreconfigitem(
2654 2657 b'web',
2655 2658 b'address',
2656 2659 default=b'',
2657 2660 )
2658 2661 coreconfigitem(
2659 2662 b'web',
2660 2663 b'allow-archive',
2661 2664 alias=[(b'web', b'allow_archive')],
2662 2665 default=list,
2663 2666 )
2664 2667 coreconfigitem(
2665 2668 b'web',
2666 2669 b'allow_read',
2667 2670 default=list,
2668 2671 )
2669 2672 coreconfigitem(
2670 2673 b'web',
2671 2674 b'baseurl',
2672 2675 default=None,
2673 2676 )
2674 2677 coreconfigitem(
2675 2678 b'web',
2676 2679 b'cacerts',
2677 2680 default=None,
2678 2681 )
2679 2682 coreconfigitem(
2680 2683 b'web',
2681 2684 b'certificate',
2682 2685 default=None,
2683 2686 )
2684 2687 coreconfigitem(
2685 2688 b'web',
2686 2689 b'collapse',
2687 2690 default=False,
2688 2691 )
2689 2692 coreconfigitem(
2690 2693 b'web',
2691 2694 b'csp',
2692 2695 default=None,
2693 2696 )
2694 2697 coreconfigitem(
2695 2698 b'web',
2696 2699 b'deny_read',
2697 2700 default=list,
2698 2701 )
2699 2702 coreconfigitem(
2700 2703 b'web',
2701 2704 b'descend',
2702 2705 default=True,
2703 2706 )
2704 2707 coreconfigitem(
2705 2708 b'web',
2706 2709 b'description',
2707 2710 default=b"",
2708 2711 )
2709 2712 coreconfigitem(
2710 2713 b'web',
2711 2714 b'encoding',
2712 2715 default=lambda: encoding.encoding,
2713 2716 )
2714 2717 coreconfigitem(
2715 2718 b'web',
2716 2719 b'errorlog',
2717 2720 default=b'-',
2718 2721 )
2719 2722 coreconfigitem(
2720 2723 b'web',
2721 2724 b'ipv6',
2722 2725 default=False,
2723 2726 )
2724 2727 coreconfigitem(
2725 2728 b'web',
2726 2729 b'maxchanges',
2727 2730 default=10,
2728 2731 )
2729 2732 coreconfigitem(
2730 2733 b'web',
2731 2734 b'maxfiles',
2732 2735 default=10,
2733 2736 )
2734 2737 coreconfigitem(
2735 2738 b'web',
2736 2739 b'maxshortchanges',
2737 2740 default=60,
2738 2741 )
2739 2742 coreconfigitem(
2740 2743 b'web',
2741 2744 b'motd',
2742 2745 default=b'',
2743 2746 )
2744 2747 coreconfigitem(
2745 2748 b'web',
2746 2749 b'name',
2747 2750 default=dynamicdefault,
2748 2751 )
2749 2752 coreconfigitem(
2750 2753 b'web',
2751 2754 b'port',
2752 2755 default=8000,
2753 2756 )
2754 2757 coreconfigitem(
2755 2758 b'web',
2756 2759 b'prefix',
2757 2760 default=b'',
2758 2761 )
2759 2762 coreconfigitem(
2760 2763 b'web',
2761 2764 b'push_ssl',
2762 2765 default=True,
2763 2766 )
2764 2767 coreconfigitem(
2765 2768 b'web',
2766 2769 b'refreshinterval',
2767 2770 default=20,
2768 2771 )
2769 2772 coreconfigitem(
2770 2773 b'web',
2771 2774 b'server-header',
2772 2775 default=None,
2773 2776 )
2774 2777 coreconfigitem(
2775 2778 b'web',
2776 2779 b'static',
2777 2780 default=None,
2778 2781 )
2779 2782 coreconfigitem(
2780 2783 b'web',
2781 2784 b'staticurl',
2782 2785 default=None,
2783 2786 )
2784 2787 coreconfigitem(
2785 2788 b'web',
2786 2789 b'stripes',
2787 2790 default=1,
2788 2791 )
2789 2792 coreconfigitem(
2790 2793 b'web',
2791 2794 b'style',
2792 2795 default=b'paper',
2793 2796 )
2794 2797 coreconfigitem(
2795 2798 b'web',
2796 2799 b'templates',
2797 2800 default=None,
2798 2801 )
2799 2802 coreconfigitem(
2800 2803 b'web',
2801 2804 b'view',
2802 2805 default=b'served',
2803 2806 experimental=True,
2804 2807 )
2805 2808 coreconfigitem(
2806 2809 b'worker',
2807 2810 b'backgroundclose',
2808 2811 default=dynamicdefault,
2809 2812 )
2810 2813 # Windows defaults to a limit of 512 open files. A buffer of 128
2811 2814 # should give us enough headway.
2812 2815 coreconfigitem(
2813 2816 b'worker',
2814 2817 b'backgroundclosemaxqueue',
2815 2818 default=384,
2816 2819 )
2817 2820 coreconfigitem(
2818 2821 b'worker',
2819 2822 b'backgroundcloseminfilecount',
2820 2823 default=2048,
2821 2824 )
2822 2825 coreconfigitem(
2823 2826 b'worker',
2824 2827 b'backgroundclosethreadcount',
2825 2828 default=4,
2826 2829 )
2827 2830 coreconfigitem(
2828 2831 b'worker',
2829 2832 b'enabled',
2830 2833 default=True,
2831 2834 )
2832 2835 coreconfigitem(
2833 2836 b'worker',
2834 2837 b'numcpus',
2835 2838 default=None,
2836 2839 )
2837 2840
2838 2841 # Rebase related configuration moved to core because other extension are doing
2839 2842 # strange things. For example, shelve import the extensions to reuse some bit
2840 2843 # without formally loading it.
2841 2844 coreconfigitem(
2842 2845 b'commands',
2843 2846 b'rebase.requiredest',
2844 2847 default=False,
2845 2848 )
2846 2849 coreconfigitem(
2847 2850 b'experimental',
2848 2851 b'rebaseskipobsolete',
2849 2852 default=True,
2850 2853 )
2851 2854 coreconfigitem(
2852 2855 b'rebase',
2853 2856 b'singletransaction',
2854 2857 default=False,
2855 2858 )
2856 2859 coreconfigitem(
2857 2860 b'rebase',
2858 2861 b'experimental.inmemory',
2859 2862 default=False,
2860 2863 )
2861 2864
2862 2865 # This setting controls creation of a rebase_source extra field
2863 2866 # during rebase. When False, no such field is created. This is
2864 2867 # useful eg for incrementally converting changesets and then
2865 2868 # rebasing them onto an existing repo.
2866 2869 # WARNING: this is an advanced setting reserved for people who know
2867 2870 # exactly what they are doing. Misuse of this setting can easily
2868 2871 # result in obsmarker cycles and a vivid headache.
2869 2872 coreconfigitem(
2870 2873 b'rebase',
2871 2874 b'store-source',
2872 2875 default=True,
2873 2876 experimental=True,
2874 2877 )
@@ -1,3951 +1,3951 b''
1 1 # localrepo.py - read/write repository class for mercurial
2 2 # coding: utf-8
3 3 #
4 4 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
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
10 10 import functools
11 11 import os
12 12 import random
13 13 import sys
14 14 import time
15 15 import weakref
16 16
17 17 from concurrent import futures
18 18 from .i18n import _
19 19 from .node import (
20 20 bin,
21 21 hex,
22 22 nullrev,
23 23 sha1nodeconstants,
24 24 short,
25 25 )
26 26 from .pycompat import (
27 27 delattr,
28 28 getattr,
29 29 )
30 30 from . import (
31 31 bookmarks,
32 32 branchmap,
33 33 bundle2,
34 34 bundlecaches,
35 35 changegroup,
36 36 color,
37 37 commit,
38 38 context,
39 39 dirstate,
40 40 dirstateguard,
41 41 discovery,
42 42 encoding,
43 43 error,
44 44 exchange,
45 45 extensions,
46 46 filelog,
47 47 hook,
48 48 lock as lockmod,
49 49 match as matchmod,
50 50 mergestate as mergestatemod,
51 51 mergeutil,
52 52 namespaces,
53 53 narrowspec,
54 54 obsolete,
55 55 pathutil,
56 56 phases,
57 57 pushkey,
58 58 pycompat,
59 59 rcutil,
60 60 repoview,
61 61 requirements as requirementsmod,
62 62 revlog,
63 63 revset,
64 64 revsetlang,
65 65 scmutil,
66 66 sparse,
67 67 store as storemod,
68 68 subrepoutil,
69 69 tags as tagsmod,
70 70 transaction,
71 71 txnutil,
72 72 util,
73 73 vfs as vfsmod,
74 74 wireprototypes,
75 75 )
76 76
77 77 from .interfaces import (
78 78 repository,
79 79 util as interfaceutil,
80 80 )
81 81
82 82 from .utils import (
83 83 hashutil,
84 84 procutil,
85 85 stringutil,
86 86 urlutil,
87 87 )
88 88
89 89 from .revlogutils import (
90 90 concurrency_checker as revlogchecker,
91 91 constants as revlogconst,
92 92 sidedata as sidedatamod,
93 93 )
94 94
95 95 release = lockmod.release
96 96 urlerr = util.urlerr
97 97 urlreq = util.urlreq
98 98
99 99 # set of (path, vfs-location) tuples. vfs-location is:
100 100 # - 'plain for vfs relative paths
101 101 # - '' for svfs relative paths
102 102 _cachedfiles = set()
103 103
104 104
105 105 class _basefilecache(scmutil.filecache):
106 106 """All filecache usage on repo are done for logic that should be unfiltered"""
107 107
108 108 def __get__(self, repo, type=None):
109 109 if repo is None:
110 110 return self
111 111 # proxy to unfiltered __dict__ since filtered repo has no entry
112 112 unfi = repo.unfiltered()
113 113 try:
114 114 return unfi.__dict__[self.sname]
115 115 except KeyError:
116 116 pass
117 117 return super(_basefilecache, self).__get__(unfi, type)
118 118
119 119 def set(self, repo, value):
120 120 return super(_basefilecache, self).set(repo.unfiltered(), value)
121 121
122 122
123 123 class repofilecache(_basefilecache):
124 124 """filecache for files in .hg but outside of .hg/store"""
125 125
126 126 def __init__(self, *paths):
127 127 super(repofilecache, self).__init__(*paths)
128 128 for path in paths:
129 129 _cachedfiles.add((path, b'plain'))
130 130
131 131 def join(self, obj, fname):
132 132 return obj.vfs.join(fname)
133 133
134 134
135 135 class storecache(_basefilecache):
136 136 """filecache for files in the store"""
137 137
138 138 def __init__(self, *paths):
139 139 super(storecache, self).__init__(*paths)
140 140 for path in paths:
141 141 _cachedfiles.add((path, b''))
142 142
143 143 def join(self, obj, fname):
144 144 return obj.sjoin(fname)
145 145
146 146
147 147 class changelogcache(storecache):
148 148 """filecache for the changelog"""
149 149
150 150 def __init__(self):
151 151 super(changelogcache, self).__init__()
152 152 _cachedfiles.add((b'00changelog.i', b''))
153 153 _cachedfiles.add((b'00changelog.n', b''))
154 154
155 155 def tracked_paths(self, obj):
156 156 paths = [self.join(obj, b'00changelog.i')]
157 157 if obj.store.opener.options.get(b'persistent-nodemap', False):
158 158 paths.append(self.join(obj, b'00changelog.n'))
159 159 return paths
160 160
161 161
162 162 class manifestlogcache(storecache):
163 163 """filecache for the manifestlog"""
164 164
165 165 def __init__(self):
166 166 super(manifestlogcache, self).__init__()
167 167 _cachedfiles.add((b'00manifest.i', b''))
168 168 _cachedfiles.add((b'00manifest.n', b''))
169 169
170 170 def tracked_paths(self, obj):
171 171 paths = [self.join(obj, b'00manifest.i')]
172 172 if obj.store.opener.options.get(b'persistent-nodemap', False):
173 173 paths.append(self.join(obj, b'00manifest.n'))
174 174 return paths
175 175
176 176
177 177 class mixedrepostorecache(_basefilecache):
178 178 """filecache for a mix files in .hg/store and outside"""
179 179
180 180 def __init__(self, *pathsandlocations):
181 181 # scmutil.filecache only uses the path for passing back into our
182 182 # join(), so we can safely pass a list of paths and locations
183 183 super(mixedrepostorecache, self).__init__(*pathsandlocations)
184 184 _cachedfiles.update(pathsandlocations)
185 185
186 186 def join(self, obj, fnameandlocation):
187 187 fname, location = fnameandlocation
188 188 if location == b'plain':
189 189 return obj.vfs.join(fname)
190 190 else:
191 191 if location != b'':
192 192 raise error.ProgrammingError(
193 193 b'unexpected location: %s' % location
194 194 )
195 195 return obj.sjoin(fname)
196 196
197 197
198 198 def isfilecached(repo, name):
199 199 """check if a repo has already cached "name" filecache-ed property
200 200
201 201 This returns (cachedobj-or-None, iscached) tuple.
202 202 """
203 203 cacheentry = repo.unfiltered()._filecache.get(name, None)
204 204 if not cacheentry:
205 205 return None, False
206 206 return cacheentry.obj, True
207 207
208 208
209 209 class unfilteredpropertycache(util.propertycache):
210 210 """propertycache that apply to unfiltered repo only"""
211 211
212 212 def __get__(self, repo, type=None):
213 213 unfi = repo.unfiltered()
214 214 if unfi is repo:
215 215 return super(unfilteredpropertycache, self).__get__(unfi)
216 216 return getattr(unfi, self.name)
217 217
218 218
219 219 class filteredpropertycache(util.propertycache):
220 220 """propertycache that must take filtering in account"""
221 221
222 222 def cachevalue(self, obj, value):
223 223 object.__setattr__(obj, self.name, value)
224 224
225 225
226 226 def hasunfilteredcache(repo, name):
227 227 """check if a repo has an unfilteredpropertycache value for <name>"""
228 228 return name in vars(repo.unfiltered())
229 229
230 230
231 231 def unfilteredmethod(orig):
232 232 """decorate method that always need to be run on unfiltered version"""
233 233
234 234 @functools.wraps(orig)
235 235 def wrapper(repo, *args, **kwargs):
236 236 return orig(repo.unfiltered(), *args, **kwargs)
237 237
238 238 return wrapper
239 239
240 240
241 241 moderncaps = {
242 242 b'lookup',
243 243 b'branchmap',
244 244 b'pushkey',
245 245 b'known',
246 246 b'getbundle',
247 247 b'unbundle',
248 248 }
249 249 legacycaps = moderncaps.union({b'changegroupsubset'})
250 250
251 251
252 252 @interfaceutil.implementer(repository.ipeercommandexecutor)
253 253 class localcommandexecutor:
254 254 def __init__(self, peer):
255 255 self._peer = peer
256 256 self._sent = False
257 257 self._closed = False
258 258
259 259 def __enter__(self):
260 260 return self
261 261
262 262 def __exit__(self, exctype, excvalue, exctb):
263 263 self.close()
264 264
265 265 def callcommand(self, command, args):
266 266 if self._sent:
267 267 raise error.ProgrammingError(
268 268 b'callcommand() cannot be used after sendcommands()'
269 269 )
270 270
271 271 if self._closed:
272 272 raise error.ProgrammingError(
273 273 b'callcommand() cannot be used after close()'
274 274 )
275 275
276 276 # We don't need to support anything fancy. Just call the named
277 277 # method on the peer and return a resolved future.
278 278 fn = getattr(self._peer, pycompat.sysstr(command))
279 279
280 280 f = futures.Future()
281 281
282 282 try:
283 283 result = fn(**pycompat.strkwargs(args))
284 284 except Exception:
285 285 pycompat.future_set_exception_info(f, sys.exc_info()[1:])
286 286 else:
287 287 f.set_result(result)
288 288
289 289 return f
290 290
291 291 def sendcommands(self):
292 292 self._sent = True
293 293
294 294 def close(self):
295 295 self._closed = True
296 296
297 297
298 298 @interfaceutil.implementer(repository.ipeercommands)
299 299 class localpeer(repository.peer):
300 300 '''peer for a local repo; reflects only the most recent API'''
301 301
302 302 def __init__(self, repo, caps=None):
303 303 super(localpeer, self).__init__()
304 304
305 305 if caps is None:
306 306 caps = moderncaps.copy()
307 307 self._repo = repo.filtered(b'served')
308 308 self.ui = repo.ui
309 309
310 310 if repo._wanted_sidedata:
311 311 formatted = bundle2.format_remote_wanted_sidedata(repo)
312 312 caps.add(b'exp-wanted-sidedata=' + formatted)
313 313
314 314 self._caps = repo._restrictcapabilities(caps)
315 315
316 316 # Begin of _basepeer interface.
317 317
318 318 def url(self):
319 319 return self._repo.url()
320 320
321 321 def local(self):
322 322 return self._repo
323 323
324 324 def peer(self):
325 325 return self
326 326
327 327 def canpush(self):
328 328 return True
329 329
330 330 def close(self):
331 331 self._repo.close()
332 332
333 333 # End of _basepeer interface.
334 334
335 335 # Begin of _basewirecommands interface.
336 336
337 337 def branchmap(self):
338 338 return self._repo.branchmap()
339 339
340 340 def capabilities(self):
341 341 return self._caps
342 342
343 343 def clonebundles(self):
344 344 return self._repo.tryread(bundlecaches.CB_MANIFEST_FILE)
345 345
346 346 def debugwireargs(self, one, two, three=None, four=None, five=None):
347 347 """Used to test argument passing over the wire"""
348 348 return b"%s %s %s %s %s" % (
349 349 one,
350 350 two,
351 351 pycompat.bytestr(three),
352 352 pycompat.bytestr(four),
353 353 pycompat.bytestr(five),
354 354 )
355 355
356 356 def getbundle(
357 357 self,
358 358 source,
359 359 heads=None,
360 360 common=None,
361 361 bundlecaps=None,
362 362 remote_sidedata=None,
363 363 **kwargs
364 364 ):
365 365 chunks = exchange.getbundlechunks(
366 366 self._repo,
367 367 source,
368 368 heads=heads,
369 369 common=common,
370 370 bundlecaps=bundlecaps,
371 371 remote_sidedata=remote_sidedata,
372 372 **kwargs
373 373 )[1]
374 374 cb = util.chunkbuffer(chunks)
375 375
376 376 if exchange.bundle2requested(bundlecaps):
377 377 # When requesting a bundle2, getbundle returns a stream to make the
378 378 # wire level function happier. We need to build a proper object
379 379 # from it in local peer.
380 380 return bundle2.getunbundler(self.ui, cb)
381 381 else:
382 382 return changegroup.getunbundler(b'01', cb, None)
383 383
384 384 def heads(self):
385 385 return self._repo.heads()
386 386
387 387 def known(self, nodes):
388 388 return self._repo.known(nodes)
389 389
390 390 def listkeys(self, namespace):
391 391 return self._repo.listkeys(namespace)
392 392
393 393 def lookup(self, key):
394 394 return self._repo.lookup(key)
395 395
396 396 def pushkey(self, namespace, key, old, new):
397 397 return self._repo.pushkey(namespace, key, old, new)
398 398
399 399 def stream_out(self):
400 400 raise error.Abort(_(b'cannot perform stream clone against local peer'))
401 401
402 402 def unbundle(self, bundle, heads, url):
403 403 """apply a bundle on a repo
404 404
405 405 This function handles the repo locking itself."""
406 406 try:
407 407 try:
408 408 bundle = exchange.readbundle(self.ui, bundle, None)
409 409 ret = exchange.unbundle(self._repo, bundle, heads, b'push', url)
410 410 if util.safehasattr(ret, b'getchunks'):
411 411 # This is a bundle20 object, turn it into an unbundler.
412 412 # This little dance should be dropped eventually when the
413 413 # API is finally improved.
414 414 stream = util.chunkbuffer(ret.getchunks())
415 415 ret = bundle2.getunbundler(self.ui, stream)
416 416 return ret
417 417 except Exception as exc:
418 418 # If the exception contains output salvaged from a bundle2
419 419 # reply, we need to make sure it is printed before continuing
420 420 # to fail. So we build a bundle2 with such output and consume
421 421 # it directly.
422 422 #
423 423 # This is not very elegant but allows a "simple" solution for
424 424 # issue4594
425 425 output = getattr(exc, '_bundle2salvagedoutput', ())
426 426 if output:
427 427 bundler = bundle2.bundle20(self._repo.ui)
428 428 for out in output:
429 429 bundler.addpart(out)
430 430 stream = util.chunkbuffer(bundler.getchunks())
431 431 b = bundle2.getunbundler(self.ui, stream)
432 432 bundle2.processbundle(self._repo, b)
433 433 raise
434 434 except error.PushRaced as exc:
435 435 raise error.ResponseError(
436 436 _(b'push failed:'), stringutil.forcebytestr(exc)
437 437 )
438 438
439 439 # End of _basewirecommands interface.
440 440
441 441 # Begin of peer interface.
442 442
443 443 def commandexecutor(self):
444 444 return localcommandexecutor(self)
445 445
446 446 # End of peer interface.
447 447
448 448
449 449 @interfaceutil.implementer(repository.ipeerlegacycommands)
450 450 class locallegacypeer(localpeer):
451 451 """peer extension which implements legacy methods too; used for tests with
452 452 restricted capabilities"""
453 453
454 454 def __init__(self, repo):
455 455 super(locallegacypeer, self).__init__(repo, caps=legacycaps)
456 456
457 457 # Begin of baselegacywirecommands interface.
458 458
459 459 def between(self, pairs):
460 460 return self._repo.between(pairs)
461 461
462 462 def branches(self, nodes):
463 463 return self._repo.branches(nodes)
464 464
465 465 def changegroup(self, nodes, source):
466 466 outgoing = discovery.outgoing(
467 467 self._repo, missingroots=nodes, ancestorsof=self._repo.heads()
468 468 )
469 469 return changegroup.makechangegroup(self._repo, outgoing, b'01', source)
470 470
471 471 def changegroupsubset(self, bases, heads, source):
472 472 outgoing = discovery.outgoing(
473 473 self._repo, missingroots=bases, ancestorsof=heads
474 474 )
475 475 return changegroup.makechangegroup(self._repo, outgoing, b'01', source)
476 476
477 477 # End of baselegacywirecommands interface.
478 478
479 479
480 480 # Functions receiving (ui, features) that extensions can register to impact
481 481 # the ability to load repositories with custom requirements. Only
482 482 # functions defined in loaded extensions are called.
483 483 #
484 484 # The function receives a set of requirement strings that the repository
485 485 # is capable of opening. Functions will typically add elements to the
486 486 # set to reflect that the extension knows how to handle that requirements.
487 487 featuresetupfuncs = set()
488 488
489 489
490 490 def _getsharedvfs(hgvfs, requirements):
491 491 """returns the vfs object pointing to root of shared source
492 492 repo for a shared repository
493 493
494 494 hgvfs is vfs pointing at .hg/ of current repo (shared one)
495 495 requirements is a set of requirements of current repo (shared one)
496 496 """
497 497 # The ``shared`` or ``relshared`` requirements indicate the
498 498 # store lives in the path contained in the ``.hg/sharedpath`` file.
499 499 # This is an absolute path for ``shared`` and relative to
500 500 # ``.hg/`` for ``relshared``.
501 501 sharedpath = hgvfs.read(b'sharedpath').rstrip(b'\n')
502 502 if requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements:
503 503 sharedpath = util.normpath(hgvfs.join(sharedpath))
504 504
505 505 sharedvfs = vfsmod.vfs(sharedpath, realpath=True)
506 506
507 507 if not sharedvfs.exists():
508 508 raise error.RepoError(
509 509 _(b'.hg/sharedpath points to nonexistent directory %s')
510 510 % sharedvfs.base
511 511 )
512 512 return sharedvfs
513 513
514 514
515 515 def _readrequires(vfs, allowmissing):
516 516 """reads the require file present at root of this vfs
517 517 and return a set of requirements
518 518
519 519 If allowmissing is True, we suppress FileNotFoundError if raised"""
520 520 # requires file contains a newline-delimited list of
521 521 # features/capabilities the opener (us) must have in order to use
522 522 # the repository. This file was introduced in Mercurial 0.9.2,
523 523 # which means very old repositories may not have one. We assume
524 524 # a missing file translates to no requirements.
525 525 try:
526 526 return set(vfs.read(b'requires').splitlines())
527 527 except FileNotFoundError:
528 528 if not allowmissing:
529 529 raise
530 530 return set()
531 531
532 532
533 533 def makelocalrepository(baseui, path, intents=None):
534 534 """Create a local repository object.
535 535
536 536 Given arguments needed to construct a local repository, this function
537 537 performs various early repository loading functionality (such as
538 538 reading the ``.hg/requires`` and ``.hg/hgrc`` files), validates that
539 539 the repository can be opened, derives a type suitable for representing
540 540 that repository, and returns an instance of it.
541 541
542 542 The returned object conforms to the ``repository.completelocalrepository``
543 543 interface.
544 544
545 545 The repository type is derived by calling a series of factory functions
546 546 for each aspect/interface of the final repository. These are defined by
547 547 ``REPO_INTERFACES``.
548 548
549 549 Each factory function is called to produce a type implementing a specific
550 550 interface. The cumulative list of returned types will be combined into a
551 551 new type and that type will be instantiated to represent the local
552 552 repository.
553 553
554 554 The factory functions each receive various state that may be consulted
555 555 as part of deriving a type.
556 556
557 557 Extensions should wrap these factory functions to customize repository type
558 558 creation. Note that an extension's wrapped function may be called even if
559 559 that extension is not loaded for the repo being constructed. Extensions
560 560 should check if their ``__name__`` appears in the
561 561 ``extensionmodulenames`` set passed to the factory function and no-op if
562 562 not.
563 563 """
564 564 ui = baseui.copy()
565 565 # Prevent copying repo configuration.
566 566 ui.copy = baseui.copy
567 567
568 568 # Working directory VFS rooted at repository root.
569 569 wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True)
570 570
571 571 # Main VFS for .hg/ directory.
572 572 hgpath = wdirvfs.join(b'.hg')
573 573 hgvfs = vfsmod.vfs(hgpath, cacheaudited=True)
574 574 # Whether this repository is shared one or not
575 575 shared = False
576 576 # If this repository is shared, vfs pointing to shared repo
577 577 sharedvfs = None
578 578
579 579 # The .hg/ path should exist and should be a directory. All other
580 580 # cases are errors.
581 581 if not hgvfs.isdir():
582 582 try:
583 583 hgvfs.stat()
584 584 except FileNotFoundError:
585 585 pass
586 586 except ValueError as e:
587 587 # Can be raised on Python 3.8 when path is invalid.
588 588 raise error.Abort(
589 589 _(b'invalid path %s: %s') % (path, stringutil.forcebytestr(e))
590 590 )
591 591
592 592 raise error.RepoError(_(b'repository %s not found') % path)
593 593
594 594 requirements = _readrequires(hgvfs, True)
595 595 shared = (
596 596 requirementsmod.SHARED_REQUIREMENT in requirements
597 597 or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements
598 598 )
599 599 storevfs = None
600 600 if shared:
601 601 # This is a shared repo
602 602 sharedvfs = _getsharedvfs(hgvfs, requirements)
603 603 storevfs = vfsmod.vfs(sharedvfs.join(b'store'))
604 604 else:
605 605 storevfs = vfsmod.vfs(hgvfs.join(b'store'))
606 606
607 607 # if .hg/requires contains the sharesafe requirement, it means
608 608 # there exists a `.hg/store/requires` too and we should read it
609 609 # NOTE: presence of SHARESAFE_REQUIREMENT imply that store requirement
610 610 # is present. We never write SHARESAFE_REQUIREMENT for a repo if store
611 611 # is not present, refer checkrequirementscompat() for that
612 612 #
613 613 # However, if SHARESAFE_REQUIREMENT is not present, it means that the
614 614 # repository was shared the old way. We check the share source .hg/requires
615 615 # for SHARESAFE_REQUIREMENT to detect whether the current repository needs
616 616 # to be reshared
617 617 hint = _(b"see `hg help config.format.use-share-safe` for more information")
618 618 if requirementsmod.SHARESAFE_REQUIREMENT in requirements:
619 619
620 620 if (
621 621 shared
622 622 and requirementsmod.SHARESAFE_REQUIREMENT
623 623 not in _readrequires(sharedvfs, True)
624 624 ):
625 625 mismatch_warn = ui.configbool(
626 626 b'share', b'safe-mismatch.source-not-safe.warn'
627 627 )
628 628 mismatch_config = ui.config(
629 629 b'share', b'safe-mismatch.source-not-safe'
630 630 )
631 631 mismatch_verbose_upgrade = ui.configbool(
632 632 b'share', b'safe-mismatch.source-not-safe:verbose-upgrade'
633 633 )
634 634 if mismatch_config in (
635 635 b'downgrade-allow',
636 636 b'allow',
637 637 b'downgrade-abort',
638 638 ):
639 639 # prevent cyclic import localrepo -> upgrade -> localrepo
640 640 from . import upgrade
641 641
642 642 upgrade.downgrade_share_to_non_safe(
643 643 ui,
644 644 hgvfs,
645 645 sharedvfs,
646 646 requirements,
647 647 mismatch_config,
648 648 mismatch_warn,
649 649 mismatch_verbose_upgrade,
650 650 )
651 651 elif mismatch_config == b'abort':
652 652 raise error.Abort(
653 653 _(b"share source does not support share-safe requirement"),
654 654 hint=hint,
655 655 )
656 656 else:
657 657 raise error.Abort(
658 658 _(
659 659 b"share-safe mismatch with source.\nUnrecognized"
660 660 b" value '%s' of `share.safe-mismatch.source-not-safe`"
661 661 b" set."
662 662 )
663 663 % mismatch_config,
664 664 hint=hint,
665 665 )
666 666 else:
667 667 requirements |= _readrequires(storevfs, False)
668 668 elif shared:
669 669 sourcerequires = _readrequires(sharedvfs, False)
670 670 if requirementsmod.SHARESAFE_REQUIREMENT in sourcerequires:
671 671 mismatch_config = ui.config(b'share', b'safe-mismatch.source-safe')
672 672 mismatch_warn = ui.configbool(
673 673 b'share', b'safe-mismatch.source-safe.warn'
674 674 )
675 675 mismatch_verbose_upgrade = ui.configbool(
676 676 b'share', b'safe-mismatch.source-safe:verbose-upgrade'
677 677 )
678 678 if mismatch_config in (
679 679 b'upgrade-allow',
680 680 b'allow',
681 681 b'upgrade-abort',
682 682 ):
683 683 # prevent cyclic import localrepo -> upgrade -> localrepo
684 684 from . import upgrade
685 685
686 686 upgrade.upgrade_share_to_safe(
687 687 ui,
688 688 hgvfs,
689 689 storevfs,
690 690 requirements,
691 691 mismatch_config,
692 692 mismatch_warn,
693 693 mismatch_verbose_upgrade,
694 694 )
695 695 elif mismatch_config == b'abort':
696 696 raise error.Abort(
697 697 _(
698 698 b'version mismatch: source uses share-safe'
699 699 b' functionality while the current share does not'
700 700 ),
701 701 hint=hint,
702 702 )
703 703 else:
704 704 raise error.Abort(
705 705 _(
706 706 b"share-safe mismatch with source.\nUnrecognized"
707 707 b" value '%s' of `share.safe-mismatch.source-safe` set."
708 708 )
709 709 % mismatch_config,
710 710 hint=hint,
711 711 )
712 712
713 713 # The .hg/hgrc file may load extensions or contain config options
714 714 # that influence repository construction. Attempt to load it and
715 715 # process any new extensions that it may have pulled in.
716 716 if loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs):
717 717 afterhgrcload(ui, wdirvfs, hgvfs, requirements)
718 718 extensions.loadall(ui)
719 719 extensions.populateui(ui)
720 720
721 721 # Set of module names of extensions loaded for this repository.
722 722 extensionmodulenames = {m.__name__ for n, m in extensions.extensions(ui)}
723 723
724 724 supportedrequirements = gathersupportedrequirements(ui)
725 725
726 726 # We first validate the requirements are known.
727 727 ensurerequirementsrecognized(requirements, supportedrequirements)
728 728
729 729 # Then we validate that the known set is reasonable to use together.
730 730 ensurerequirementscompatible(ui, requirements)
731 731
732 732 # TODO there are unhandled edge cases related to opening repositories with
733 733 # shared storage. If storage is shared, we should also test for requirements
734 734 # compatibility in the pointed-to repo. This entails loading the .hg/hgrc in
735 735 # that repo, as that repo may load extensions needed to open it. This is a
736 736 # bit complicated because we don't want the other hgrc to overwrite settings
737 737 # in this hgrc.
738 738 #
739 739 # This bug is somewhat mitigated by the fact that we copy the .hg/requires
740 740 # file when sharing repos. But if a requirement is added after the share is
741 741 # performed, thereby introducing a new requirement for the opener, we may
742 742 # will not see that and could encounter a run-time error interacting with
743 743 # that shared store since it has an unknown-to-us requirement.
744 744
745 745 # At this point, we know we should be capable of opening the repository.
746 746 # Now get on with doing that.
747 747
748 748 features = set()
749 749
750 750 # The "store" part of the repository holds versioned data. How it is
751 751 # accessed is determined by various requirements. If `shared` or
752 752 # `relshared` requirements are present, this indicates current repository
753 753 # is a share and store exists in path mentioned in `.hg/sharedpath`
754 754 if shared:
755 755 storebasepath = sharedvfs.base
756 756 cachepath = sharedvfs.join(b'cache')
757 757 features.add(repository.REPO_FEATURE_SHARED_STORAGE)
758 758 else:
759 759 storebasepath = hgvfs.base
760 760 cachepath = hgvfs.join(b'cache')
761 761 wcachepath = hgvfs.join(b'wcache')
762 762
763 763 # The store has changed over time and the exact layout is dictated by
764 764 # requirements. The store interface abstracts differences across all
765 765 # of them.
766 766 store = makestore(
767 767 requirements,
768 768 storebasepath,
769 769 lambda base: vfsmod.vfs(base, cacheaudited=True),
770 770 )
771 771 hgvfs.createmode = store.createmode
772 772
773 773 storevfs = store.vfs
774 774 storevfs.options = resolvestorevfsoptions(ui, requirements, features)
775 775
776 776 if (
777 777 requirementsmod.REVLOGV2_REQUIREMENT in requirements
778 778 or requirementsmod.CHANGELOGV2_REQUIREMENT in requirements
779 779 ):
780 780 features.add(repository.REPO_FEATURE_SIDE_DATA)
781 781 # the revlogv2 docket introduced race condition that we need to fix
782 782 features.discard(repository.REPO_FEATURE_STREAM_CLONE)
783 783
784 784 # The cache vfs is used to manage cache files.
785 785 cachevfs = vfsmod.vfs(cachepath, cacheaudited=True)
786 786 cachevfs.createmode = store.createmode
787 787 # The cache vfs is used to manage cache files related to the working copy
788 788 wcachevfs = vfsmod.vfs(wcachepath, cacheaudited=True)
789 789 wcachevfs.createmode = store.createmode
790 790
791 791 # Now resolve the type for the repository object. We do this by repeatedly
792 792 # calling a factory function to produces types for specific aspects of the
793 793 # repo's operation. The aggregate returned types are used as base classes
794 794 # for a dynamically-derived type, which will represent our new repository.
795 795
796 796 bases = []
797 797 extrastate = {}
798 798
799 799 for iface, fn in REPO_INTERFACES:
800 800 # We pass all potentially useful state to give extensions tons of
801 801 # flexibility.
802 802 typ = fn()(
803 803 ui=ui,
804 804 intents=intents,
805 805 requirements=requirements,
806 806 features=features,
807 807 wdirvfs=wdirvfs,
808 808 hgvfs=hgvfs,
809 809 store=store,
810 810 storevfs=storevfs,
811 811 storeoptions=storevfs.options,
812 812 cachevfs=cachevfs,
813 813 wcachevfs=wcachevfs,
814 814 extensionmodulenames=extensionmodulenames,
815 815 extrastate=extrastate,
816 816 baseclasses=bases,
817 817 )
818 818
819 819 if not isinstance(typ, type):
820 820 raise error.ProgrammingError(
821 821 b'unable to construct type for %s' % iface
822 822 )
823 823
824 824 bases.append(typ)
825 825
826 826 # type() allows you to use characters in type names that wouldn't be
827 827 # recognized as Python symbols in source code. We abuse that to add
828 828 # rich information about our constructed repo.
829 829 name = pycompat.sysstr(
830 830 b'derivedrepo:%s<%s>' % (wdirvfs.base, b','.join(sorted(requirements)))
831 831 )
832 832
833 833 cls = type(name, tuple(bases), {})
834 834
835 835 return cls(
836 836 baseui=baseui,
837 837 ui=ui,
838 838 origroot=path,
839 839 wdirvfs=wdirvfs,
840 840 hgvfs=hgvfs,
841 841 requirements=requirements,
842 842 supportedrequirements=supportedrequirements,
843 843 sharedpath=storebasepath,
844 844 store=store,
845 845 cachevfs=cachevfs,
846 846 wcachevfs=wcachevfs,
847 847 features=features,
848 848 intents=intents,
849 849 )
850 850
851 851
852 852 def loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs=None):
853 853 """Load hgrc files/content into a ui instance.
854 854
855 855 This is called during repository opening to load any additional
856 856 config files or settings relevant to the current repository.
857 857
858 858 Returns a bool indicating whether any additional configs were loaded.
859 859
860 860 Extensions should monkeypatch this function to modify how per-repo
861 861 configs are loaded. For example, an extension may wish to pull in
862 862 configs from alternate files or sources.
863 863
864 864 sharedvfs is vfs object pointing to source repo if the current one is a
865 865 shared one
866 866 """
867 867 if not rcutil.use_repo_hgrc():
868 868 return False
869 869
870 870 ret = False
871 871 # first load config from shared source if we has to
872 872 if requirementsmod.SHARESAFE_REQUIREMENT in requirements and sharedvfs:
873 873 try:
874 874 ui.readconfig(sharedvfs.join(b'hgrc'), root=sharedvfs.base)
875 875 ret = True
876 876 except IOError:
877 877 pass
878 878
879 879 try:
880 880 ui.readconfig(hgvfs.join(b'hgrc'), root=wdirvfs.base)
881 881 ret = True
882 882 except IOError:
883 883 pass
884 884
885 885 try:
886 886 ui.readconfig(hgvfs.join(b'hgrc-not-shared'), root=wdirvfs.base)
887 887 ret = True
888 888 except IOError:
889 889 pass
890 890
891 891 return ret
892 892
893 893
894 894 def afterhgrcload(ui, wdirvfs, hgvfs, requirements):
895 895 """Perform additional actions after .hg/hgrc is loaded.
896 896
897 897 This function is called during repository loading immediately after
898 898 the .hg/hgrc file is loaded and before per-repo extensions are loaded.
899 899
900 900 The function can be used to validate configs, automatically add
901 901 options (including extensions) based on requirements, etc.
902 902 """
903 903
904 904 # Map of requirements to list of extensions to load automatically when
905 905 # requirement is present.
906 906 autoextensions = {
907 907 b'git': [b'git'],
908 908 b'largefiles': [b'largefiles'],
909 909 b'lfs': [b'lfs'],
910 910 }
911 911
912 912 for requirement, names in sorted(autoextensions.items()):
913 913 if requirement not in requirements:
914 914 continue
915 915
916 916 for name in names:
917 917 if not ui.hasconfig(b'extensions', name):
918 918 ui.setconfig(b'extensions', name, b'', source=b'autoload')
919 919
920 920
921 921 def gathersupportedrequirements(ui):
922 922 """Determine the complete set of recognized requirements."""
923 923 # Start with all requirements supported by this file.
924 924 supported = set(localrepository._basesupported)
925 925
926 926 # Execute ``featuresetupfuncs`` entries if they belong to an extension
927 927 # relevant to this ui instance.
928 928 modules = {m.__name__ for n, m in extensions.extensions(ui)}
929 929
930 930 for fn in featuresetupfuncs:
931 931 if fn.__module__ in modules:
932 932 fn(ui, supported)
933 933
934 934 # Add derived requirements from registered compression engines.
935 935 for name in util.compengines:
936 936 engine = util.compengines[name]
937 937 if engine.available() and engine.revlogheader():
938 938 supported.add(b'exp-compression-%s' % name)
939 939 if engine.name() == b'zstd':
940 940 supported.add(requirementsmod.REVLOG_COMPRESSION_ZSTD)
941 941
942 942 return supported
943 943
944 944
945 945 def ensurerequirementsrecognized(requirements, supported):
946 946 """Validate that a set of local requirements is recognized.
947 947
948 948 Receives a set of requirements. Raises an ``error.RepoError`` if there
949 949 exists any requirement in that set that currently loaded code doesn't
950 950 recognize.
951 951
952 952 Returns a set of supported requirements.
953 953 """
954 954 missing = set()
955 955
956 956 for requirement in requirements:
957 957 if requirement in supported:
958 958 continue
959 959
960 960 if not requirement or not requirement[0:1].isalnum():
961 961 raise error.RequirementError(_(b'.hg/requires file is corrupt'))
962 962
963 963 missing.add(requirement)
964 964
965 965 if missing:
966 966 raise error.RequirementError(
967 967 _(b'repository requires features unknown to this Mercurial: %s')
968 968 % b' '.join(sorted(missing)),
969 969 hint=_(
970 970 b'see https://mercurial-scm.org/wiki/MissingRequirement '
971 971 b'for more information'
972 972 ),
973 973 )
974 974
975 975
976 976 def ensurerequirementscompatible(ui, requirements):
977 977 """Validates that a set of recognized requirements is mutually compatible.
978 978
979 979 Some requirements may not be compatible with others or require
980 980 config options that aren't enabled. This function is called during
981 981 repository opening to ensure that the set of requirements needed
982 982 to open a repository is sane and compatible with config options.
983 983
984 984 Extensions can monkeypatch this function to perform additional
985 985 checking.
986 986
987 987 ``error.RepoError`` should be raised on failure.
988 988 """
989 989 if (
990 990 requirementsmod.SPARSE_REQUIREMENT in requirements
991 991 and not sparse.enabled
992 992 ):
993 993 raise error.RepoError(
994 994 _(
995 995 b'repository is using sparse feature but '
996 996 b'sparse is not enabled; enable the '
997 997 b'"sparse" extensions to access'
998 998 )
999 999 )
1000 1000
1001 1001
1002 1002 def makestore(requirements, path, vfstype):
1003 1003 """Construct a storage object for a repository."""
1004 1004 if requirementsmod.STORE_REQUIREMENT in requirements:
1005 1005 if requirementsmod.FNCACHE_REQUIREMENT in requirements:
1006 1006 dotencode = requirementsmod.DOTENCODE_REQUIREMENT in requirements
1007 1007 return storemod.fncachestore(path, vfstype, dotencode)
1008 1008
1009 1009 return storemod.encodedstore(path, vfstype)
1010 1010
1011 1011 return storemod.basicstore(path, vfstype)
1012 1012
1013 1013
1014 1014 def resolvestorevfsoptions(ui, requirements, features):
1015 1015 """Resolve the options to pass to the store vfs opener.
1016 1016
1017 1017 The returned dict is used to influence behavior of the storage layer.
1018 1018 """
1019 1019 options = {}
1020 1020
1021 1021 if requirementsmod.TREEMANIFEST_REQUIREMENT in requirements:
1022 1022 options[b'treemanifest'] = True
1023 1023
1024 1024 # experimental config: format.manifestcachesize
1025 1025 manifestcachesize = ui.configint(b'format', b'manifestcachesize')
1026 1026 if manifestcachesize is not None:
1027 1027 options[b'manifestcachesize'] = manifestcachesize
1028 1028
1029 1029 # In the absence of another requirement superseding a revlog-related
1030 1030 # requirement, we have to assume the repo is using revlog version 0.
1031 1031 # This revlog format is super old and we don't bother trying to parse
1032 1032 # opener options for it because those options wouldn't do anything
1033 1033 # meaningful on such old repos.
1034 1034 if (
1035 1035 requirementsmod.REVLOGV1_REQUIREMENT in requirements
1036 1036 or requirementsmod.REVLOGV2_REQUIREMENT in requirements
1037 1037 ):
1038 1038 options.update(resolverevlogstorevfsoptions(ui, requirements, features))
1039 1039 else: # explicitly mark repo as using revlogv0
1040 1040 options[b'revlogv0'] = True
1041 1041
1042 1042 if requirementsmod.COPIESSDC_REQUIREMENT in requirements:
1043 1043 options[b'copies-storage'] = b'changeset-sidedata'
1044 1044 else:
1045 1045 writecopiesto = ui.config(b'experimental', b'copies.write-to')
1046 1046 copiesextramode = (b'changeset-only', b'compatibility')
1047 1047 if writecopiesto in copiesextramode:
1048 1048 options[b'copies-storage'] = b'extra'
1049 1049
1050 1050 return options
1051 1051
1052 1052
1053 1053 def resolverevlogstorevfsoptions(ui, requirements, features):
1054 1054 """Resolve opener options specific to revlogs."""
1055 1055
1056 1056 options = {}
1057 1057 options[b'flagprocessors'] = {}
1058 1058
1059 1059 if requirementsmod.REVLOGV1_REQUIREMENT in requirements:
1060 1060 options[b'revlogv1'] = True
1061 1061 if requirementsmod.REVLOGV2_REQUIREMENT in requirements:
1062 1062 options[b'revlogv2'] = True
1063 1063 if requirementsmod.CHANGELOGV2_REQUIREMENT in requirements:
1064 1064 options[b'changelogv2'] = True
1065 1065
1066 1066 if requirementsmod.GENERALDELTA_REQUIREMENT in requirements:
1067 1067 options[b'generaldelta'] = True
1068 1068
1069 1069 # experimental config: format.chunkcachesize
1070 1070 chunkcachesize = ui.configint(b'format', b'chunkcachesize')
1071 1071 if chunkcachesize is not None:
1072 1072 options[b'chunkcachesize'] = chunkcachesize
1073 1073
1074 1074 deltabothparents = ui.configbool(
1075 1075 b'storage', b'revlog.optimize-delta-parent-choice'
1076 1076 )
1077 1077 options[b'deltabothparents'] = deltabothparents
1078 1078 options[b'debug-delta'] = ui.configbool(b'debug', b'revlog.debug-delta')
1079 1079
1080 1080 issue6528 = ui.configbool(b'storage', b'revlog.issue6528.fix-incoming')
1081 1081 options[b'issue6528.fix-incoming'] = issue6528
1082 1082
1083 1083 lazydelta = ui.configbool(b'storage', b'revlog.reuse-external-delta')
1084 1084 lazydeltabase = False
1085 1085 if lazydelta:
1086 1086 lazydeltabase = ui.configbool(
1087 1087 b'storage', b'revlog.reuse-external-delta-parent'
1088 1088 )
1089 1089 if lazydeltabase is None:
1090 1090 lazydeltabase = not scmutil.gddeltaconfig(ui)
1091 1091 options[b'lazydelta'] = lazydelta
1092 1092 options[b'lazydeltabase'] = lazydeltabase
1093 1093
1094 1094 chainspan = ui.configbytes(b'experimental', b'maxdeltachainspan')
1095 1095 if 0 <= chainspan:
1096 1096 options[b'maxdeltachainspan'] = chainspan
1097 1097
1098 1098 mmapindexthreshold = ui.configbytes(b'experimental', b'mmapindexthreshold')
1099 1099 if mmapindexthreshold is not None:
1100 1100 options[b'mmapindexthreshold'] = mmapindexthreshold
1101 1101
1102 1102 withsparseread = ui.configbool(b'experimental', b'sparse-read')
1103 1103 srdensitythres = float(
1104 1104 ui.config(b'experimental', b'sparse-read.density-threshold')
1105 1105 )
1106 1106 srmingapsize = ui.configbytes(b'experimental', b'sparse-read.min-gap-size')
1107 1107 options[b'with-sparse-read'] = withsparseread
1108 1108 options[b'sparse-read-density-threshold'] = srdensitythres
1109 1109 options[b'sparse-read-min-gap-size'] = srmingapsize
1110 1110
1111 1111 sparserevlog = requirementsmod.SPARSEREVLOG_REQUIREMENT in requirements
1112 1112 options[b'sparse-revlog'] = sparserevlog
1113 1113 if sparserevlog:
1114 1114 options[b'generaldelta'] = True
1115 1115
1116 1116 maxchainlen = None
1117 1117 if sparserevlog:
1118 1118 maxchainlen = revlogconst.SPARSE_REVLOG_MAX_CHAIN_LENGTH
1119 1119 # experimental config: format.maxchainlen
1120 1120 maxchainlen = ui.configint(b'format', b'maxchainlen', maxchainlen)
1121 1121 if maxchainlen is not None:
1122 1122 options[b'maxchainlen'] = maxchainlen
1123 1123
1124 1124 for r in requirements:
1125 1125 # we allow multiple compression engine requirement to co-exist because
1126 1126 # strickly speaking, revlog seems to support mixed compression style.
1127 1127 #
1128 1128 # The compression used for new entries will be "the last one"
1129 1129 prefix = r.startswith
1130 1130 if prefix(b'revlog-compression-') or prefix(b'exp-compression-'):
1131 1131 options[b'compengine'] = r.split(b'-', 2)[2]
1132 1132
1133 1133 options[b'zlib.level'] = ui.configint(b'storage', b'revlog.zlib.level')
1134 1134 if options[b'zlib.level'] is not None:
1135 1135 if not (0 <= options[b'zlib.level'] <= 9):
1136 1136 msg = _(b'invalid value for `storage.revlog.zlib.level` config: %d')
1137 1137 raise error.Abort(msg % options[b'zlib.level'])
1138 1138 options[b'zstd.level'] = ui.configint(b'storage', b'revlog.zstd.level')
1139 1139 if options[b'zstd.level'] is not None:
1140 1140 if not (0 <= options[b'zstd.level'] <= 22):
1141 1141 msg = _(b'invalid value for `storage.revlog.zstd.level` config: %d')
1142 1142 raise error.Abort(msg % options[b'zstd.level'])
1143 1143
1144 1144 if requirementsmod.NARROW_REQUIREMENT in requirements:
1145 1145 options[b'enableellipsis'] = True
1146 1146
1147 1147 if ui.configbool(b'experimental', b'rust.index'):
1148 1148 options[b'rust.index'] = True
1149 1149 if requirementsmod.NODEMAP_REQUIREMENT in requirements:
1150 1150 slow_path = ui.config(
1151 1151 b'storage', b'revlog.persistent-nodemap.slow-path'
1152 1152 )
1153 1153 if slow_path not in (b'allow', b'warn', b'abort'):
1154 1154 default = ui.config_default(
1155 1155 b'storage', b'revlog.persistent-nodemap.slow-path'
1156 1156 )
1157 1157 msg = _(
1158 1158 b'unknown value for config '
1159 1159 b'"storage.revlog.persistent-nodemap.slow-path": "%s"\n'
1160 1160 )
1161 1161 ui.warn(msg % slow_path)
1162 1162 if not ui.quiet:
1163 1163 ui.warn(_(b'falling back to default value: %s\n') % default)
1164 1164 slow_path = default
1165 1165
1166 1166 msg = _(
1167 1167 b"accessing `persistent-nodemap` repository without associated "
1168 1168 b"fast implementation."
1169 1169 )
1170 1170 hint = _(
1171 1171 b"check `hg help config.format.use-persistent-nodemap` "
1172 1172 b"for details"
1173 1173 )
1174 1174 if not revlog.HAS_FAST_PERSISTENT_NODEMAP:
1175 1175 if slow_path == b'warn':
1176 1176 msg = b"warning: " + msg + b'\n'
1177 1177 ui.warn(msg)
1178 1178 if not ui.quiet:
1179 1179 hint = b'(' + hint + b')\n'
1180 1180 ui.warn(hint)
1181 1181 if slow_path == b'abort':
1182 1182 raise error.Abort(msg, hint=hint)
1183 1183 options[b'persistent-nodemap'] = True
1184 1184 if requirementsmod.DIRSTATE_V2_REQUIREMENT in requirements:
1185 1185 slow_path = ui.config(b'storage', b'dirstate-v2.slow-path')
1186 1186 if slow_path not in (b'allow', b'warn', b'abort'):
1187 1187 default = ui.config_default(b'storage', b'dirstate-v2.slow-path')
1188 1188 msg = _(b'unknown value for config "dirstate-v2.slow-path": "%s"\n')
1189 1189 ui.warn(msg % slow_path)
1190 1190 if not ui.quiet:
1191 1191 ui.warn(_(b'falling back to default value: %s\n') % default)
1192 1192 slow_path = default
1193 1193
1194 1194 msg = _(
1195 1195 b"accessing `dirstate-v2` repository without associated "
1196 1196 b"fast implementation."
1197 1197 )
1198 1198 hint = _(
1199 1199 b"check `hg help config.format.use-dirstate-v2` " b"for details"
1200 1200 )
1201 1201 if not dirstate.HAS_FAST_DIRSTATE_V2:
1202 1202 if slow_path == b'warn':
1203 1203 msg = b"warning: " + msg + b'\n'
1204 1204 ui.warn(msg)
1205 1205 if not ui.quiet:
1206 1206 hint = b'(' + hint + b')\n'
1207 1207 ui.warn(hint)
1208 1208 if slow_path == b'abort':
1209 1209 raise error.Abort(msg, hint=hint)
1210 1210 if ui.configbool(b'storage', b'revlog.persistent-nodemap.mmap'):
1211 1211 options[b'persistent-nodemap.mmap'] = True
1212 1212 if ui.configbool(b'devel', b'persistent-nodemap'):
1213 1213 options[b'devel-force-nodemap'] = True
1214 1214
1215 1215 return options
1216 1216
1217 1217
1218 1218 def makemain(**kwargs):
1219 1219 """Produce a type conforming to ``ilocalrepositorymain``."""
1220 1220 return localrepository
1221 1221
1222 1222
1223 1223 @interfaceutil.implementer(repository.ilocalrepositoryfilestorage)
1224 1224 class revlogfilestorage:
1225 1225 """File storage when using revlogs."""
1226 1226
1227 1227 def file(self, path):
1228 1228 if path.startswith(b'/'):
1229 1229 path = path[1:]
1230 1230
1231 1231 return filelog.filelog(self.svfs, path)
1232 1232
1233 1233
1234 1234 @interfaceutil.implementer(repository.ilocalrepositoryfilestorage)
1235 1235 class revlognarrowfilestorage:
1236 1236 """File storage when using revlogs and narrow files."""
1237 1237
1238 1238 def file(self, path):
1239 1239 if path.startswith(b'/'):
1240 1240 path = path[1:]
1241 1241
1242 1242 return filelog.narrowfilelog(self.svfs, path, self._storenarrowmatch)
1243 1243
1244 1244
1245 1245 def makefilestorage(requirements, features, **kwargs):
1246 1246 """Produce a type conforming to ``ilocalrepositoryfilestorage``."""
1247 1247 features.add(repository.REPO_FEATURE_REVLOG_FILE_STORAGE)
1248 1248 features.add(repository.REPO_FEATURE_STREAM_CLONE)
1249 1249
1250 1250 if requirementsmod.NARROW_REQUIREMENT in requirements:
1251 1251 return revlognarrowfilestorage
1252 1252 else:
1253 1253 return revlogfilestorage
1254 1254
1255 1255
1256 1256 # List of repository interfaces and factory functions for them. Each
1257 1257 # will be called in order during ``makelocalrepository()`` to iteratively
1258 1258 # derive the final type for a local repository instance. We capture the
1259 1259 # function as a lambda so we don't hold a reference and the module-level
1260 1260 # functions can be wrapped.
1261 1261 REPO_INTERFACES = [
1262 1262 (repository.ilocalrepositorymain, lambda: makemain),
1263 1263 (repository.ilocalrepositoryfilestorage, lambda: makefilestorage),
1264 1264 ]
1265 1265
1266 1266
1267 1267 @interfaceutil.implementer(repository.ilocalrepositorymain)
1268 1268 class localrepository:
1269 1269 """Main class for representing local repositories.
1270 1270
1271 1271 All local repositories are instances of this class.
1272 1272
1273 1273 Constructed on its own, instances of this class are not usable as
1274 1274 repository objects. To obtain a usable repository object, call
1275 1275 ``hg.repository()``, ``localrepo.instance()``, or
1276 1276 ``localrepo.makelocalrepository()``. The latter is the lowest-level.
1277 1277 ``instance()`` adds support for creating new repositories.
1278 1278 ``hg.repository()`` adds more extension integration, including calling
1279 1279 ``reposetup()``. Generally speaking, ``hg.repository()`` should be
1280 1280 used.
1281 1281 """
1282 1282
1283 1283 _basesupported = {
1284 1284 requirementsmod.ARCHIVED_PHASE_REQUIREMENT,
1285 1285 requirementsmod.BOOKMARKS_IN_STORE_REQUIREMENT,
1286 1286 requirementsmod.CHANGELOGV2_REQUIREMENT,
1287 1287 requirementsmod.COPIESSDC_REQUIREMENT,
1288 1288 requirementsmod.DIRSTATE_TRACKED_HINT_V1,
1289 1289 requirementsmod.DIRSTATE_V2_REQUIREMENT,
1290 1290 requirementsmod.DOTENCODE_REQUIREMENT,
1291 1291 requirementsmod.FNCACHE_REQUIREMENT,
1292 1292 requirementsmod.GENERALDELTA_REQUIREMENT,
1293 1293 requirementsmod.INTERNAL_PHASE_REQUIREMENT,
1294 1294 requirementsmod.NODEMAP_REQUIREMENT,
1295 1295 requirementsmod.RELATIVE_SHARED_REQUIREMENT,
1296 1296 requirementsmod.REVLOGV1_REQUIREMENT,
1297 1297 requirementsmod.REVLOGV2_REQUIREMENT,
1298 1298 requirementsmod.SHARED_REQUIREMENT,
1299 1299 requirementsmod.SHARESAFE_REQUIREMENT,
1300 1300 requirementsmod.SPARSE_REQUIREMENT,
1301 1301 requirementsmod.SPARSEREVLOG_REQUIREMENT,
1302 1302 requirementsmod.STORE_REQUIREMENT,
1303 1303 requirementsmod.TREEMANIFEST_REQUIREMENT,
1304 1304 }
1305 1305
1306 1306 # list of prefix for file which can be written without 'wlock'
1307 1307 # Extensions should extend this list when needed
1308 1308 _wlockfreeprefix = {
1309 1309 # We migh consider requiring 'wlock' for the next
1310 1310 # two, but pretty much all the existing code assume
1311 1311 # wlock is not needed so we keep them excluded for
1312 1312 # now.
1313 1313 b'hgrc',
1314 1314 b'requires',
1315 1315 # XXX cache is a complicatged business someone
1316 1316 # should investigate this in depth at some point
1317 1317 b'cache/',
1318 1318 # XXX shouldn't be dirstate covered by the wlock?
1319 1319 b'dirstate',
1320 1320 # XXX bisect was still a bit too messy at the time
1321 1321 # this changeset was introduced. Someone should fix
1322 1322 # the remainig bit and drop this line
1323 1323 b'bisect.state',
1324 1324 }
1325 1325
1326 1326 def __init__(
1327 1327 self,
1328 1328 baseui,
1329 1329 ui,
1330 1330 origroot,
1331 1331 wdirvfs,
1332 1332 hgvfs,
1333 1333 requirements,
1334 1334 supportedrequirements,
1335 1335 sharedpath,
1336 1336 store,
1337 1337 cachevfs,
1338 1338 wcachevfs,
1339 1339 features,
1340 1340 intents=None,
1341 1341 ):
1342 1342 """Create a new local repository instance.
1343 1343
1344 1344 Most callers should use ``hg.repository()``, ``localrepo.instance()``,
1345 1345 or ``localrepo.makelocalrepository()`` for obtaining a new repository
1346 1346 object.
1347 1347
1348 1348 Arguments:
1349 1349
1350 1350 baseui
1351 1351 ``ui.ui`` instance that ``ui`` argument was based off of.
1352 1352
1353 1353 ui
1354 1354 ``ui.ui`` instance for use by the repository.
1355 1355
1356 1356 origroot
1357 1357 ``bytes`` path to working directory root of this repository.
1358 1358
1359 1359 wdirvfs
1360 1360 ``vfs.vfs`` rooted at the working directory.
1361 1361
1362 1362 hgvfs
1363 1363 ``vfs.vfs`` rooted at .hg/
1364 1364
1365 1365 requirements
1366 1366 ``set`` of bytestrings representing repository opening requirements.
1367 1367
1368 1368 supportedrequirements
1369 1369 ``set`` of bytestrings representing repository requirements that we
1370 1370 know how to open. May be a supetset of ``requirements``.
1371 1371
1372 1372 sharedpath
1373 1373 ``bytes`` Defining path to storage base directory. Points to a
1374 1374 ``.hg/`` directory somewhere.
1375 1375
1376 1376 store
1377 1377 ``store.basicstore`` (or derived) instance providing access to
1378 1378 versioned storage.
1379 1379
1380 1380 cachevfs
1381 1381 ``vfs.vfs`` used for cache files.
1382 1382
1383 1383 wcachevfs
1384 1384 ``vfs.vfs`` used for cache files related to the working copy.
1385 1385
1386 1386 features
1387 1387 ``set`` of bytestrings defining features/capabilities of this
1388 1388 instance.
1389 1389
1390 1390 intents
1391 1391 ``set`` of system strings indicating what this repo will be used
1392 1392 for.
1393 1393 """
1394 1394 self.baseui = baseui
1395 1395 self.ui = ui
1396 1396 self.origroot = origroot
1397 1397 # vfs rooted at working directory.
1398 1398 self.wvfs = wdirvfs
1399 1399 self.root = wdirvfs.base
1400 1400 # vfs rooted at .hg/. Used to access most non-store paths.
1401 1401 self.vfs = hgvfs
1402 1402 self.path = hgvfs.base
1403 1403 self.requirements = requirements
1404 1404 self.nodeconstants = sha1nodeconstants
1405 1405 self.nullid = self.nodeconstants.nullid
1406 1406 self.supported = supportedrequirements
1407 1407 self.sharedpath = sharedpath
1408 1408 self.store = store
1409 1409 self.cachevfs = cachevfs
1410 1410 self.wcachevfs = wcachevfs
1411 1411 self.features = features
1412 1412
1413 1413 self.filtername = None
1414 1414
1415 1415 if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool(
1416 1416 b'devel', b'check-locks'
1417 1417 ):
1418 1418 self.vfs.audit = self._getvfsward(self.vfs.audit)
1419 1419 # A list of callback to shape the phase if no data were found.
1420 1420 # Callback are in the form: func(repo, roots) --> processed root.
1421 1421 # This list it to be filled by extension during repo setup
1422 1422 self._phasedefaults = []
1423 1423
1424 1424 color.setup(self.ui)
1425 1425
1426 1426 self.spath = self.store.path
1427 1427 self.svfs = self.store.vfs
1428 1428 self.sjoin = self.store.join
1429 1429 if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool(
1430 1430 b'devel', b'check-locks'
1431 1431 ):
1432 1432 if util.safehasattr(self.svfs, b'vfs'): # this is filtervfs
1433 1433 self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit)
1434 1434 else: # standard vfs
1435 1435 self.svfs.audit = self._getsvfsward(self.svfs.audit)
1436 1436
1437 1437 self._dirstatevalidatewarned = False
1438 1438
1439 1439 self._branchcaches = branchmap.BranchMapCache()
1440 1440 self._revbranchcache = None
1441 1441 self._filterpats = {}
1442 1442 self._datafilters = {}
1443 1443 self._transref = self._lockref = self._wlockref = None
1444 1444
1445 1445 # A cache for various files under .hg/ that tracks file changes,
1446 1446 # (used by the filecache decorator)
1447 1447 #
1448 1448 # Maps a property name to its util.filecacheentry
1449 1449 self._filecache = {}
1450 1450
1451 1451 # hold sets of revision to be filtered
1452 1452 # should be cleared when something might have changed the filter value:
1453 1453 # - new changesets,
1454 1454 # - phase change,
1455 1455 # - new obsolescence marker,
1456 1456 # - working directory parent change,
1457 1457 # - bookmark changes
1458 1458 self.filteredrevcache = {}
1459 1459
1460 1460 # post-dirstate-status hooks
1461 1461 self._postdsstatus = []
1462 1462
1463 1463 # generic mapping between names and nodes
1464 1464 self.names = namespaces.namespaces()
1465 1465
1466 1466 # Key to signature value.
1467 1467 self._sparsesignaturecache = {}
1468 1468 # Signature to cached matcher instance.
1469 1469 self._sparsematchercache = {}
1470 1470
1471 1471 self._extrafilterid = repoview.extrafilter(ui)
1472 1472
1473 1473 self.filecopiesmode = None
1474 1474 if requirementsmod.COPIESSDC_REQUIREMENT in self.requirements:
1475 1475 self.filecopiesmode = b'changeset-sidedata'
1476 1476
1477 1477 self._wanted_sidedata = set()
1478 1478 self._sidedata_computers = {}
1479 1479 sidedatamod.set_sidedata_spec_for_repo(self)
1480 1480
1481 1481 def _getvfsward(self, origfunc):
1482 1482 """build a ward for self.vfs"""
1483 1483 rref = weakref.ref(self)
1484 1484
1485 1485 def checkvfs(path, mode=None):
1486 1486 ret = origfunc(path, mode=mode)
1487 1487 repo = rref()
1488 1488 if (
1489 1489 repo is None
1490 1490 or not util.safehasattr(repo, b'_wlockref')
1491 1491 or not util.safehasattr(repo, b'_lockref')
1492 1492 ):
1493 1493 return
1494 1494 if mode in (None, b'r', b'rb'):
1495 1495 return
1496 1496 if path.startswith(repo.path):
1497 1497 # truncate name relative to the repository (.hg)
1498 1498 path = path[len(repo.path) + 1 :]
1499 1499 if path.startswith(b'cache/'):
1500 1500 msg = b'accessing cache with vfs instead of cachevfs: "%s"'
1501 1501 repo.ui.develwarn(msg % path, stacklevel=3, config=b"cache-vfs")
1502 1502 # path prefixes covered by 'lock'
1503 1503 vfs_path_prefixes = (
1504 1504 b'journal.',
1505 1505 b'undo.',
1506 1506 b'strip-backup/',
1507 1507 b'cache/',
1508 1508 )
1509 1509 if any(path.startswith(prefix) for prefix in vfs_path_prefixes):
1510 1510 if repo._currentlock(repo._lockref) is None:
1511 1511 repo.ui.develwarn(
1512 1512 b'write with no lock: "%s"' % path,
1513 1513 stacklevel=3,
1514 1514 config=b'check-locks',
1515 1515 )
1516 1516 elif repo._currentlock(repo._wlockref) is None:
1517 1517 # rest of vfs files are covered by 'wlock'
1518 1518 #
1519 1519 # exclude special files
1520 1520 for prefix in self._wlockfreeprefix:
1521 1521 if path.startswith(prefix):
1522 1522 return
1523 1523 repo.ui.develwarn(
1524 1524 b'write with no wlock: "%s"' % path,
1525 1525 stacklevel=3,
1526 1526 config=b'check-locks',
1527 1527 )
1528 1528 return ret
1529 1529
1530 1530 return checkvfs
1531 1531
1532 1532 def _getsvfsward(self, origfunc):
1533 1533 """build a ward for self.svfs"""
1534 1534 rref = weakref.ref(self)
1535 1535
1536 1536 def checksvfs(path, mode=None):
1537 1537 ret = origfunc(path, mode=mode)
1538 1538 repo = rref()
1539 1539 if repo is None or not util.safehasattr(repo, b'_lockref'):
1540 1540 return
1541 1541 if mode in (None, b'r', b'rb'):
1542 1542 return
1543 1543 if path.startswith(repo.sharedpath):
1544 1544 # truncate name relative to the repository (.hg)
1545 1545 path = path[len(repo.sharedpath) + 1 :]
1546 1546 if repo._currentlock(repo._lockref) is None:
1547 1547 repo.ui.develwarn(
1548 1548 b'write with no lock: "%s"' % path, stacklevel=4
1549 1549 )
1550 1550 return ret
1551 1551
1552 1552 return checksvfs
1553 1553
1554 1554 def close(self):
1555 1555 self._writecaches()
1556 1556
1557 1557 def _writecaches(self):
1558 1558 if self._revbranchcache:
1559 1559 self._revbranchcache.write()
1560 1560
1561 1561 def _restrictcapabilities(self, caps):
1562 1562 if self.ui.configbool(b'experimental', b'bundle2-advertise'):
1563 1563 caps = set(caps)
1564 1564 capsblob = bundle2.encodecaps(
1565 1565 bundle2.getrepocaps(self, role=b'client')
1566 1566 )
1567 1567 caps.add(b'bundle2=' + urlreq.quote(capsblob))
1568 1568 if self.ui.configbool(b'experimental', b'narrow'):
1569 1569 caps.add(wireprototypes.NARROWCAP)
1570 1570 return caps
1571 1571
1572 1572 # Don't cache auditor/nofsauditor, or you'll end up with reference cycle:
1573 1573 # self -> auditor -> self._checknested -> self
1574 1574
1575 1575 @property
1576 1576 def auditor(self):
1577 1577 # This is only used by context.workingctx.match in order to
1578 1578 # detect files in subrepos.
1579 1579 return pathutil.pathauditor(self.root, callback=self._checknested)
1580 1580
1581 1581 @property
1582 1582 def nofsauditor(self):
1583 1583 # This is only used by context.basectx.match in order to detect
1584 1584 # files in subrepos.
1585 1585 return pathutil.pathauditor(
1586 1586 self.root, callback=self._checknested, realfs=False, cached=True
1587 1587 )
1588 1588
1589 1589 def _checknested(self, path):
1590 1590 """Determine if path is a legal nested repository."""
1591 1591 if not path.startswith(self.root):
1592 1592 return False
1593 1593 subpath = path[len(self.root) + 1 :]
1594 1594 normsubpath = util.pconvert(subpath)
1595 1595
1596 1596 # XXX: Checking against the current working copy is wrong in
1597 1597 # the sense that it can reject things like
1598 1598 #
1599 1599 # $ hg cat -r 10 sub/x.txt
1600 1600 #
1601 1601 # if sub/ is no longer a subrepository in the working copy
1602 1602 # parent revision.
1603 1603 #
1604 1604 # However, it can of course also allow things that would have
1605 1605 # been rejected before, such as the above cat command if sub/
1606 1606 # is a subrepository now, but was a normal directory before.
1607 1607 # The old path auditor would have rejected by mistake since it
1608 1608 # panics when it sees sub/.hg/.
1609 1609 #
1610 1610 # All in all, checking against the working copy seems sensible
1611 1611 # since we want to prevent access to nested repositories on
1612 1612 # the filesystem *now*.
1613 1613 ctx = self[None]
1614 1614 parts = util.splitpath(subpath)
1615 1615 while parts:
1616 1616 prefix = b'/'.join(parts)
1617 1617 if prefix in ctx.substate:
1618 1618 if prefix == normsubpath:
1619 1619 return True
1620 1620 else:
1621 1621 sub = ctx.sub(prefix)
1622 1622 return sub.checknested(subpath[len(prefix) + 1 :])
1623 1623 else:
1624 1624 parts.pop()
1625 1625 return False
1626 1626
1627 1627 def peer(self):
1628 1628 return localpeer(self) # not cached to avoid reference cycle
1629 1629
1630 1630 def unfiltered(self):
1631 1631 """Return unfiltered version of the repository
1632 1632
1633 1633 Intended to be overwritten by filtered repo."""
1634 1634 return self
1635 1635
1636 1636 def filtered(self, name, visibilityexceptions=None):
1637 1637 """Return a filtered version of a repository
1638 1638
1639 1639 The `name` parameter is the identifier of the requested view. This
1640 1640 will return a repoview object set "exactly" to the specified view.
1641 1641
1642 1642 This function does not apply recursive filtering to a repository. For
1643 1643 example calling `repo.filtered("served")` will return a repoview using
1644 1644 the "served" view, regardless of the initial view used by `repo`.
1645 1645
1646 1646 In other word, there is always only one level of `repoview` "filtering".
1647 1647 """
1648 1648 if self._extrafilterid is not None and b'%' not in name:
1649 1649 name = name + b'%' + self._extrafilterid
1650 1650
1651 1651 cls = repoview.newtype(self.unfiltered().__class__)
1652 1652 return cls(self, name, visibilityexceptions)
1653 1653
1654 1654 @mixedrepostorecache(
1655 1655 (b'bookmarks', b'plain'),
1656 1656 (b'bookmarks.current', b'plain'),
1657 1657 (b'bookmarks', b''),
1658 1658 (b'00changelog.i', b''),
1659 1659 )
1660 1660 def _bookmarks(self):
1661 1661 # Since the multiple files involved in the transaction cannot be
1662 1662 # written atomically (with current repository format), there is a race
1663 1663 # condition here.
1664 1664 #
1665 1665 # 1) changelog content A is read
1666 1666 # 2) outside transaction update changelog to content B
1667 1667 # 3) outside transaction update bookmark file referring to content B
1668 1668 # 4) bookmarks file content is read and filtered against changelog-A
1669 1669 #
1670 1670 # When this happens, bookmarks against nodes missing from A are dropped.
1671 1671 #
1672 1672 # Having this happening during read is not great, but it become worse
1673 1673 # when this happen during write because the bookmarks to the "unknown"
1674 1674 # nodes will be dropped for good. However, writes happen within locks.
1675 1675 # This locking makes it possible to have a race free consistent read.
1676 1676 # For this purpose data read from disc before locking are
1677 1677 # "invalidated" right after the locks are taken. This invalidations are
1678 1678 # "light", the `filecache` mechanism keep the data in memory and will
1679 1679 # reuse them if the underlying files did not changed. Not parsing the
1680 1680 # same data multiple times helps performances.
1681 1681 #
1682 1682 # Unfortunately in the case describe above, the files tracked by the
1683 1683 # bookmarks file cache might not have changed, but the in-memory
1684 1684 # content is still "wrong" because we used an older changelog content
1685 1685 # to process the on-disk data. So after locking, the changelog would be
1686 1686 # refreshed but `_bookmarks` would be preserved.
1687 1687 # Adding `00changelog.i` to the list of tracked file is not
1688 1688 # enough, because at the time we build the content for `_bookmarks` in
1689 1689 # (4), the changelog file has already diverged from the content used
1690 1690 # for loading `changelog` in (1)
1691 1691 #
1692 1692 # To prevent the issue, we force the changelog to be explicitly
1693 1693 # reloaded while computing `_bookmarks`. The data race can still happen
1694 1694 # without the lock (with a narrower window), but it would no longer go
1695 1695 # undetected during the lock time refresh.
1696 1696 #
1697 1697 # The new schedule is as follow
1698 1698 #
1699 1699 # 1) filecache logic detect that `_bookmarks` needs to be computed
1700 1700 # 2) cachestat for `bookmarks` and `changelog` are captured (for book)
1701 1701 # 3) We force `changelog` filecache to be tested
1702 1702 # 4) cachestat for `changelog` are captured (for changelog)
1703 1703 # 5) `_bookmarks` is computed and cached
1704 1704 #
1705 1705 # The step in (3) ensure we have a changelog at least as recent as the
1706 1706 # cache stat computed in (1). As a result at locking time:
1707 1707 # * if the changelog did not changed since (1) -> we can reuse the data
1708 1708 # * otherwise -> the bookmarks get refreshed.
1709 1709 self._refreshchangelog()
1710 1710 return bookmarks.bmstore(self)
1711 1711
1712 1712 def _refreshchangelog(self):
1713 1713 """make sure the in memory changelog match the on-disk one"""
1714 1714 if 'changelog' in vars(self) and self.currenttransaction() is None:
1715 1715 del self.changelog
1716 1716
1717 1717 @property
1718 1718 def _activebookmark(self):
1719 1719 return self._bookmarks.active
1720 1720
1721 1721 # _phasesets depend on changelog. what we need is to call
1722 1722 # _phasecache.invalidate() if '00changelog.i' was changed, but it
1723 1723 # can't be easily expressed in filecache mechanism.
1724 1724 @storecache(b'phaseroots', b'00changelog.i')
1725 1725 def _phasecache(self):
1726 1726 return phases.phasecache(self, self._phasedefaults)
1727 1727
1728 1728 @storecache(b'obsstore')
1729 1729 def obsstore(self):
1730 1730 return obsolete.makestore(self.ui, self)
1731 1731
1732 1732 @changelogcache()
1733 1733 def changelog(repo):
1734 1734 # load dirstate before changelog to avoid race see issue6303
1735 1735 repo.dirstate.prefetch_parents()
1736 1736 return repo.store.changelog(
1737 1737 txnutil.mayhavepending(repo.root),
1738 1738 concurrencychecker=revlogchecker.get_checker(repo.ui, b'changelog'),
1739 1739 )
1740 1740
1741 1741 @manifestlogcache()
1742 1742 def manifestlog(self):
1743 1743 return self.store.manifestlog(self, self._storenarrowmatch)
1744 1744
1745 1745 @repofilecache(b'dirstate')
1746 1746 def dirstate(self):
1747 1747 return self._makedirstate()
1748 1748
1749 1749 def _makedirstate(self):
1750 1750 """Extension point for wrapping the dirstate per-repo."""
1751 1751 sparsematchfn = None
1752 1752 if sparse.use_sparse(self):
1753 1753 sparsematchfn = lambda: sparse.matcher(self)
1754 1754 v2_req = requirementsmod.DIRSTATE_V2_REQUIREMENT
1755 1755 th = requirementsmod.DIRSTATE_TRACKED_HINT_V1
1756 1756 use_dirstate_v2 = v2_req in self.requirements
1757 1757 use_tracked_hint = th in self.requirements
1758 1758
1759 1759 return dirstate.dirstate(
1760 1760 self.vfs,
1761 1761 self.ui,
1762 1762 self.root,
1763 1763 self._dirstatevalidate,
1764 1764 sparsematchfn,
1765 1765 self.nodeconstants,
1766 1766 use_dirstate_v2,
1767 1767 use_tracked_hint=use_tracked_hint,
1768 1768 )
1769 1769
1770 1770 def _dirstatevalidate(self, node):
1771 1771 try:
1772 1772 self.changelog.rev(node)
1773 1773 return node
1774 1774 except error.LookupError:
1775 1775 if not self._dirstatevalidatewarned:
1776 1776 self._dirstatevalidatewarned = True
1777 1777 self.ui.warn(
1778 1778 _(b"warning: ignoring unknown working parent %s!\n")
1779 1779 % short(node)
1780 1780 )
1781 1781 return self.nullid
1782 1782
1783 1783 @storecache(narrowspec.FILENAME)
1784 1784 def narrowpats(self):
1785 1785 """matcher patterns for this repository's narrowspec
1786 1786
1787 1787 A tuple of (includes, excludes).
1788 1788 """
1789 1789 return narrowspec.load(self)
1790 1790
1791 1791 @storecache(narrowspec.FILENAME)
1792 1792 def _storenarrowmatch(self):
1793 1793 if requirementsmod.NARROW_REQUIREMENT not in self.requirements:
1794 1794 return matchmod.always()
1795 1795 include, exclude = self.narrowpats
1796 1796 return narrowspec.match(self.root, include=include, exclude=exclude)
1797 1797
1798 1798 @storecache(narrowspec.FILENAME)
1799 1799 def _narrowmatch(self):
1800 1800 if requirementsmod.NARROW_REQUIREMENT not in self.requirements:
1801 1801 return matchmod.always()
1802 1802 narrowspec.checkworkingcopynarrowspec(self)
1803 1803 include, exclude = self.narrowpats
1804 1804 return narrowspec.match(self.root, include=include, exclude=exclude)
1805 1805
1806 1806 def narrowmatch(self, match=None, includeexact=False):
1807 1807 """matcher corresponding the the repo's narrowspec
1808 1808
1809 1809 If `match` is given, then that will be intersected with the narrow
1810 1810 matcher.
1811 1811
1812 1812 If `includeexact` is True, then any exact matches from `match` will
1813 1813 be included even if they're outside the narrowspec.
1814 1814 """
1815 1815 if match:
1816 1816 if includeexact and not self._narrowmatch.always():
1817 1817 # do not exclude explicitly-specified paths so that they can
1818 1818 # be warned later on
1819 1819 em = matchmod.exact(match.files())
1820 1820 nm = matchmod.unionmatcher([self._narrowmatch, em])
1821 1821 return matchmod.intersectmatchers(match, nm)
1822 1822 return matchmod.intersectmatchers(match, self._narrowmatch)
1823 1823 return self._narrowmatch
1824 1824
1825 1825 def setnarrowpats(self, newincludes, newexcludes):
1826 1826 narrowspec.save(self, newincludes, newexcludes)
1827 1827 self.invalidate(clearfilecache=True)
1828 1828
1829 1829 @unfilteredpropertycache
1830 1830 def _quick_access_changeid_null(self):
1831 1831 return {
1832 1832 b'null': (nullrev, self.nodeconstants.nullid),
1833 1833 nullrev: (nullrev, self.nodeconstants.nullid),
1834 1834 self.nullid: (nullrev, self.nullid),
1835 1835 }
1836 1836
1837 1837 @unfilteredpropertycache
1838 1838 def _quick_access_changeid_wc(self):
1839 1839 # also fast path access to the working copy parents
1840 1840 # however, only do it for filter that ensure wc is visible.
1841 1841 quick = self._quick_access_changeid_null.copy()
1842 1842 cl = self.unfiltered().changelog
1843 1843 for node in self.dirstate.parents():
1844 1844 if node == self.nullid:
1845 1845 continue
1846 1846 rev = cl.index.get_rev(node)
1847 1847 if rev is None:
1848 1848 # unknown working copy parent case:
1849 1849 #
1850 1850 # skip the fast path and let higher code deal with it
1851 1851 continue
1852 1852 pair = (rev, node)
1853 1853 quick[rev] = pair
1854 1854 quick[node] = pair
1855 1855 # also add the parents of the parents
1856 1856 for r in cl.parentrevs(rev):
1857 1857 if r == nullrev:
1858 1858 continue
1859 1859 n = cl.node(r)
1860 1860 pair = (r, n)
1861 1861 quick[r] = pair
1862 1862 quick[n] = pair
1863 1863 p1node = self.dirstate.p1()
1864 1864 if p1node != self.nullid:
1865 1865 quick[b'.'] = quick[p1node]
1866 1866 return quick
1867 1867
1868 1868 @unfilteredmethod
1869 1869 def _quick_access_changeid_invalidate(self):
1870 1870 if '_quick_access_changeid_wc' in vars(self):
1871 1871 del self.__dict__['_quick_access_changeid_wc']
1872 1872
1873 1873 @property
1874 1874 def _quick_access_changeid(self):
1875 1875 """an helper dictionnary for __getitem__ calls
1876 1876
1877 1877 This contains a list of symbol we can recognise right away without
1878 1878 further processing.
1879 1879 """
1880 1880 if self.filtername in repoview.filter_has_wc:
1881 1881 return self._quick_access_changeid_wc
1882 1882 return self._quick_access_changeid_null
1883 1883
1884 1884 def __getitem__(self, changeid):
1885 1885 # dealing with special cases
1886 1886 if changeid is None:
1887 1887 return context.workingctx(self)
1888 1888 if isinstance(changeid, context.basectx):
1889 1889 return changeid
1890 1890
1891 1891 # dealing with multiple revisions
1892 1892 if isinstance(changeid, slice):
1893 1893 # wdirrev isn't contiguous so the slice shouldn't include it
1894 1894 return [
1895 1895 self[i]
1896 1896 for i in range(*changeid.indices(len(self)))
1897 1897 if i not in self.changelog.filteredrevs
1898 1898 ]
1899 1899
1900 1900 # dealing with some special values
1901 1901 quick_access = self._quick_access_changeid.get(changeid)
1902 1902 if quick_access is not None:
1903 1903 rev, node = quick_access
1904 1904 return context.changectx(self, rev, node, maybe_filtered=False)
1905 1905 if changeid == b'tip':
1906 1906 node = self.changelog.tip()
1907 1907 rev = self.changelog.rev(node)
1908 1908 return context.changectx(self, rev, node)
1909 1909
1910 1910 # dealing with arbitrary values
1911 1911 try:
1912 1912 if isinstance(changeid, int):
1913 1913 node = self.changelog.node(changeid)
1914 1914 rev = changeid
1915 1915 elif changeid == b'.':
1916 1916 # this is a hack to delay/avoid loading obsmarkers
1917 1917 # when we know that '.' won't be hidden
1918 1918 node = self.dirstate.p1()
1919 1919 rev = self.unfiltered().changelog.rev(node)
1920 1920 elif len(changeid) == self.nodeconstants.nodelen:
1921 1921 try:
1922 1922 node = changeid
1923 1923 rev = self.changelog.rev(changeid)
1924 1924 except error.FilteredLookupError:
1925 1925 changeid = hex(changeid) # for the error message
1926 1926 raise
1927 1927 except LookupError:
1928 1928 # check if it might have come from damaged dirstate
1929 1929 #
1930 1930 # XXX we could avoid the unfiltered if we had a recognizable
1931 1931 # exception for filtered changeset access
1932 1932 if (
1933 1933 self.local()
1934 1934 and changeid in self.unfiltered().dirstate.parents()
1935 1935 ):
1936 1936 msg = _(b"working directory has unknown parent '%s'!")
1937 1937 raise error.Abort(msg % short(changeid))
1938 1938 changeid = hex(changeid) # for the error message
1939 1939 raise
1940 1940
1941 1941 elif len(changeid) == 2 * self.nodeconstants.nodelen:
1942 1942 node = bin(changeid)
1943 1943 rev = self.changelog.rev(node)
1944 1944 else:
1945 1945 raise error.ProgrammingError(
1946 1946 b"unsupported changeid '%s' of type %s"
1947 1947 % (changeid, pycompat.bytestr(type(changeid)))
1948 1948 )
1949 1949
1950 1950 return context.changectx(self, rev, node)
1951 1951
1952 1952 except (error.FilteredIndexError, error.FilteredLookupError):
1953 1953 raise error.FilteredRepoLookupError(
1954 1954 _(b"filtered revision '%s'") % pycompat.bytestr(changeid)
1955 1955 )
1956 1956 except (IndexError, LookupError):
1957 1957 raise error.RepoLookupError(
1958 1958 _(b"unknown revision '%s'") % pycompat.bytestr(changeid)
1959 1959 )
1960 1960 except error.WdirUnsupported:
1961 1961 return context.workingctx(self)
1962 1962
1963 1963 def __contains__(self, changeid):
1964 1964 """True if the given changeid exists"""
1965 1965 try:
1966 1966 self[changeid]
1967 1967 return True
1968 1968 except error.RepoLookupError:
1969 1969 return False
1970 1970
1971 1971 def __nonzero__(self):
1972 1972 return True
1973 1973
1974 1974 __bool__ = __nonzero__
1975 1975
1976 1976 def __len__(self):
1977 1977 # no need to pay the cost of repoview.changelog
1978 1978 unfi = self.unfiltered()
1979 1979 return len(unfi.changelog)
1980 1980
1981 1981 def __iter__(self):
1982 1982 return iter(self.changelog)
1983 1983
1984 1984 def revs(self, expr, *args):
1985 1985 """Find revisions matching a revset.
1986 1986
1987 1987 The revset is specified as a string ``expr`` that may contain
1988 1988 %-formatting to escape certain types. See ``revsetlang.formatspec``.
1989 1989
1990 1990 Revset aliases from the configuration are not expanded. To expand
1991 1991 user aliases, consider calling ``scmutil.revrange()`` or
1992 1992 ``repo.anyrevs([expr], user=True)``.
1993 1993
1994 1994 Returns a smartset.abstractsmartset, which is a list-like interface
1995 1995 that contains integer revisions.
1996 1996 """
1997 1997 tree = revsetlang.spectree(expr, *args)
1998 1998 return revset.makematcher(tree)(self)
1999 1999
2000 2000 def set(self, expr, *args):
2001 2001 """Find revisions matching a revset and emit changectx instances.
2002 2002
2003 2003 This is a convenience wrapper around ``revs()`` that iterates the
2004 2004 result and is a generator of changectx instances.
2005 2005
2006 2006 Revset aliases from the configuration are not expanded. To expand
2007 2007 user aliases, consider calling ``scmutil.revrange()``.
2008 2008 """
2009 2009 for r in self.revs(expr, *args):
2010 2010 yield self[r]
2011 2011
2012 2012 def anyrevs(self, specs, user=False, localalias=None):
2013 2013 """Find revisions matching one of the given revsets.
2014 2014
2015 2015 Revset aliases from the configuration are not expanded by default. To
2016 2016 expand user aliases, specify ``user=True``. To provide some local
2017 2017 definitions overriding user aliases, set ``localalias`` to
2018 2018 ``{name: definitionstring}``.
2019 2019 """
2020 2020 if specs == [b'null']:
2021 2021 return revset.baseset([nullrev])
2022 2022 if specs == [b'.']:
2023 2023 quick_data = self._quick_access_changeid.get(b'.')
2024 2024 if quick_data is not None:
2025 2025 return revset.baseset([quick_data[0]])
2026 2026 if user:
2027 2027 m = revset.matchany(
2028 2028 self.ui,
2029 2029 specs,
2030 2030 lookup=revset.lookupfn(self),
2031 2031 localalias=localalias,
2032 2032 )
2033 2033 else:
2034 2034 m = revset.matchany(None, specs, localalias=localalias)
2035 2035 return m(self)
2036 2036
2037 2037 def url(self):
2038 2038 return b'file:' + self.root
2039 2039
2040 2040 def hook(self, name, throw=False, **args):
2041 2041 """Call a hook, passing this repo instance.
2042 2042
2043 2043 This a convenience method to aid invoking hooks. Extensions likely
2044 2044 won't call this unless they have registered a custom hook or are
2045 2045 replacing code that is expected to call a hook.
2046 2046 """
2047 2047 return hook.hook(self.ui, self, name, throw, **args)
2048 2048
2049 2049 @filteredpropertycache
2050 2050 def _tagscache(self):
2051 2051 """Returns a tagscache object that contains various tags related
2052 2052 caches."""
2053 2053
2054 2054 # This simplifies its cache management by having one decorated
2055 2055 # function (this one) and the rest simply fetch things from it.
2056 2056 class tagscache:
2057 2057 def __init__(self):
2058 2058 # These two define the set of tags for this repository. tags
2059 2059 # maps tag name to node; tagtypes maps tag name to 'global' or
2060 2060 # 'local'. (Global tags are defined by .hgtags across all
2061 2061 # heads, and local tags are defined in .hg/localtags.)
2062 2062 # They constitute the in-memory cache of tags.
2063 2063 self.tags = self.tagtypes = None
2064 2064
2065 2065 self.nodetagscache = self.tagslist = None
2066 2066
2067 2067 cache = tagscache()
2068 2068 cache.tags, cache.tagtypes = self._findtags()
2069 2069
2070 2070 return cache
2071 2071
2072 2072 def tags(self):
2073 2073 '''return a mapping of tag to node'''
2074 2074 t = {}
2075 2075 if self.changelog.filteredrevs:
2076 2076 tags, tt = self._findtags()
2077 2077 else:
2078 2078 tags = self._tagscache.tags
2079 2079 rev = self.changelog.rev
2080 2080 for k, v in tags.items():
2081 2081 try:
2082 2082 # ignore tags to unknown nodes
2083 2083 rev(v)
2084 2084 t[k] = v
2085 2085 except (error.LookupError, ValueError):
2086 2086 pass
2087 2087 return t
2088 2088
2089 2089 def _findtags(self):
2090 2090 """Do the hard work of finding tags. Return a pair of dicts
2091 2091 (tags, tagtypes) where tags maps tag name to node, and tagtypes
2092 2092 maps tag name to a string like \'global\' or \'local\'.
2093 2093 Subclasses or extensions are free to add their own tags, but
2094 2094 should be aware that the returned dicts will be retained for the
2095 2095 duration of the localrepo object."""
2096 2096
2097 2097 # XXX what tagtype should subclasses/extensions use? Currently
2098 2098 # mq and bookmarks add tags, but do not set the tagtype at all.
2099 2099 # Should each extension invent its own tag type? Should there
2100 2100 # be one tagtype for all such "virtual" tags? Or is the status
2101 2101 # quo fine?
2102 2102
2103 2103 # map tag name to (node, hist)
2104 2104 alltags = tagsmod.findglobaltags(self.ui, self)
2105 2105 # map tag name to tag type
2106 2106 tagtypes = {tag: b'global' for tag in alltags}
2107 2107
2108 2108 tagsmod.readlocaltags(self.ui, self, alltags, tagtypes)
2109 2109
2110 2110 # Build the return dicts. Have to re-encode tag names because
2111 2111 # the tags module always uses UTF-8 (in order not to lose info
2112 2112 # writing to the cache), but the rest of Mercurial wants them in
2113 2113 # local encoding.
2114 2114 tags = {}
2115 2115 for (name, (node, hist)) in alltags.items():
2116 2116 if node != self.nullid:
2117 2117 tags[encoding.tolocal(name)] = node
2118 2118 tags[b'tip'] = self.changelog.tip()
2119 2119 tagtypes = {
2120 2120 encoding.tolocal(name): value for (name, value) in tagtypes.items()
2121 2121 }
2122 2122 return (tags, tagtypes)
2123 2123
2124 2124 def tagtype(self, tagname):
2125 2125 """
2126 2126 return the type of the given tag. result can be:
2127 2127
2128 2128 'local' : a local tag
2129 2129 'global' : a global tag
2130 2130 None : tag does not exist
2131 2131 """
2132 2132
2133 2133 return self._tagscache.tagtypes.get(tagname)
2134 2134
2135 2135 def tagslist(self):
2136 2136 '''return a list of tags ordered by revision'''
2137 2137 if not self._tagscache.tagslist:
2138 2138 l = []
2139 2139 for t, n in self.tags().items():
2140 2140 l.append((self.changelog.rev(n), t, n))
2141 2141 self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)]
2142 2142
2143 2143 return self._tagscache.tagslist
2144 2144
2145 2145 def nodetags(self, node):
2146 2146 '''return the tags associated with a node'''
2147 2147 if not self._tagscache.nodetagscache:
2148 2148 nodetagscache = {}
2149 2149 for t, n in self._tagscache.tags.items():
2150 2150 nodetagscache.setdefault(n, []).append(t)
2151 2151 for tags in nodetagscache.values():
2152 2152 tags.sort()
2153 2153 self._tagscache.nodetagscache = nodetagscache
2154 2154 return self._tagscache.nodetagscache.get(node, [])
2155 2155
2156 2156 def nodebookmarks(self, node):
2157 2157 """return the list of bookmarks pointing to the specified node"""
2158 2158 return self._bookmarks.names(node)
2159 2159
2160 2160 def branchmap(self):
2161 2161 """returns a dictionary {branch: [branchheads]} with branchheads
2162 2162 ordered by increasing revision number"""
2163 2163 return self._branchcaches[self]
2164 2164
2165 2165 @unfilteredmethod
2166 2166 def revbranchcache(self):
2167 2167 if not self._revbranchcache:
2168 2168 self._revbranchcache = branchmap.revbranchcache(self.unfiltered())
2169 2169 return self._revbranchcache
2170 2170
2171 2171 def register_changeset(self, rev, changelogrevision):
2172 2172 self.revbranchcache().setdata(rev, changelogrevision)
2173 2173
2174 2174 def branchtip(self, branch, ignoremissing=False):
2175 2175 """return the tip node for a given branch
2176 2176
2177 2177 If ignoremissing is True, then this method will not raise an error.
2178 2178 This is helpful for callers that only expect None for a missing branch
2179 2179 (e.g. namespace).
2180 2180
2181 2181 """
2182 2182 try:
2183 2183 return self.branchmap().branchtip(branch)
2184 2184 except KeyError:
2185 2185 if not ignoremissing:
2186 2186 raise error.RepoLookupError(_(b"unknown branch '%s'") % branch)
2187 2187 else:
2188 2188 pass
2189 2189
2190 2190 def lookup(self, key):
2191 2191 node = scmutil.revsymbol(self, key).node()
2192 2192 if node is None:
2193 2193 raise error.RepoLookupError(_(b"unknown revision '%s'") % key)
2194 2194 return node
2195 2195
2196 2196 def lookupbranch(self, key):
2197 2197 if self.branchmap().hasbranch(key):
2198 2198 return key
2199 2199
2200 2200 return scmutil.revsymbol(self, key).branch()
2201 2201
2202 2202 def known(self, nodes):
2203 2203 cl = self.changelog
2204 2204 get_rev = cl.index.get_rev
2205 2205 filtered = cl.filteredrevs
2206 2206 result = []
2207 2207 for n in nodes:
2208 2208 r = get_rev(n)
2209 2209 resp = not (r is None or r in filtered)
2210 2210 result.append(resp)
2211 2211 return result
2212 2212
2213 2213 def local(self):
2214 2214 return self
2215 2215
2216 2216 def publishing(self):
2217 2217 # it's safe (and desirable) to trust the publish flag unconditionally
2218 2218 # so that we don't finalize changes shared between users via ssh or nfs
2219 2219 return self.ui.configbool(b'phases', b'publish', untrusted=True)
2220 2220
2221 2221 def cancopy(self):
2222 2222 # so statichttprepo's override of local() works
2223 2223 if not self.local():
2224 2224 return False
2225 2225 if not self.publishing():
2226 2226 return True
2227 2227 # if publishing we can't copy if there is filtered content
2228 2228 return not self.filtered(b'visible').changelog.filteredrevs
2229 2229
2230 2230 def shared(self):
2231 2231 '''the type of shared repository (None if not shared)'''
2232 2232 if self.sharedpath != self.path:
2233 2233 return b'store'
2234 2234 return None
2235 2235
2236 2236 def wjoin(self, f, *insidef):
2237 2237 return self.vfs.reljoin(self.root, f, *insidef)
2238 2238
2239 2239 def setparents(self, p1, p2=None):
2240 2240 if p2 is None:
2241 2241 p2 = self.nullid
2242 2242 self[None].setparents(p1, p2)
2243 2243 self._quick_access_changeid_invalidate()
2244 2244
2245 2245 def filectx(self, path, changeid=None, fileid=None, changectx=None):
2246 2246 """changeid must be a changeset revision, if specified.
2247 2247 fileid can be a file revision or node."""
2248 2248 return context.filectx(
2249 2249 self, path, changeid, fileid, changectx=changectx
2250 2250 )
2251 2251
2252 2252 def getcwd(self):
2253 2253 return self.dirstate.getcwd()
2254 2254
2255 2255 def pathto(self, f, cwd=None):
2256 2256 return self.dirstate.pathto(f, cwd)
2257 2257
2258 2258 def _loadfilter(self, filter):
2259 2259 if filter not in self._filterpats:
2260 2260 l = []
2261 2261 for pat, cmd in self.ui.configitems(filter):
2262 2262 if cmd == b'!':
2263 2263 continue
2264 2264 mf = matchmod.match(self.root, b'', [pat])
2265 2265 fn = None
2266 2266 params = cmd
2267 2267 for name, filterfn in self._datafilters.items():
2268 2268 if cmd.startswith(name):
2269 2269 fn = filterfn
2270 2270 params = cmd[len(name) :].lstrip()
2271 2271 break
2272 2272 if not fn:
2273 2273 fn = lambda s, c, **kwargs: procutil.filter(s, c)
2274 2274 fn.__name__ = 'commandfilter'
2275 2275 # Wrap old filters not supporting keyword arguments
2276 2276 if not pycompat.getargspec(fn)[2]:
2277 2277 oldfn = fn
2278 2278 fn = lambda s, c, oldfn=oldfn, **kwargs: oldfn(s, c)
2279 2279 fn.__name__ = 'compat-' + oldfn.__name__
2280 2280 l.append((mf, fn, params))
2281 2281 self._filterpats[filter] = l
2282 2282 return self._filterpats[filter]
2283 2283
2284 2284 def _filter(self, filterpats, filename, data):
2285 2285 for mf, fn, cmd in filterpats:
2286 2286 if mf(filename):
2287 2287 self.ui.debug(
2288 2288 b"filtering %s through %s\n"
2289 2289 % (filename, cmd or pycompat.sysbytes(fn.__name__))
2290 2290 )
2291 2291 data = fn(data, cmd, ui=self.ui, repo=self, filename=filename)
2292 2292 break
2293 2293
2294 2294 return data
2295 2295
2296 2296 @unfilteredpropertycache
2297 2297 def _encodefilterpats(self):
2298 2298 return self._loadfilter(b'encode')
2299 2299
2300 2300 @unfilteredpropertycache
2301 2301 def _decodefilterpats(self):
2302 2302 return self._loadfilter(b'decode')
2303 2303
2304 2304 def adddatafilter(self, name, filter):
2305 2305 self._datafilters[name] = filter
2306 2306
2307 2307 def wread(self, filename):
2308 2308 if self.wvfs.islink(filename):
2309 2309 data = self.wvfs.readlink(filename)
2310 2310 else:
2311 2311 data = self.wvfs.read(filename)
2312 2312 return self._filter(self._encodefilterpats, filename, data)
2313 2313
2314 2314 def wwrite(self, filename, data, flags, backgroundclose=False, **kwargs):
2315 2315 """write ``data`` into ``filename`` in the working directory
2316 2316
2317 2317 This returns length of written (maybe decoded) data.
2318 2318 """
2319 2319 data = self._filter(self._decodefilterpats, filename, data)
2320 2320 if b'l' in flags:
2321 2321 self.wvfs.symlink(data, filename)
2322 2322 else:
2323 2323 self.wvfs.write(
2324 2324 filename, data, backgroundclose=backgroundclose, **kwargs
2325 2325 )
2326 2326 if b'x' in flags:
2327 2327 self.wvfs.setflags(filename, False, True)
2328 2328 else:
2329 2329 self.wvfs.setflags(filename, False, False)
2330 2330 return len(data)
2331 2331
2332 2332 def wwritedata(self, filename, data):
2333 2333 return self._filter(self._decodefilterpats, filename, data)
2334 2334
2335 2335 def currenttransaction(self):
2336 2336 """return the current transaction or None if non exists"""
2337 2337 if self._transref:
2338 2338 tr = self._transref()
2339 2339 else:
2340 2340 tr = None
2341 2341
2342 2342 if tr and tr.running():
2343 2343 return tr
2344 2344 return None
2345 2345
2346 2346 def transaction(self, desc, report=None):
2347 2347 if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool(
2348 2348 b'devel', b'check-locks'
2349 2349 ):
2350 2350 if self._currentlock(self._lockref) is None:
2351 2351 raise error.ProgrammingError(b'transaction requires locking')
2352 2352 tr = self.currenttransaction()
2353 2353 if tr is not None:
2354 2354 return tr.nest(name=desc)
2355 2355
2356 2356 # abort here if the journal already exists
2357 2357 if self.svfs.exists(b"journal"):
2358 2358 raise error.RepoError(
2359 2359 _(b"abandoned transaction found"),
2360 2360 hint=_(b"run 'hg recover' to clean up transaction"),
2361 2361 )
2362 2362
2363 2363 idbase = b"%.40f#%f" % (random.random(), time.time())
2364 2364 ha = hex(hashutil.sha1(idbase).digest())
2365 2365 txnid = b'TXN:' + ha
2366 2366 self.hook(b'pretxnopen', throw=True, txnname=desc, txnid=txnid)
2367 2367
2368 2368 self._writejournal(desc)
2369 2369 renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()]
2370 2370 if report:
2371 2371 rp = report
2372 2372 else:
2373 2373 rp = self.ui.warn
2374 2374 vfsmap = {b'plain': self.vfs, b'store': self.svfs} # root of .hg/
2375 2375 # we must avoid cyclic reference between repo and transaction.
2376 2376 reporef = weakref.ref(self)
2377 2377 # Code to track tag movement
2378 2378 #
2379 2379 # Since tags are all handled as file content, it is actually quite hard
2380 2380 # to track these movement from a code perspective. So we fallback to a
2381 2381 # tracking at the repository level. One could envision to track changes
2382 2382 # to the '.hgtags' file through changegroup apply but that fails to
2383 2383 # cope with case where transaction expose new heads without changegroup
2384 2384 # being involved (eg: phase movement).
2385 2385 #
2386 2386 # For now, We gate the feature behind a flag since this likely comes
2387 2387 # with performance impacts. The current code run more often than needed
2388 2388 # and do not use caches as much as it could. The current focus is on
2389 2389 # the behavior of the feature so we disable it by default. The flag
2390 2390 # will be removed when we are happy with the performance impact.
2391 2391 #
2392 2392 # Once this feature is no longer experimental move the following
2393 2393 # documentation to the appropriate help section:
2394 2394 #
2395 2395 # The ``HG_TAG_MOVED`` variable will be set if the transaction touched
2396 2396 # tags (new or changed or deleted tags). In addition the details of
2397 2397 # these changes are made available in a file at:
2398 2398 # ``REPOROOT/.hg/changes/tags.changes``.
2399 2399 # Make sure you check for HG_TAG_MOVED before reading that file as it
2400 2400 # might exist from a previous transaction even if no tag were touched
2401 2401 # in this one. Changes are recorded in a line base format::
2402 2402 #
2403 2403 # <action> <hex-node> <tag-name>\n
2404 2404 #
2405 2405 # Actions are defined as follow:
2406 2406 # "-R": tag is removed,
2407 2407 # "+A": tag is added,
2408 2408 # "-M": tag is moved (old value),
2409 2409 # "+M": tag is moved (new value),
2410 2410 tracktags = lambda x: None
2411 2411 # experimental config: experimental.hook-track-tags
2412 2412 shouldtracktags = self.ui.configbool(
2413 2413 b'experimental', b'hook-track-tags'
2414 2414 )
2415 2415 if desc != b'strip' and shouldtracktags:
2416 2416 oldheads = self.changelog.headrevs()
2417 2417
2418 2418 def tracktags(tr2):
2419 2419 repo = reporef()
2420 2420 assert repo is not None # help pytype
2421 2421 oldfnodes = tagsmod.fnoderevs(repo.ui, repo, oldheads)
2422 2422 newheads = repo.changelog.headrevs()
2423 2423 newfnodes = tagsmod.fnoderevs(repo.ui, repo, newheads)
2424 2424 # notes: we compare lists here.
2425 2425 # As we do it only once buiding set would not be cheaper
2426 2426 changes = tagsmod.difftags(repo.ui, repo, oldfnodes, newfnodes)
2427 2427 if changes:
2428 2428 tr2.hookargs[b'tag_moved'] = b'1'
2429 2429 with repo.vfs(
2430 2430 b'changes/tags.changes', b'w', atomictemp=True
2431 2431 ) as changesfile:
2432 2432 # note: we do not register the file to the transaction
2433 2433 # because we needs it to still exist on the transaction
2434 2434 # is close (for txnclose hooks)
2435 2435 tagsmod.writediff(changesfile, changes)
2436 2436
2437 2437 def validate(tr2):
2438 2438 """will run pre-closing hooks"""
2439 2439 # XXX the transaction API is a bit lacking here so we take a hacky
2440 2440 # path for now
2441 2441 #
2442 2442 # We cannot add this as a "pending" hooks since the 'tr.hookargs'
2443 2443 # dict is copied before these run. In addition we needs the data
2444 2444 # available to in memory hooks too.
2445 2445 #
2446 2446 # Moreover, we also need to make sure this runs before txnclose
2447 2447 # hooks and there is no "pending" mechanism that would execute
2448 2448 # logic only if hooks are about to run.
2449 2449 #
2450 2450 # Fixing this limitation of the transaction is also needed to track
2451 2451 # other families of changes (bookmarks, phases, obsolescence).
2452 2452 #
2453 2453 # This will have to be fixed before we remove the experimental
2454 2454 # gating.
2455 2455 tracktags(tr2)
2456 2456 repo = reporef()
2457 2457 assert repo is not None # help pytype
2458 2458
2459 2459 singleheadopt = (b'experimental', b'single-head-per-branch')
2460 2460 singlehead = repo.ui.configbool(*singleheadopt)
2461 2461 if singlehead:
2462 2462 singleheadsub = repo.ui.configsuboptions(*singleheadopt)[1]
2463 2463 accountclosed = singleheadsub.get(
2464 2464 b"account-closed-heads", False
2465 2465 )
2466 2466 if singleheadsub.get(b"public-changes-only", False):
2467 2467 filtername = b"immutable"
2468 2468 else:
2469 2469 filtername = b"visible"
2470 2470 scmutil.enforcesinglehead(
2471 2471 repo, tr2, desc, accountclosed, filtername
2472 2472 )
2473 2473 if hook.hashook(repo.ui, b'pretxnclose-bookmark'):
2474 2474 for name, (old, new) in sorted(
2475 2475 tr.changes[b'bookmarks'].items()
2476 2476 ):
2477 2477 args = tr.hookargs.copy()
2478 2478 args.update(bookmarks.preparehookargs(name, old, new))
2479 2479 repo.hook(
2480 2480 b'pretxnclose-bookmark',
2481 2481 throw=True,
2482 2482 **pycompat.strkwargs(args)
2483 2483 )
2484 2484 if hook.hashook(repo.ui, b'pretxnclose-phase'):
2485 2485 cl = repo.unfiltered().changelog
2486 2486 for revs, (old, new) in tr.changes[b'phases']:
2487 2487 for rev in revs:
2488 2488 args = tr.hookargs.copy()
2489 2489 node = hex(cl.node(rev))
2490 2490 args.update(phases.preparehookargs(node, old, new))
2491 2491 repo.hook(
2492 2492 b'pretxnclose-phase',
2493 2493 throw=True,
2494 2494 **pycompat.strkwargs(args)
2495 2495 )
2496 2496
2497 2497 repo.hook(
2498 2498 b'pretxnclose', throw=True, **pycompat.strkwargs(tr.hookargs)
2499 2499 )
2500 2500
2501 2501 def releasefn(tr, success):
2502 2502 repo = reporef()
2503 2503 if repo is None:
2504 2504 # If the repo has been GC'd (and this release function is being
2505 2505 # called from transaction.__del__), there's not much we can do,
2506 2506 # so just leave the unfinished transaction there and let the
2507 2507 # user run `hg recover`.
2508 2508 return
2509 2509 if success:
2510 2510 # this should be explicitly invoked here, because
2511 2511 # in-memory changes aren't written out at closing
2512 2512 # transaction, if tr.addfilegenerator (via
2513 2513 # dirstate.write or so) isn't invoked while
2514 2514 # transaction running
2515 2515 repo.dirstate.write(None)
2516 2516 else:
2517 2517 # discard all changes (including ones already written
2518 2518 # out) in this transaction
2519 2519 narrowspec.restorebackup(self, b'journal.narrowspec')
2520 2520 narrowspec.restorewcbackup(self, b'journal.narrowspec.dirstate')
2521 2521 repo.dirstate.restorebackup(None, b'journal.dirstate')
2522 2522
2523 2523 repo.invalidate(clearfilecache=True)
2524 2524
2525 2525 tr = transaction.transaction(
2526 2526 rp,
2527 2527 self.svfs,
2528 2528 vfsmap,
2529 2529 b"journal",
2530 2530 b"undo",
2531 2531 aftertrans(renames),
2532 2532 self.store.createmode,
2533 2533 validator=validate,
2534 2534 releasefn=releasefn,
2535 2535 checkambigfiles=_cachedfiles,
2536 2536 name=desc,
2537 2537 )
2538 2538 tr.changes[b'origrepolen'] = len(self)
2539 2539 tr.changes[b'obsmarkers'] = set()
2540 2540 tr.changes[b'phases'] = []
2541 2541 tr.changes[b'bookmarks'] = {}
2542 2542
2543 2543 tr.hookargs[b'txnid'] = txnid
2544 2544 tr.hookargs[b'txnname'] = desc
2545 2545 tr.hookargs[b'changes'] = tr.changes
2546 2546 # note: writing the fncache only during finalize mean that the file is
2547 2547 # outdated when running hooks. As fncache is used for streaming clone,
2548 2548 # this is not expected to break anything that happen during the hooks.
2549 2549 tr.addfinalize(b'flush-fncache', self.store.write)
2550 2550
2551 2551 def txnclosehook(tr2):
2552 2552 """To be run if transaction is successful, will schedule a hook run"""
2553 2553 # Don't reference tr2 in hook() so we don't hold a reference.
2554 2554 # This reduces memory consumption when there are multiple
2555 2555 # transactions per lock. This can likely go away if issue5045
2556 2556 # fixes the function accumulation.
2557 2557 hookargs = tr2.hookargs
2558 2558
2559 2559 def hookfunc(unused_success):
2560 2560 repo = reporef()
2561 2561 assert repo is not None # help pytype
2562 2562
2563 2563 if hook.hashook(repo.ui, b'txnclose-bookmark'):
2564 2564 bmchanges = sorted(tr.changes[b'bookmarks'].items())
2565 2565 for name, (old, new) in bmchanges:
2566 2566 args = tr.hookargs.copy()
2567 2567 args.update(bookmarks.preparehookargs(name, old, new))
2568 2568 repo.hook(
2569 2569 b'txnclose-bookmark',
2570 2570 throw=False,
2571 2571 **pycompat.strkwargs(args)
2572 2572 )
2573 2573
2574 2574 if hook.hashook(repo.ui, b'txnclose-phase'):
2575 2575 cl = repo.unfiltered().changelog
2576 2576 phasemv = sorted(
2577 2577 tr.changes[b'phases'], key=lambda r: r[0][0]
2578 2578 )
2579 2579 for revs, (old, new) in phasemv:
2580 2580 for rev in revs:
2581 2581 args = tr.hookargs.copy()
2582 2582 node = hex(cl.node(rev))
2583 2583 args.update(phases.preparehookargs(node, old, new))
2584 2584 repo.hook(
2585 2585 b'txnclose-phase',
2586 2586 throw=False,
2587 2587 **pycompat.strkwargs(args)
2588 2588 )
2589 2589
2590 2590 repo.hook(
2591 2591 b'txnclose', throw=False, **pycompat.strkwargs(hookargs)
2592 2592 )
2593 2593
2594 2594 repo = reporef()
2595 2595 assert repo is not None # help pytype
2596 2596 repo._afterlock(hookfunc)
2597 2597
2598 2598 tr.addfinalize(b'txnclose-hook', txnclosehook)
2599 2599 # Include a leading "-" to make it happen before the transaction summary
2600 2600 # reports registered via scmutil.registersummarycallback() whose names
2601 2601 # are 00-txnreport etc. That way, the caches will be warm when the
2602 2602 # callbacks run.
2603 2603 tr.addpostclose(b'-warm-cache', self._buildcacheupdater(tr))
2604 2604
2605 2605 def txnaborthook(tr2):
2606 2606 """To be run if transaction is aborted"""
2607 2607 repo = reporef()
2608 2608 assert repo is not None # help pytype
2609 2609 repo.hook(
2610 2610 b'txnabort', throw=False, **pycompat.strkwargs(tr2.hookargs)
2611 2611 )
2612 2612
2613 2613 tr.addabort(b'txnabort-hook', txnaborthook)
2614 2614 # avoid eager cache invalidation. in-memory data should be identical
2615 2615 # to stored data if transaction has no error.
2616 2616 tr.addpostclose(b'refresh-filecachestats', self._refreshfilecachestats)
2617 2617 self._transref = weakref.ref(tr)
2618 2618 scmutil.registersummarycallback(self, tr, desc)
2619 2619 return tr
2620 2620
2621 2621 def _journalfiles(self):
2622 2622 return (
2623 2623 (self.svfs, b'journal'),
2624 2624 (self.svfs, b'journal.narrowspec'),
2625 2625 (self.vfs, b'journal.narrowspec.dirstate'),
2626 2626 (self.vfs, b'journal.dirstate'),
2627 2627 (self.vfs, b'journal.branch'),
2628 2628 (self.vfs, b'journal.desc'),
2629 2629 (bookmarks.bookmarksvfs(self), b'journal.bookmarks'),
2630 2630 (self.svfs, b'journal.phaseroots'),
2631 2631 )
2632 2632
2633 2633 def undofiles(self):
2634 2634 return [(vfs, undoname(x)) for vfs, x in self._journalfiles()]
2635 2635
2636 2636 @unfilteredmethod
2637 2637 def _writejournal(self, desc):
2638 2638 self.dirstate.savebackup(None, b'journal.dirstate')
2639 2639 narrowspec.savewcbackup(self, b'journal.narrowspec.dirstate')
2640 2640 narrowspec.savebackup(self, b'journal.narrowspec')
2641 2641 self.vfs.write(
2642 2642 b"journal.branch", encoding.fromlocal(self.dirstate.branch())
2643 2643 )
2644 2644 self.vfs.write(b"journal.desc", b"%d\n%s\n" % (len(self), desc))
2645 2645 bookmarksvfs = bookmarks.bookmarksvfs(self)
2646 2646 bookmarksvfs.write(
2647 2647 b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks")
2648 2648 )
2649 2649 self.svfs.write(b"journal.phaseroots", self.svfs.tryread(b"phaseroots"))
2650 2650
2651 2651 def recover(self):
2652 2652 with self.lock():
2653 2653 if self.svfs.exists(b"journal"):
2654 2654 self.ui.status(_(b"rolling back interrupted transaction\n"))
2655 2655 vfsmap = {
2656 2656 b'': self.svfs,
2657 2657 b'plain': self.vfs,
2658 2658 }
2659 2659 transaction.rollback(
2660 2660 self.svfs,
2661 2661 vfsmap,
2662 2662 b"journal",
2663 2663 self.ui.warn,
2664 2664 checkambigfiles=_cachedfiles,
2665 2665 )
2666 2666 self.invalidate()
2667 2667 return True
2668 2668 else:
2669 2669 self.ui.warn(_(b"no interrupted transaction available\n"))
2670 2670 return False
2671 2671
2672 2672 def rollback(self, dryrun=False, force=False):
2673 2673 wlock = lock = dsguard = None
2674 2674 try:
2675 2675 wlock = self.wlock()
2676 2676 lock = self.lock()
2677 2677 if self.svfs.exists(b"undo"):
2678 2678 dsguard = dirstateguard.dirstateguard(self, b'rollback')
2679 2679
2680 2680 return self._rollback(dryrun, force, dsguard)
2681 2681 else:
2682 2682 self.ui.warn(_(b"no rollback information available\n"))
2683 2683 return 1
2684 2684 finally:
2685 2685 release(dsguard, lock, wlock)
2686 2686
2687 2687 @unfilteredmethod # Until we get smarter cache management
2688 2688 def _rollback(self, dryrun, force, dsguard):
2689 2689 ui = self.ui
2690 2690 try:
2691 2691 args = self.vfs.read(b'undo.desc').splitlines()
2692 2692 (oldlen, desc, detail) = (int(args[0]), args[1], None)
2693 2693 if len(args) >= 3:
2694 2694 detail = args[2]
2695 2695 oldtip = oldlen - 1
2696 2696
2697 2697 if detail and ui.verbose:
2698 2698 msg = _(
2699 2699 b'repository tip rolled back to revision %d'
2700 2700 b' (undo %s: %s)\n'
2701 2701 ) % (oldtip, desc, detail)
2702 2702 else:
2703 2703 msg = _(
2704 2704 b'repository tip rolled back to revision %d (undo %s)\n'
2705 2705 ) % (oldtip, desc)
2706 2706 except IOError:
2707 2707 msg = _(b'rolling back unknown transaction\n')
2708 2708 desc = None
2709 2709
2710 2710 if not force and self[b'.'] != self[b'tip'] and desc == b'commit':
2711 2711 raise error.Abort(
2712 2712 _(
2713 2713 b'rollback of last commit while not checked out '
2714 2714 b'may lose data'
2715 2715 ),
2716 2716 hint=_(b'use -f to force'),
2717 2717 )
2718 2718
2719 2719 ui.status(msg)
2720 2720 if dryrun:
2721 2721 return 0
2722 2722
2723 2723 parents = self.dirstate.parents()
2724 2724 self.destroying()
2725 2725 vfsmap = {b'plain': self.vfs, b'': self.svfs}
2726 2726 transaction.rollback(
2727 2727 self.svfs, vfsmap, b'undo', ui.warn, checkambigfiles=_cachedfiles
2728 2728 )
2729 2729 bookmarksvfs = bookmarks.bookmarksvfs(self)
2730 2730 if bookmarksvfs.exists(b'undo.bookmarks'):
2731 2731 bookmarksvfs.rename(
2732 2732 b'undo.bookmarks', b'bookmarks', checkambig=True
2733 2733 )
2734 2734 if self.svfs.exists(b'undo.phaseroots'):
2735 2735 self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True)
2736 2736 self.invalidate()
2737 2737
2738 2738 has_node = self.changelog.index.has_node
2739 2739 parentgone = any(not has_node(p) for p in parents)
2740 2740 if parentgone:
2741 2741 # prevent dirstateguard from overwriting already restored one
2742 2742 dsguard.close()
2743 2743
2744 2744 narrowspec.restorebackup(self, b'undo.narrowspec')
2745 2745 narrowspec.restorewcbackup(self, b'undo.narrowspec.dirstate')
2746 2746 self.dirstate.restorebackup(None, b'undo.dirstate')
2747 2747 try:
2748 2748 branch = self.vfs.read(b'undo.branch')
2749 2749 self.dirstate.setbranch(encoding.tolocal(branch))
2750 2750 except IOError:
2751 2751 ui.warn(
2752 2752 _(
2753 2753 b'named branch could not be reset: '
2754 2754 b'current branch is still \'%s\'\n'
2755 2755 )
2756 2756 % self.dirstate.branch()
2757 2757 )
2758 2758
2759 2759 parents = tuple([p.rev() for p in self[None].parents()])
2760 2760 if len(parents) > 1:
2761 2761 ui.status(
2762 2762 _(
2763 2763 b'working directory now based on '
2764 2764 b'revisions %d and %d\n'
2765 2765 )
2766 2766 % parents
2767 2767 )
2768 2768 else:
2769 2769 ui.status(
2770 2770 _(b'working directory now based on revision %d\n') % parents
2771 2771 )
2772 2772 mergestatemod.mergestate.clean(self)
2773 2773
2774 2774 # TODO: if we know which new heads may result from this rollback, pass
2775 2775 # them to destroy(), which will prevent the branchhead cache from being
2776 2776 # invalidated.
2777 2777 self.destroyed()
2778 2778 return 0
2779 2779
2780 2780 def _buildcacheupdater(self, newtransaction):
2781 2781 """called during transaction to build the callback updating cache
2782 2782
2783 2783 Lives on the repository to help extension who might want to augment
2784 2784 this logic. For this purpose, the created transaction is passed to the
2785 2785 method.
2786 2786 """
2787 2787 # we must avoid cyclic reference between repo and transaction.
2788 2788 reporef = weakref.ref(self)
2789 2789
2790 2790 def updater(tr):
2791 2791 repo = reporef()
2792 2792 assert repo is not None # help pytype
2793 2793 repo.updatecaches(tr)
2794 2794
2795 2795 return updater
2796 2796
2797 2797 @unfilteredmethod
2798 2798 def updatecaches(self, tr=None, full=False, caches=None):
2799 2799 """warm appropriate caches
2800 2800
2801 2801 If this function is called after a transaction closed. The transaction
2802 2802 will be available in the 'tr' argument. This can be used to selectively
2803 2803 update caches relevant to the changes in that transaction.
2804 2804
2805 2805 If 'full' is set, make sure all caches the function knows about have
2806 2806 up-to-date data. Even the ones usually loaded more lazily.
2807 2807
2808 2808 The `full` argument can take a special "post-clone" value. In this case
2809 2809 the cache warming is made after a clone and of the slower cache might
2810 2810 be skipped, namely the `.fnodetags` one. This argument is 5.8 specific
2811 2811 as we plan for a cleaner way to deal with this for 5.9.
2812 2812 """
2813 2813 if tr is not None and tr.hookargs.get(b'source') == b'strip':
2814 2814 # During strip, many caches are invalid but
2815 2815 # later call to `destroyed` will refresh them.
2816 2816 return
2817 2817
2818 2818 unfi = self.unfiltered()
2819 2819
2820 2820 if full:
2821 2821 msg = (
2822 2822 "`full` argument for `repo.updatecaches` is deprecated\n"
2823 2823 "(use `caches=repository.CACHE_ALL` instead)"
2824 2824 )
2825 2825 self.ui.deprecwarn(msg, b"5.9")
2826 2826 caches = repository.CACHES_ALL
2827 2827 if full == b"post-clone":
2828 2828 caches = repository.CACHES_POST_CLONE
2829 2829 caches = repository.CACHES_ALL
2830 2830 elif caches is None:
2831 2831 caches = repository.CACHES_DEFAULT
2832 2832
2833 2833 if repository.CACHE_BRANCHMAP_SERVED in caches:
2834 2834 if tr is None or tr.changes[b'origrepolen'] < len(self):
2835 2835 # accessing the 'served' branchmap should refresh all the others,
2836 2836 self.ui.debug(b'updating the branch cache\n')
2837 2837 self.filtered(b'served').branchmap()
2838 2838 self.filtered(b'served.hidden').branchmap()
2839 2839 # flush all possibly delayed write.
2840 2840 self._branchcaches.write_delayed(self)
2841 2841
2842 2842 if repository.CACHE_CHANGELOG_CACHE in caches:
2843 2843 self.changelog.update_caches(transaction=tr)
2844 2844
2845 2845 if repository.CACHE_MANIFESTLOG_CACHE in caches:
2846 2846 self.manifestlog.update_caches(transaction=tr)
2847 2847
2848 2848 if repository.CACHE_REV_BRANCH in caches:
2849 2849 rbc = unfi.revbranchcache()
2850 2850 for r in unfi.changelog:
2851 2851 rbc.branchinfo(r)
2852 2852 rbc.write()
2853 2853
2854 2854 if repository.CACHE_FULL_MANIFEST in caches:
2855 2855 # ensure the working copy parents are in the manifestfulltextcache
2856 2856 for ctx in self[b'.'].parents():
2857 2857 ctx.manifest() # accessing the manifest is enough
2858 2858
2859 2859 if repository.CACHE_FILE_NODE_TAGS in caches:
2860 2860 # accessing fnode cache warms the cache
2861 2861 tagsmod.fnoderevs(self.ui, unfi, unfi.changelog.revs())
2862 2862
2863 2863 if repository.CACHE_TAGS_DEFAULT in caches:
2864 2864 # accessing tags warm the cache
2865 2865 self.tags()
2866 2866 if repository.CACHE_TAGS_SERVED in caches:
2867 2867 self.filtered(b'served').tags()
2868 2868
2869 2869 if repository.CACHE_BRANCHMAP_ALL in caches:
2870 2870 # The CACHE_BRANCHMAP_ALL updates lazily-loaded caches immediately,
2871 2871 # so we're forcing a write to cause these caches to be warmed up
2872 2872 # even if they haven't explicitly been requested yet (if they've
2873 2873 # never been used by hg, they won't ever have been written, even if
2874 2874 # they're a subset of another kind of cache that *has* been used).
2875 2875 for filt in repoview.filtertable.keys():
2876 2876 filtered = self.filtered(filt)
2877 2877 filtered.branchmap().write(filtered)
2878 2878
2879 2879 def invalidatecaches(self):
2880 2880
2881 2881 if '_tagscache' in vars(self):
2882 2882 # can't use delattr on proxy
2883 2883 del self.__dict__['_tagscache']
2884 2884
2885 2885 self._branchcaches.clear()
2886 2886 self.invalidatevolatilesets()
2887 2887 self._sparsesignaturecache.clear()
2888 2888
2889 2889 def invalidatevolatilesets(self):
2890 2890 self.filteredrevcache.clear()
2891 2891 obsolete.clearobscaches(self)
2892 2892 self._quick_access_changeid_invalidate()
2893 2893
2894 2894 def invalidatedirstate(self):
2895 2895 """Invalidates the dirstate, causing the next call to dirstate
2896 2896 to check if it was modified since the last time it was read,
2897 2897 rereading it if it has.
2898 2898
2899 2899 This is different to dirstate.invalidate() that it doesn't always
2900 2900 rereads the dirstate. Use dirstate.invalidate() if you want to
2901 2901 explicitly read the dirstate again (i.e. restoring it to a previous
2902 2902 known good state)."""
2903 2903 if hasunfilteredcache(self, 'dirstate'):
2904 2904 for k in self.dirstate._filecache:
2905 2905 try:
2906 2906 delattr(self.dirstate, k)
2907 2907 except AttributeError:
2908 2908 pass
2909 2909 delattr(self.unfiltered(), 'dirstate')
2910 2910
2911 2911 def invalidate(self, clearfilecache=False):
2912 2912 """Invalidates both store and non-store parts other than dirstate
2913 2913
2914 2914 If a transaction is running, invalidation of store is omitted,
2915 2915 because discarding in-memory changes might cause inconsistency
2916 2916 (e.g. incomplete fncache causes unintentional failure, but
2917 2917 redundant one doesn't).
2918 2918 """
2919 2919 unfiltered = self.unfiltered() # all file caches are stored unfiltered
2920 2920 for k in list(self._filecache.keys()):
2921 2921 # dirstate is invalidated separately in invalidatedirstate()
2922 2922 if k == b'dirstate':
2923 2923 continue
2924 2924 if (
2925 2925 k == b'changelog'
2926 2926 and self.currenttransaction()
2927 2927 and self.changelog._delayed
2928 2928 ):
2929 2929 # The changelog object may store unwritten revisions. We don't
2930 2930 # want to lose them.
2931 2931 # TODO: Solve the problem instead of working around it.
2932 2932 continue
2933 2933
2934 2934 if clearfilecache:
2935 2935 del self._filecache[k]
2936 2936 try:
2937 2937 delattr(unfiltered, k)
2938 2938 except AttributeError:
2939 2939 pass
2940 2940 self.invalidatecaches()
2941 2941 if not self.currenttransaction():
2942 2942 # TODO: Changing contents of store outside transaction
2943 2943 # causes inconsistency. We should make in-memory store
2944 2944 # changes detectable, and abort if changed.
2945 2945 self.store.invalidatecaches()
2946 2946
2947 2947 def invalidateall(self):
2948 2948 """Fully invalidates both store and non-store parts, causing the
2949 2949 subsequent operation to reread any outside changes."""
2950 2950 # extension should hook this to invalidate its caches
2951 2951 self.invalidate()
2952 2952 self.invalidatedirstate()
2953 2953
2954 2954 @unfilteredmethod
2955 2955 def _refreshfilecachestats(self, tr):
2956 2956 """Reload stats of cached files so that they are flagged as valid"""
2957 2957 for k, ce in self._filecache.items():
2958 2958 k = pycompat.sysstr(k)
2959 2959 if k == 'dirstate' or k not in self.__dict__:
2960 2960 continue
2961 2961 ce.refresh()
2962 2962
2963 2963 def _lock(
2964 2964 self,
2965 2965 vfs,
2966 2966 lockname,
2967 2967 wait,
2968 2968 releasefn,
2969 2969 acquirefn,
2970 2970 desc,
2971 2971 ):
2972 2972 timeout = 0
2973 2973 warntimeout = 0
2974 2974 if wait:
2975 2975 timeout = self.ui.configint(b"ui", b"timeout")
2976 2976 warntimeout = self.ui.configint(b"ui", b"timeout.warn")
2977 2977 # internal config: ui.signal-safe-lock
2978 2978 signalsafe = self.ui.configbool(b'ui', b'signal-safe-lock')
2979 2979
2980 2980 l = lockmod.trylock(
2981 2981 self.ui,
2982 2982 vfs,
2983 2983 lockname,
2984 2984 timeout,
2985 2985 warntimeout,
2986 2986 releasefn=releasefn,
2987 2987 acquirefn=acquirefn,
2988 2988 desc=desc,
2989 2989 signalsafe=signalsafe,
2990 2990 )
2991 2991 return l
2992 2992
2993 2993 def _afterlock(self, callback):
2994 2994 """add a callback to be run when the repository is fully unlocked
2995 2995
2996 2996 The callback will be executed when the outermost lock is released
2997 2997 (with wlock being higher level than 'lock')."""
2998 2998 for ref in (self._wlockref, self._lockref):
2999 2999 l = ref and ref()
3000 3000 if l and l.held:
3001 3001 l.postrelease.append(callback)
3002 3002 break
3003 3003 else: # no lock have been found.
3004 3004 callback(True)
3005 3005
3006 3006 def lock(self, wait=True):
3007 3007 """Lock the repository store (.hg/store) and return a weak reference
3008 3008 to the lock. Use this before modifying the store (e.g. committing or
3009 3009 stripping). If you are opening a transaction, get a lock as well.)
3010 3010
3011 3011 If both 'lock' and 'wlock' must be acquired, ensure you always acquires
3012 3012 'wlock' first to avoid a dead-lock hazard."""
3013 3013 l = self._currentlock(self._lockref)
3014 3014 if l is not None:
3015 3015 l.lock()
3016 3016 return l
3017 3017
3018 3018 l = self._lock(
3019 3019 vfs=self.svfs,
3020 3020 lockname=b"lock",
3021 3021 wait=wait,
3022 3022 releasefn=None,
3023 3023 acquirefn=self.invalidate,
3024 3024 desc=_(b'repository %s') % self.origroot,
3025 3025 )
3026 3026 self._lockref = weakref.ref(l)
3027 3027 return l
3028 3028
3029 3029 def wlock(self, wait=True):
3030 3030 """Lock the non-store parts of the repository (everything under
3031 3031 .hg except .hg/store) and return a weak reference to the lock.
3032 3032
3033 3033 Use this before modifying files in .hg.
3034 3034
3035 3035 If both 'lock' and 'wlock' must be acquired, ensure you always acquires
3036 3036 'wlock' first to avoid a dead-lock hazard."""
3037 3037 l = self._wlockref() if self._wlockref else None
3038 3038 if l is not None and l.held:
3039 3039 l.lock()
3040 3040 return l
3041 3041
3042 3042 # We do not need to check for non-waiting lock acquisition. Such
3043 3043 # acquisition would not cause dead-lock as they would just fail.
3044 3044 if wait and (
3045 3045 self.ui.configbool(b'devel', b'all-warnings')
3046 3046 or self.ui.configbool(b'devel', b'check-locks')
3047 3047 ):
3048 3048 if self._currentlock(self._lockref) is not None:
3049 3049 self.ui.develwarn(b'"wlock" acquired after "lock"')
3050 3050
3051 3051 def unlock():
3052 3052 if self.dirstate.pendingparentchange():
3053 3053 self.dirstate.invalidate()
3054 3054 else:
3055 3055 self.dirstate.write(None)
3056 3056
3057 3057 self._filecache[b'dirstate'].refresh()
3058 3058
3059 3059 l = self._lock(
3060 3060 self.vfs,
3061 3061 b"wlock",
3062 3062 wait,
3063 3063 unlock,
3064 3064 self.invalidatedirstate,
3065 3065 _(b'working directory of %s') % self.origroot,
3066 3066 )
3067 3067 self._wlockref = weakref.ref(l)
3068 3068 return l
3069 3069
3070 3070 def _currentlock(self, lockref):
3071 3071 """Returns the lock if it's held, or None if it's not."""
3072 3072 if lockref is None:
3073 3073 return None
3074 3074 l = lockref()
3075 3075 if l is None or not l.held:
3076 3076 return None
3077 3077 return l
3078 3078
3079 3079 def currentwlock(self):
3080 3080 """Returns the wlock if it's held, or None if it's not."""
3081 3081 return self._currentlock(self._wlockref)
3082 3082
3083 3083 def checkcommitpatterns(self, wctx, match, status, fail):
3084 3084 """check for commit arguments that aren't committable"""
3085 3085 if match.isexact() or match.prefix():
3086 3086 matched = set(status.modified + status.added + status.removed)
3087 3087
3088 3088 for f in match.files():
3089 3089 f = self.dirstate.normalize(f)
3090 3090 if f == b'.' or f in matched or f in wctx.substate:
3091 3091 continue
3092 3092 if f in status.deleted:
3093 3093 fail(f, _(b'file not found!'))
3094 3094 # Is it a directory that exists or used to exist?
3095 3095 if self.wvfs.isdir(f) or wctx.p1().hasdir(f):
3096 3096 d = f + b'/'
3097 3097 for mf in matched:
3098 3098 if mf.startswith(d):
3099 3099 break
3100 3100 else:
3101 3101 fail(f, _(b"no match under directory!"))
3102 3102 elif f not in self.dirstate:
3103 3103 fail(f, _(b"file not tracked!"))
3104 3104
3105 3105 @unfilteredmethod
3106 3106 def commit(
3107 3107 self,
3108 3108 text=b"",
3109 3109 user=None,
3110 3110 date=None,
3111 3111 match=None,
3112 3112 force=False,
3113 3113 editor=None,
3114 3114 extra=None,
3115 3115 ):
3116 3116 """Add a new revision to current repository.
3117 3117
3118 3118 Revision information is gathered from the working directory,
3119 3119 match can be used to filter the committed files. If editor is
3120 3120 supplied, it is called to get a commit message.
3121 3121 """
3122 3122 if extra is None:
3123 3123 extra = {}
3124 3124
3125 3125 def fail(f, msg):
3126 3126 raise error.InputError(b'%s: %s' % (f, msg))
3127 3127
3128 3128 if not match:
3129 3129 match = matchmod.always()
3130 3130
3131 3131 if not force:
3132 3132 match.bad = fail
3133 3133
3134 3134 # lock() for recent changelog (see issue4368)
3135 3135 with self.wlock(), self.lock():
3136 3136 wctx = self[None]
3137 3137 merge = len(wctx.parents()) > 1
3138 3138
3139 3139 if not force and merge and not match.always():
3140 3140 raise error.Abort(
3141 3141 _(
3142 3142 b'cannot partially commit a merge '
3143 3143 b'(do not specify files or patterns)'
3144 3144 )
3145 3145 )
3146 3146
3147 3147 status = self.status(match=match, clean=force)
3148 3148 if force:
3149 3149 status.modified.extend(
3150 3150 status.clean
3151 3151 ) # mq may commit clean files
3152 3152
3153 3153 # check subrepos
3154 3154 subs, commitsubs, newstate = subrepoutil.precommit(
3155 3155 self.ui, wctx, status, match, force=force
3156 3156 )
3157 3157
3158 3158 # make sure all explicit patterns are matched
3159 3159 if not force:
3160 3160 self.checkcommitpatterns(wctx, match, status, fail)
3161 3161
3162 3162 cctx = context.workingcommitctx(
3163 3163 self, status, text, user, date, extra
3164 3164 )
3165 3165
3166 3166 ms = mergestatemod.mergestate.read(self)
3167 3167 mergeutil.checkunresolved(ms)
3168 3168
3169 3169 # internal config: ui.allowemptycommit
3170 3170 if cctx.isempty() and not self.ui.configbool(
3171 3171 b'ui', b'allowemptycommit'
3172 3172 ):
3173 3173 self.ui.debug(b'nothing to commit, clearing merge state\n')
3174 3174 ms.reset()
3175 3175 return None
3176 3176
3177 3177 if merge and cctx.deleted():
3178 3178 raise error.Abort(_(b"cannot commit merge with missing files"))
3179 3179
3180 3180 if editor:
3181 3181 cctx._text = editor(self, cctx, subs)
3182 3182 edited = text != cctx._text
3183 3183
3184 3184 # Save commit message in case this transaction gets rolled back
3185 3185 # (e.g. by a pretxncommit hook). Leave the content alone on
3186 3186 # the assumption that the user will use the same editor again.
3187 3187 msg_path = self.savecommitmessage(cctx._text)
3188 3188
3189 3189 # commit subs and write new state
3190 3190 if subs:
3191 3191 uipathfn = scmutil.getuipathfn(self)
3192 3192 for s in sorted(commitsubs):
3193 3193 sub = wctx.sub(s)
3194 3194 self.ui.status(
3195 3195 _(b'committing subrepository %s\n')
3196 3196 % uipathfn(subrepoutil.subrelpath(sub))
3197 3197 )
3198 3198 sr = sub.commit(cctx._text, user, date)
3199 3199 newstate[s] = (newstate[s][0], sr)
3200 3200 subrepoutil.writestate(self, newstate)
3201 3201
3202 3202 p1, p2 = self.dirstate.parents()
3203 3203 hookp1, hookp2 = hex(p1), (p2 != self.nullid and hex(p2) or b'')
3204 3204 try:
3205 3205 self.hook(
3206 3206 b"precommit", throw=True, parent1=hookp1, parent2=hookp2
3207 3207 )
3208 3208 with self.transaction(b'commit'):
3209 3209 ret = self.commitctx(cctx, True)
3210 3210 # update bookmarks, dirstate and mergestate
3211 3211 bookmarks.update(self, [p1, p2], ret)
3212 3212 cctx.markcommitted(ret)
3213 3213 ms.reset()
3214 3214 except: # re-raises
3215 3215 if edited:
3216 3216 self.ui.write(
3217 3217 _(b'note: commit message saved in %s\n') % msg_path
3218 3218 )
3219 3219 self.ui.write(
3220 3220 _(
3221 3221 b"note: use 'hg commit --logfile "
3222 3222 b"%s --edit' to reuse it\n"
3223 3223 )
3224 3224 % msg_path
3225 3225 )
3226 3226 raise
3227 3227
3228 3228 def commithook(unused_success):
3229 3229 # hack for command that use a temporary commit (eg: histedit)
3230 3230 # temporary commit got stripped before hook release
3231 3231 if self.changelog.hasnode(ret):
3232 3232 self.hook(
3233 3233 b"commit", node=hex(ret), parent1=hookp1, parent2=hookp2
3234 3234 )
3235 3235
3236 3236 self._afterlock(commithook)
3237 3237 return ret
3238 3238
3239 3239 @unfilteredmethod
3240 3240 def commitctx(self, ctx, error=False, origctx=None):
3241 3241 return commit.commitctx(self, ctx, error=error, origctx=origctx)
3242 3242
3243 3243 @unfilteredmethod
3244 3244 def destroying(self):
3245 3245 """Inform the repository that nodes are about to be destroyed.
3246 3246 Intended for use by strip and rollback, so there's a common
3247 3247 place for anything that has to be done before destroying history.
3248 3248
3249 3249 This is mostly useful for saving state that is in memory and waiting
3250 3250 to be flushed when the current lock is released. Because a call to
3251 3251 destroyed is imminent, the repo will be invalidated causing those
3252 3252 changes to stay in memory (waiting for the next unlock), or vanish
3253 3253 completely.
3254 3254 """
3255 3255 # When using the same lock to commit and strip, the phasecache is left
3256 3256 # dirty after committing. Then when we strip, the repo is invalidated,
3257 3257 # causing those changes to disappear.
3258 3258 if '_phasecache' in vars(self):
3259 3259 self._phasecache.write()
3260 3260
3261 3261 @unfilteredmethod
3262 3262 def destroyed(self):
3263 3263 """Inform the repository that nodes have been destroyed.
3264 3264 Intended for use by strip and rollback, so there's a common
3265 3265 place for anything that has to be done after destroying history.
3266 3266 """
3267 3267 # When one tries to:
3268 3268 # 1) destroy nodes thus calling this method (e.g. strip)
3269 3269 # 2) use phasecache somewhere (e.g. commit)
3270 3270 #
3271 3271 # then 2) will fail because the phasecache contains nodes that were
3272 3272 # removed. We can either remove phasecache from the filecache,
3273 3273 # causing it to reload next time it is accessed, or simply filter
3274 3274 # the removed nodes now and write the updated cache.
3275 3275 self._phasecache.filterunknown(self)
3276 3276 self._phasecache.write()
3277 3277
3278 3278 # refresh all repository caches
3279 3279 self.updatecaches()
3280 3280
3281 3281 # Ensure the persistent tag cache is updated. Doing it now
3282 3282 # means that the tag cache only has to worry about destroyed
3283 3283 # heads immediately after a strip/rollback. That in turn
3284 3284 # guarantees that "cachetip == currenttip" (comparing both rev
3285 3285 # and node) always means no nodes have been added or destroyed.
3286 3286
3287 3287 # XXX this is suboptimal when qrefresh'ing: we strip the current
3288 3288 # head, refresh the tag cache, then immediately add a new head.
3289 3289 # But I think doing it this way is necessary for the "instant
3290 3290 # tag cache retrieval" case to work.
3291 3291 self.invalidate()
3292 3292
3293 3293 def status(
3294 3294 self,
3295 3295 node1=b'.',
3296 3296 node2=None,
3297 3297 match=None,
3298 3298 ignored=False,
3299 3299 clean=False,
3300 3300 unknown=False,
3301 3301 listsubrepos=False,
3302 3302 ):
3303 3303 '''a convenience method that calls node1.status(node2)'''
3304 3304 return self[node1].status(
3305 3305 node2, match, ignored, clean, unknown, listsubrepos
3306 3306 )
3307 3307
3308 3308 def addpostdsstatus(self, ps):
3309 3309 """Add a callback to run within the wlock, at the point at which status
3310 3310 fixups happen.
3311 3311
3312 3312 On status completion, callback(wctx, status) will be called with the
3313 3313 wlock held, unless the dirstate has changed from underneath or the wlock
3314 3314 couldn't be grabbed.
3315 3315
3316 3316 Callbacks should not capture and use a cached copy of the dirstate --
3317 3317 it might change in the meanwhile. Instead, they should access the
3318 3318 dirstate via wctx.repo().dirstate.
3319 3319
3320 3320 This list is emptied out after each status run -- extensions should
3321 3321 make sure it adds to this list each time dirstate.status is called.
3322 3322 Extensions should also make sure they don't call this for statuses
3323 3323 that don't involve the dirstate.
3324 3324 """
3325 3325
3326 3326 # The list is located here for uniqueness reasons -- it is actually
3327 3327 # managed by the workingctx, but that isn't unique per-repo.
3328 3328 self._postdsstatus.append(ps)
3329 3329
3330 3330 def postdsstatus(self):
3331 3331 """Used by workingctx to get the list of post-dirstate-status hooks."""
3332 3332 return self._postdsstatus
3333 3333
3334 3334 def clearpostdsstatus(self):
3335 3335 """Used by workingctx to clear post-dirstate-status hooks."""
3336 3336 del self._postdsstatus[:]
3337 3337
3338 3338 def heads(self, start=None):
3339 3339 if start is None:
3340 3340 cl = self.changelog
3341 3341 headrevs = reversed(cl.headrevs())
3342 3342 return [cl.node(rev) for rev in headrevs]
3343 3343
3344 3344 heads = self.changelog.heads(start)
3345 3345 # sort the output in rev descending order
3346 3346 return sorted(heads, key=self.changelog.rev, reverse=True)
3347 3347
3348 3348 def branchheads(self, branch=None, start=None, closed=False):
3349 3349 """return a (possibly filtered) list of heads for the given branch
3350 3350
3351 3351 Heads are returned in topological order, from newest to oldest.
3352 3352 If branch is None, use the dirstate branch.
3353 3353 If start is not None, return only heads reachable from start.
3354 3354 If closed is True, return heads that are marked as closed as well.
3355 3355 """
3356 3356 if branch is None:
3357 3357 branch = self[None].branch()
3358 3358 branches = self.branchmap()
3359 3359 if not branches.hasbranch(branch):
3360 3360 return []
3361 3361 # the cache returns heads ordered lowest to highest
3362 3362 bheads = list(reversed(branches.branchheads(branch, closed=closed)))
3363 3363 if start is not None:
3364 3364 # filter out the heads that cannot be reached from startrev
3365 3365 fbheads = set(self.changelog.nodesbetween([start], bheads)[2])
3366 3366 bheads = [h for h in bheads if h in fbheads]
3367 3367 return bheads
3368 3368
3369 3369 def branches(self, nodes):
3370 3370 if not nodes:
3371 3371 nodes = [self.changelog.tip()]
3372 3372 b = []
3373 3373 for n in nodes:
3374 3374 t = n
3375 3375 while True:
3376 3376 p = self.changelog.parents(n)
3377 3377 if p[1] != self.nullid or p[0] == self.nullid:
3378 3378 b.append((t, n, p[0], p[1]))
3379 3379 break
3380 3380 n = p[0]
3381 3381 return b
3382 3382
3383 3383 def between(self, pairs):
3384 3384 r = []
3385 3385
3386 3386 for top, bottom in pairs:
3387 3387 n, l, i = top, [], 0
3388 3388 f = 1
3389 3389
3390 3390 while n != bottom and n != self.nullid:
3391 3391 p = self.changelog.parents(n)[0]
3392 3392 if i == f:
3393 3393 l.append(n)
3394 3394 f = f * 2
3395 3395 n = p
3396 3396 i += 1
3397 3397
3398 3398 r.append(l)
3399 3399
3400 3400 return r
3401 3401
3402 3402 def checkpush(self, pushop):
3403 3403 """Extensions can override this function if additional checks have
3404 3404 to be performed before pushing, or call it if they override push
3405 3405 command.
3406 3406 """
3407 3407
3408 3408 @unfilteredpropertycache
3409 3409 def prepushoutgoinghooks(self):
3410 3410 """Return util.hooks consists of a pushop with repo, remote, outgoing
3411 3411 methods, which are called before pushing changesets.
3412 3412 """
3413 3413 return util.hooks()
3414 3414
3415 3415 def pushkey(self, namespace, key, old, new):
3416 3416 try:
3417 3417 tr = self.currenttransaction()
3418 3418 hookargs = {}
3419 3419 if tr is not None:
3420 3420 hookargs.update(tr.hookargs)
3421 3421 hookargs = pycompat.strkwargs(hookargs)
3422 3422 hookargs['namespace'] = namespace
3423 3423 hookargs['key'] = key
3424 3424 hookargs['old'] = old
3425 3425 hookargs['new'] = new
3426 3426 self.hook(b'prepushkey', throw=True, **hookargs)
3427 3427 except error.HookAbort as exc:
3428 3428 self.ui.write_err(_(b"pushkey-abort: %s\n") % exc)
3429 3429 if exc.hint:
3430 3430 self.ui.write_err(_(b"(%s)\n") % exc.hint)
3431 3431 return False
3432 3432 self.ui.debug(b'pushing key for "%s:%s"\n' % (namespace, key))
3433 3433 ret = pushkey.push(self, namespace, key, old, new)
3434 3434
3435 3435 def runhook(unused_success):
3436 3436 self.hook(
3437 3437 b'pushkey',
3438 3438 namespace=namespace,
3439 3439 key=key,
3440 3440 old=old,
3441 3441 new=new,
3442 3442 ret=ret,
3443 3443 )
3444 3444
3445 3445 self._afterlock(runhook)
3446 3446 return ret
3447 3447
3448 3448 def listkeys(self, namespace):
3449 3449 self.hook(b'prelistkeys', throw=True, namespace=namespace)
3450 3450 self.ui.debug(b'listing keys for "%s"\n' % namespace)
3451 3451 values = pushkey.list(self, namespace)
3452 3452 self.hook(b'listkeys', namespace=namespace, values=values)
3453 3453 return values
3454 3454
3455 3455 def debugwireargs(self, one, two, three=None, four=None, five=None):
3456 3456 '''used to test argument passing over the wire'''
3457 3457 return b"%s %s %s %s %s" % (
3458 3458 one,
3459 3459 two,
3460 3460 pycompat.bytestr(three),
3461 3461 pycompat.bytestr(four),
3462 3462 pycompat.bytestr(five),
3463 3463 )
3464 3464
3465 3465 def savecommitmessage(self, text):
3466 3466 fp = self.vfs(b'last-message.txt', b'wb')
3467 3467 try:
3468 3468 fp.write(text)
3469 3469 finally:
3470 3470 fp.close()
3471 3471 return self.pathto(fp.name[len(self.root) + 1 :])
3472 3472
3473 3473 def register_wanted_sidedata(self, category):
3474 3474 if repository.REPO_FEATURE_SIDE_DATA not in self.features:
3475 3475 # Only revlogv2 repos can want sidedata.
3476 3476 return
3477 3477 self._wanted_sidedata.add(pycompat.bytestr(category))
3478 3478
3479 3479 def register_sidedata_computer(
3480 3480 self, kind, category, keys, computer, flags, replace=False
3481 3481 ):
3482 3482 if kind not in revlogconst.ALL_KINDS:
3483 3483 msg = _(b"unexpected revlog kind '%s'.")
3484 3484 raise error.ProgrammingError(msg % kind)
3485 3485 category = pycompat.bytestr(category)
3486 3486 already_registered = category in self._sidedata_computers.get(kind, [])
3487 3487 if already_registered and not replace:
3488 3488 msg = _(
3489 3489 b"cannot register a sidedata computer twice for category '%s'."
3490 3490 )
3491 3491 raise error.ProgrammingError(msg % category)
3492 3492 if replace and not already_registered:
3493 3493 msg = _(
3494 3494 b"cannot replace a sidedata computer that isn't registered "
3495 3495 b"for category '%s'."
3496 3496 )
3497 3497 raise error.ProgrammingError(msg % category)
3498 3498 self._sidedata_computers.setdefault(kind, {})
3499 3499 self._sidedata_computers[kind][category] = (keys, computer, flags)
3500 3500
3501 3501
3502 3502 # used to avoid circular references so destructors work
3503 3503 def aftertrans(files):
3504 3504 renamefiles = [tuple(t) for t in files]
3505 3505
3506 3506 def a():
3507 3507 for vfs, src, dest in renamefiles:
3508 3508 # if src and dest refer to a same file, vfs.rename is a no-op,
3509 3509 # leaving both src and dest on disk. delete dest to make sure
3510 3510 # the rename couldn't be such a no-op.
3511 3511 vfs.tryunlink(dest)
3512 3512 try:
3513 3513 vfs.rename(src, dest)
3514 3514 except FileNotFoundError: # journal file does not yet exist
3515 3515 pass
3516 3516
3517 3517 return a
3518 3518
3519 3519
3520 3520 def undoname(fn):
3521 3521 base, name = os.path.split(fn)
3522 3522 assert name.startswith(b'journal')
3523 3523 return os.path.join(base, name.replace(b'journal', b'undo', 1))
3524 3524
3525 3525
3526 3526 def instance(ui, path, create, intents=None, createopts=None):
3527 3527
3528 3528 # prevent cyclic import localrepo -> upgrade -> localrepo
3529 3529 from . import upgrade
3530 3530
3531 3531 localpath = urlutil.urllocalpath(path)
3532 3532 if create:
3533 3533 createrepository(ui, localpath, createopts=createopts)
3534 3534
3535 3535 def repo_maker():
3536 3536 return makelocalrepository(ui, localpath, intents=intents)
3537 3537
3538 3538 repo = repo_maker()
3539 3539 repo = upgrade.may_auto_upgrade(repo, repo_maker)
3540 3540 return repo
3541 3541
3542 3542
3543 3543 def islocal(path):
3544 3544 return True
3545 3545
3546 3546
3547 3547 def defaultcreateopts(ui, createopts=None):
3548 3548 """Populate the default creation options for a repository.
3549 3549
3550 3550 A dictionary of explicitly requested creation options can be passed
3551 3551 in. Missing keys will be populated.
3552 3552 """
3553 3553 createopts = dict(createopts or {})
3554 3554
3555 3555 if b'backend' not in createopts:
3556 3556 # experimental config: storage.new-repo-backend
3557 3557 createopts[b'backend'] = ui.config(b'storage', b'new-repo-backend')
3558 3558
3559 3559 return createopts
3560 3560
3561 3561
3562 3562 def clone_requirements(ui, createopts, srcrepo):
3563 3563 """clone the requirements of a local repo for a local clone
3564 3564
3565 3565 The store requirements are unchanged while the working copy requirements
3566 3566 depends on the configuration
3567 3567 """
3568 3568 target_requirements = set()
3569 3569 if not srcrepo.requirements:
3570 3570 # this is a legacy revlog "v0" repository, we cannot do anything fancy
3571 3571 # with it.
3572 3572 return target_requirements
3573 3573 createopts = defaultcreateopts(ui, createopts=createopts)
3574 3574 for r in newreporequirements(ui, createopts):
3575 3575 if r in requirementsmod.WORKING_DIR_REQUIREMENTS:
3576 3576 target_requirements.add(r)
3577 3577
3578 3578 for r in srcrepo.requirements:
3579 3579 if r not in requirementsmod.WORKING_DIR_REQUIREMENTS:
3580 3580 target_requirements.add(r)
3581 3581 return target_requirements
3582 3582
3583 3583
3584 3584 def newreporequirements(ui, createopts):
3585 3585 """Determine the set of requirements for a new local repository.
3586 3586
3587 3587 Extensions can wrap this function to specify custom requirements for
3588 3588 new repositories.
3589 3589 """
3590 3590
3591 3591 if b'backend' not in createopts:
3592 3592 raise error.ProgrammingError(
3593 3593 b'backend key not present in createopts; '
3594 3594 b'was defaultcreateopts() called?'
3595 3595 )
3596 3596
3597 3597 if createopts[b'backend'] != b'revlogv1':
3598 3598 raise error.Abort(
3599 3599 _(
3600 3600 b'unable to determine repository requirements for '
3601 3601 b'storage backend: %s'
3602 3602 )
3603 3603 % createopts[b'backend']
3604 3604 )
3605 3605
3606 3606 requirements = {requirementsmod.REVLOGV1_REQUIREMENT}
3607 3607 if ui.configbool(b'format', b'usestore'):
3608 3608 requirements.add(requirementsmod.STORE_REQUIREMENT)
3609 3609 if ui.configbool(b'format', b'usefncache'):
3610 3610 requirements.add(requirementsmod.FNCACHE_REQUIREMENT)
3611 3611 if ui.configbool(b'format', b'dotencode'):
3612 3612 requirements.add(requirementsmod.DOTENCODE_REQUIREMENT)
3613 3613
3614 3614 compengines = ui.configlist(b'format', b'revlog-compression')
3615 3615 for compengine in compengines:
3616 3616 if compengine in util.compengines:
3617 3617 engine = util.compengines[compengine]
3618 3618 if engine.available() and engine.revlogheader():
3619 3619 break
3620 3620 else:
3621 3621 raise error.Abort(
3622 3622 _(
3623 3623 b'compression engines %s defined by '
3624 3624 b'format.revlog-compression not available'
3625 3625 )
3626 3626 % b', '.join(b'"%s"' % e for e in compengines),
3627 3627 hint=_(
3628 3628 b'run "hg debuginstall" to list available '
3629 3629 b'compression engines'
3630 3630 ),
3631 3631 )
3632 3632
3633 3633 # zlib is the historical default and doesn't need an explicit requirement.
3634 3634 if compengine == b'zstd':
3635 3635 requirements.add(b'revlog-compression-zstd')
3636 3636 elif compengine != b'zlib':
3637 3637 requirements.add(b'exp-compression-%s' % compengine)
3638 3638
3639 3639 if scmutil.gdinitconfig(ui):
3640 3640 requirements.add(requirementsmod.GENERALDELTA_REQUIREMENT)
3641 3641 if ui.configbool(b'format', b'sparse-revlog'):
3642 3642 requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT)
3643 3643
3644 3644 # experimental config: format.use-dirstate-v2
3645 3645 # Keep this logic in sync with `has_dirstate_v2()` in `tests/hghave.py`
3646 3646 if ui.configbool(b'format', b'use-dirstate-v2'):
3647 3647 requirements.add(requirementsmod.DIRSTATE_V2_REQUIREMENT)
3648 3648
3649 3649 # experimental config: format.exp-use-copies-side-data-changeset
3650 3650 if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'):
3651 3651 requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT)
3652 3652 requirements.add(requirementsmod.COPIESSDC_REQUIREMENT)
3653 3653 if ui.configbool(b'experimental', b'treemanifest'):
3654 3654 requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT)
3655 3655
3656 3656 changelogv2 = ui.config(b'format', b'exp-use-changelog-v2')
3657 3657 if changelogv2 == b'enable-unstable-format-and-corrupt-my-data':
3658 3658 requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT)
3659 3659
3660 3660 revlogv2 = ui.config(b'experimental', b'revlogv2')
3661 3661 if revlogv2 == b'enable-unstable-format-and-corrupt-my-data':
3662 3662 requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT)
3663 3663 requirements.add(requirementsmod.REVLOGV2_REQUIREMENT)
3664 3664 # experimental config: format.internal-phase
3665 if ui.configbool(b'format', b'internal-phase'):
3665 if ui.configbool(b'format', b'use-internal-phase'):
3666 3666 requirements.add(requirementsmod.INTERNAL_PHASE_REQUIREMENT)
3667 3667
3668 3668 # experimental config: format.exp-archived-phase
3669 3669 if ui.configbool(b'format', b'exp-archived-phase'):
3670 3670 requirements.add(requirementsmod.ARCHIVED_PHASE_REQUIREMENT)
3671 3671
3672 3672 if createopts.get(b'narrowfiles'):
3673 3673 requirements.add(requirementsmod.NARROW_REQUIREMENT)
3674 3674
3675 3675 if createopts.get(b'lfs'):
3676 3676 requirements.add(b'lfs')
3677 3677
3678 3678 if ui.configbool(b'format', b'bookmarks-in-store'):
3679 3679 requirements.add(requirementsmod.BOOKMARKS_IN_STORE_REQUIREMENT)
3680 3680
3681 3681 if ui.configbool(b'format', b'use-persistent-nodemap'):
3682 3682 requirements.add(requirementsmod.NODEMAP_REQUIREMENT)
3683 3683
3684 3684 # if share-safe is enabled, let's create the new repository with the new
3685 3685 # requirement
3686 3686 if ui.configbool(b'format', b'use-share-safe'):
3687 3687 requirements.add(requirementsmod.SHARESAFE_REQUIREMENT)
3688 3688
3689 3689 # if we are creating a share-repoΒΉ we have to handle requirement
3690 3690 # differently.
3691 3691 #
3692 3692 # [1] (i.e. reusing the store from another repository, just having a
3693 3693 # working copy)
3694 3694 if b'sharedrepo' in createopts:
3695 3695 source_requirements = set(createopts[b'sharedrepo'].requirements)
3696 3696
3697 3697 if requirementsmod.SHARESAFE_REQUIREMENT not in source_requirements:
3698 3698 # share to an old school repository, we have to copy the
3699 3699 # requirements and hope for the best.
3700 3700 requirements = source_requirements
3701 3701 else:
3702 3702 # We have control on the working copy only, so "copy" the non
3703 3703 # working copy part over, ignoring previous logic.
3704 3704 to_drop = set()
3705 3705 for req in requirements:
3706 3706 if req in requirementsmod.WORKING_DIR_REQUIREMENTS:
3707 3707 continue
3708 3708 if req in source_requirements:
3709 3709 continue
3710 3710 to_drop.add(req)
3711 3711 requirements -= to_drop
3712 3712 requirements |= source_requirements
3713 3713
3714 3714 if createopts.get(b'sharedrelative'):
3715 3715 requirements.add(requirementsmod.RELATIVE_SHARED_REQUIREMENT)
3716 3716 else:
3717 3717 requirements.add(requirementsmod.SHARED_REQUIREMENT)
3718 3718
3719 3719 if ui.configbool(b'format', b'use-dirstate-tracked-hint'):
3720 3720 version = ui.configint(b'format', b'use-dirstate-tracked-hint.version')
3721 3721 msg = _("ignoring unknown tracked key version: %d\n")
3722 3722 hint = _("see `hg help config.format.use-dirstate-tracked-hint-version")
3723 3723 if version != 1:
3724 3724 ui.warn(msg % version, hint=hint)
3725 3725 else:
3726 3726 requirements.add(requirementsmod.DIRSTATE_TRACKED_HINT_V1)
3727 3727
3728 3728 return requirements
3729 3729
3730 3730
3731 3731 def checkrequirementscompat(ui, requirements):
3732 3732 """Checks compatibility of repository requirements enabled and disabled.
3733 3733
3734 3734 Returns a set of requirements which needs to be dropped because dependend
3735 3735 requirements are not enabled. Also warns users about it"""
3736 3736
3737 3737 dropped = set()
3738 3738
3739 3739 if requirementsmod.STORE_REQUIREMENT not in requirements:
3740 3740 if requirementsmod.BOOKMARKS_IN_STORE_REQUIREMENT in requirements:
3741 3741 ui.warn(
3742 3742 _(
3743 3743 b'ignoring enabled \'format.bookmarks-in-store\' config '
3744 3744 b'beacuse it is incompatible with disabled '
3745 3745 b'\'format.usestore\' config\n'
3746 3746 )
3747 3747 )
3748 3748 dropped.add(requirementsmod.BOOKMARKS_IN_STORE_REQUIREMENT)
3749 3749
3750 3750 if (
3751 3751 requirementsmod.SHARED_REQUIREMENT in requirements
3752 3752 or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements
3753 3753 ):
3754 3754 raise error.Abort(
3755 3755 _(
3756 3756 b"cannot create shared repository as source was created"
3757 3757 b" with 'format.usestore' config disabled"
3758 3758 )
3759 3759 )
3760 3760
3761 3761 if requirementsmod.SHARESAFE_REQUIREMENT in requirements:
3762 3762 if ui.hasconfig(b'format', b'use-share-safe'):
3763 3763 msg = _(
3764 3764 b"ignoring enabled 'format.use-share-safe' config because "
3765 3765 b"it is incompatible with disabled 'format.usestore'"
3766 3766 b" config\n"
3767 3767 )
3768 3768 ui.warn(msg)
3769 3769 dropped.add(requirementsmod.SHARESAFE_REQUIREMENT)
3770 3770
3771 3771 return dropped
3772 3772
3773 3773
3774 3774 def filterknowncreateopts(ui, createopts):
3775 3775 """Filters a dict of repo creation options against options that are known.
3776 3776
3777 3777 Receives a dict of repo creation options and returns a dict of those
3778 3778 options that we don't know how to handle.
3779 3779
3780 3780 This function is called as part of repository creation. If the
3781 3781 returned dict contains any items, repository creation will not
3782 3782 be allowed, as it means there was a request to create a repository
3783 3783 with options not recognized by loaded code.
3784 3784
3785 3785 Extensions can wrap this function to filter out creation options
3786 3786 they know how to handle.
3787 3787 """
3788 3788 known = {
3789 3789 b'backend',
3790 3790 b'lfs',
3791 3791 b'narrowfiles',
3792 3792 b'sharedrepo',
3793 3793 b'sharedrelative',
3794 3794 b'shareditems',
3795 3795 b'shallowfilestore',
3796 3796 }
3797 3797
3798 3798 return {k: v for k, v in createopts.items() if k not in known}
3799 3799
3800 3800
3801 3801 def createrepository(ui, path, createopts=None, requirements=None):
3802 3802 """Create a new repository in a vfs.
3803 3803
3804 3804 ``path`` path to the new repo's working directory.
3805 3805 ``createopts`` options for the new repository.
3806 3806 ``requirement`` predefined set of requirements.
3807 3807 (incompatible with ``createopts``)
3808 3808
3809 3809 The following keys for ``createopts`` are recognized:
3810 3810
3811 3811 backend
3812 3812 The storage backend to use.
3813 3813 lfs
3814 3814 Repository will be created with ``lfs`` requirement. The lfs extension
3815 3815 will automatically be loaded when the repository is accessed.
3816 3816 narrowfiles
3817 3817 Set up repository to support narrow file storage.
3818 3818 sharedrepo
3819 3819 Repository object from which storage should be shared.
3820 3820 sharedrelative
3821 3821 Boolean indicating if the path to the shared repo should be
3822 3822 stored as relative. By default, the pointer to the "parent" repo
3823 3823 is stored as an absolute path.
3824 3824 shareditems
3825 3825 Set of items to share to the new repository (in addition to storage).
3826 3826 shallowfilestore
3827 3827 Indicates that storage for files should be shallow (not all ancestor
3828 3828 revisions are known).
3829 3829 """
3830 3830
3831 3831 if requirements is not None:
3832 3832 if createopts is not None:
3833 3833 msg = b'cannot specify both createopts and requirements'
3834 3834 raise error.ProgrammingError(msg)
3835 3835 createopts = {}
3836 3836 else:
3837 3837 createopts = defaultcreateopts(ui, createopts=createopts)
3838 3838
3839 3839 unknownopts = filterknowncreateopts(ui, createopts)
3840 3840
3841 3841 if not isinstance(unknownopts, dict):
3842 3842 raise error.ProgrammingError(
3843 3843 b'filterknowncreateopts() did not return a dict'
3844 3844 )
3845 3845
3846 3846 if unknownopts:
3847 3847 raise error.Abort(
3848 3848 _(
3849 3849 b'unable to create repository because of unknown '
3850 3850 b'creation option: %s'
3851 3851 )
3852 3852 % b', '.join(sorted(unknownopts)),
3853 3853 hint=_(b'is a required extension not loaded?'),
3854 3854 )
3855 3855
3856 3856 requirements = newreporequirements(ui, createopts=createopts)
3857 3857 requirements -= checkrequirementscompat(ui, requirements)
3858 3858
3859 3859 wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True)
3860 3860
3861 3861 hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg'))
3862 3862 if hgvfs.exists():
3863 3863 raise error.RepoError(_(b'repository %s already exists') % path)
3864 3864
3865 3865 if b'sharedrepo' in createopts:
3866 3866 sharedpath = createopts[b'sharedrepo'].sharedpath
3867 3867
3868 3868 if createopts.get(b'sharedrelative'):
3869 3869 try:
3870 3870 sharedpath = os.path.relpath(sharedpath, hgvfs.base)
3871 3871 sharedpath = util.pconvert(sharedpath)
3872 3872 except (IOError, ValueError) as e:
3873 3873 # ValueError is raised on Windows if the drive letters differ
3874 3874 # on each path.
3875 3875 raise error.Abort(
3876 3876 _(b'cannot calculate relative path'),
3877 3877 hint=stringutil.forcebytestr(e),
3878 3878 )
3879 3879
3880 3880 if not wdirvfs.exists():
3881 3881 wdirvfs.makedirs()
3882 3882
3883 3883 hgvfs.makedir(notindexed=True)
3884 3884 if b'sharedrepo' not in createopts:
3885 3885 hgvfs.mkdir(b'cache')
3886 3886 hgvfs.mkdir(b'wcache')
3887 3887
3888 3888 has_store = requirementsmod.STORE_REQUIREMENT in requirements
3889 3889 if has_store and b'sharedrepo' not in createopts:
3890 3890 hgvfs.mkdir(b'store')
3891 3891
3892 3892 # We create an invalid changelog outside the store so very old
3893 3893 # Mercurial versions (which didn't know about the requirements
3894 3894 # file) encounter an error on reading the changelog. This
3895 3895 # effectively locks out old clients and prevents them from
3896 3896 # mucking with a repo in an unknown format.
3897 3897 #
3898 3898 # The revlog header has version 65535, which won't be recognized by
3899 3899 # such old clients.
3900 3900 hgvfs.append(
3901 3901 b'00changelog.i',
3902 3902 b'\0\0\xFF\xFF dummy changelog to prevent using the old repo '
3903 3903 b'layout',
3904 3904 )
3905 3905
3906 3906 # Filter the requirements into working copy and store ones
3907 3907 wcreq, storereq = scmutil.filterrequirements(requirements)
3908 3908 # write working copy ones
3909 3909 scmutil.writerequires(hgvfs, wcreq)
3910 3910 # If there are store requirements and the current repository
3911 3911 # is not a shared one, write stored requirements
3912 3912 # For new shared repository, we don't need to write the store
3913 3913 # requirements as they are already present in store requires
3914 3914 if storereq and b'sharedrepo' not in createopts:
3915 3915 storevfs = vfsmod.vfs(hgvfs.join(b'store'), cacheaudited=True)
3916 3916 scmutil.writerequires(storevfs, storereq)
3917 3917
3918 3918 # Write out file telling readers where to find the shared store.
3919 3919 if b'sharedrepo' in createopts:
3920 3920 hgvfs.write(b'sharedpath', sharedpath)
3921 3921
3922 3922 if createopts.get(b'shareditems'):
3923 3923 shared = b'\n'.join(sorted(createopts[b'shareditems'])) + b'\n'
3924 3924 hgvfs.write(b'shared', shared)
3925 3925
3926 3926
3927 3927 def poisonrepository(repo):
3928 3928 """Poison a repository instance so it can no longer be used."""
3929 3929 # Perform any cleanup on the instance.
3930 3930 repo.close()
3931 3931
3932 3932 # Our strategy is to replace the type of the object with one that
3933 3933 # has all attribute lookups result in error.
3934 3934 #
3935 3935 # But we have to allow the close() method because some constructors
3936 3936 # of repos call close() on repo references.
3937 3937 class poisonedrepository:
3938 3938 def __getattribute__(self, item):
3939 3939 if item == 'close':
3940 3940 return object.__getattribute__(self, item)
3941 3941
3942 3942 raise error.ProgrammingError(
3943 3943 b'repo instances should not be used after unshare'
3944 3944 )
3945 3945
3946 3946 def close(self):
3947 3947 pass
3948 3948
3949 3949 # We may have a repoview, which intercepts __setattr__. So be sure
3950 3950 # we operate at the lowest level possible.
3951 3951 object.__setattr__(repo, '__class__', poisonedrepository)
@@ -1,125 +1,125 b''
1 1 # requirements.py - objects and functions related to repository requirements
2 2 #
3 3 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7
8 8
9 9 # obsolete experimental requirements:
10 10 # - manifestv2: An experimental new manifest format that allowed
11 11 # for stem compression of long paths. Experiment ended up not
12 12 # being successful (repository sizes went up due to worse delta
13 13 # chains), and the code was deleted in 4.6.
14 14
15 15 GENERALDELTA_REQUIREMENT = b'generaldelta'
16 16 DOTENCODE_REQUIREMENT = b'dotencode'
17 17 STORE_REQUIREMENT = b'store'
18 18 FNCACHE_REQUIREMENT = b'fncache'
19 19
20 20 DIRSTATE_TRACKED_HINT_V1 = b'dirstate-tracked-key-v1'
21 21 DIRSTATE_V2_REQUIREMENT = b'dirstate-v2'
22 22
23 23 # When narrowing is finalized and no longer subject to format changes,
24 24 # we should move this to just "narrow" or similar.
25 25 NARROW_REQUIREMENT = b'narrowhg-experimental'
26 26
27 27 # Enables sparse working directory usage
28 28 SPARSE_REQUIREMENT = b'exp-sparse'
29 29
30 30 # Enables the internal phase which is used to hide changesets instead
31 31 # of stripping them
32 INTERNAL_PHASE_REQUIREMENT = b'internal-phase'
32 INTERNAL_PHASE_REQUIREMENT = b'internal-phase-2'
33 33
34 34 # Enables the internal phase which is used to hide changesets instead
35 35 # of stripping them
36 36 ARCHIVED_PHASE_REQUIREMENT = b'exp-archived-phase'
37 37
38 38 # Stores manifest in Tree structure
39 39 TREEMANIFEST_REQUIREMENT = b'treemanifest'
40 40
41 41 REVLOGV1_REQUIREMENT = b'revlogv1'
42 42
43 43 # allow using ZSTD as compression engine for revlog content
44 44 REVLOG_COMPRESSION_ZSTD = b'revlog-compression-zstd'
45 45
46 46 # Increment the sub-version when the revlog v2 format changes to lock out old
47 47 # clients.
48 48 CHANGELOGV2_REQUIREMENT = b'exp-changelog-v2'
49 49
50 50 # Increment the sub-version when the revlog v2 format changes to lock out old
51 51 # clients.
52 52 REVLOGV2_REQUIREMENT = b'exp-revlogv2.2'
53 53
54 54 # A repository with the sparserevlog feature will have delta chains that
55 55 # can spread over a larger span. Sparse reading cuts these large spans into
56 56 # pieces, so that each piece isn't too big.
57 57 # Without the sparserevlog capability, reading from the repository could use
58 58 # huge amounts of memory, because the whole span would be read at once,
59 59 # including all the intermediate revisions that aren't pertinent for the chain.
60 60 # This is why once a repository has enabled sparse-read, it becomes required.
61 61 SPARSEREVLOG_REQUIREMENT = b'sparserevlog'
62 62
63 63 # A repository with the the copies-sidedata-changeset requirement will store
64 64 # copies related information in changeset's sidedata.
65 65 COPIESSDC_REQUIREMENT = b'exp-copies-sidedata-changeset'
66 66
67 67 # The repository use persistent nodemap for the changelog and the manifest.
68 68 NODEMAP_REQUIREMENT = b'persistent-nodemap'
69 69
70 70 # Denotes that the current repository is a share
71 71 SHARED_REQUIREMENT = b'shared'
72 72
73 73 # Denotes that current repository is a share and the shared source path is
74 74 # relative to the current repository root path
75 75 RELATIVE_SHARED_REQUIREMENT = b'relshared'
76 76
77 77 # A repository with share implemented safely. The repository has different
78 78 # store and working copy requirements i.e. both `.hg/requires` and
79 79 # `.hg/store/requires` are present.
80 80 SHARESAFE_REQUIREMENT = b'share-safe'
81 81
82 82 # Bookmarks must be stored in the `store` part of the repository and will be
83 83 # share accross shares
84 84 BOOKMARKS_IN_STORE_REQUIREMENT = b'bookmarksinstore'
85 85
86 86 # List of requirements which are working directory specific
87 87 # These requirements cannot be shared between repositories if they
88 88 # share the same store
89 89 # * sparse is a working directory specific functionality and hence working
90 90 # directory specific requirement
91 91 # * SHARED_REQUIREMENT and RELATIVE_SHARED_REQUIREMENT are requirements which
92 92 # represents that the current working copy/repository shares store of another
93 93 # repo. Hence both of them should be stored in working copy
94 94 # * SHARESAFE_REQUIREMENT needs to be stored in working dir to mark that rest of
95 95 # the requirements are stored in store's requires
96 96 # * DIRSTATE_V2_REQUIREMENT affects .hg/dirstate, of which there is one per
97 97 # working directory.
98 98 WORKING_DIR_REQUIREMENTS = {
99 99 SPARSE_REQUIREMENT,
100 100 SHARED_REQUIREMENT,
101 101 RELATIVE_SHARED_REQUIREMENT,
102 102 SHARESAFE_REQUIREMENT,
103 103 DIRSTATE_TRACKED_HINT_V1,
104 104 DIRSTATE_V2_REQUIREMENT,
105 105 }
106 106
107 107 # List of requirement that impact "stream-clone" (and hardlink clone) and
108 108 # cannot be changed in such cases.
109 109 #
110 110 # requirements not in this list are safe to be altered during stream-clone.
111 111 #
112 112 # note: the list is currently inherited from previous code and miss some relevant requirement while containing some irrelevant ones.
113 113 STREAM_FIXED_REQUIREMENTS = {
114 114 ARCHIVED_PHASE_REQUIREMENT,
115 115 BOOKMARKS_IN_STORE_REQUIREMENT,
116 116 CHANGELOGV2_REQUIREMENT,
117 117 COPIESSDC_REQUIREMENT,
118 118 GENERALDELTA_REQUIREMENT,
119 119 INTERNAL_PHASE_REQUIREMENT,
120 120 REVLOG_COMPRESSION_ZSTD,
121 121 REVLOGV1_REQUIREMENT,
122 122 REVLOGV2_REQUIREMENT,
123 123 SPARSEREVLOG_REQUIREMENT,
124 124 TREEMANIFEST_REQUIREMENT,
125 125 }
@@ -1,1049 +1,1049 b''
1 1 $ cat > $TESTTMP/hook.sh << 'EOF'
2 2 > echo "test-hook-close-phase: $HG_NODE: $HG_OLDPHASE -> $HG_PHASE"
3 3 > EOF
4 4
5 5 $ cat >> $HGRCPATH << EOF
6 6 > [extensions]
7 7 > phasereport=$TESTDIR/testlib/ext-phase-report.py
8 8 > [hooks]
9 9 > txnclose-phase.test = sh $TESTTMP/hook.sh
10 10 > EOF
11 11
12 12 $ hglog() { hg log --template "{rev} {phaseidx} {desc}\n" $*; }
13 13 $ mkcommit() {
14 14 > echo "$1" > "$1"
15 15 > hg add "$1"
16 16 > message="$1"
17 17 > shift
18 18 > hg ci -m "$message" $*
19 19 > }
20 20
21 21 $ hg init initialrepo
22 22 $ cd initialrepo
23 23
24 24 Cannot change null revision phase
25 25
26 26 $ hg phase --force --secret null
27 27 abort: cannot change null revision phase
28 28 [255]
29 29 $ hg phase null
30 30 -1: public
31 31
32 32 $ mkcommit A
33 33 test-debug-phase: new rev 0: x -> 1
34 34 test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: -> draft
35 35
36 36 New commit are draft by default
37 37
38 38 $ hglog
39 39 0 1 A
40 40
41 41 Following commit are draft too
42 42
43 43 $ mkcommit B
44 44 test-debug-phase: new rev 1: x -> 1
45 45 test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: -> draft
46 46
47 47 $ hglog
48 48 1 1 B
49 49 0 1 A
50 50
51 51 Working directory phase is secret when its parent is secret.
52 52
53 53 $ hg phase --force --secret .
54 54 test-debug-phase: move rev 0: 1 -> 2
55 55 test-debug-phase: move rev 1: 1 -> 2
56 56 test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: draft -> secret
57 57 test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: draft -> secret
58 58 $ hg log -r 'wdir()' -T '{phase}\n'
59 59 secret
60 60 $ hg log -r 'wdir() and public()' -T '{phase}\n'
61 61 $ hg log -r 'wdir() and draft()' -T '{phase}\n'
62 62 $ hg log -r 'wdir() and secret()' -T '{phase}\n'
63 63 secret
64 64
65 65 Working directory phase is draft when its parent is draft.
66 66
67 67 $ hg phase --draft .
68 68 test-debug-phase: move rev 1: 2 -> 1
69 69 test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: secret -> draft
70 70 $ hg log -r 'wdir()' -T '{phase}\n'
71 71 draft
72 72 $ hg log -r 'wdir() and public()' -T '{phase}\n'
73 73 $ hg log -r 'wdir() and draft()' -T '{phase}\n'
74 74 draft
75 75 $ hg log -r 'wdir() and secret()' -T '{phase}\n'
76 76
77 77 Working directory phase is secret when a new commit will be created as secret,
78 78 even if the parent is draft.
79 79
80 80 $ hg log -r 'wdir() and secret()' -T '{phase}\n' \
81 81 > --config phases.new-commit='secret'
82 82 secret
83 83
84 84 Working directory phase is draft when its parent is public.
85 85
86 86 $ hg phase --public .
87 87 test-debug-phase: move rev 0: 1 -> 0
88 88 test-debug-phase: move rev 1: 1 -> 0
89 89 test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: draft -> public
90 90 test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: draft -> public
91 91 $ hg log -r 'wdir()' -T '{phase}\n'
92 92 draft
93 93 $ hg log -r 'wdir() and public()' -T '{phase}\n'
94 94 $ hg log -r 'wdir() and draft()' -T '{phase}\n'
95 95 draft
96 96 $ hg log -r 'wdir() and secret()' -T '{phase}\n'
97 97 $ hg log -r 'wdir() and secret()' -T '{phase}\n' \
98 98 > --config phases.new-commit='secret'
99 99 secret
100 100
101 101 Draft commit are properly created over public one:
102 102
103 103 $ hg phase
104 104 1: public
105 105 $ hglog
106 106 1 0 B
107 107 0 0 A
108 108
109 109 $ mkcommit C
110 110 test-debug-phase: new rev 2: x -> 1
111 111 test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: -> draft
112 112 $ mkcommit D
113 113 test-debug-phase: new rev 3: x -> 1
114 114 test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: -> draft
115 115
116 116 $ hglog
117 117 3 1 D
118 118 2 1 C
119 119 1 0 B
120 120 0 0 A
121 121
122 122 Test creating changeset as secret
123 123
124 124 $ mkcommit E --config phases.new-commit='secret'
125 125 test-debug-phase: new rev 4: x -> 2
126 126 test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde: -> secret
127 127 $ hglog
128 128 4 2 E
129 129 3 1 D
130 130 2 1 C
131 131 1 0 B
132 132 0 0 A
133 133
134 134 Test the secret property is inherited
135 135
136 136 $ mkcommit H
137 137 test-debug-phase: new rev 5: x -> 2
138 138 test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8: -> secret
139 139 $ hglog
140 140 5 2 H
141 141 4 2 E
142 142 3 1 D
143 143 2 1 C
144 144 1 0 B
145 145 0 0 A
146 146
147 147 Even on merge
148 148
149 149 $ hg up -q 1
150 150 $ mkcommit "B'"
151 151 test-debug-phase: new rev 6: x -> 1
152 152 created new head
153 153 test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> draft
154 154 $ hglog
155 155 6 1 B'
156 156 5 2 H
157 157 4 2 E
158 158 3 1 D
159 159 2 1 C
160 160 1 0 B
161 161 0 0 A
162 162 $ hg merge 4 # E
163 163 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
164 164 (branch merge, don't forget to commit)
165 165 $ hg phase
166 166 6: draft
167 167 4: secret
168 168 $ hg ci -m "merge B' and E"
169 169 test-debug-phase: new rev 7: x -> 2
170 170 test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af: -> secret
171 171
172 172 $ hglog
173 173 7 2 merge B' and E
174 174 6 1 B'
175 175 5 2 H
176 176 4 2 E
177 177 3 1 D
178 178 2 1 C
179 179 1 0 B
180 180 0 0 A
181 181
182 182 Test secret changeset are not pushed
183 183
184 184 $ hg init ../push-dest
185 185 $ cat > ../push-dest/.hg/hgrc << EOF
186 186 > [phases]
187 187 > publish=False
188 188 > EOF
189 189 $ hg outgoing ../push-dest --template='{rev} {phase} {desc|firstline}\n'
190 190 comparing with ../push-dest
191 191 searching for changes
192 192 0 public A
193 193 1 public B
194 194 2 draft C
195 195 3 draft D
196 196 6 draft B'
197 197 $ hg outgoing -r 'branch(default)' ../push-dest --template='{rev} {phase} {desc|firstline}\n'
198 198 comparing with ../push-dest
199 199 searching for changes
200 200 0 public A
201 201 1 public B
202 202 2 draft C
203 203 3 draft D
204 204 6 draft B'
205 205
206 206 $ hg push ../push-dest -f # force because we push multiple heads
207 207 pushing to ../push-dest
208 208 searching for changes
209 209 adding changesets
210 210 adding manifests
211 211 adding file changes
212 212 added 5 changesets with 5 changes to 5 files (+1 heads)
213 213 test-debug-phase: new rev 0: x -> 0
214 214 test-debug-phase: new rev 1: x -> 0
215 215 test-debug-phase: new rev 2: x -> 1
216 216 test-debug-phase: new rev 3: x -> 1
217 217 test-debug-phase: new rev 4: x -> 1
218 218 test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: -> public
219 219 test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: -> public
220 220 test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: -> draft
221 221 test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: -> draft
222 222 test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> draft
223 223 $ hglog
224 224 7 2 merge B' and E
225 225 6 1 B'
226 226 5 2 H
227 227 4 2 E
228 228 3 1 D
229 229 2 1 C
230 230 1 0 B
231 231 0 0 A
232 232 $ cd ../push-dest
233 233 $ hglog
234 234 4 1 B'
235 235 3 1 D
236 236 2 1 C
237 237 1 0 B
238 238 0 0 A
239 239
240 240 (Issue3303)
241 241 Check that remote secret changeset are ignore when checking creation of remote heads
242 242
243 243 We add a secret head into the push destination. This secret head shadows a
244 244 visible shared between the initial repo and the push destination.
245 245
246 246 $ hg up -q 4 # B'
247 247 $ mkcommit Z --config phases.new-commit=secret
248 248 test-debug-phase: new rev 5: x -> 2
249 249 test-hook-close-phase: 2713879da13d6eea1ff22b442a5a87cb31a7ce6a: -> secret
250 250 $ hg phase .
251 251 5: secret
252 252
253 253 We now try to push a new public changeset that descend from the common public
254 254 head shadowed by the remote secret head.
255 255
256 256 $ cd ../initialrepo
257 257 $ hg up -q 6 #B'
258 258 $ mkcommit I
259 259 test-debug-phase: new rev 8: x -> 1
260 260 created new head
261 261 test-hook-close-phase: 6d6770faffce199f1fddd1cf87f6f026138cf061: -> draft
262 262 $ hg push ../push-dest
263 263 pushing to ../push-dest
264 264 searching for changes
265 265 adding changesets
266 266 adding manifests
267 267 adding file changes
268 268 added 1 changesets with 1 changes to 1 files (+1 heads)
269 269 test-debug-phase: new rev 6: x -> 1
270 270 test-hook-close-phase: 6d6770faffce199f1fddd1cf87f6f026138cf061: -> draft
271 271
272 272 :note: The "(+1 heads)" is wrong as we do not had any visible head
273 273
274 274 check that branch cache with "served" filter are properly computed and stored
275 275
276 276 $ ls ../push-dest/.hg/cache/branch2*
277 277 ../push-dest/.hg/cache/branch2-base
278 278 ../push-dest/.hg/cache/branch2-served
279 279 $ cat ../push-dest/.hg/cache/branch2-served
280 280 6d6770faffce199f1fddd1cf87f6f026138cf061 6 465891ffab3c47a3c23792f7dc84156e19a90722
281 281 b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default
282 282 6d6770faffce199f1fddd1cf87f6f026138cf061 o default
283 283 $ hg heads -R ../push-dest --template '{rev}:{node} {phase}\n' #update visible cache too
284 284 6:6d6770faffce199f1fddd1cf87f6f026138cf061 draft
285 285 5:2713879da13d6eea1ff22b442a5a87cb31a7ce6a secret
286 286 3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e draft
287 287 $ ls ../push-dest/.hg/cache/branch2*
288 288 ../push-dest/.hg/cache/branch2-base
289 289 ../push-dest/.hg/cache/branch2-served
290 290 ../push-dest/.hg/cache/branch2-visible
291 291 $ cat ../push-dest/.hg/cache/branch2-served
292 292 6d6770faffce199f1fddd1cf87f6f026138cf061 6 465891ffab3c47a3c23792f7dc84156e19a90722
293 293 b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default
294 294 6d6770faffce199f1fddd1cf87f6f026138cf061 o default
295 295 $ cat ../push-dest/.hg/cache/branch2-visible
296 296 6d6770faffce199f1fddd1cf87f6f026138cf061 6
297 297 b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default
298 298 2713879da13d6eea1ff22b442a5a87cb31a7ce6a o default
299 299 6d6770faffce199f1fddd1cf87f6f026138cf061 o default
300 300
301 301
302 302 Restore condition prior extra insertion.
303 303 $ hg -q --config extensions.mq= strip .
304 304 $ hg up -q 7
305 305 $ cd ..
306 306
307 307 Test secret changeset are not pull
308 308
309 309 $ hg init pull-dest
310 310 $ cd pull-dest
311 311 $ hg pull ../initialrepo
312 312 pulling from ../initialrepo
313 313 requesting all changes
314 314 adding changesets
315 315 adding manifests
316 316 adding file changes
317 317 added 5 changesets with 5 changes to 5 files (+1 heads)
318 318 new changesets 4a2df7238c3b:cf9fe039dfd6
319 319 test-debug-phase: new rev 0: x -> 0
320 320 test-debug-phase: new rev 1: x -> 0
321 321 test-debug-phase: new rev 2: x -> 0
322 322 test-debug-phase: new rev 3: x -> 0
323 323 test-debug-phase: new rev 4: x -> 0
324 324 test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: -> public
325 325 test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: -> public
326 326 test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: -> public
327 327 test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: -> public
328 328 test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> public
329 329 (run 'hg heads' to see heads, 'hg merge' to merge)
330 330 $ hglog
331 331 4 0 B'
332 332 3 0 D
333 333 2 0 C
334 334 1 0 B
335 335 0 0 A
336 336 $ cd ..
337 337
338 338 But secret can still be bundled explicitly
339 339
340 340 $ cd initialrepo
341 341 $ hg bundle --base '4^' -r 'children(4)' ../secret-bundle.hg
342 342 4 changesets found
343 343 $ cd ..
344 344
345 345 Test secret changeset are not cloned
346 346 (during local clone)
347 347
348 348 $ hg clone -qU initialrepo clone-dest
349 349 test-debug-phase: new rev 0: x -> 0
350 350 test-debug-phase: new rev 1: x -> 0
351 351 test-debug-phase: new rev 2: x -> 0
352 352 test-debug-phase: new rev 3: x -> 0
353 353 test-debug-phase: new rev 4: x -> 0
354 354 test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: -> public
355 355 test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: -> public
356 356 test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: -> public
357 357 test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: -> public
358 358 test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> public
359 359 $ hglog -R clone-dest
360 360 4 0 B'
361 361 3 0 D
362 362 2 0 C
363 363 1 0 B
364 364 0 0 A
365 365
366 366 Test summary
367 367
368 368 $ hg summary -R clone-dest --verbose
369 369 parent: -1:000000000000 (no revision checked out)
370 370 branch: default
371 371 commit: (clean)
372 372 update: 5 new changesets (update)
373 373 $ hg summary -R initialrepo
374 374 parent: 7:17a481b3bccb tip
375 375 merge B' and E
376 376 branch: default
377 377 commit: (clean) (secret)
378 378 update: 1 new changesets, 2 branch heads (merge)
379 379 phases: 3 draft, 3 secret
380 380 $ hg summary -R initialrepo --quiet
381 381 parent: 7:17a481b3bccb tip
382 382 update: 1 new changesets, 2 branch heads (merge)
383 383
384 384 Test revset
385 385
386 386 $ cd initialrepo
387 387 $ hglog -r 'public()'
388 388 0 0 A
389 389 1 0 B
390 390 $ hglog -r 'draft()'
391 391 2 1 C
392 392 3 1 D
393 393 6 1 B'
394 394 $ hglog -r 'secret()'
395 395 4 2 E
396 396 5 2 H
397 397 7 2 merge B' and E
398 398
399 399 test that phase are displayed in log at debug level
400 400
401 401 $ hg log --debug
402 402 changeset: 7:17a481b3bccb796c0521ae97903d81c52bfee4af
403 403 tag: tip
404 404 phase: secret
405 405 parent: 6:cf9fe039dfd67e829edf6522a45de057b5c86519
406 406 parent: 4:a603bfb5a83e312131cebcd05353c217d4d21dde
407 407 manifest: 7:5e724ffacba267b2ab726c91fc8b650710deaaa8
408 408 user: test
409 409 date: Thu Jan 01 00:00:00 1970 +0000
410 410 extra: branch=default
411 411 description:
412 412 merge B' and E
413 413
414 414
415 415 changeset: 6:cf9fe039dfd67e829edf6522a45de057b5c86519
416 416 phase: draft
417 417 parent: 1:27547f69f25460a52fff66ad004e58da7ad3fb56
418 418 parent: -1:0000000000000000000000000000000000000000
419 419 manifest: 6:ab8bfef2392903058bf4ebb9e7746e8d7026b27a
420 420 user: test
421 421 date: Thu Jan 01 00:00:00 1970 +0000
422 422 files+: B'
423 423 extra: branch=default
424 424 description:
425 425 B'
426 426
427 427
428 428 changeset: 5:a030c6be5127abc010fcbff1851536552e6951a8
429 429 phase: secret
430 430 parent: 4:a603bfb5a83e312131cebcd05353c217d4d21dde
431 431 parent: -1:0000000000000000000000000000000000000000
432 432 manifest: 5:5c710aa854874fe3d5fa7192e77bdb314cc08b5a
433 433 user: test
434 434 date: Thu Jan 01 00:00:00 1970 +0000
435 435 files+: H
436 436 extra: branch=default
437 437 description:
438 438 H
439 439
440 440
441 441 changeset: 4:a603bfb5a83e312131cebcd05353c217d4d21dde
442 442 phase: secret
443 443 parent: 3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e
444 444 parent: -1:0000000000000000000000000000000000000000
445 445 manifest: 4:7173fd1c27119750b959e3a0f47ed78abe75d6dc
446 446 user: test
447 447 date: Thu Jan 01 00:00:00 1970 +0000
448 448 files+: E
449 449 extra: branch=default
450 450 description:
451 451 E
452 452
453 453
454 454 changeset: 3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e
455 455 phase: draft
456 456 parent: 2:f838bfaca5c7226600ebcfd84f3c3c13a28d3757
457 457 parent: -1:0000000000000000000000000000000000000000
458 458 manifest: 3:6e1f4c47ecb533ffd0c8e52cdc88afb6cd39e20c
459 459 user: test
460 460 date: Thu Jan 01 00:00:00 1970 +0000
461 461 files+: D
462 462 extra: branch=default
463 463 description:
464 464 D
465 465
466 466
467 467 changeset: 2:f838bfaca5c7226600ebcfd84f3c3c13a28d3757
468 468 phase: draft
469 469 parent: 1:27547f69f25460a52fff66ad004e58da7ad3fb56
470 470 parent: -1:0000000000000000000000000000000000000000
471 471 manifest: 2:66a5a01817fdf5239c273802b5b7618d051c89e4
472 472 user: test
473 473 date: Thu Jan 01 00:00:00 1970 +0000
474 474 files+: C
475 475 extra: branch=default
476 476 description:
477 477 C
478 478
479 479
480 480 changeset: 1:27547f69f25460a52fff66ad004e58da7ad3fb56
481 481 phase: public
482 482 parent: 0:4a2df7238c3b48766b5e22fafbb8a2f506ec8256
483 483 parent: -1:0000000000000000000000000000000000000000
484 484 manifest: 1:cb5cbbc1bfbf24cc34b9e8c16914e9caa2d2a7fd
485 485 user: test
486 486 date: Thu Jan 01 00:00:00 1970 +0000
487 487 files+: B
488 488 extra: branch=default
489 489 description:
490 490 B
491 491
492 492
493 493 changeset: 0:4a2df7238c3b48766b5e22fafbb8a2f506ec8256
494 494 phase: public
495 495 parent: -1:0000000000000000000000000000000000000000
496 496 parent: -1:0000000000000000000000000000000000000000
497 497 manifest: 0:007d8c9d88841325f5c6b06371b35b4e8a2b1a83
498 498 user: test
499 499 date: Thu Jan 01 00:00:00 1970 +0000
500 500 files+: A
501 501 extra: branch=default
502 502 description:
503 503 A
504 504
505 505
506 506
507 507
508 508 (Issue3707)
509 509 test invalid phase name
510 510
511 511 $ mkcommit I --config phases.new-commit='babar'
512 512 transaction abort!
513 513 rollback completed
514 514 config error: phases.new-commit: not a valid phase name ('babar')
515 515 [30]
516 516 Test phase command
517 517 ===================
518 518
519 519 initial picture
520 520
521 521 $ hg log -G --template "{rev} {phase} {desc}\n"
522 522 @ 7 secret merge B' and E
523 523 |\
524 524 | o 6 draft B'
525 525 | |
526 526 +---o 5 secret H
527 527 | |
528 528 o | 4 secret E
529 529 | |
530 530 o | 3 draft D
531 531 | |
532 532 o | 2 draft C
533 533 |/
534 534 o 1 public B
535 535 |
536 536 o 0 public A
537 537
538 538
539 539 display changesets phase
540 540
541 541 (mixing -r and plain rev specification)
542 542
543 543 $ hg phase 1::4 -r 7
544 544 1: public
545 545 2: draft
546 546 3: draft
547 547 4: secret
548 548 7: secret
549 549
550 550
551 551 move changeset forward
552 552
553 553 (with -r option)
554 554
555 555 $ hg phase --public -r 2
556 556 test-debug-phase: move rev 2: 1 -> 0
557 557 test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: draft -> public
558 558 $ hg log -G --template "{rev} {phase} {desc}\n"
559 559 @ 7 secret merge B' and E
560 560 |\
561 561 | o 6 draft B'
562 562 | |
563 563 +---o 5 secret H
564 564 | |
565 565 o | 4 secret E
566 566 | |
567 567 o | 3 draft D
568 568 | |
569 569 o | 2 public C
570 570 |/
571 571 o 1 public B
572 572 |
573 573 o 0 public A
574 574
575 575
576 576 move changeset backward
577 577
578 578 (without -r option)
579 579
580 580 $ hg phase --draft --force 2
581 581 test-debug-phase: move rev 2: 0 -> 1
582 582 test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: public -> draft
583 583 $ hg log -G --template "{rev} {phase} {desc}\n"
584 584 @ 7 secret merge B' and E
585 585 |\
586 586 | o 6 draft B'
587 587 | |
588 588 +---o 5 secret H
589 589 | |
590 590 o | 4 secret E
591 591 | |
592 592 o | 3 draft D
593 593 | |
594 594 o | 2 draft C
595 595 |/
596 596 o 1 public B
597 597 |
598 598 o 0 public A
599 599
600 600
601 601 move changeset forward and backward
602 602
603 603 $ hg phase --draft --force 1::4
604 604 test-debug-phase: move rev 1: 0 -> 1
605 605 test-debug-phase: move rev 4: 2 -> 1
606 606 test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: public -> draft
607 607 test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde: secret -> draft
608 608 $ hg log -G --template "{rev} {phase} {desc}\n"
609 609 @ 7 secret merge B' and E
610 610 |\
611 611 | o 6 draft B'
612 612 | |
613 613 +---o 5 secret H
614 614 | |
615 615 o | 4 draft E
616 616 | |
617 617 o | 3 draft D
618 618 | |
619 619 o | 2 draft C
620 620 |/
621 621 o 1 draft B
622 622 |
623 623 o 0 public A
624 624
625 625 test partial failure
626 626
627 627 $ hg phase --public 7
628 628 test-debug-phase: move rev 1: 1 -> 0
629 629 test-debug-phase: move rev 2: 1 -> 0
630 630 test-debug-phase: move rev 3: 1 -> 0
631 631 test-debug-phase: move rev 4: 1 -> 0
632 632 test-debug-phase: move rev 6: 1 -> 0
633 633 test-debug-phase: move rev 7: 2 -> 0
634 634 test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: draft -> public
635 635 test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: draft -> public
636 636 test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: draft -> public
637 637 test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde: draft -> public
638 638 test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: draft -> public
639 639 test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af: secret -> public
640 640 $ hg phase --draft '5 or 7'
641 641 test-debug-phase: move rev 5: 2 -> 1
642 642 test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8: secret -> draft
643 643 cannot move 1 changesets to a higher phase, use --force
644 644 phase changed for 1 changesets
645 645 [1]
646 646 $ hg log -G --template "{rev} {phase} {desc}\n"
647 647 @ 7 public merge B' and E
648 648 |\
649 649 | o 6 public B'
650 650 | |
651 651 +---o 5 draft H
652 652 | |
653 653 o | 4 public E
654 654 | |
655 655 o | 3 public D
656 656 | |
657 657 o | 2 public C
658 658 |/
659 659 o 1 public B
660 660 |
661 661 o 0 public A
662 662
663 663
664 664 test complete failure
665 665
666 666 $ hg phase --draft 7
667 667 cannot move 1 changesets to a higher phase, use --force
668 668 no phases changed
669 669 [1]
670 670
671 671 $ cd ..
672 672
673 673 test hidden changeset are not cloned as public (issue3935)
674 674
675 675 $ cd initialrepo
676 676
677 677 (enabling evolution)
678 678 $ cat >> $HGRCPATH << EOF
679 679 > [experimental]
680 680 > evolution.createmarkers=True
681 681 > EOF
682 682
683 683 (making a changeset hidden; H in that case)
684 684 $ hg debugobsolete `hg id --debug -r 5`
685 685 1 new obsolescence markers
686 686 obsoleted 1 changesets
687 687
688 688 $ cd ..
689 689 $ hg clone initialrepo clonewithobs
690 690 requesting all changes
691 691 adding changesets
692 692 adding manifests
693 693 adding file changes
694 694 added 7 changesets with 6 changes to 6 files
695 695 new changesets 4a2df7238c3b:17a481b3bccb
696 696 test-debug-phase: new rev 0: x -> 0
697 697 test-debug-phase: new rev 1: x -> 0
698 698 test-debug-phase: new rev 2: x -> 0
699 699 test-debug-phase: new rev 3: x -> 0
700 700 test-debug-phase: new rev 4: x -> 0
701 701 test-debug-phase: new rev 5: x -> 0
702 702 test-debug-phase: new rev 6: x -> 0
703 703 test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: -> public
704 704 test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: -> public
705 705 test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: -> public
706 706 test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: -> public
707 707 test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde: -> public
708 708 test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> public
709 709 test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af: -> public
710 710 updating to branch default
711 711 6 files updated, 0 files merged, 0 files removed, 0 files unresolved
712 712 $ cd clonewithobs
713 713 $ hg log -G --template "{rev} {phase} {desc}\n"
714 714 @ 6 public merge B' and E
715 715 |\
716 716 | o 5 public B'
717 717 | |
718 718 o | 4 public E
719 719 | |
720 720 o | 3 public D
721 721 | |
722 722 o | 2 public C
723 723 |/
724 724 o 1 public B
725 725 |
726 726 o 0 public A
727 727
728 728
729 729 test verify repo containing hidden changesets, which should not abort just
730 730 because repo.cancopy() is False
731 731
732 732 $ cd ../initialrepo
733 733 $ hg verify
734 734 checking changesets
735 735 checking manifests
736 736 crosschecking files in changesets and manifests
737 737 checking files
738 738 checked 8 changesets with 7 changes to 7 files
739 739
740 740 $ cd ..
741 741
742 742 check whether HG_PENDING makes pending changes only in related
743 743 repositories visible to an external hook.
744 744
745 745 (emulate a transaction running concurrently by copied
746 746 .hg/phaseroots.pending in subsequent test)
747 747
748 748 $ cat > $TESTTMP/savepending.sh <<EOF
749 749 > cp .hg/store/phaseroots.pending .hg/store/phaseroots.pending.saved
750 750 > exit 1 # to avoid changing phase for subsequent tests
751 751 > EOF
752 752 $ cd push-dest
753 753 $ hg phase 6
754 754 6: draft
755 755 $ hg --config hooks.pretxnclose="sh $TESTTMP/savepending.sh" phase -f -s 6
756 756 transaction abort!
757 757 rollback completed
758 758 abort: pretxnclose hook exited with status 1
759 759 [40]
760 760 $ cp .hg/store/phaseroots.pending.saved .hg/store/phaseroots.pending
761 761
762 762 (check (in)visibility of phaseroot while transaction running in repo)
763 763
764 764 $ cat > $TESTTMP/checkpending.sh <<EOF
765 765 > echo '@initialrepo'
766 766 > hg -R "$TESTTMP/initialrepo" phase 7
767 767 > echo '@push-dest'
768 768 > hg -R "$TESTTMP/push-dest" phase 6
769 769 > exit 1 # to avoid changing phase for subsequent tests
770 770 > EOF
771 771 $ cd ../initialrepo
772 772 $ hg phase 7
773 773 7: public
774 774 $ hg --config hooks.pretxnclose="sh $TESTTMP/checkpending.sh" phase -f -s 7
775 775 @initialrepo
776 776 7: secret
777 777 @push-dest
778 778 6: draft
779 779 transaction abort!
780 780 rollback completed
781 781 abort: pretxnclose hook exited with status 1
782 782 [40]
783 783
784 784 Check that pretxnclose-phase hook can control phase movement
785 785
786 786 $ hg phase --force b3325c91a4d9 --secret
787 787 test-debug-phase: move rev 3: 0 -> 2
788 788 test-debug-phase: move rev 4: 0 -> 2
789 789 test-debug-phase: move rev 5: 1 -> 2
790 790 test-debug-phase: move rev 7: 0 -> 2
791 791 test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: public -> secret
792 792 test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde: public -> secret
793 793 test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8: draft -> secret
794 794 test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af: public -> secret
795 795 $ hg log -G -T phases
796 796 @ changeset: 7:17a481b3bccb
797 797 |\ tag: tip
798 798 | | phase: secret
799 799 | | parent: 6:cf9fe039dfd6
800 800 | | parent: 4:a603bfb5a83e
801 801 | | user: test
802 802 | | date: Thu Jan 01 00:00:00 1970 +0000
803 803 | | summary: merge B' and E
804 804 | |
805 805 | o changeset: 6:cf9fe039dfd6
806 806 | | phase: public
807 807 | | parent: 1:27547f69f254
808 808 | | user: test
809 809 | | date: Thu Jan 01 00:00:00 1970 +0000
810 810 | | summary: B'
811 811 | |
812 812 o | changeset: 4:a603bfb5a83e
813 813 | | phase: secret
814 814 | | user: test
815 815 | | date: Thu Jan 01 00:00:00 1970 +0000
816 816 | | summary: E
817 817 | |
818 818 o | changeset: 3:b3325c91a4d9
819 819 | | phase: secret
820 820 | | user: test
821 821 | | date: Thu Jan 01 00:00:00 1970 +0000
822 822 | | summary: D
823 823 | |
824 824 o | changeset: 2:f838bfaca5c7
825 825 |/ phase: public
826 826 | user: test
827 827 | date: Thu Jan 01 00:00:00 1970 +0000
828 828 | summary: C
829 829 |
830 830 o changeset: 1:27547f69f254
831 831 | phase: public
832 832 | user: test
833 833 | date: Thu Jan 01 00:00:00 1970 +0000
834 834 | summary: B
835 835 |
836 836 o changeset: 0:4a2df7238c3b
837 837 phase: public
838 838 user: test
839 839 date: Thu Jan 01 00:00:00 1970 +0000
840 840 summary: A
841 841
842 842
843 843 Install a hook that prevent b3325c91a4d9 to become public
844 844
845 845 $ cat >> .hg/hgrc << EOF
846 846 > [hooks]
847 847 > pretxnclose-phase.nopublish_D = sh -c "(echo \$HG_NODE| grep -v b3325c91a4d9>/dev/null) || [ 'public' != \$HG_PHASE ]"
848 848 > EOF
849 849
850 850 Try various actions. only the draft move should succeed
851 851
852 852 $ hg phase --public b3325c91a4d9
853 853 transaction abort!
854 854 rollback completed
855 855 abort: pretxnclose-phase.nopublish_D hook exited with status 1
856 856 [40]
857 857 $ hg phase --public a603bfb5a83e
858 858 transaction abort!
859 859 rollback completed
860 860 abort: pretxnclose-phase.nopublish_D hook exited with status 1
861 861 [40]
862 862 $ hg phase --draft 17a481b3bccb
863 863 test-debug-phase: move rev 3: 2 -> 1
864 864 test-debug-phase: move rev 4: 2 -> 1
865 865 test-debug-phase: move rev 7: 2 -> 1
866 866 test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: secret -> draft
867 867 test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde: secret -> draft
868 868 test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af: secret -> draft
869 869 $ hg phase --public 17a481b3bccb
870 870 transaction abort!
871 871 rollback completed
872 872 abort: pretxnclose-phase.nopublish_D hook exited with status 1
873 873 [40]
874 874
875 875 $ cd ..
876 876
877 877 Test for the "internal" phase
878 878 =============================
879 879
880 880 Check we deny its usage on older repository
881 881
882 $ hg init no-internal-phase --config format.internal-phase=no
882 $ hg init no-internal-phase --config format.use-internal-phase=no
883 883 $ cd no-internal-phase
884 884 $ hg debugrequires | grep internal-phase
885 885 [1]
886 886 $ echo X > X
887 887 $ hg add X
888 888 $ hg status
889 889 A X
890 890 $ hg --config "phases.new-commit=internal" commit -m "my test internal commit" 2>&1 | grep ProgrammingError
891 891 ** ProgrammingError: this repository does not support the internal phase
892 892 raise error.ProgrammingError(msg) (no-pyoxidizer !)
893 893 *ProgrammingError: this repository does not support the internal phase (glob)
894 894 $ hg --config "phases.new-commit=archived" commit -m "my test archived commit" 2>&1 | grep ProgrammingError
895 895 ** ProgrammingError: this repository does not support the archived phase
896 896 raise error.ProgrammingError(msg) (no-pyoxidizer !)
897 897 *ProgrammingError: this repository does not support the archived phase (glob)
898 898
899 899 $ cd ..
900 900
901 901 Check it works fine with repository that supports it.
902 902
903 $ hg init internal-phase --config format.internal-phase=yes
903 $ hg init internal-phase --config format.use-internal-phase=yes
904 904 $ cd internal-phase
905 905 $ hg debugrequires | grep internal-phase
906 internal-phase
906 internal-phase-2
907 907 $ mkcommit A
908 908 test-debug-phase: new rev 0: x -> 1
909 909 test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: -> draft
910 910
911 911 Commit an internal changesets
912 912
913 913 $ echo B > B
914 914 $ hg add B
915 915 $ hg status
916 916 A B
917 917 $ hg --config "phases.new-commit=internal" commit -m "my test internal commit"
918 918 test-debug-phase: new rev 1: x -> 96
919 919 test-hook-close-phase: c01c42dffc7f81223397e99652a0703f83e1c5ea: -> internal
920 920
921 921 The changeset is a working parent descendant.
922 922 Per the usual visibility rules, it is made visible.
923 923
924 924 $ hg log -G -l 3
925 925 @ changeset: 1:c01c42dffc7f
926 926 | tag: tip
927 927 | user: test
928 928 | date: Thu Jan 01 00:00:00 1970 +0000
929 929 | summary: my test internal commit
930 930 |
931 931 o changeset: 0:4a2df7238c3b
932 932 user: test
933 933 date: Thu Jan 01 00:00:00 1970 +0000
934 934 summary: A
935 935
936 936
937 937 Commit is hidden as expected
938 938
939 939 $ hg up 0
940 940 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
941 941 $ hg log -G
942 942 @ changeset: 0:4a2df7238c3b
943 943 tag: tip
944 944 user: test
945 945 date: Thu Jan 01 00:00:00 1970 +0000
946 946 summary: A
947 947
948 948
949 949 Test for archived phase
950 950 -----------------------
951 951
952 952 Commit an archived changesets
953 953
954 954 $ cd ..
955 955 $ hg clone --quiet --pull internal-phase archived-phase \
956 956 > --config format.exp-archived-phase=yes \
957 957 > --config extensions.phasereport='!' \
958 958 > --config hooks.txnclose-phase.test=
959 959
960 960 $ cd archived-phase
961 961
962 962 $ echo B > B
963 963 $ hg add B
964 964 $ hg status
965 965 A B
966 966 $ hg --config "phases.new-commit=archived" commit -m "my test archived commit"
967 967 test-debug-phase: new rev 1: x -> 32
968 968 test-hook-close-phase: 8df5997c3361518f733d1ae67cd3adb9b0eaf125: -> archived
969 969
970 970 The changeset is a working parent descendant.
971 971 Per the usual visibility rules, it is made visible.
972 972
973 973 $ hg log -G -l 3
974 974 @ changeset: 1:8df5997c3361
975 975 | tag: tip
976 976 | user: test
977 977 | date: Thu Jan 01 00:00:00 1970 +0000
978 978 | summary: my test archived commit
979 979 |
980 980 o changeset: 0:4a2df7238c3b
981 981 user: test
982 982 date: Thu Jan 01 00:00:00 1970 +0000
983 983 summary: A
984 984
985 985
986 986 Commit is hidden as expected
987 987
988 988 $ hg up 0
989 989 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
990 990 $ hg log -G
991 991 @ changeset: 0:4a2df7238c3b
992 992 tag: tip
993 993 user: test
994 994 date: Thu Jan 01 00:00:00 1970 +0000
995 995 summary: A
996 996
997 997 $ cd ..
998 998
999 999 Recommitting an exact match of a public commit shouldn't change it to
1000 1000 draft:
1001 1001
1002 1002 $ cd initialrepo
1003 1003 $ hg phase -r 2
1004 1004 2: public
1005 1005 $ hg up -C 1
1006 1006 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
1007 1007 $ mkcommit C
1008 1008 warning: commit already existed in the repository!
1009 1009 $ hg phase -r 2
1010 1010 2: public
1011 1011
1012 1012 Same, but for secret:
1013 1013
1014 1014 $ hg up 7
1015 1015 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
1016 1016 $ mkcommit F -s
1017 1017 test-debug-phase: new rev 8: x -> 2
1018 1018 test-hook-close-phase: de414268ec5ce2330c590b942fbb5ff0b0ca1a0a: -> secret
1019 1019 $ hg up 7
1020 1020 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1021 1021 $ hg phase
1022 1022 7: draft
1023 1023 $ mkcommit F
1024 1024 test-debug-phase: new rev 8: x -> 2
1025 1025 warning: commit already existed in the repository!
1026 1026 test-hook-close-phase: de414268ec5ce2330c590b942fbb5ff0b0ca1a0a: -> secret
1027 1027 $ hg phase -r tip
1028 1028 8: secret
1029 1029
1030 1030 But what about obsoleted changesets?
1031 1031
1032 1032 $ hg up 4
1033 1033 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
1034 1034 $ mkcommit H
1035 1035 test-debug-phase: new rev 5: x -> 2
1036 1036 warning: commit already existed in the repository!
1037 1037 test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8: -> secret
1038 1038 $ hg phase -r 5
1039 1039 5: secret
1040 1040 $ hg par
1041 1041 changeset: 5:a030c6be5127
1042 1042 user: test
1043 1043 date: Thu Jan 01 00:00:00 1970 +0000
1044 1044 obsolete: pruned
1045 1045 summary: H
1046 1046
1047 1047 $ hg up tip
1048 1048 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1049 1049 $ cd ..
@@ -1,1601 +1,1601 b''
1 1 #testcases stripbased phasebased
2 2
3 3 $ cat <<EOF >> $HGRCPATH
4 4 > [extensions]
5 5 > mq =
6 6 > [defaults]
7 7 > diff = --nodates --git
8 8 > qnew = --date '0 0'
9 9 > [shelve]
10 10 > maxbackups = 2
11 11 > EOF
12 12
13 13 #if phasebased
14 14
15 15 $ cat <<EOF >> $HGRCPATH
16 16 > [format]
17 > internal-phase = yes
17 > use-internal-phase = yes
18 18 > EOF
19 19
20 20 #endif
21 21
22 22 $ hg init repo
23 23 $ cd repo
24 24 $ mkdir a b
25 25 $ echo a > a/a
26 26 $ echo b > b/b
27 27 $ echo c > c
28 28 $ echo d > d
29 29 $ echo x > x
30 30 $ hg addremove -q
31 31
32 32 shelve has a help message
33 33 $ hg shelve -h
34 34 hg shelve [OPTION]... [FILE]...
35 35
36 36 save and set aside changes from the working directory
37 37
38 38 Shelving takes files that "hg status" reports as not clean, saves the
39 39 modifications to a bundle (a shelved change), and reverts the files so
40 40 that their state in the working directory becomes clean.
41 41
42 42 To restore these changes to the working directory, using "hg unshelve";
43 43 this will work even if you switch to a different commit.
44 44
45 45 When no files are specified, "hg shelve" saves all not-clean files. If
46 46 specific files or directories are named, only changes to those files are
47 47 shelved.
48 48
49 49 In bare shelve (when no files are specified, without interactive, include
50 50 and exclude option), shelving remembers information if the working
51 51 directory was on newly created branch, in other words working directory
52 52 was on different branch than its first parent. In this situation
53 53 unshelving restores branch information to the working directory.
54 54
55 55 Each shelved change has a name that makes it easier to find later. The
56 56 name of a shelved change defaults to being based on the active bookmark,
57 57 or if there is no active bookmark, the current named branch. To specify a
58 58 different name, use "--name".
59 59
60 60 To see a list of existing shelved changes, use the "--list" option. For
61 61 each shelved change, this will print its name, age, and description; use "
62 62 --patch" or "--stat" for more details.
63 63
64 64 To delete specific shelved changes, use "--delete". To delete all shelved
65 65 changes, use "--cleanup".
66 66
67 67 options ([+] can be repeated):
68 68
69 69 -A --addremove mark new/missing files as added/removed before
70 70 shelving
71 71 -u --unknown store unknown files in the shelve
72 72 --cleanup delete all shelved changes
73 73 --date DATE shelve with the specified commit date
74 74 -d --delete delete the named shelved change(s)
75 75 -e --edit invoke editor on commit messages
76 76 -k --keep shelve, but keep changes in the working directory
77 77 -l --list list current shelves
78 78 -m --message TEXT use text as shelve message
79 79 -n --name NAME use the given name for the shelved commit
80 80 -p --patch output patches for changes (provide the names of the
81 81 shelved changes as positional arguments)
82 82 -i --interactive interactive mode
83 83 --stat output diffstat-style summary of changes (provide
84 84 the names of the shelved changes as positional
85 85 arguments)
86 86 -I --include PATTERN [+] include names matching the given patterns
87 87 -X --exclude PATTERN [+] exclude names matching the given patterns
88 88 --mq operate on patch repository
89 89
90 90 (some details hidden, use --verbose to show complete help)
91 91
92 92 shelving in an empty repo should be possible
93 93 (this tests also that editor is not invoked, if '--edit' is not
94 94 specified)
95 95
96 96 $ HGEDITOR=cat hg shelve
97 97 shelved as default
98 98 0 files updated, 0 files merged, 5 files removed, 0 files unresolved
99 99
100 100 $ hg unshelve
101 101 unshelving change 'default'
102 102
103 103 $ hg commit -q -m 'initial commit'
104 104
105 105 $ hg shelve
106 106 nothing changed
107 107 [1]
108 108
109 109 make sure shelve files were backed up
110 110
111 111 $ ls .hg/shelve-backup
112 112 default.hg
113 113 default.patch
114 114 default.shelve
115 115
116 116 checks to make sure we dont create a directory or
117 117 hidden file while choosing a new shelve name
118 118
119 119 when we are given a name
120 120
121 121 $ hg shelve -n foo/bar
122 122 abort: shelved change names can not contain slashes
123 123 [255]
124 124 $ hg shelve -n .baz
125 125 abort: shelved change names can not start with '.'
126 126 [255]
127 127 $ hg shelve -n foo\\bar
128 128 abort: shelved change names can not contain slashes
129 129 [255]
130 130
131 131 when shelve has to choose itself
132 132
133 133 $ hg branch x/y -q
134 134 $ hg commit -q -m "Branch commit 0"
135 135 $ hg shelve
136 136 nothing changed
137 137 [1]
138 138 $ hg branch .x -q
139 139 $ hg commit -q -m "Branch commit 1"
140 140 $ hg shelve
141 141 nothing changed
142 142 [1]
143 143 $ hg branch x\\y -q
144 144 $ hg commit -q -m "Branch commit 2"
145 145 $ hg shelve
146 146 nothing changed
147 147 [1]
148 148
149 149 cleaning the branches made for name checking tests
150 150
151 151 $ hg up default -q
152 152 $ hg strip e9177275307e+6a6d231f43d+882bae7c62c2 -q
153 153
154 154 create an mq patch - shelving should work fine with a patch applied
155 155
156 156 $ echo n > n
157 157 $ hg add n
158 158 $ hg commit n -m second
159 159 $ hg qnew second.patch
160 160
161 161 shelve a change that we will delete later
162 162
163 163 $ echo a >> a/a
164 164 $ hg shelve
165 165 shelved as default
166 166 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
167 167
168 168 set up some more complex changes to shelve
169 169
170 170 $ echo a >> a/a
171 171 $ hg mv b b.rename
172 172 moving b/b to b.rename/b
173 173 $ hg cp c c.copy
174 174 $ hg mv d ghost
175 175 $ rm ghost
176 176 $ hg status -C
177 177 M a/a
178 178 A b.rename/b
179 179 b/b
180 180 A c.copy
181 181 c
182 182 R b/b
183 183 R d
184 184 ! ghost
185 185 d
186 186
187 187 the common case - no options or filenames
188 188
189 189 $ hg shelve
190 190 shelved as default-01
191 191 3 files updated, 0 files merged, 2 files removed, 0 files unresolved
192 192 $ hg status -C
193 193
194 194 ensure that our shelved changes exist
195 195
196 196 $ hg shelve -l
197 197 default-01 (*)* changes to: [mq]: second.patch (glob)
198 198 default (*)* changes to: [mq]: second.patch (glob)
199 199
200 200 $ hg shelve -l -p default
201 201 default (*)* changes to: [mq]: second.patch (glob)
202 202
203 203 diff --git a/a/a b/a/a
204 204 --- a/a/a
205 205 +++ b/a/a
206 206 @@ -1,1 +1,2 @@
207 207 a
208 208 +a
209 209
210 210 $ hg shelve --list --addremove
211 211 abort: options '--list' and '--addremove' may not be used together
212 212 [10]
213 213
214 214 delete our older shelved change
215 215
216 216 $ hg shelve -d default
217 217 $ hg qfinish -a -q
218 218
219 219 ensure shelve backups aren't overwritten
220 220
221 221 $ ls .hg/shelve-backup/
222 222 default-1.hg
223 223 default-1.patch
224 224 default-1.shelve
225 225 default.hg
226 226 default.patch
227 227 default.shelve
228 228
229 229 local edits should not prevent a shelved change from applying
230 230
231 231 $ printf "z\na\n" > a/a
232 232 $ hg unshelve --keep
233 233 unshelving change 'default-01'
234 234 temporarily committing pending changes (restore with 'hg unshelve --abort')
235 235 rebasing shelved changes
236 236 merging a/a
237 237
238 238 $ hg revert --all -q
239 239 $ rm a/a.orig b.rename/b c.copy
240 240
241 241 apply it and make sure our state is as expected
242 242
243 243 (this also tests that same timestamp prevents backups from being
244 244 removed, even though there are more than 'maxbackups' backups)
245 245
246 246 $ f -t .hg/shelve-backup/default.shelve
247 247 .hg/shelve-backup/default.shelve: file
248 248 $ touch -t 200001010000 .hg/shelve-backup/default.shelve
249 249 $ f -t .hg/shelve-backup/default-1.shelve
250 250 .hg/shelve-backup/default-1.shelve: file
251 251 $ touch -t 200001010000 .hg/shelve-backup/default-1.shelve
252 252
253 253 $ hg unshelve
254 254 unshelving change 'default-01'
255 255 $ hg status -C
256 256 M a/a
257 257 A b.rename/b
258 258 b/b
259 259 A c.copy
260 260 c
261 261 R b/b
262 262 R d
263 263 $ hg shelve -l
264 264
265 265 (both of default.hg and default-1.hg should be still kept, because it
266 266 is difficult to decide actual order of them from same timestamp)
267 267
268 268 $ ls .hg/shelve-backup/
269 269 default-01.hg
270 270 default-01.patch
271 271 default-01.shelve
272 272 default-1.hg
273 273 default-1.patch
274 274 default-1.shelve
275 275 default.hg
276 276 default.patch
277 277 default.shelve
278 278
279 279 $ hg unshelve
280 280 abort: no shelved changes to apply!
281 281 [20]
282 282 $ hg unshelve foo
283 283 abort: shelved change 'foo' not found
284 284 [10]
285 285
286 286 named shelves, specific filenames, and "commit messages" should all work
287 287 (this tests also that editor is invoked, if '--edit' is specified)
288 288
289 289 $ hg status -C
290 290 M a/a
291 291 A b.rename/b
292 292 b/b
293 293 A c.copy
294 294 c
295 295 R b/b
296 296 R d
297 297 $ HGEDITOR=cat hg shelve -q -n wibble -m wat -e a
298 298 wat
299 299
300 300
301 301 HG: Enter commit message. Lines beginning with 'HG:' are removed.
302 302 HG: Leave message empty to abort commit.
303 303 HG: --
304 304 HG: user: shelve@localhost
305 305 HG: branch 'default'
306 306 HG: changed a/a
307 307
308 308 expect "a" to no longer be present, but status otherwise unchanged
309 309
310 310 $ hg status -C
311 311 A b.rename/b
312 312 b/b
313 313 A c.copy
314 314 c
315 315 R b/b
316 316 R d
317 317 $ hg shelve -l --stat
318 318 wibble (*) wat (glob)
319 319 a/a | 1 +
320 320 1 files changed, 1 insertions(+), 0 deletions(-)
321 321
322 322 and now "a/a" should reappear
323 323
324 324 $ cd a
325 325 $ hg unshelve -q wibble
326 326 $ cd ..
327 327 $ hg status -C
328 328 M a/a
329 329 A b.rename/b
330 330 b/b
331 331 A c.copy
332 332 c
333 333 R b/b
334 334 R d
335 335
336 336 ensure old shelve backups are being deleted automatically
337 337
338 338 $ ls .hg/shelve-backup/
339 339 default-01.hg
340 340 default-01.patch
341 341 default-01.shelve
342 342 wibble.hg
343 343 wibble.patch
344 344 wibble.shelve
345 345
346 346 cause unshelving to result in a merge with 'a' conflicting
347 347
348 348 $ hg shelve -q
349 349 $ echo c>>a/a
350 350 $ hg commit -m second
351 351 $ hg tip --template '{files}\n'
352 352 a/a
353 353
354 354 add an unrelated change that should be preserved
355 355
356 356 $ mkdir foo
357 357 $ echo foo > foo/foo
358 358 $ hg add foo/foo
359 359
360 360 force a conflicted merge to occur
361 361
362 362 $ hg unshelve
363 363 unshelving change 'default'
364 364 temporarily committing pending changes (restore with 'hg unshelve --abort')
365 365 rebasing shelved changes
366 366 merging a/a
367 367 warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
368 368 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
369 369 [240]
370 370 $ hg status -v
371 371 M a/a
372 372 M b.rename/b
373 373 M c.copy
374 374 R b/b
375 375 R d
376 376 ? a/a.orig
377 377 # The repository is in an unfinished *unshelve* state.
378 378
379 379 # Unresolved merge conflicts:
380 380 #
381 381 # a/a
382 382 #
383 383 # To mark files as resolved: hg resolve --mark FILE
384 384
385 385 # To continue: hg unshelve --continue
386 386 # To abort: hg unshelve --abort
387 387
388 388
389 389 ensure that we have a merge with unresolved conflicts
390 390
391 391 #if phasebased
392 392 $ hg heads -q --template '{rev}\n'
393 393 8
394 394 5
395 395 $ hg parents -q --template '{rev}\n'
396 396 8
397 397 5
398 398 #endif
399 399
400 400 #if stripbased
401 401 $ hg heads -q --template '{rev}\n'
402 402 5
403 403 4
404 404 $ hg parents -q --template '{rev}\n'
405 405 4
406 406 5
407 407 #endif
408 408
409 409 $ hg status
410 410 M a/a
411 411 M b.rename/b
412 412 M c.copy
413 413 R b/b
414 414 R d
415 415 ? a/a.orig
416 416 $ hg diff
417 417 diff --git a/a/a b/a/a
418 418 --- a/a/a
419 419 +++ b/a/a
420 420 @@ -1,2 +1,6 @@
421 421 a
422 422 +<<<<<<< working-copy: 2377350b6337 - shelve: pending changes temporary commit
423 423 c
424 424 +=======
425 425 +a
426 426 +>>>>>>> shelved change: 203c9f771d2b - shelve: changes to: [mq]: second.patch
427 427 diff --git a/b/b b/b.rename/b
428 428 rename from b/b
429 429 rename to b.rename/b
430 430 diff --git a/c b/c.copy
431 431 copy from c
432 432 copy to c.copy
433 433 diff --git a/d b/d
434 434 deleted file mode 100644
435 435 --- a/d
436 436 +++ /dev/null
437 437 @@ -1,1 +0,0 @@
438 438 -d
439 439 $ hg resolve -l
440 440 U a/a
441 441
442 442 $ hg shelve
443 443 abort: unshelve already in progress
444 444 (use 'hg unshelve --continue' or 'hg unshelve --abort')
445 445 [20]
446 446
447 447 abort the unshelve and be happy
448 448
449 449 $ hg status
450 450 M a/a
451 451 M b.rename/b
452 452 M c.copy
453 453 R b/b
454 454 R d
455 455 ? a/a.orig
456 456 $ hg unshelve -a
457 457 unshelve of 'default' aborted
458 458 $ hg heads -q
459 459 [37]:2e69b451d1ea (re)
460 460 $ hg parents
461 461 changeset: [37]:2e69b451d1ea (re)
462 462 tag: tip
463 463 parent: 3:509104101065 (?)
464 464 user: test
465 465 date: Thu Jan 01 00:00:00 1970 +0000
466 466 summary: second
467 467
468 468 $ hg resolve -l
469 469 $ hg status
470 470 A foo/foo
471 471 ? a/a.orig
472 472
473 473 try to continue with no unshelve underway
474 474
475 475 $ hg unshelve -c
476 476 abort: no unshelve in progress
477 477 [20]
478 478 $ hg status
479 479 A foo/foo
480 480 ? a/a.orig
481 481
482 482 redo the unshelve to get a conflict
483 483
484 484 $ hg unshelve -q
485 485 warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
486 486 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
487 487 [240]
488 488
489 489 attempt to continue
490 490
491 491 $ hg unshelve -c
492 492 abort: unresolved conflicts, can't continue
493 493 (see 'hg resolve', then 'hg unshelve --continue')
494 494 [255]
495 495
496 496 $ hg revert -r . a/a
497 497 $ hg resolve -m a/a
498 498 (no more unresolved files)
499 499 continue: hg unshelve --continue
500 500
501 501 $ hg commit -m 'commit while unshelve in progress'
502 502 abort: unshelve already in progress
503 503 (use 'hg unshelve --continue' or 'hg unshelve --abort')
504 504 [20]
505 505
506 506 $ hg graft --continue
507 507 abort: no graft in progress
508 508 (continue: hg unshelve --continue)
509 509 [20]
510 510 $ hg unshelve -c
511 511 unshelve of 'default' complete
512 512
513 513 ensure the repo is as we hope
514 514
515 515 $ hg parents
516 516 changeset: [37]:2e69b451d1ea (re)
517 517 tag: tip
518 518 parent: 3:509104101065 (?)
519 519 user: test
520 520 date: Thu Jan 01 00:00:00 1970 +0000
521 521 summary: second
522 522
523 523 $ hg heads -q
524 524 [37]:2e69b451d1ea (re)
525 525
526 526 $ hg status -C
527 527 A b.rename/b
528 528 b/b
529 529 A c.copy
530 530 c
531 531 A foo/foo
532 532 R b/b
533 533 R d
534 534 ? a/a.orig
535 535
536 536 there should be no shelves left
537 537
538 538 $ hg shelve -l
539 539
540 540 #if execbit
541 541
542 542 ensure that metadata-only changes are shelved
543 543
544 544 $ chmod +x a/a
545 545 $ hg shelve -q -n execbit a/a
546 546 $ hg status a/a
547 547 $ hg unshelve -q execbit
548 548 $ hg status a/a
549 549 M a/a
550 550 $ hg revert a/a
551 551
552 552 #else
553 553
554 554 Dummy shelve op, to keep rev numbers aligned
555 555
556 556 $ echo foo > a/a
557 557 $ hg shelve -q -n dummy a/a
558 558 $ hg unshelve -q dummy
559 559 $ hg revert a/a
560 560
561 561 #endif
562 562
563 563 #if symlink
564 564
565 565 $ rm a/a
566 566 $ ln -s foo a/a
567 567 $ hg shelve -q -n symlink a/a
568 568 $ hg status a/a
569 569 $ hg unshelve -q -n symlink
570 570 $ hg status a/a
571 571 M a/a
572 572 $ hg revert a/a
573 573
574 574 #else
575 575
576 576 Dummy shelve op, to keep rev numbers aligned
577 577
578 578 $ echo bar > a/a
579 579 $ hg shelve -q -n dummy a/a
580 580 $ hg unshelve -q dummy
581 581 $ hg revert a/a
582 582
583 583 #endif
584 584
585 585 set up another conflict between a commit and a shelved change
586 586
587 587 $ hg revert -q -C -a
588 588 $ rm a/a.orig b.rename/b c.copy
589 589 $ echo a >> a/a
590 590 $ hg shelve -q
591 591 $ echo x >> a/a
592 592 $ hg ci -m 'create conflict'
593 593 $ hg add foo/foo
594 594
595 595 if we resolve a conflict while unshelving, the unshelve should succeed
596 596
597 597 $ hg unshelve --tool :merge-other --keep
598 598 unshelving change 'default'
599 599 temporarily committing pending changes (restore with 'hg unshelve --abort')
600 600 rebasing shelved changes
601 601 merging a/a
602 602 $ hg parents -q
603 603 (4|13):33f7f61e6c5e (re)
604 604 $ hg shelve -l
605 605 default (*)* changes to: second (glob)
606 606 $ hg status
607 607 M a/a
608 608 A foo/foo
609 609 $ cat a/a
610 610 a
611 611 c
612 612 a
613 613 $ cat > a/a << EOF
614 614 > a
615 615 > c
616 616 > x
617 617 > EOF
618 618
619 619 $ HGMERGE=true hg unshelve
620 620 unshelving change 'default'
621 621 temporarily committing pending changes (restore with 'hg unshelve --abort')
622 622 rebasing shelved changes
623 623 merging a/a
624 624 note: unshelved changes already existed in the working copy
625 625 $ hg parents -q
626 626 (4|13):33f7f61e6c5e (re)
627 627 $ hg shelve -l
628 628 $ hg status
629 629 A foo/foo
630 630 $ cat a/a
631 631 a
632 632 c
633 633 x
634 634
635 635 test keep and cleanup
636 636
637 637 $ hg shelve
638 638 shelved as default
639 639 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
640 640 $ hg shelve --list
641 641 default (*)* changes to: create conflict (glob)
642 642 $ hg unshelve -k
643 643 unshelving change 'default'
644 644 $ hg shelve --list
645 645 default (*)* changes to: create conflict (glob)
646 646 $ hg shelve --cleanup
647 647 $ hg shelve --list
648 648
649 649 $ hg shelve --cleanup --delete
650 650 abort: options '--cleanup' and '--delete' may not be used together
651 651 [10]
652 652 $ hg shelve --cleanup --patch
653 653 abort: options '--cleanup' and '--patch' may not be used together
654 654 [10]
655 655 $ hg shelve --cleanup --message MESSAGE
656 656 abort: options '--cleanup' and '--message' may not be used together
657 657 [10]
658 658
659 659 test bookmarks
660 660
661 661 $ hg bookmark test
662 662 $ hg bookmark
663 663 \* test (4|13):33f7f61e6c5e (re)
664 664 $ hg shelve
665 665 shelved as test
666 666 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
667 667 $ hg bookmark
668 668 \* test (4|13):33f7f61e6c5e (re)
669 669 $ hg unshelve
670 670 unshelving change 'test'
671 671 $ hg bookmark
672 672 \* test (4|13):33f7f61e6c5e (re)
673 673
674 674 shelve should still work even if mq is disabled
675 675
676 676 $ hg --config extensions.mq=! shelve
677 677 shelved as test
678 678 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
679 679 $ hg --config extensions.mq=! shelve --list
680 680 test (*)* changes to: create conflict (glob)
681 681 $ hg bookmark
682 682 \* test (4|13):33f7f61e6c5e (re)
683 683 $ hg --config extensions.mq=! unshelve
684 684 unshelving change 'test'
685 685 $ hg bookmark
686 686 \* test (4|13):33f7f61e6c5e (re)
687 687
688 688 Recreate some conflict again
689 689
690 690 $ hg up -C -r 2e69b451d1ea
691 691 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
692 692 (leaving bookmark test)
693 693 $ echo y >> a/a
694 694 $ hg shelve
695 695 shelved as default
696 696 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
697 697 $ hg up test
698 698 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
699 699 (activating bookmark test)
700 700 $ hg bookmark
701 701 \* test (4|13):33f7f61e6c5e (re)
702 702 $ hg unshelve
703 703 unshelving change 'default'
704 704 rebasing shelved changes
705 705 merging a/a
706 706 warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
707 707 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
708 708 [240]
709 709 $ hg bookmark
710 710 test (4|13):33f7f61e6c5e (re)
711 711
712 712 Test that resolving all conflicts in one direction (so that the rebase
713 713 is a no-op), works (issue4398)
714 714
715 715 $ hg revert -a -r .
716 716 reverting a/a
717 717 $ hg resolve -m a/a
718 718 (no more unresolved files)
719 719 continue: hg unshelve --continue
720 720 $ hg unshelve -c
721 721 note: unshelved changes already existed in the working copy
722 722 unshelve of 'default' complete
723 723 $ hg bookmark
724 724 \* test (4|13):33f7f61e6c5e (re)
725 725 $ hg diff
726 726 $ hg status
727 727 ? a/a.orig
728 728 ? foo/foo
729 729 $ hg summary
730 730 parent: (4|13):33f7f61e6c5e tip (re)
731 731 create conflict
732 732 branch: default
733 733 bookmarks: *test
734 734 commit: 2 unknown (clean)
735 735 update: (current)
736 736 phases: 5 draft
737 737
738 738 $ hg shelve --delete --stat
739 739 abort: options '--delete' and '--stat' may not be used together
740 740 [10]
741 741 $ hg shelve --delete --name NAME
742 742 abort: options '--delete' and '--name' may not be used together
743 743 [10]
744 744
745 745 Test interactive shelve
746 746 $ cat <<EOF >> $HGRCPATH
747 747 > [ui]
748 748 > interactive = true
749 749 > EOF
750 750 $ echo 'a' >> a/b
751 751 $ cat a/a >> a/b
752 752 $ echo 'x' >> a/b
753 753 $ mv a/b a/a
754 754 $ echo 'a' >> foo/foo
755 755 $ hg st
756 756 M a/a
757 757 ? a/a.orig
758 758 ? foo/foo
759 759 $ cat a/a
760 760 a
761 761 a
762 762 c
763 763 x
764 764 x
765 765 $ cat foo/foo
766 766 foo
767 767 a
768 768 $ hg shelve --interactive --config ui.interactive=false
769 769 abort: running non-interactively
770 770 [10]
771 771 $ hg shelve --interactive << EOF
772 772 > y
773 773 > y
774 774 > n
775 775 > EOF
776 776 diff --git a/a/a b/a/a
777 777 2 hunks, 2 lines changed
778 778 examine changes to 'a/a'?
779 779 (enter ? for help) [Ynesfdaq?] y
780 780
781 781 @@ -1,3 +1,4 @@
782 782 +a
783 783 a
784 784 c
785 785 x
786 786 record change 1/2 to 'a/a'?
787 787 (enter ? for help) [Ynesfdaq?] y
788 788
789 789 @@ -1,3 +2,4 @@
790 790 a
791 791 c
792 792 x
793 793 +x
794 794 record change 2/2 to 'a/a'?
795 795 (enter ? for help) [Ynesfdaq?] n
796 796
797 797 shelved as test
798 798 merging a/a
799 799 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
800 800 $ cat a/a
801 801 a
802 802 c
803 803 x
804 804 x
805 805 $ cat foo/foo
806 806 foo
807 807 a
808 808 $ hg st
809 809 M a/a
810 810 ? foo/foo
811 811 $ hg bookmark
812 812 \* test (4|13):33f7f61e6c5e (re)
813 813 there shouldn't be a merge state
814 814 $ hg resolve -l
815 815 $ hg unshelve
816 816 unshelving change 'test'
817 817 temporarily committing pending changes (restore with 'hg unshelve --abort')
818 818 rebasing shelved changes
819 819 merging a/a
820 820 $ hg bookmark
821 821 \* test (4|13):33f7f61e6c5e (re)
822 822 $ cat a/a
823 823 a
824 824 a
825 825 c
826 826 x
827 827 x
828 828
829 829 shelve --patch and shelve --stat should work with valid shelfnames
830 830
831 831 $ hg up --clean .
832 832 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
833 833 (leaving bookmark test)
834 834 $ hg shelve --list
835 835 $ echo 'patch a' > shelf-patch-a
836 836 $ hg add shelf-patch-a
837 837 $ hg shelve
838 838 shelved as default
839 839 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
840 840 $ echo 'patch b' > shelf-patch-b
841 841 $ hg add shelf-patch-b
842 842 $ hg shelve
843 843 shelved as default-01
844 844 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
845 845 $ hg shelve --patch default default-01
846 846 default-01 (*)* changes to: create conflict (glob)
847 847
848 848 diff --git a/shelf-patch-b b/shelf-patch-b
849 849 new file mode 100644
850 850 --- /dev/null
851 851 +++ b/shelf-patch-b
852 852 @@ -0,0 +1,1 @@
853 853 +patch b
854 854 default (*)* changes to: create conflict (glob)
855 855
856 856 diff --git a/shelf-patch-a b/shelf-patch-a
857 857 new file mode 100644
858 858 --- /dev/null
859 859 +++ b/shelf-patch-a
860 860 @@ -0,0 +1,1 @@
861 861 +patch a
862 862 $ hg shelve --stat default default-01
863 863 default-01 (*)* changes to: create conflict (glob)
864 864 shelf-patch-b | 1 +
865 865 1 files changed, 1 insertions(+), 0 deletions(-)
866 866 default (*)* changes to: create conflict (glob)
867 867 shelf-patch-a | 1 +
868 868 1 files changed, 1 insertions(+), 0 deletions(-)
869 869 $ hg shelve --patch default
870 870 default (*)* changes to: create conflict (glob)
871 871
872 872 diff --git a/shelf-patch-a b/shelf-patch-a
873 873 new file mode 100644
874 874 --- /dev/null
875 875 +++ b/shelf-patch-a
876 876 @@ -0,0 +1,1 @@
877 877 +patch a
878 878 $ hg shelve --stat default
879 879 default (*)* changes to: create conflict (glob)
880 880 shelf-patch-a | 1 +
881 881 1 files changed, 1 insertions(+), 0 deletions(-)
882 882 $ hg shelve --patch nonexistentshelf
883 883 abort: cannot find shelf nonexistentshelf
884 884 [255]
885 885 $ hg shelve --stat nonexistentshelf
886 886 abort: cannot find shelf nonexistentshelf
887 887 [255]
888 888 $ hg shelve --patch default nonexistentshelf
889 889 abort: cannot find shelf nonexistentshelf
890 890 [255]
891 891
892 892 when the user asks for a patch, we assume they want the most recent shelve if
893 893 they don't provide a shelve name
894 894
895 895 $ hg shelve --patch
896 896 default-01 (*)* changes to: create conflict (glob)
897 897
898 898 diff --git a/shelf-patch-b b/shelf-patch-b
899 899 new file mode 100644
900 900 --- /dev/null
901 901 +++ b/shelf-patch-b
902 902 @@ -0,0 +1,1 @@
903 903 +patch b
904 904
905 905 $ cd ..
906 906
907 907 Shelve from general delta repo uses bundle2 on disk
908 908 --------------------------------------------------
909 909
910 910 no general delta
911 911
912 912 $ hg clone --pull repo bundle1 --config format.usegeneraldelta=0
913 913 requesting all changes
914 914 adding changesets
915 915 adding manifests
916 916 adding file changes
917 917 added 5 changesets with 8 changes to 6 files
918 918 new changesets cc01e2b0c59f:33f7f61e6c5e
919 919 updating to branch default
920 920 6 files updated, 0 files merged, 0 files removed, 0 files unresolved
921 921 $ cd bundle1
922 922 $ echo babar > jungle
923 923 $ hg add jungle
924 924 $ hg shelve
925 925 shelved as default
926 926 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
927 927 $ hg debugbundle .hg/shelved/*.hg
928 928 330882a04d2ce8487636b1fb292e5beea77fa1e3
929 929 $ cd ..
930 930
931 931 with general delta
932 932
933 933 $ hg clone --pull repo bundle2 --config format.usegeneraldelta=1
934 934 requesting all changes
935 935 adding changesets
936 936 adding manifests
937 937 adding file changes
938 938 added 5 changesets with 8 changes to 6 files
939 939 new changesets cc01e2b0c59f:33f7f61e6c5e
940 940 updating to branch default
941 941 6 files updated, 0 files merged, 0 files removed, 0 files unresolved
942 942 $ cd bundle2
943 943 $ echo babar > jungle
944 944 $ hg add jungle
945 945 $ hg shelve
946 946 shelved as default
947 947 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
948 948 $ hg debugbundle .hg/shelved/*.hg
949 949 Stream params: {Compression: BZ}
950 950 changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
951 951 330882a04d2ce8487636b1fb292e5beea77fa1e3
952 952
953 953 Test shelve --keep
954 954
955 955 $ hg unshelve
956 956 unshelving change 'default'
957 957 $ hg shelve --keep --list
958 958 abort: options '--list' and '--keep' may not be used together
959 959 [10]
960 960 $ hg shelve --keep --patch
961 961 abort: options '--patch' and '--keep' may not be used together
962 962 [10]
963 963 $ hg shelve --keep --delete
964 964 abort: options '--delete' and '--keep' may not be used together
965 965 [10]
966 966 $ hg shelve --keep
967 967 shelved as default
968 968 $ hg diff
969 969 diff --git a/jungle b/jungle
970 970 new file mode 100644
971 971 --- /dev/null
972 972 +++ b/jungle
973 973 @@ -0,0 +1,1 @@
974 974 +babar
975 975
976 976 Test shelve --delete
977 977
978 978 $ hg shelve --list
979 979 default (*s ago) * changes to: create conflict (glob)
980 980 $ hg shelve --delete doesnotexist
981 981 abort: shelved change 'doesnotexist' not found
982 982 [10]
983 983 $ hg shelve --delete default
984 984
985 985 $ cd ..
986 986
987 987 Test visibility of in-memory changes inside transaction to external hook
988 988 ------------------------------------------------------------------------
989 989
990 990 $ cd repo
991 991
992 992 $ echo xxxx >> x
993 993 $ hg commit -m "#5: changes to invoke rebase"
994 994
995 995 $ cat > $TESTTMP/checkvisibility.sh <<EOF
996 996 > echo "==== \$1:"
997 997 > hg parents --template "VISIBLE {rev}:{node|short}\n"
998 998 > # test that pending changes are hidden
999 999 > unset HG_PENDING
1000 1000 > hg parents --template "ACTUAL {rev}:{node|short}\n"
1001 1001 > echo "===="
1002 1002 > EOF
1003 1003
1004 1004 $ cat >> .hg/hgrc <<EOF
1005 1005 > [defaults]
1006 1006 > # to fix hash id of temporary revisions
1007 1007 > unshelve = --date '0 0'
1008 1008 > EOF
1009 1009
1010 1010 "hg unshelve" at REV5 implies steps below:
1011 1011
1012 1012 (1) commit changes in the working directory (REV6)
1013 1013 (2) unbundle shelved revision (REV7)
1014 1014 (3) rebase: merge REV7 into REV6 (REV6 => REV6, REV7)
1015 1015 (4) rebase: commit merged revision (REV8)
1016 1016 (5) rebase: update to REV6 (REV8 => REV6)
1017 1017 (6) update to REV5 (REV6 => REV5)
1018 1018 (7) abort transaction
1019 1019
1020 1020 == test visibility to external preupdate hook
1021 1021
1022 1022 $ cat >> .hg/hgrc <<EOF
1023 1023 > [hooks]
1024 1024 > preupdate.visibility = sh $TESTTMP/checkvisibility.sh preupdate
1025 1025 > EOF
1026 1026
1027 1027 $ echo nnnn >> n
1028 1028
1029 1029 $ sh $TESTTMP/checkvisibility.sh before-unshelving
1030 1030 ==== before-unshelving:
1031 1031 VISIBLE (5|19):703117a2acfb (re)
1032 1032 ACTUAL (5|19):703117a2acfb (re)
1033 1033 ====
1034 1034
1035 1035 $ hg unshelve --keep default
1036 1036 temporarily committing pending changes (restore with 'hg unshelve --abort')
1037 1037 rebasing shelved changes
1038 1038 ==== preupdate:
1039 1039 VISIBLE (6|20):54c00d20fb3f (re)
1040 1040 ACTUAL (5|19):703117a2acfb (re)
1041 1041 ====
1042 1042 ==== preupdate:
1043 1043 VISIBLE (8|21):8efe6f7537dc (re)
1044 1044 ACTUAL (5|19):703117a2acfb (re)
1045 1045 ====
1046 1046 ==== preupdate:
1047 1047 VISIBLE (6|20):54c00d20fb3f (re)
1048 1048 ACTUAL (5|19):703117a2acfb (re)
1049 1049 ====
1050 1050
1051 1051 $ cat >> .hg/hgrc <<EOF
1052 1052 > [hooks]
1053 1053 > preupdate.visibility =
1054 1054 > EOF
1055 1055
1056 1056 $ sh $TESTTMP/checkvisibility.sh after-unshelving
1057 1057 ==== after-unshelving:
1058 1058 VISIBLE (5|19):703117a2acfb (re)
1059 1059 ACTUAL (5|19):703117a2acfb (re)
1060 1060 ====
1061 1061
1062 1062 == test visibility to external update hook
1063 1063
1064 1064 $ hg update -q -C 703117a2acfb
1065 1065
1066 1066 $ cat >> .hg/hgrc <<EOF
1067 1067 > [hooks]
1068 1068 > update.visibility = sh $TESTTMP/checkvisibility.sh update
1069 1069 > EOF
1070 1070
1071 1071 $ echo nnnn >> n
1072 1072
1073 1073 $ sh $TESTTMP/checkvisibility.sh before-unshelving
1074 1074 ==== before-unshelving:
1075 1075 VISIBLE (5|19):703117a2acfb (re)
1076 1076 ACTUAL (5|19):703117a2acfb (re)
1077 1077 ====
1078 1078
1079 1079 $ hg unshelve --keep default
1080 1080 temporarily committing pending changes (restore with 'hg unshelve --abort')
1081 1081 rebasing shelved changes
1082 1082 ==== update:
1083 1083 VISIBLE (6|20):54c00d20fb3f (re)
1084 1084 VISIBLE 1?7:492ed9d705e5 (re)
1085 1085 ACTUAL (5|19):703117a2acfb (re)
1086 1086 ====
1087 1087 ==== update:
1088 1088 VISIBLE (6|20):54c00d20fb3f (re)
1089 1089 ACTUAL (5|19):703117a2acfb (re)
1090 1090 ====
1091 1091 ==== update:
1092 1092 VISIBLE (5|19):703117a2acfb (re)
1093 1093 ACTUAL (5|19):703117a2acfb (re)
1094 1094 ====
1095 1095
1096 1096 $ cat >> .hg/hgrc <<EOF
1097 1097 > [hooks]
1098 1098 > update.visibility =
1099 1099 > EOF
1100 1100
1101 1101 $ sh $TESTTMP/checkvisibility.sh after-unshelving
1102 1102 ==== after-unshelving:
1103 1103 VISIBLE (5|19):703117a2acfb (re)
1104 1104 ACTUAL (5|19):703117a2acfb (re)
1105 1105 ====
1106 1106
1107 1107 $ cd ..
1108 1108
1109 1109 Keep active bookmark while (un)shelving even on shared repo (issue4940)
1110 1110 -----------------------------------------------------------------------
1111 1111
1112 1112 $ cat <<EOF >> $HGRCPATH
1113 1113 > [extensions]
1114 1114 > share =
1115 1115 > EOF
1116 1116
1117 1117 $ hg bookmarks -R repo
1118 1118 test (4|13):33f7f61e6c5e (re)
1119 1119 $ hg share -B repo share
1120 1120 updating working directory
1121 1121 6 files updated, 0 files merged, 0 files removed, 0 files unresolved
1122 1122 $ cd share
1123 1123
1124 1124 $ hg bookmarks
1125 1125 test (4|13):33f7f61e6c5e (re)
1126 1126 $ hg bookmarks foo
1127 1127 $ hg bookmarks
1128 1128 \* foo (5|19):703117a2acfb (re)
1129 1129 test (4|13):33f7f61e6c5e (re)
1130 1130 $ echo x >> x
1131 1131 $ hg shelve
1132 1132 shelved as foo
1133 1133 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1134 1134 $ hg bookmarks
1135 1135 \* foo (5|19):703117a2acfb (re)
1136 1136 test (4|13):33f7f61e6c5e (re)
1137 1137
1138 1138 $ hg unshelve
1139 1139 unshelving change 'foo'
1140 1140 $ hg bookmarks
1141 1141 \* foo (5|19):703117a2acfb (re)
1142 1142 test (4|13):33f7f61e6c5e (re)
1143 1143
1144 1144 $ cd ..
1145 1145
1146 1146 Abort unshelve while merging (issue5123)
1147 1147 ----------------------------------------
1148 1148
1149 1149 $ hg init issue5123
1150 1150 $ cd issue5123
1151 1151 $ echo > a
1152 1152 $ hg ci -Am a
1153 1153 adding a
1154 1154 $ hg co null
1155 1155 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1156 1156 $ echo > b
1157 1157 $ hg ci -Am b
1158 1158 adding b
1159 1159 created new head
1160 1160 $ echo > c
1161 1161 $ hg add c
1162 1162 $ hg shelve
1163 1163 shelved as default
1164 1164 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1165 1165 $ hg co 1
1166 1166 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1167 1167 $ hg merge 0
1168 1168 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1169 1169 (branch merge, don't forget to commit)
1170 1170 -- successful merge with two parents
1171 1171 $ hg log -G
1172 1172 @ changeset: 1:406bf70c274f
1173 1173 tag: tip
1174 1174 parent: -1:000000000000
1175 1175 user: test
1176 1176 date: Thu Jan 01 00:00:00 1970 +0000
1177 1177 summary: b
1178 1178
1179 1179 @ changeset: 0:ada8c9eb8252
1180 1180 user: test
1181 1181 date: Thu Jan 01 00:00:00 1970 +0000
1182 1182 summary: a
1183 1183
1184 1184 -- trying to pull in the shelve bits
1185 1185 -- unshelve should abort otherwise, it'll eat my second parent.
1186 1186 $ hg unshelve
1187 1187 abort: outstanding uncommitted merge
1188 1188 (use 'hg commit' or 'hg merge --abort')
1189 1189 [20]
1190 1190
1191 1191 $ cd ..
1192 1192
1193 1193 -- test for interactive mode on unshelve
1194 1194
1195 1195 $ hg init a
1196 1196 $ cd a
1197 1197 $ echo > b
1198 1198 $ hg ci -Am b
1199 1199 adding b
1200 1200 $ echo > c
1201 1201 $ echo > d
1202 1202 $ hg add .
1203 1203 adding c
1204 1204 adding d
1205 1205 $ hg shelve
1206 1206 shelved as default
1207 1207 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
1208 1208 $ echo > e
1209 1209 $ hg add e
1210 1210 $ hg ci -m e
1211 1211 $ hg shelve --patch
1212 1212 default (*s ago) * changes to: b (glob)
1213 1213
1214 1214 diff --git a/c b/c
1215 1215 new file mode 100644
1216 1216 --- /dev/null
1217 1217 +++ b/c
1218 1218 @@ -0,0 +1,1 @@
1219 1219 +
1220 1220 diff --git a/d b/d
1221 1221 new file mode 100644
1222 1222 --- /dev/null
1223 1223 +++ b/d
1224 1224 @@ -0,0 +1,1 @@
1225 1225 +
1226 1226 $ hg unshelve -i <<EOF
1227 1227 > y
1228 1228 > y
1229 1229 > y
1230 1230 > n
1231 1231 > EOF
1232 1232 unshelving change 'default'
1233 1233 rebasing shelved changes
1234 1234 diff --git a/c b/c
1235 1235 new file mode 100644
1236 1236 examine changes to 'c'?
1237 1237 (enter ? for help) [Ynesfdaq?] y
1238 1238
1239 1239 @@ -0,0 +1,1 @@
1240 1240 +
1241 1241 record change 1/2 to 'c'?
1242 1242 (enter ? for help) [Ynesfdaq?] y
1243 1243
1244 1244 diff --git a/d b/d
1245 1245 new file mode 100644
1246 1246 examine changes to 'd'?
1247 1247 (enter ? for help) [Ynesfdaq?] y
1248 1248
1249 1249 @@ -0,0 +1,1 @@
1250 1250 +
1251 1251 record change 2/2 to 'd'?
1252 1252 (enter ? for help) [Ynesfdaq?] n
1253 1253
1254 1254 $ ls -A
1255 1255 .hg
1256 1256 b
1257 1257 c
1258 1258 e
1259 1259 -- shelve should not contain `c` now
1260 1260 $ hg shelve --patch
1261 1261 default (*s ago) * changes to: b (glob)
1262 1262
1263 1263 diff --git a/d b/d
1264 1264 new file mode 100644
1265 1265 --- /dev/null
1266 1266 +++ b/d
1267 1267 @@ -0,0 +1,1 @@
1268 1268 +
1269 1269 $ hg unshelve -i <<EOF
1270 1270 > y
1271 1271 > y
1272 1272 > EOF
1273 1273 unshelving change 'default'
1274 1274 temporarily committing pending changes (restore with 'hg unshelve --abort')
1275 1275 rebasing shelved changes
1276 1276 diff --git a/d b/d
1277 1277 new file mode 100644
1278 1278 examine changes to 'd'?
1279 1279 (enter ? for help) [Ynesfdaq?] y
1280 1280
1281 1281 @@ -0,0 +1,1 @@
1282 1282 +
1283 1283 record this change to 'd'?
1284 1284 (enter ? for help) [Ynesfdaq?] y
1285 1285
1286 1286
1287 1287 $ hg status -v
1288 1288 A c
1289 1289 A d
1290 1290 $ ls -A
1291 1291 .hg
1292 1292 b
1293 1293 c
1294 1294 d
1295 1295 e
1296 1296 $ hg shelve --list
1297 1297
1298 1298 -- now, unshelve selected changes from a file
1299 1299
1300 1300 $ echo B > foo
1301 1301 $ hg add foo
1302 1302 $ hg ci -m 'add B to foo'
1303 1303 $ cat > foo <<EOF
1304 1304 > A
1305 1305 > B
1306 1306 > C
1307 1307 > EOF
1308 1308 $ echo > garbage
1309 1309 $ hg st
1310 1310 M foo
1311 1311 ? garbage
1312 1312 $ hg shelve --unknown
1313 1313 shelved as default
1314 1314 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1315 1315 $ cat foo
1316 1316 B
1317 1317 $ hg unshelve -i <<EOF
1318 1318 > y
1319 1319 > y
1320 1320 > n
1321 1321 > y
1322 1322 > y
1323 1323 > EOF
1324 1324 unshelving change 'default'
1325 1325 rebasing shelved changes
1326 1326 diff --git a/foo b/foo
1327 1327 2 hunks, 2 lines changed
1328 1328 examine changes to 'foo'?
1329 1329 (enter ? for help) [Ynesfdaq?] y
1330 1330
1331 1331 @@ -1,1 +1,2 @@
1332 1332 +A
1333 1333 B
1334 1334 record change 1/3 to 'foo'?
1335 1335 (enter ? for help) [Ynesfdaq?] y
1336 1336
1337 1337 @@ -1,1 +2,2 @@
1338 1338 B
1339 1339 +C
1340 1340 record change 2/3 to 'foo'?
1341 1341 (enter ? for help) [Ynesfdaq?] n
1342 1342
1343 1343 diff --git a/garbage b/garbage
1344 1344 new file mode 100644
1345 1345 examine changes to 'garbage'?
1346 1346 (enter ? for help) [Ynesfdaq?] y
1347 1347
1348 1348 @@ -0,0 +1,1 @@
1349 1349 +
1350 1350 record change 3/3 to 'garbage'?
1351 1351 (enter ? for help) [Ynesfdaq?] y
1352 1352
1353 1353 $ hg st
1354 1354 M foo
1355 1355 ? garbage
1356 1356 $ cat foo
1357 1357 A
1358 1358 B
1359 1359 $ hg shelve --patch
1360 1360 default (*s ago) * changes to: add B to foo (glob)
1361 1361
1362 1362 diff --git a/foo b/foo
1363 1363 --- a/foo
1364 1364 +++ b/foo
1365 1365 @@ -1,2 +1,3 @@
1366 1366 A
1367 1367 B
1368 1368 +C
1369 1369
1370 1370 -- unshelve interactive on conflicts
1371 1371
1372 1372 $ echo A >> bar1
1373 1373 $ echo A >> bar2
1374 1374 $ hg add bar1 bar2
1375 1375 $ hg ci -m 'add A to bars'
1376 1376 $ echo B >> bar1
1377 1377 $ echo B >> bar2
1378 1378 $ hg shelve
1379 1379 shelved as default-01
1380 1380 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1381 1381 $ echo C >> bar1
1382 1382 $ echo C >> bar2
1383 1383 $ hg ci -m 'add C to bars'
1384 1384 $ hg unshelve -i
1385 1385 unshelving change 'default-01'
1386 1386 rebasing shelved changes
1387 1387 merging bar1
1388 1388 warning: conflicts while merging bar1! (edit, then use 'hg resolve --mark')
1389 1389 merging bar2
1390 1390 warning: conflicts while merging bar2! (edit, then use 'hg resolve --mark')
1391 1391 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
1392 1392 [240]
1393 1393
1394 1394 $ cat > bar1 <<EOF
1395 1395 > A
1396 1396 > B
1397 1397 > C
1398 1398 > EOF
1399 1399 $ cat > bar2 <<EOF
1400 1400 > A
1401 1401 > B
1402 1402 > C
1403 1403 > EOF
1404 1404 $ hg resolve -m bar1 bar2
1405 1405 (no more unresolved files)
1406 1406 continue: hg unshelve --continue
1407 1407
1408 1408 -- using --continue with --interactive should throw an error
1409 1409 $ hg unshelve --continue -i
1410 1410 abort: cannot use both continue and interactive
1411 1411 [10]
1412 1412
1413 1413 $ cat bar1
1414 1414 A
1415 1415 B
1416 1416 C
1417 1417
1418 1418 #if stripbased
1419 1419 $ hg log -r 3:: -G
1420 1420 @ changeset: 5:f1d5f53e397b
1421 1421 | tag: tip
1422 1422 | parent: 3:e28fd7fa7938
1423 1423 | user: shelve@localhost
1424 1424 | date: Thu Jan 01 00:00:00 1970 +0000
1425 1425 | summary: changes to: add A to bars
1426 1426 |
1427 1427 | @ changeset: 4:fe451a778c81
1428 1428 |/ user: test
1429 1429 | date: Thu Jan 01 00:00:00 1970 +0000
1430 1430 | summary: add C to bars
1431 1431 |
1432 1432 o changeset: 3:e28fd7fa7938
1433 1433 | user: test
1434 1434 ~ date: Thu Jan 01 00:00:00 1970 +0000
1435 1435 summary: add A to bars
1436 1436
1437 1437 #endif
1438 1438
1439 1439 $ hg unshelve --continue <<EOF
1440 1440 > y
1441 1441 > y
1442 1442 > y
1443 1443 > n
1444 1444 > EOF
1445 1445 diff --git a/bar1 b/bar1
1446 1446 1 hunks, 1 lines changed
1447 1447 examine changes to 'bar1'?
1448 1448 (enter ? for help) [Ynesfdaq?] y
1449 1449
1450 1450 @@ -1,2 +1,3 @@
1451 1451 A
1452 1452 +B
1453 1453 C
1454 1454 record change 1/2 to 'bar1'?
1455 1455 (enter ? for help) [Ynesfdaq?] y
1456 1456
1457 1457 diff --git a/bar2 b/bar2
1458 1458 1 hunks, 1 lines changed
1459 1459 examine changes to 'bar2'?
1460 1460 (enter ? for help) [Ynesfdaq?] y
1461 1461
1462 1462 @@ -1,2 +1,3 @@
1463 1463 A
1464 1464 +B
1465 1465 C
1466 1466 record change 2/2 to 'bar2'?
1467 1467 (enter ? for help) [Ynesfdaq?] n
1468 1468
1469 1469 unshelve of 'default-01' complete
1470 1470
1471 1471 #if stripbased
1472 1472 $ hg log -r 3:: -G
1473 1473 @ changeset: 4:fe451a778c81
1474 1474 | tag: tip
1475 1475 | user: test
1476 1476 | date: Thu Jan 01 00:00:00 1970 +0000
1477 1477 | summary: add C to bars
1478 1478 |
1479 1479 o changeset: 3:e28fd7fa7938
1480 1480 | user: test
1481 1481 ~ date: Thu Jan 01 00:00:00 1970 +0000
1482 1482 summary: add A to bars
1483 1483
1484 1484 #endif
1485 1485
1486 1486 $ hg unshelve --continue
1487 1487 abort: no unshelve in progress
1488 1488 [20]
1489 1489
1490 1490 $ hg shelve --list
1491 1491 default-01 (*)* changes to: add A to bars (glob)
1492 1492 default (*)* changes to: add B to foo (glob)
1493 1493 $ hg unshelve -n default-01 -i <<EOF
1494 1494 > y
1495 1495 > y
1496 1496 > EOF
1497 1497 temporarily committing pending changes (restore with 'hg unshelve --abort')
1498 1498 rebasing shelved changes
1499 1499 diff --git a/bar2 b/bar2
1500 1500 1 hunks, 1 lines changed
1501 1501 examine changes to 'bar2'?
1502 1502 (enter ? for help) [Ynesfdaq?] y
1503 1503
1504 1504 @@ -1,2 +1,3 @@
1505 1505 A
1506 1506 +B
1507 1507 C
1508 1508 record this change to 'bar2'?
1509 1509 (enter ? for help) [Ynesfdaq?] y
1510 1510
1511 1511 -- test for --interactive --keep
1512 1512 $ hg unshelve -i --keep
1513 1513 abort: --keep on --interactive is not yet supported
1514 1514 [10]
1515 1515
1516 1516 $ hg update -q --clean .
1517 1517
1518 1518 Test that we can successfully shelve and unshelve a file with a trailing space
1519 1519 in the filename. Such filenames are supposedly unsupported on Windows, so we
1520 1520 wrap it in the no-windows check. Also test `hg patch` of the .patch file
1521 1521 produced by `hg shelve`.
1522 1522 #if no-windows
1523 1523 $ echo hi > 'my filename '
1524 1524 $ hg add 'my filename '
1525 1525 warning: filename ends with ' ', which is not allowed on Windows: 'my filename '
1526 1526 $ hg shelve
1527 1527 shelved as default-01
1528 1528 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1529 1529 $ cp .hg/shelved/default-01.patch test_patch.patch
1530 1530 $ hg unshelve
1531 1531 unshelving change 'default-01'
1532 1532 $ cat 'my filename '
1533 1533 hi
1534 1534 $ hg update -q --clean .
1535 1535 $ hg patch -p1 test_patch.patch
1536 1536 applying test_patch.patch
1537 1537 #endif
1538 1538
1539 1539 -- if phasebased, shelve works without patch and bundle
1540 1540
1541 1541 $ hg update -q --clean .
1542 1542 $ hg strip -q -r 0
1543 1543 $ rm -r .hg/shelve*
1544 1544 $ echo import antigravity >> somefile.py
1545 1545 $ hg add somefile.py
1546 1546 $ hg shelve -q
1547 1547 #if phasebased
1548 1548 $ rm .hg/shelved/default.hg
1549 1549 $ rm .hg/shelved/default.patch
1550 1550 #endif
1551 1551
1552 1552 shelve --list --patch should work even with no patch file.
1553 1553
1554 1554 $ hg shelve --list --patch
1555 1555 default (*s ago) * (changes in empty repository) (glob)
1556 1556
1557 1557 diff --git a/somefile.py b/somefile.py
1558 1558 new file mode 100644
1559 1559 --- /dev/null
1560 1560 +++ b/somefile.py
1561 1561 @@ -0,0 +1,1 @@
1562 1562 +import antigravity
1563 1563
1564 1564 $ hg unshelve
1565 1565 unshelving change 'default'
1566 1566
1567 1567 #if phasebased
1568 1568 $ ls .hg/shelve-backup
1569 1569 default.shelve
1570 1570 #endif
1571 1571
1572 1572 #if stripbased
1573 1573 $ ls .hg/shelve-backup
1574 1574 default.hg
1575 1575 default.patch
1576 1576 default.shelve
1577 1577 #endif
1578 1578
1579 1579
1580 1580 -- allow for phase-based shelves to be disabled
1581 1581
1582 1582 $ hg update -q --clean .
1583 1583 $ hg strip -q --hidden -r 0
1584 1584 $ rm -r .hg/shelve*
1585 1585
1586 1586 #if phasebased
1587 1587 $ cat <<EOF >> $HGRCPATH
1588 1588 > [shelve]
1589 1589 > store = strip
1590 1590 > EOF
1591 1591 #endif
1592 1592
1593 1593 $ echo import this >> somefile.py
1594 1594 $ hg add somefile.py
1595 1595 $ hg shelve -q
1596 1596 $ hg log --hidden
1597 1597 $ ls .hg/shelved
1598 1598 default.hg
1599 1599 default.patch
1600 1600 default.shelve
1601 1601 $ hg unshelve -q
@@ -1,994 +1,994 b''
1 1 #testcases stripbased phasebased
2 2 #testcases abortflag abortcommand
3 3 #testcases continueflag continuecommand
4 4
5 5 $ cat <<EOF >> $HGRCPATH
6 6 > [extensions]
7 7 > mq =
8 8 > [defaults]
9 9 > diff = --nodates --git
10 10 > qnew = --date '0 0'
11 11 > [shelve]
12 12 > maxbackups = 2
13 13 > EOF
14 14
15 15 #if phasebased
16 16
17 17 $ cat <<EOF >> $HGRCPATH
18 18 > [format]
19 > internal-phase = yes
19 > use-internal-phase = yes
20 20 > EOF
21 21
22 22 #endif
23 23
24 24 #if abortflag
25 25 $ cat >> $HGRCPATH <<EOF
26 26 > [alias]
27 27 > abort = unshelve --abort
28 28 > EOF
29 29 #endif
30 30
31 31 #if continueflag
32 32 $ cat >> $HGRCPATH <<EOF
33 33 > [alias]
34 34 > continue = unshelve --continue
35 35 > EOF
36 36 #endif
37 37
38 38 shelve should leave dirstate clean (issue4055)
39 39
40 40 $ hg init shelverebase
41 41 $ cd shelverebase
42 42 $ printf 'x\ny\n' > x
43 43 $ echo z > z
44 44 $ hg commit -Aqm xy
45 45 $ echo z >> x
46 46 $ hg commit -Aqm z
47 47 $ hg up 5c4c67fb7dce
48 48 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
49 49 $ printf 'a\nx\ny\nz\n' > x
50 50 $ hg commit -Aqm xyz
51 51 $ echo c >> z
52 52 $ hg shelve
53 53 shelved as default
54 54 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
55 55
56 56 $ hg rebase -d 6c103be8f4e4 --config extensions.rebase=
57 57 rebasing 2:323bfa07f744( tip)? "xyz" (re)
58 58 merging x
59 59 saved backup bundle to \$TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-(78114325|7ae538ef)-rebase.hg (re)
60 60 $ hg unshelve
61 61 unshelving change 'default'
62 62 rebasing shelved changes
63 63 $ hg status
64 64 M z
65 65
66 66 $ cd ..
67 67
68 68 shelve should only unshelve pending changes (issue4068)
69 69
70 70 $ hg init onlypendingchanges
71 71 $ cd onlypendingchanges
72 72 $ touch a
73 73 $ hg ci -Aqm a
74 74 $ touch b
75 75 $ hg ci -Aqm b
76 76 $ hg up -q 3903775176ed
77 77 $ touch c
78 78 $ hg ci -Aqm c
79 79
80 80 $ touch d
81 81 $ hg add d
82 82 $ hg shelve
83 83 shelved as default
84 84 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
85 85 $ hg up -q 0e067c57feba
86 86 $ hg unshelve
87 87 unshelving change 'default'
88 88 rebasing shelved changes
89 89 $ hg status
90 90 A d
91 91
92 92 unshelve should work on an ancestor of the original commit
93 93
94 94 $ hg shelve
95 95 shelved as default
96 96 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
97 97 $ hg up 3903775176ed
98 98 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
99 99 $ hg unshelve
100 100 unshelving change 'default'
101 101 rebasing shelved changes
102 102 $ hg status
103 103 A d
104 104
105 105 test bug 4073 we need to enable obsolete markers for it
106 106
107 107 $ cat >> $HGRCPATH << EOF
108 108 > [experimental]
109 109 > evolution.createmarkers=True
110 110 > EOF
111 111 $ hg shelve
112 112 shelved as default
113 113 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
114 114 $ hg debugobsolete `hg log -r 0e067c57feba -T '{node}'`
115 115 1 new obsolescence markers
116 116 obsoleted 1 changesets
117 117 $ hg unshelve
118 118 unshelving change 'default'
119 119
120 120 unshelve should leave unknown files alone (issue4113)
121 121
122 122 $ echo e > e
123 123 $ hg shelve
124 124 shelved as default
125 125 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
126 126 $ hg status
127 127 ? e
128 128 $ hg unshelve
129 129 unshelving change 'default'
130 130 $ hg status
131 131 A d
132 132 ? e
133 133 $ cat e
134 134 e
135 135
136 136 unshelve should keep a copy of unknown files
137 137
138 138 $ hg add e
139 139 $ hg shelve
140 140 shelved as default
141 141 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
142 142 $ echo z > e
143 143 $ hg unshelve
144 144 unshelving change 'default'
145 145 $ cat e
146 146 e
147 147 $ cat e.orig
148 148 z
149 149 $ rm e.orig
150 150
151 151 restores backup of unknown file to right directory
152 152
153 153 $ hg shelve
154 154 shelved as default
155 155 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
156 156 $ echo z > e
157 157 $ mkdir dir
158 158 $ hg unshelve --cwd dir
159 159 unshelving change 'default'
160 160 $ rmdir dir
161 161 $ cat e
162 162 e
163 163 $ cat e.orig
164 164 z
165 165
166 166 unshelve and conflicts with tracked and untracked files
167 167
168 168 preparing:
169 169
170 170 $ rm -f *.orig
171 171 $ hg ci -qm 'commit stuff'
172 172 $ hg phase -p null:
173 173
174 174 no other changes - no merge:
175 175
176 176 $ echo f > f
177 177 $ hg add f
178 178 $ hg shelve
179 179 shelved as default
180 180 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
181 181 $ echo g > f
182 182 $ hg unshelve
183 183 unshelving change 'default'
184 184 $ hg st
185 185 A f
186 186 ? f.orig
187 187 $ cat f
188 188 f
189 189 $ cat f.orig
190 190 g
191 191
192 192 other uncommitted changes - merge:
193 193
194 194 $ hg st
195 195 A f
196 196 ? f.orig
197 197 $ hg shelve
198 198 shelved as default
199 199 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
200 200 #if repobundlerepo
201 201 $ hg log -G --template '{rev} {desc|firstline} {author}' -R bundle://.hg/shelved/default.hg -r 'bundle()' --hidden
202 202 o [48] changes to: commit stuff shelve@localhost (re)
203 203 |
204 204 ~
205 205 #endif
206 206 $ hg log -G --template '{rev} {desc|firstline} {author}'
207 207 @ [37] commit stuff test (re)
208 208 |
209 209 | o 2 c test
210 210 |/
211 211 o 0 a test
212 212
213 213 $ mv f.orig f
214 214 $ echo 1 > a
215 215 $ hg unshelve --date '1073741824 0'
216 216 unshelving change 'default'
217 217 temporarily committing pending changes (restore with 'hg unshelve --abort')
218 218 rebasing shelved changes
219 219 merging f
220 220 warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
221 221 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
222 222 [240]
223 223
224 224 #if phasebased
225 225 $ hg log -G --template '{rev} {desc|firstline} {author} {date|isodate}'
226 226 @ 9 pending changes temporary commit shelve@localhost 2004-01-10 13:37 +0000
227 227 |
228 228 | @ 8 changes to: commit stuff shelve@localhost 1970-01-01 00:00 +0000
229 229 |/
230 230 o 7 commit stuff test 1970-01-01 00:00 +0000
231 231 |
232 232 | o 2 c test 1970-01-01 00:00 +0000
233 233 |/
234 234 o 0 a test 1970-01-01 00:00 +0000
235 235
236 236 #endif
237 237
238 238 #if stripbased
239 239 $ hg log -G --template '{rev} {desc|firstline} {author} {date|isodate}'
240 240 @ 5 changes to: commit stuff shelve@localhost 1970-01-01 00:00 +0000
241 241 |
242 242 | @ 4 pending changes temporary commit shelve@localhost 2004-01-10 13:37 +0000
243 243 |/
244 244 o 3 commit stuff test 1970-01-01 00:00 +0000
245 245 |
246 246 | o 2 c test 1970-01-01 00:00 +0000
247 247 |/
248 248 o 0 a test 1970-01-01 00:00 +0000
249 249
250 250 #endif
251 251
252 252 $ hg st
253 253 M f
254 254 ? f.orig
255 255 $ cat f
256 256 <<<<<<< working-copy: d44eae5c3d33 - shelve: pending changes temporary commit
257 257 g
258 258 =======
259 259 f
260 260 >>>>>>> shelved change: aef214a5229c - shelve: changes to: commit stuff
261 261 $ cat f.orig
262 262 g
263 263 $ hg unshelve --abort -t false
264 264 tool option will be ignored
265 265 unshelve of 'default' aborted
266 266 $ hg st
267 267 M a
268 268 ? f.orig
269 269 $ cat f.orig
270 270 g
271 271 $ hg unshelve
272 272 unshelving change 'default'
273 273 temporarily committing pending changes (restore with 'hg unshelve --abort')
274 274 rebasing shelved changes
275 275 $ hg st
276 276 M a
277 277 A f
278 278 ? f.orig
279 279
280 280 other committed changes - merge:
281 281
282 282 $ hg shelve f
283 283 shelved as default
284 284 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
285 285 $ hg ci a -m 'intermediate other change'
286 286 $ mv f.orig f
287 287 $ hg unshelve
288 288 unshelving change 'default'
289 289 rebasing shelved changes
290 290 merging f
291 291 warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
292 292 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
293 293 [240]
294 294 $ hg st
295 295 M f
296 296 ? f.orig
297 297 $ cat f
298 298 <<<<<<< working-copy: 6b563750f973 - test: intermediate other change
299 299 g
300 300 =======
301 301 f
302 302 >>>>>>> shelved change: aef214a5229c - shelve: changes to: commit stuff
303 303 $ cat f.orig
304 304 g
305 305
306 306 #if abortcommand
307 307 when in dry-run mode
308 308 $ hg abort --dry-run
309 309 unshelve in progress, will be aborted
310 310 #endif
311 311
312 312 $ hg abort
313 313 unshelve of 'default' aborted
314 314 $ hg st
315 315 ? f.orig
316 316 $ cat f.orig
317 317 g
318 318 $ hg shelve --delete default
319 319 $ cd ..
320 320
321 321 you shouldn't be able to ask for the patch/stats of the most recent shelve if
322 322 there are no shelves
323 323
324 324 $ hg init noshelves
325 325 $ cd noshelves
326 326
327 327 $ hg shelve --patch
328 328 abort: there are no shelves to show
329 329 [255]
330 330 $ hg shelve --stat
331 331 abort: there are no shelves to show
332 332 [255]
333 333
334 334 $ cd ..
335 335
336 336 test .orig files go where the user wants them to
337 337 ---------------------------------------------------------------
338 338 $ hg init salvage
339 339 $ cd salvage
340 340 $ echo 'content' > root
341 341 $ hg commit -A -m 'root' -q
342 342 $ echo '' > root
343 343 $ hg shelve -q
344 344 $ echo 'contADDent' > root
345 345 $ hg unshelve -q --config 'ui.origbackuppath=.hg/origbackups'
346 346 warning: conflicts while merging root! (edit, then use 'hg resolve --mark')
347 347 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
348 348 [240]
349 349 $ ls .hg/origbackups
350 350 root
351 351 $ rm -rf .hg/origbackups
352 352
353 353 test Abort unshelve always gets user out of the unshelved state
354 354 ---------------------------------------------------------------
355 355
356 356 with a corrupted shelve state file
357 357 $ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate
358 358 $ mv ../corrupt-shelvedstate .hg/shelvestate
359 359 $ hg unshelve --abort 2>&1 | grep 'aborted'
360 360 unshelve of 'default' aborted
361 361 $ hg summary
362 362 parent: 0:ae8c668541e8 tip
363 363 root
364 364 branch: default
365 365 commit: 1 modified
366 366 update: (current)
367 367 phases: 1 draft
368 368 $ hg up -C .
369 369 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
370 370
371 371 $ cd ..
372 372
373 373 Shelve and unshelve unknown files. For the purposes of unshelve, a shelved
374 374 unknown file is the same as a shelved added file, except that it will be in
375 375 unknown state after unshelve if and only if it was either absent or unknown
376 376 before the unshelve operation.
377 377
378 378 $ hg init unknowns
379 379 $ cd unknowns
380 380
381 381 The simplest case is if I simply have an unknown file that I shelve and unshelve
382 382
383 383 $ echo unknown > unknown
384 384 $ hg status
385 385 ? unknown
386 386 $ hg shelve --unknown
387 387 shelved as default
388 388 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
389 389 $ hg status
390 390 $ hg unshelve
391 391 unshelving change 'default'
392 392 $ hg status
393 393 ? unknown
394 394 $ rm unknown
395 395
396 396 If I shelve, add the file, and unshelve, does it stay added?
397 397
398 398 $ echo unknown > unknown
399 399 $ hg shelve -u
400 400 shelved as default
401 401 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
402 402 $ hg status
403 403 $ touch unknown
404 404 $ hg add unknown
405 405 $ hg status
406 406 A unknown
407 407 $ hg unshelve
408 408 unshelving change 'default'
409 409 temporarily committing pending changes (restore with 'hg unshelve --abort')
410 410 rebasing shelved changes
411 411 merging unknown
412 412 $ hg status
413 413 A unknown
414 414 $ hg forget unknown
415 415 $ rm unknown
416 416
417 417 And if I shelve, commit, then unshelve, does it become modified?
418 418
419 419 $ echo unknown > unknown
420 420 $ hg shelve -u
421 421 shelved as default
422 422 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
423 423 $ hg status
424 424 $ touch unknown
425 425 $ hg add unknown
426 426 $ hg commit -qm "Add unknown"
427 427 $ hg status
428 428 $ hg unshelve
429 429 unshelving change 'default'
430 430 rebasing shelved changes
431 431 merging unknown
432 432 $ hg status
433 433 M unknown
434 434 $ hg remove --force unknown
435 435 $ hg commit -qm "Remove unknown"
436 436
437 437 $ cd ..
438 438
439 439 We expects that non-bare shelve keeps newly created branch in
440 440 working directory.
441 441
442 442 $ hg init shelve-preserve-new-branch
443 443 $ cd shelve-preserve-new-branch
444 444 $ echo "a" >> a
445 445 $ hg add a
446 446 $ echo "b" >> b
447 447 $ hg add b
448 448 $ hg commit -m "ab"
449 449 $ echo "aa" >> a
450 450 $ echo "bb" >> b
451 451 $ hg branch new-branch
452 452 marked working directory as branch new-branch
453 453 (branches are permanent and global, did you want a bookmark?)
454 454 $ hg status
455 455 M a
456 456 M b
457 457 $ hg branch
458 458 new-branch
459 459 $ hg shelve a
460 460 shelved as default
461 461 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
462 462 $ hg branch
463 463 new-branch
464 464 $ hg status
465 465 M b
466 466 $ touch "c" >> c
467 467 $ hg add c
468 468 $ hg status
469 469 M b
470 470 A c
471 471 $ hg shelve --exclude c
472 472 shelved as default-01
473 473 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
474 474 $ hg branch
475 475 new-branch
476 476 $ hg status
477 477 A c
478 478 $ hg shelve --include c
479 479 shelved as default-02
480 480 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
481 481 $ hg branch
482 482 new-branch
483 483 $ hg status
484 484 $ echo "d" >> d
485 485 $ hg add d
486 486 $ hg status
487 487 A d
488 488
489 489 We expect that bare-shelve will not keep branch in current working directory.
490 490
491 491 $ hg shelve
492 492 shelved as default-03
493 493 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
494 494 $ hg branch
495 495 default
496 496 $ cd ..
497 497
498 498 When i shelve commit on newly created branch i expect
499 499 that after unshelve newly created branch will be preserved.
500 500
501 501 $ hg init shelve_on_new_branch_simple
502 502 $ cd shelve_on_new_branch_simple
503 503 $ echo "aaa" >> a
504 504 $ hg commit -A -m "a"
505 505 adding a
506 506 $ hg branch
507 507 default
508 508 $ hg branch test
509 509 marked working directory as branch test
510 510 (branches are permanent and global, did you want a bookmark?)
511 511 $ echo "bbb" >> a
512 512 $ hg status
513 513 M a
514 514 $ hg shelve
515 515 shelved as default
516 516 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
517 517 $ hg branch
518 518 default
519 519 $ echo "bbb" >> b
520 520 $ hg status
521 521 ? b
522 522 $ hg unshelve
523 523 unshelving change 'default'
524 524 marked working directory as branch test
525 525 $ hg status
526 526 M a
527 527 ? b
528 528 $ hg branch
529 529 test
530 530 $ cd ..
531 531
532 532 When i shelve commit on newly created branch, make
533 533 some changes, unshelve it and running into merge
534 534 conflicts i expect that after fixing them and
535 535 running unshelve --continue newly created branch
536 536 will be preserved.
537 537
538 538 $ hg init shelve_on_new_branch_conflict
539 539 $ cd shelve_on_new_branch_conflict
540 540 $ echo "aaa" >> a
541 541 $ hg commit -A -m "a"
542 542 adding a
543 543 $ hg branch
544 544 default
545 545 $ hg branch test
546 546 marked working directory as branch test
547 547 (branches are permanent and global, did you want a bookmark?)
548 548 $ echo "bbb" >> a
549 549 $ hg status
550 550 M a
551 551 $ hg shelve
552 552 shelved as default
553 553 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
554 554 $ hg branch
555 555 default
556 556 $ echo "ccc" >> a
557 557 $ hg status
558 558 M a
559 559 $ hg unshelve
560 560 unshelving change 'default'
561 561 temporarily committing pending changes (restore with 'hg unshelve --abort')
562 562 rebasing shelved changes
563 563 merging a
564 564 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
565 565 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
566 566 [240]
567 567 $ echo "aaabbbccc" > a
568 568 $ rm a.orig
569 569 $ hg resolve --mark a
570 570 (no more unresolved files)
571 571 continue: hg unshelve --continue
572 572 $ hg continue
573 573 marked working directory as branch test
574 574 unshelve of 'default' complete
575 575 $ cat a
576 576 aaabbbccc
577 577 $ hg status
578 578 M a
579 579 $ hg branch
580 580 test
581 581 $ hg commit -m "test-commit"
582 582
583 583 When i shelve on test branch, update to default branch
584 584 and unshelve i expect that it will not preserve previous
585 585 test branch.
586 586
587 587 $ echo "xxx" > b
588 588 $ hg add b
589 589 $ hg shelve
590 590 shelved as test
591 591 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
592 592 $ hg update -r 7049e48789d7
593 593 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
594 594 $ hg unshelve
595 595 unshelving change 'test'
596 596 rebasing shelved changes
597 597 $ hg status
598 598 A b
599 599 $ hg branch
600 600 default
601 601 $ cd ..
602 602
603 603 When i unshelve resulting in merge conflicts and makes saved
604 604 file shelvedstate looks like in previous versions in
605 605 mercurial(without restore branch information in 7th line) i
606 606 expect that after resolving conflicts and successfully
607 607 running 'shelve --continue' the branch information won't be
608 608 restored and branch will be unchanged.
609 609
610 610 shelve on new branch, conflict with previous shelvedstate
611 611
612 612 $ hg init conflict
613 613 $ cd conflict
614 614 $ echo "aaa" >> a
615 615 $ hg commit -A -m "a"
616 616 adding a
617 617 $ hg branch
618 618 default
619 619 $ hg branch test
620 620 marked working directory as branch test
621 621 (branches are permanent and global, did you want a bookmark?)
622 622 $ echo "bbb" >> a
623 623 $ hg status
624 624 M a
625 625 $ hg shelve
626 626 shelved as default
627 627 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
628 628 $ hg branch
629 629 default
630 630 $ echo "ccc" >> a
631 631 $ hg status
632 632 M a
633 633 $ hg unshelve
634 634 unshelving change 'default'
635 635 temporarily committing pending changes (restore with 'hg unshelve --abort')
636 636 rebasing shelved changes
637 637 merging a
638 638 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
639 639 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
640 640 [240]
641 641
642 642 Removing restore branch information from shelvedstate file(making it looks like
643 643 in previous versions) and running unshelve --continue
644 644
645 645 $ cp .hg/shelvedstate .hg/shelvedstate_old
646 646 $ cat .hg/shelvedstate_old | grep -v 'branchtorestore' > .hg/shelvedstate
647 647
648 648 $ echo "aaabbbccc" > a
649 649 $ rm a.orig
650 650 $ hg resolve --mark a
651 651 (no more unresolved files)
652 652 continue: hg unshelve --continue
653 653
654 654 #if continuecommand
655 655 $ hg continue --dry-run
656 656 unshelve in progress, will be resumed
657 657 #endif
658 658
659 659 $ hg continue
660 660 unshelve of 'default' complete
661 661 $ cat a
662 662 aaabbbccc
663 663 $ hg status
664 664 M a
665 665 $ hg branch
666 666 default
667 667 $ cd ..
668 668
669 669 On non bare shelve the branch information shouldn't be restored
670 670
671 671 $ hg init bare_shelve_on_new_branch
672 672 $ cd bare_shelve_on_new_branch
673 673 $ echo "aaa" >> a
674 674 $ hg commit -A -m "a"
675 675 adding a
676 676 $ hg branch
677 677 default
678 678 $ hg branch test
679 679 marked working directory as branch test
680 680 (branches are permanent and global, did you want a bookmark?)
681 681 $ echo "bbb" >> a
682 682 $ hg status
683 683 M a
684 684 $ hg shelve a
685 685 shelved as default
686 686 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
687 687 $ hg branch
688 688 test
689 689 $ hg branch default
690 690 marked working directory as branch default
691 691 (branches are permanent and global, did you want a bookmark?)
692 692 $ echo "bbb" >> b
693 693 $ hg status
694 694 ? b
695 695 $ hg unshelve
696 696 unshelving change 'default'
697 697 $ hg status
698 698 M a
699 699 ? b
700 700 $ hg branch
701 701 default
702 702 $ cd ..
703 703
704 704 Prepare unshelve with a corrupted shelvedstate
705 705 $ hg init r1 && cd r1
706 706 $ echo text1 > file && hg add file
707 707 $ hg shelve
708 708 shelved as default
709 709 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
710 710 $ echo text2 > file && hg ci -Am text1
711 711 adding file
712 712 $ hg unshelve
713 713 unshelving change 'default'
714 714 rebasing shelved changes
715 715 merging file
716 716 warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
717 717 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
718 718 [240]
719 719 $ echo somethingsomething > .hg/shelvedstate
720 720
721 721 Unshelve --continue fails with appropriate message if shelvedstate is corrupted
722 722 $ hg continue
723 723 abort: corrupted shelved state file
724 724 (please run hg unshelve --abort to abort unshelve operation)
725 725 [255]
726 726
727 727 Unshelve --abort works with a corrupted shelvedstate
728 728 $ hg abort
729 729 abort: could not read shelved state file, your working copy may be in an unexpected state
730 730 please update to some commit
731 731
732 732 [255]
733 733
734 734 Unshelve --abort fails with appropriate message if there's no unshelve in
735 735 progress
736 736
737 737 #if abortflag
738 738 $ hg unshelve --abort
739 739 abort: no unshelve in progress
740 740 [20]
741 741 #else
742 742 $ hg abort
743 743 aborting the merge, updating back to 9451eaa6eee3
744 744 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
745 745 #endif
746 746 $ cd ..
747 747
748 748 Test corrupt shelves (in .hg/shelved/, not .hg/shelvestate)
749 749 $ hg init corrupt-shelves
750 750 $ cd corrupt-shelves
751 751 $ mkdir .hg/shelved
752 752
753 753 # A (corrupt) .patch file without a .hg file
754 754 $ touch .hg/shelved/junk1.patch
755 755 $ hg shelve -l
756 756 $ hg unshelve
757 757 abort: no shelved changes to apply!
758 758 [20]
759 759 $ hg shelve -d junk1
760 760 abort: shelved change 'junk1' not found
761 761 [10]
762 762 $ find .hg/shelve* | sort
763 763 .hg/shelved
764 764 .hg/shelved/junk1.patch
765 765
766 766 # A .hg file without a .patch file
767 767 $ touch .hg/shelved/junk2.hg
768 768 $ hg shelve -l
769 769 $ hg unshelve
770 770 abort: no shelved changes to apply!
771 771 [20]
772 772 $ hg shelve -d junk2
773 773 abort: shelved change 'junk2' not found
774 774 [10]
775 775 $ find .hg/shelve* | sort
776 776 .hg/shelved
777 777 .hg/shelved/junk1.patch
778 778 .hg/shelved/junk2.hg
779 779
780 780 # A file with an unexpected extension
781 781 $ touch .hg/shelved/junk3
782 782 $ hg shelve -l
783 783 $ hg unshelve
784 784 abort: no shelved changes to apply!
785 785 [20]
786 786 $ hg shelve -d junk3
787 787 abort: shelved change 'junk3' not found
788 788 [10]
789 789 $ find .hg/shelve* | sort
790 790 .hg/shelved
791 791 .hg/shelved/junk1.patch
792 792 .hg/shelved/junk2.hg
793 793 .hg/shelved/junk3
794 794
795 795 $ cd ..
796 796
797 797 Unshelve respects --keep even if user intervention is needed
798 798 $ hg init unshelvekeep && cd unshelvekeep
799 799 $ echo 1 > file && hg ci -Am 1
800 800 adding file
801 801 $ echo 2 >> file
802 802 $ hg shelve
803 803 shelved as default
804 804 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
805 805 $ echo 3 >> file && hg ci -Am 13
806 806 $ hg shelve --list
807 807 default (*s ago) * changes to: 1 (glob)
808 808 $ hg unshelve --keep
809 809 unshelving change 'default'
810 810 rebasing shelved changes
811 811 merging file
812 812 warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
813 813 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
814 814 [240]
815 815 $ hg resolve --mark file
816 816 (no more unresolved files)
817 817 continue: hg unshelve --continue
818 818 $ hg continue
819 819 unshelve of 'default' complete
820 820 $ hg shelve --list
821 821 default (*s ago) * changes to: 1 (glob)
822 822 $ cd ..
823 823
824 824 Unshelving when there are deleted files does not crash (issue4176)
825 825 $ hg init unshelve-deleted-file && cd unshelve-deleted-file
826 826 $ echo a > a && echo b > b && hg ci -Am ab
827 827 adding a
828 828 adding b
829 829 $ echo aa > a && hg shelve
830 830 shelved as default
831 831 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
832 832 $ rm b
833 833 $ hg st
834 834 ! b
835 835 $ hg unshelve
836 836 unshelving change 'default'
837 837 $ hg shelve
838 838 shelved as default
839 839 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
840 840 $ rm a && echo b > b
841 841 $ hg st
842 842 ! a
843 843 $ hg unshelve
844 844 unshelving change 'default'
845 845 abort: shelved change touches missing files
846 846 (run hg status to see which files are missing)
847 847 [255]
848 848 $ hg st
849 849 ! a
850 850 $ cd ..
851 851
852 852 New versions of Mercurial know how to read onld shelvedstate files
853 853 $ hg init oldshelvedstate
854 854 $ cd oldshelvedstate
855 855 $ echo root > root && hg ci -Am root
856 856 adding root
857 857 $ echo 1 > a
858 858 $ hg add a
859 859 $ hg shelve --name ashelve
860 860 shelved as ashelve
861 861 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
862 862 $ echo 2 > a
863 863 $ hg ci -Am a
864 864 adding a
865 865 $ hg unshelve
866 866 unshelving change 'ashelve'
867 867 rebasing shelved changes
868 868 merging a
869 869 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
870 870 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
871 871 [240]
872 872 putting v1 shelvedstate file in place of a created v2
873 873 $ cat << EOF > .hg/shelvedstate
874 874 > 1
875 875 > ashelve
876 876 > 8b058dae057a5a78f393f4535d9e363dd5efac9d
877 877 > 8b058dae057a5a78f393f4535d9e363dd5efac9d
878 878 > 8b058dae057a5a78f393f4535d9e363dd5efac9d f543b27db2cdb41737e2e0008dc524c471da1446
879 879 > f543b27db2cdb41737e2e0008dc524c471da1446
880 880 >
881 881 > nokeep
882 882 > :no-active-bookmark
883 883 > EOF
884 884 $ echo 1 > a
885 885 $ hg resolve --mark a
886 886 (no more unresolved files)
887 887 continue: hg unshelve --continue
888 888 mercurial does not crash
889 889 $ hg continue
890 890 unshelve of 'ashelve' complete
891 891
892 892 #if phasebased
893 893
894 894 Unshelve with some metadata file missing
895 895 ----------------------------------------
896 896
897 897 $ hg shelve
898 898 shelved as default
899 899 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
900 900 $ echo 3 > a
901 901
902 902 Test with the `.shelve` missing, but the changeset still in the repo (non-natural case)
903 903
904 904 $ rm .hg/shelved/default.shelve
905 905 $ hg unshelve
906 906 unshelving change 'default'
907 907 temporarily committing pending changes (restore with 'hg unshelve --abort')
908 908 rebasing shelved changes
909 909 merging a
910 910 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
911 911 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
912 912 [240]
913 913 $ hg abort
914 914 unshelve of 'default' aborted
915 915
916 916 Unshelve without .shelve metadata (can happen when upgrading a repository with old shelve)
917 917
918 918 $ cat .hg/shelved/default.shelve
919 919 node=82e0cb9893247d12667017593ce1e5655860f1ac
920 920 $ hg strip --hidden --rev 82e0cb989324 --no-backup
921 921 $ rm .hg/shelved/default.shelve
922 922 $ hg unshelve
923 923 unshelving change 'default'
924 924 temporarily committing pending changes (restore with 'hg unshelve --abort')
925 925 rebasing shelved changes
926 926 merging a
927 927 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
928 928 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
929 929 [240]
930 930 $ cat .hg/shelved/default.shelve
931 931 node=82e0cb9893247d12667017593ce1e5655860f1ac
932 932 $ hg abort
933 933 unshelve of 'default' aborted
934 934
935 935 #endif
936 936
937 937 $ cd ..
938 938
939 939 Block merge abort when unshelve in progress(issue6160)
940 940 ------------------------------------------------------
941 941
942 942 $ hg init a
943 943 $ cd a
944 944 $ echo foo > a ; hg commit -qAm "initial commit"
945 945 $ echo bar > a
946 946 $ hg shelve
947 947 shelved as default
948 948 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
949 949 $ echo foobar > a
950 950 $ hg unshelve
951 951 unshelving change 'default'
952 952 temporarily committing pending changes (restore with 'hg unshelve --abort')
953 953 rebasing shelved changes
954 954 merging a
955 955 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
956 956 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
957 957 [240]
958 958
959 959 $ hg log --template '{desc|firstline} {author} {date|isodate} \n' -r .
960 960 pending changes temporary commit shelve@localhost 1970-01-01 00:00 +0000
961 961 $ hg merge --abort
962 962 abort: cannot abort merge with unshelve in progress
963 963 (use 'hg unshelve --continue' or 'hg unshelve --abort')
964 964 [20]
965 965
966 966 $ hg unshelve --abort
967 967 unshelve of 'default' aborted
968 968
969 969 $ hg log -G --template '{desc|firstline} {author} {date|isodate} \n' -r .
970 970 @ initial commit test 1970-01-01 00:00 +0000
971 971
972 972 $ cd ..
973 973
974 974 Demonstrate that the labels are correct in the merge conflict
975 975 -------------------------------------------------------------
976 976 $ hg init labels
977 977 $ cd labels
978 978 $ echo r0 > foo
979 979 $ hg ci -qAm r0
980 980 $ echo "this will be shelved" >> foo
981 981 $ hg shelve -q
982 982 $ echo "this is in wdir, conflicts with shelve" >> foo
983 983 $ hg unshelve -q
984 984 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
985 985 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
986 986 [240]
987 987 $ cat foo
988 988 r0
989 989 <<<<<<< working-copy: 0b2fcf2a90e9 - shelve: pending changes temporary commit
990 990 this is in wdir, conflicts with shelve
991 991 =======
992 992 this will be shelved
993 993 >>>>>>> shelved change: 9c072a2163db - shelve: changes to: r0
994 994 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now