Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
similar: take the first match instead of the last
authorYuya Nishihara <yuya@tcha.org>
Thu, 23 Mar 2017 20:52:41 +0900
changeset 31583 2efd9771323e
parent 31582 2e254165a37c
child 31584 985a98c6bad0
similar: take the first match instead of the last It seems more natural. This makes the next patch slightly cleaner.
mercurial/similar.py file | annotate | diff | comparison | revisions
tests/test-addremove-similar.t file | annotate | diff | comparison | revisions 
--- a/mercurial/similar.py	Thu Mar 23 21:17:08 2017 +0900
+++ b/mercurial/similar.py	Thu Mar 23 20:52:41 2017 +0900
@@ -25,7 +25,7 @@
 
     # Get hashes of removed files.
     hashes = {}
-    for i, fctx in enumerate(removed):
+    for i, fctx in enumerate(reversed(removed)):
         repo.ui.progress(_('searching for exact renames'), i, total=numfiles,
                          unit=_('files'))
         h = hashlib.sha1(fctx.data()).digest()
@@ -85,7 +85,7 @@
             if data is None:
                 data = _ctxdata(r)
             myscore = _score(a, data)
-            if myscore >= bestscore:
+            if myscore > bestscore:
                 copies[a] = (r, myscore)
     repo.ui.progress(_('searching'), None)
 
--- a/tests/test-addremove-similar.t	Thu Mar 23 21:17:08 2017 +0900
+++ b/tests/test-addremove-similar.t	Thu Mar 23 20:52:41 2017 +0900
@@ -101,7 +101,7 @@
   removing 8
   removing 9
   adding a
-  recording removal of 9 as rename to a (100% similar)
+  recording removal of 0 as rename to a (100% similar)
   $ hg revert -aq
 
 pick one from many similar files
@@ -124,7 +124,7 @@
   removing 8
   removing 9
   adding a
-  recording removal of 9 as rename to a (99% similar)
+  recording removal of 0 as rename to a (99% similar)
   $ hg commit -m 'always the same file should be selected'
 
 should all fail
Mercurial