##// END OF EJS Templates
copies: print debug information about copies per side/branch...
Martin von Zweigbergk -
r44658:4295c420 default draft
parent child Browse files
Show More
@@ -630,9 +630,6 b' def _fullcopytracing(repo, c1, c2, base)'
630 630 if u2:
631 631 repo.ui.debug(b"%s:\n %s\n" % (header % b'other', b"\n ".join(u2)))
632 632
633 fullcopy = copies1.copy()
634 fullcopy.update(copies2)
635
636 633 if repo.ui.debugflag:
637 634 renamedeleteset = set()
638 635 divergeset = set()
@@ -647,17 +644,21 b' def _fullcopytracing(repo, c1, c2, base)'
647 644 b" all copies found (* = to merge, ! = divergent, "
648 645 b"% = renamed and deleted):\n"
649 646 )
650 for f in sorted(fullcopy):
651 note = b""
652 if f in copy1 or f in copy2:
653 note += b"*"
654 if f in divergeset:
655 note += b"!"
656 if f in renamedeleteset:
657 note += b"%"
658 repo.ui.debug(
659 b" src: '%s' -> dst: '%s' %s\n" % (fullcopy[f], f, note)
660 )
647 for side, copies in (("local", copies1), ("remote", copies2)):
648 if not copies:
649 continue
650 repo.ui.debug(b" on %s side:\n" % side)
651 for f in sorted(copies):
652 note = b""
653 if f in copy1 or f in copy2:
654 note += b"*"
655 if f in divergeset:
656 note += b"!"
657 if f in renamedeleteset:
658 note += b"%"
659 repo.ui.debug(
660 b" src: '%s' -> dst: '%s' %s\n" % (copies[f], f, note)
661 )
661 662 del renamedeleteset
662 663 del divergeset
663 664
@@ -27,8 +27,9 b' Test for the full copytracing algorithm'
27 27 b
28 28 c
29 29 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
30 src: 'a' -> dst: 'b' *
31 src: 'a' -> dst: 'c' *
30 on remote side:
31 src: 'a' -> dst: 'b' *
32 src: 'a' -> dst: 'c' *
32 33 checking for directory renames
33 34 resolving manifests
34 35 branchmerge: True, force: False, partial: False
@@ -29,7 +29,8 b" we get conflicts that shouldn't be there"
29 29 unmatched files in other:
30 30 bar
31 31 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
32 src: 'foo' -> dst: 'bar' *
32 on remote side:
33 src: 'foo' -> dst: 'bar' *
33 34 checking for directory renames
34 35 resolving manifests
35 36 branchmerge: True, force: False, partial: False
@@ -204,7 +204,8 b' Graft out of order, skipping a merge and'
204 204 unmatched files in local:
205 205 b
206 206 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
207 src: 'a' -> dst: 'b' *
207 on local side:
208 src: 'a' -> dst: 'b' *
208 209 checking for directory renames
209 210 resolving manifests
210 211 branchmerge: True, force: True, partial: False
@@ -223,7 +224,8 b' Graft out of order, skipping a merge and'
223 224 updating the branch cache
224 225 grafting 5:97f8bfe72746 "5"
225 226 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
226 src: 'c' -> dst: 'b'
227 on local side:
228 src: 'c' -> dst: 'b'
227 229 checking for directory renames
228 230 resolving manifests
229 231 branchmerge: True, force: True, partial: False
@@ -239,7 +241,8 b' Graft out of order, skipping a merge and'
239 241 scanning for duplicate grafts
240 242 grafting 4:9c233e8e184d "4"
241 243 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
242 src: 'c' -> dst: 'b'
244 on local side:
245 src: 'c' -> dst: 'b'
243 246 checking for directory renames
244 247 resolving manifests
245 248 branchmerge: True, force: True, partial: False
@@ -746,7 +749,10 b' Transplants of grafts can find a destina'
746 749 scanning for duplicate grafts
747 750 grafting 13:7a4785234d87 "2"
748 751 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
749 src: 'a' -> dst: 'b' *
752 on local side:
753 src: 'a' -> dst: 'b' *
754 on remote side:
755 src: 'a' -> dst: 'b' *
750 756 checking for directory renames
751 757 resolving manifests
752 758 branchmerge: True, force: True, partial: False
@@ -28,7 +28,8 b' https://bz.mercurial-scm.org/672'
28 28 unmatched files in other:
29 29 1a
30 30 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
31 src: '1' -> dst: '1a'
31 on remote side:
32 src: '1' -> dst: '1a'
32 33 checking for directory renames
33 34 resolving manifests
34 35 branchmerge: True, force: False, partial: False
@@ -56,7 +57,8 b' https://bz.mercurial-scm.org/672'
56 57 unmatched files in local:
57 58 1a
58 59 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
59 src: '1' -> dst: '1a' *
60 on local side:
61 src: '1' -> dst: '1a' *
60 62 checking for directory renames
61 63 resolving manifests
62 64 branchmerge: True, force: False, partial: False
@@ -78,7 +80,8 b' https://bz.mercurial-scm.org/672'
78 80 unmatched files in other:
79 81 1a
80 82 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
81 src: '1' -> dst: '1a' *
83 on remote side:
84 src: '1' -> dst: '1a' *
82 85 checking for directory renames
83 86 resolving manifests
84 87 branchmerge: True, force: False, partial: False
@@ -419,7 +419,8 b' Verify that the old context ancestor wor'
419 419 unmatched files in other:
420 420 d2/b
421 421 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
422 src: 'd1/b' -> dst: 'd2/b'
422 on remote side:
423 src: 'd1/b' -> dst: 'd2/b'
423 424 checking for directory renames
424 425 discovered dir src: 'd1/' -> dst: 'd2/'
425 426 resolving manifests
@@ -30,8 +30,9 b''
30 30 b/a
31 31 b/b
32 32 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
33 src: 'a/a' -> dst: 'b/a'
34 src: 'a/b' -> dst: 'b/b'
33 on remote side:
34 src: 'a/a' -> dst: 'b/a'
35 src: 'a/b' -> dst: 'b/b'
35 36 checking for directory renames
36 37 discovered dir src: 'a/' -> dst: 'b/'
37 38 pending file src: 'a/c' -> dst: 'b/c'
@@ -75,8 +76,9 b''
75 76 unmatched files in other:
76 77 a/c
77 78 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
78 src: 'a/a' -> dst: 'b/a'
79 src: 'a/b' -> dst: 'b/b'
79 on local side:
80 src: 'a/a' -> dst: 'b/a'
81 src: 'a/b' -> dst: 'b/b'
80 82 checking for directory renames
81 83 discovered dir src: 'a/' -> dst: 'b/'
82 84 pending file src: 'a/c' -> dst: 'b/c'
@@ -28,9 +28,11 b''
28 28 b
29 29 b2
30 30 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
31 src: 'a' -> dst: 'b' *
32 src: 'a2' -> dst: 'b2' !
33 src: 'a2' -> dst: 'c2' !
31 on local side:
32 src: 'a2' -> dst: 'c2' !
33 on remote side:
34 src: 'a' -> dst: 'b' *
35 src: 'a2' -> dst: 'b2' !
34 36 checking for directory renames
35 37 resolving manifests
36 38 branchmerge: True, force: False, partial: False
@@ -170,7 +172,8 b' Check for issue3074'
170 172 unmatched files in other:
171 173 newfile
172 174 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
173 src: 'file' -> dst: 'newfile' %
175 on remote side:
176 src: 'file' -> dst: 'newfile' %
174 177 checking for directory renames
175 178 resolving manifests
176 179 branchmerge: True, force: False, partial: False
@@ -206,7 +209,10 b' modify x and rename y to z on the other '
206 209 # we should not get the prompts about modify/delete conflicts
207 210 $ hg merge --debug 1 -t :merge3
208 211 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
209 src: 'x' -> dst: 'z'
212 on local side:
213 src: 'y' -> dst: 'z'
214 on remote side:
215 src: 'x' -> dst: 'z'
210 216 checking for directory renames
211 217 resolving manifests
212 218 branchmerge: True, force: False, partial: False
@@ -79,7 +79,8 b' args:'
79 79 unmatched files in other:
80 80 b
81 81 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
82 src: 'a' -> dst: 'b' *
82 on remote side:
83 src: 'a' -> dst: 'b' *
83 84 checking for directory renames
84 85 resolving manifests
85 86 branchmerge: True, force: False, partial: False
@@ -117,7 +118,8 b' args:'
117 118 unmatched files in local:
118 119 b
119 120 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
120 src: 'a' -> dst: 'b' *
121 on local side:
122 src: 'a' -> dst: 'b' *
121 123 checking for directory renames
122 124 resolving manifests
123 125 branchmerge: True, force: False, partial: False
@@ -156,7 +158,8 b' args:'
156 158 unmatched files in other:
157 159 b
158 160 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
159 src: 'a' -> dst: 'b' *
161 on remote side:
162 src: 'a' -> dst: 'b' *
160 163 checking for directory renames
161 164 resolving manifests
162 165 branchmerge: True, force: False, partial: False
@@ -194,7 +197,8 b' args:'
194 197 unmatched files in local:
195 198 b
196 199 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
197 src: 'a' -> dst: 'b' *
200 on local side:
201 src: 'a' -> dst: 'b' *
198 202 checking for directory renames
199 203 resolving manifests
200 204 branchmerge: True, force: False, partial: False
@@ -231,7 +235,8 b' args:'
231 235 unmatched files in other:
232 236 b
233 237 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
234 src: 'a' -> dst: 'b'
238 on remote side:
239 src: 'a' -> dst: 'b'
235 240 checking for directory renames
236 241 resolving manifests
237 242 branchmerge: True, force: False, partial: False
@@ -263,7 +268,8 b' args:'
263 268 unmatched files in local:
264 269 b
265 270 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
266 src: 'a' -> dst: 'b'
271 on local side:
272 src: 'a' -> dst: 'b'
267 273 checking for directory renames
268 274 resolving manifests
269 275 branchmerge: True, force: False, partial: False
@@ -294,7 +300,8 b' args:'
294 300 unmatched files in other:
295 301 b
296 302 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
297 src: 'a' -> dst: 'b'
303 on remote side:
304 src: 'a' -> dst: 'b'
298 305 checking for directory renames
299 306 resolving manifests
300 307 branchmerge: True, force: False, partial: False
@@ -327,7 +334,8 b' args:'
327 334 unmatched files in local:
328 335 b
329 336 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
330 src: 'a' -> dst: 'b'
337 on local side:
338 src: 'a' -> dst: 'b'
331 339 checking for directory renames
332 340 resolving manifests
333 341 branchmerge: True, force: False, partial: False
@@ -355,7 +363,10 b' args:'
355 363 test L:um a b R:um a b W: - 9 do merge with ancestor in a
356 364 --------------
357 365 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
358 src: 'a' -> dst: 'b' *
366 on local side:
367 src: 'a' -> dst: 'b' *
368 on remote side:
369 src: 'a' -> dst: 'b' *
359 370 checking for directory renames
360 371 resolving manifests
361 372 branchmerge: True, force: False, partial: False
@@ -400,8 +411,10 b' m "um a c" "um x c" " " "10 do merg'
400 411 unmatched files in other:
401 412 c
402 413 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
403 src: 'a' -> dst: 'b' !
404 src: 'a' -> dst: 'c' !
414 on local side:
415 src: 'a' -> dst: 'b' !
416 on remote side:
417 src: 'a' -> dst: 'c' !
405 418 checking for directory renames
406 419 resolving manifests
407 420 branchmerge: True, force: False, partial: False
@@ -434,7 +447,8 b' m "um a c" "um x c" " " "10 do merg'
434 447 test L:nc a b R:up b W: - 12 merge b no ancestor
435 448 --------------
436 449 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
437 src: 'a' -> dst: 'b'
450 on local side:
451 src: 'a' -> dst: 'b'
438 452 checking for directory renames
439 453 resolving manifests
440 454 branchmerge: True, force: False, partial: False
@@ -473,7 +487,8 b' m "um a c" "um x c" " " "10 do merg'
473 487 test L:up b R:nm a b W: - 13 merge b no ancestor
474 488 --------------
475 489 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
476 src: 'a' -> dst: 'b'
490 on remote side:
491 src: 'a' -> dst: 'b'
477 492 checking for directory renames
478 493 resolving manifests
479 494 branchmerge: True, force: False, partial: False
@@ -513,7 +528,8 b' m "um a c" "um x c" " " "10 do merg'
513 528 test L:nc a b R:up a b W: - 14 merge b no ancestor
514 529 --------------
515 530 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
516 src: 'a' -> dst: 'b'
531 on local side:
532 src: 'a' -> dst: 'b'
517 533 checking for directory renames
518 534 resolving manifests
519 535 branchmerge: True, force: False, partial: False
@@ -553,7 +569,8 b' m "um a c" "um x c" " " "10 do merg'
553 569 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a
554 570 --------------
555 571 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
556 src: 'a' -> dst: 'b'
572 on remote side:
573 src: 'a' -> dst: 'b'
557 574 checking for directory renames
558 575 resolving manifests
559 576 branchmerge: True, force: False, partial: False
@@ -593,7 +610,8 b' m "um a c" "um x c" " " "10 do merg'
593 610 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor
594 611 --------------
595 612 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
596 src: 'a' -> dst: 'b'
613 on local side:
614 src: 'a' -> dst: 'b'
597 615 checking for directory renames
598 616 resolving manifests
599 617 branchmerge: True, force: False, partial: False
@@ -633,7 +651,8 b' m "um a c" "um x c" " " "10 do merg'
633 651 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor
634 652 --------------
635 653 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
636 src: 'a' -> dst: 'b'
654 on remote side:
655 src: 'a' -> dst: 'b'
637 656 checking for directory renames
638 657 resolving manifests
639 658 branchmerge: True, force: False, partial: False
@@ -672,7 +691,8 b' m "um a c" "um x c" " " "10 do merg'
672 691 test L:nm a b R:up a b W: - 18 merge b no ancestor
673 692 --------------
674 693 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
675 src: 'a' -> dst: 'b'
694 on local side:
695 src: 'a' -> dst: 'b'
676 696 checking for directory renames
677 697 resolving manifests
678 698 branchmerge: True, force: False, partial: False
@@ -717,7 +737,8 b' m "um a c" "um x c" " " "10 do merg'
717 737 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a
718 738 --------------
719 739 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
720 src: 'a' -> dst: 'b'
740 on remote side:
741 src: 'a' -> dst: 'b'
721 742 checking for directory renames
722 743 resolving manifests
723 744 branchmerge: True, force: False, partial: False
@@ -765,7 +786,8 b' m "um a c" "um x c" " " "10 do merg'
765 786 unmatched files in other:
766 787 b
767 788 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
768 src: 'a' -> dst: 'b' *
789 on remote side:
790 src: 'a' -> dst: 'b' *
769 791 checking for directory renames
770 792 resolving manifests
771 793 branchmerge: True, force: False, partial: False
@@ -807,7 +829,8 b' m "um a c" "um x c" " " "10 do merg'
807 829 unmatched files in local:
808 830 b
809 831 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
810 src: 'a' -> dst: 'b' *
832 on local side:
833 src: 'a' -> dst: 'b' *
811 834 checking for directory renames
812 835 resolving manifests
813 836 branchmerge: True, force: False, partial: False
@@ -853,7 +876,8 b' m "nm a b" "um x a" " " "22 get a, '
853 876 unmatched files in other:
854 877 c
855 878 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
856 src: 'a' -> dst: 'b' *
879 on local side:
880 src: 'a' -> dst: 'b' *
857 881 checking for directory renames
858 882 resolving manifests
859 883 branchmerge: True, force: False, partial: False
@@ -936,11 +960,14 b' 8 f (f) f f "remote differs from '
936 960 4/g
937 961 7/f
938 962 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
939 src: '1/f' -> dst: '1/g' *
940 src: '3/f' -> dst: '3/g' *
941 src: '4/f' -> dst: '4/g' *
942 src: '5/f' -> dst: '5/g' *
943 src: '6/f' -> dst: '6/g' *
963 on local side:
964 src: '1/f' -> dst: '1/g' *
965 src: '5/f' -> dst: '5/g' *
966 src: '6/f' -> dst: '6/g' *
967 on remote side:
968 src: '1/f' -> dst: '1/g' *
969 src: '3/f' -> dst: '3/g' *
970 src: '4/f' -> dst: '4/g' *
944 971 checking for directory renames
945 972 $ hg mani
946 973 0/f
General Comments 0
You need to be logged in to leave comments. Login now