Submitter | Katsunori FUJIWARA |
---|---|
Date | March 2, 2017, 6:02 p.m. |
Message ID | <d7d47f54019fa9009682.1488477747@speaknoevil> |
Download | mbox | patch |
Permalink | /patch/18872/ |
State | Accepted |
Headers | show |
Comments
On Fri, Mar 03, 2017 at 03:02:27AM +0900, FUJIWARA Katsunori wrote: > # HG changeset patch > # User FUJIWARA Katsunori <foozy@lares.dti.ne.jp> > # Date 1488477426 -32400 > # Fri Mar 03 02:57:06 2017 +0900 > # Node ID d7d47f54019fa900968245163e67ca6f02378995 > # Parent 0bb3089fe73527c64f1afc40b86ecb8dfe7fd7aa > similar: compare between actual file contents for exact identity Sure, seems reasonable. Queued, thanks.
Patch
diff --git a/mercurial/similar.py b/mercurial/similar.py --- a/mercurial/similar.py +++ b/mercurial/similar.py @@ -35,9 +35,13 @@ def _findexactmatches(repo, added, remov for i, fctx in enumerate(added): repo.ui.progress(_('searching for exact renames'), i + len(removed), total=numfiles, unit=_('files')) - h = hashlib.sha1(fctx.data()).digest() + adata = fctx.data() + h = hashlib.sha1(adata).digest() if h in hashes: - yield (hashes[h], fctx) + rfctx = hashes[h] + # compare between actual file contents for exact identity + if adata == rfctx.data(): + yield (rfctx, fctx) # Done repo.ui.progress(_('searching for exact renames'), None)