Patchwork [08,of,24] copies: report found copies sorted

login
register
mail settings
Submitter Mads Kiilerich
Date Dec. 16, 2012, 10:34 p.m.
Message ID <c5976bcb3832034ff193.1355697243@localhost6.localdomain6>
Download mbox | patch
Permalink /patch/132/
State Accepted
Commit 5a4f220fbfca778dac0a21119a3020bf6cb87d1b
Headers show

Comments

Mads Kiilerich - Dec. 16, 2012, 10:34 p.m.
# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1355276294 -3600
# Node ID c5976bcb3832034ff1934a3093e0241088112cc9
# Parent  4cf320954987b2fdc24f2327cc12758f9a3a04f4
copies: report found copies sorted
Bryan O'Sullivan - Dec. 17, 2012, 8:58 p.m.
On Sun, Dec 16, 2012 at 2:34 PM, Mads Kiilerich <mads at kiilerich.com> wrote:

> copies: report found copies sorted
>

Looks good, thanks.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20121217/dfaa9adf/attachment.html>

Patch

diff --git a/mercurial/copies.py b/mercurial/copies.py
--- a/mercurial/copies.py
+++ b/mercurial/copies.py
@@ -303,7 +303,7 @@ 
     if fullcopy:
         repo.ui.debug("  all copies found (* = to merge, ! = divergent, "
                       "% = renamed and deleted):\n")
-        for f in fullcopy:
+        for f in sorted(fullcopy):
             note = ""
             if f in copy:
                 note += "*"
diff --git a/tests/test-copy-move-merge.t b/tests/test-copy-move-merge.t
--- a/tests/test-copy-move-merge.t
+++ b/tests/test-copy-move-merge.t
@@ -25,8 +25,8 @@ 
      b
      c
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     b -> a *
      c -> a *
-     b -> a *
     checking for directory renames
   resolving manifests
    overwrite: False, partial: False
diff --git a/tests/test-rename-merge1.t b/tests/test-rename-merge1.t
--- a/tests/test-rename-merge1.t
+++ b/tests/test-rename-merge1.t
@@ -29,9 +29,9 @@ 
      b
      b2
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
-     c2 -> a2 !
      b -> a *
      b2 -> a2 !
+     c2 -> a2 !
     checking for directory renames
    a2: divergent renames -> dr
   resolving manifests
diff --git a/tests/test-rename-merge2.t b/tests/test-rename-merge2.t
--- a/tests/test-rename-merge2.t
+++ b/tests/test-rename-merge2.t
@@ -370,8 +370,8 @@ 
     unmatched files in other:
      c
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     b -> a !
      c -> a !
-     b -> a !
     checking for directory renames
    a: divergent renames -> dr
   resolving manifests