mercurial/copies.py
changeset 18135 a6fe1b9cc68f
parent 18134 6c35b53cd28b
child 18136 f23dea2b296e
--- a/mercurial/copies.py	Wed Dec 26 14:50:17 2012 -0800
+++ b/mercurial/copies.py	Wed Dec 26 15:03:58 2012 -0800
@@ -318,7 +318,8 @@
                 note += "!"
             if f in renamedelete2:
                 note += "%"
-            repo.ui.debug("   %s -> %s %s\n" % (f, fullcopy[f], note))
+            repo.ui.debug("   src: '%s' -> dst: '%s' %s\n" % (fullcopy[f], f,
+                                                              note))
     del diverge2
 
     if not fullcopy:
@@ -362,7 +363,8 @@
         return copy, movewithdir, diverge, renamedelete
 
     for d in dirmove:
-        repo.ui.debug("  dir %s -> %s\n" % (d, dirmove[d]))
+        repo.ui.debug("   discovered dir src: '%s' -> dst: '%s'\n" %
+                      (d, dirmove[d]))
 
     # check unaccounted nonoverlapping files against directory moves
     for f in u1 + u2:
@@ -373,7 +375,8 @@
                     df = dirmove[d] + f[len(d):]
                     if df not in copy:
                         movewithdir[f] = df
-                        repo.ui.debug("  file %s -> %s\n" % (f, df))
+                        repo.ui.debug(("   pending file src: '%s' -> "
+                                       "dst: '%s'\n") % (f, df))
                     break
 
     return copy, movewithdir, diverge, renamedelete