copies: print debug information about copies per side/branch

Differential Revision: https://phab.mercurial-scm.org/D7987

mercurial/copies.py

@@ -630,9 +630,6 b' def _fullcopytracing(repo, c1, c2, base)'
     if u2:
         repo.ui.debug(b"%s:\n   %s\n" % (header % b'other', b"\n   ".join(u2)))
 
-    fullcopy = copies1.copy()
-    fullcopy.update(copies2)
-
     if repo.ui.debugflag:
         renamedeleteset = set()
         divergeset = set()
@@ -647,7 +644,11 b' def _fullcopytracing(repo, c1, c2, base)'
             b"  all copies found (* = to merge, ! = divergent, "
             b"% = renamed and deleted):\n"
         )
-        for f in sorted(fullcopy):
+        for side, copies in (("local", copies1), ("remote", copies2)):
+            if not copies:
+                continue
+            repo.ui.debug(b"   on %s side:\n" % side)
+            for f in sorted(copies):
             note = b""
             if f in copy1 or f in copy2:
                 note += b"*"
@@ -656,7 +657,7 b' def _fullcopytracing(repo, c1, c2, base)'
             if f in renamedeleteset:
                 note += b"%"
             repo.ui.debug(
-                b"   src: '%s' -> dst: '%s' %s\n" % (fullcopy[f], f, note)
+                    b"    src: '%s' -> dst: '%s' %s\n" % (copies[f], f, note)
             )
         del renamedeleteset
         del divergeset

tests/test-copy-move-merge.t

@@ -27,6 +27,7 b' Test for the full copytracing algorithm'
      b
      c
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on remote side:
      src: 'a' -> dst: 'b' *
      src: 'a' -> dst: 'c' *
     checking for directory renames

tests/test-double-merge.t

@@ -29,6 +29,7 b" we get conflicts that shouldn't be there"
     unmatched files in other:
      bar
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on remote side:
      src: 'foo' -> dst: 'bar' *
     checking for directory renames
   resolving manifests

tests/test-graft.t

@@ -204,6 +204,7 b' Graft out of order, skipping a merge and'
     unmatched files in local:
      b
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on local side:
      src: 'a' -> dst: 'b' *
     checking for directory renames
   resolving manifests
@@ -223,6 +224,7 b' Graft out of order, skipping a merge and'
   updating the branch cache
   grafting 5:97f8bfe72746 "5"
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on local side:
      src: 'c' -> dst: 'b' 
     checking for directory renames
   resolving manifests
@@ -239,6 +241,7 b' Graft out of order, skipping a merge and'
   scanning for duplicate grafts
   grafting 4:9c233e8e184d "4"
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on local side:
      src: 'c' -> dst: 'b' 
     checking for directory renames
   resolving manifests
@@ -746,6 +749,9 b' Transplants of grafts can find a destina'
   scanning for duplicate grafts
   grafting 13:7a4785234d87 "2"
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on local side:
+      src: 'a' -> dst: 'b' *
+     on remote side:
      src: 'a' -> dst: 'b' *
     checking for directory renames
   resolving manifests

tests/test-issue672.t

@@ -28,6 +28,7 b' https://bz.mercurial-scm.org/672'
     unmatched files in other:
      1a
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on remote side:
      src: '1' -> dst: '1a' 
     checking for directory renames
   resolving manifests
@@ -56,6 +57,7 b' https://bz.mercurial-scm.org/672'
     unmatched files in local:
      1a
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on local side:
      src: '1' -> dst: '1a' *
     checking for directory renames
   resolving manifests
@@ -78,6 +80,7 b' https://bz.mercurial-scm.org/672'
     unmatched files in other:
      1a
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on remote side:
      src: '1' -> dst: '1a' *
     checking for directory renames
   resolving manifests

tests/test-merge-criss-cross.t

@@ -419,6 +419,7 b' Verify that the old context ancestor wor'
     unmatched files in other:
      d2/b
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on remote side:
      src: 'd1/b' -> dst: 'd2/b' 
     checking for directory renames
      discovered dir src: 'd1/' -> dst: 'd2/'

tests/test-rename-dir-merge.t

@@ -30,6 +30,7 b''
      b/a
      b/b
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on remote side:
      src: 'a/a' -> dst: 'b/a' 
      src: 'a/b' -> dst: 'b/b' 
     checking for directory renames
@@ -75,6 +76,7 b''
     unmatched files in other:
      a/c
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on local side:
      src: 'a/a' -> dst: 'b/a' 
      src: 'a/b' -> dst: 'b/b' 
     checking for directory renames

tests/test-rename-merge1.t

@@ -28,9 +28,11 b''
      b
      b2
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on local side:
+      src: 'a2' -> dst: 'c2' !
+     on remote side:
      src: 'a' -> dst: 'b' *
      src: 'a2' -> dst: 'b2' !
-     src: 'a2' -> dst: 'c2' !
     checking for directory renames
   resolving manifests
    branchmerge: True, force: False, partial: False
@@ -170,6 +172,7 b' Check for issue3074'
     unmatched files in other:
      newfile
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on remote side:
      src: 'file' -> dst: 'newfile' %
     checking for directory renames
   resolving manifests
@@ -206,6 +209,9 b' modify x and rename y to z on the other '
 # we should not get the prompts about modify/delete conflicts
   $ hg merge --debug 1 -t :merge3
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on local side:
+      src: 'y' -> dst: 'z' 
+     on remote side:
      src: 'x' -> dst: 'z' 
     checking for directory renames
   resolving manifests

tests/test-rename-merge2.t

@@ -79,6 +79,7 b' args:'
     unmatched files in other:
      b
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on remote side:
      src: 'a' -> dst: 'b' *
     checking for directory renames
   resolving manifests
@@ -117,6 +118,7 b' args:'
     unmatched files in local:
      b
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on local side:
      src: 'a' -> dst: 'b' *
     checking for directory renames
   resolving manifests
@@ -156,6 +158,7 b' args:'
     unmatched files in other:
      b
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on remote side:
      src: 'a' -> dst: 'b' *
     checking for directory renames
   resolving manifests
@@ -194,6 +197,7 b' args:'
     unmatched files in local:
      b
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on local side:
      src: 'a' -> dst: 'b' *
     checking for directory renames
   resolving manifests
@@ -231,6 +235,7 b' args:'
     unmatched files in other:
      b
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on remote side:
      src: 'a' -> dst: 'b' 
     checking for directory renames
   resolving manifests
@@ -263,6 +268,7 b' args:'
     unmatched files in local:
      b
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on local side:
      src: 'a' -> dst: 'b' 
     checking for directory renames
   resolving manifests
@@ -294,6 +300,7 b' args:'
     unmatched files in other:
      b
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on remote side:
      src: 'a' -> dst: 'b' 
     checking for directory renames
   resolving manifests
@@ -327,6 +334,7 b' args:'
     unmatched files in local:
      b
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on local side:
      src: 'a' -> dst: 'b' 
     checking for directory renames
   resolving manifests
@@ -355,6 +363,9 b' args:'
   test L:um a b R:um a b W:       - 9  do merge with ancestor in a
   --------------
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on local side:
+      src: 'a' -> dst: 'b' *
+     on remote side:
      src: 'a' -> dst: 'b' *
     checking for directory renames
   resolving manifests
@@ -400,7 +411,9 b' m "um a c" "um x c" " " "10 do merg'
     unmatched files in other:
      c
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on local side:
      src: 'a' -> dst: 'b' !
+     on remote side:
      src: 'a' -> dst: 'c' !
     checking for directory renames
   resolving manifests
@@ -434,6 +447,7 b' m "um a c" "um x c" " " "10 do merg'
   test L:nc a b R:up b   W:       - 12 merge b no ancestor
   --------------
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on local side:
      src: 'a' -> dst: 'b' 
     checking for directory renames
   resolving manifests
@@ -473,6 +487,7 b' m "um a c" "um x c" " " "10 do merg'
   test L:up b   R:nm a b W:       - 13 merge b no ancestor
   --------------
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on remote side:
      src: 'a' -> dst: 'b' 
     checking for directory renames
   resolving manifests
@@ -513,6 +528,7 b' m "um a c" "um x c" " " "10 do merg'
   test L:nc a b R:up a b W:       - 14 merge b no ancestor
   --------------
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on local side:
      src: 'a' -> dst: 'b' 
     checking for directory renames
   resolving manifests
@@ -553,6 +569,7 b' m "um a c" "um x c" " " "10 do merg'
   test L:up b   R:nm a b W:       - 15 merge b no ancestor, remove a
   --------------
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on remote side:
      src: 'a' -> dst: 'b' 
     checking for directory renames
   resolving manifests
@@ -593,6 +610,7 b' m "um a c" "um x c" " " "10 do merg'
   test L:nc a b R:up a b W:       - 16 get a, merge b no ancestor
   --------------
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on local side:
      src: 'a' -> dst: 'b' 
     checking for directory renames
   resolving manifests
@@ -633,6 +651,7 b' m "um a c" "um x c" " " "10 do merg'
   test L:up a b R:nc a b W:       - 17 keep a, merge b no ancestor
   --------------
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on remote side:
      src: 'a' -> dst: 'b' 
     checking for directory renames
   resolving manifests
@@ -672,6 +691,7 b' m "um a c" "um x c" " " "10 do merg'
   test L:nm a b R:up a b W:       - 18 merge b no ancestor
   --------------
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on local side:
      src: 'a' -> dst: 'b' 
     checking for directory renames
   resolving manifests
@@ -717,6 +737,7 b' m "um a c" "um x c" " " "10 do merg'
   test L:up a b R:nm a b W:       - 19 merge b no ancestor, prompt remove a
   --------------
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on remote side:
      src: 'a' -> dst: 'b' 
     checking for directory renames
   resolving manifests
@@ -765,6 +786,7 b' m "um a c" "um x c" " " "10 do merg'
     unmatched files in other:
      b
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on remote side:
      src: 'a' -> dst: 'b' *
     checking for directory renames
   resolving manifests
@@ -807,6 +829,7 b' m "um a c" "um x c" " " "10 do merg'
     unmatched files in local:
      b
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on local side:
      src: 'a' -> dst: 'b' *
     checking for directory renames
   resolving manifests
@@ -853,6 +876,7 b' m "nm a b" "um x a" " " "22 get a, '
     unmatched files in other:
      c
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on local side:
      src: 'a' -> dst: 'b' *
     checking for directory renames
   resolving manifests
@@ -936,11 +960,14 b' 8 f (f) f f "remote differs from '
      4/g
      7/f
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     on local side:
+      src: '1/f' -> dst: '1/g' *
+      src: '5/f' -> dst: '5/g' *
+      src: '6/f' -> dst: '6/g' *
+     on remote side:
      src: '1/f' -> dst: '1/g' *
      src: '3/f' -> dst: '3/g' *
      src: '4/f' -> dst: '4/g' *
-     src: '5/f' -> dst: '5/g' *
-     src: '6/f' -> dst: '6/g' *
     checking for directory renames
   $ hg mani
   0/f