D4802: storageutil: invert logic of file data comparison
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Wed Oct 3 15:05:35 UTC 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG1470183068b8: storageutil: invert logic of file data comparison (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D4802?vs=11485&id=11616
REVISION DETAIL
https://phab.mercurial-scm.org/D4802
AFFECTED FILES
mercurial/filelog.py
mercurial/utils/storageutil.py
CHANGE DETAILS
diff --git a/mercurial/utils/storageutil.py b/mercurial/utils/storageutil.py
--- a/mercurial/utils/storageutil.py
+++ b/mercurial/utils/storageutil.py
@@ -108,8 +108,18 @@
return False
-def filerevisiondifferent(store, node, filedata):
- """Determines whether file data is equivalent to a stored node."""
+def filedataequivalent(store, node, filedata):
+ """Determines whether file data is equivalent to a stored node.
+
+ Returns True if the passed file data would hash to the same value
+ as a stored revision and False otherwise.
+
+ When a stored revision is censored, filedata must be empty to have
+ equivalence.
+
+ When a stored revision has copy metadata, it is ignored as part
+ of the compare.
+ """
if filedata.startswith(b'\x01\n'):
revisiontext = b'\x01\n\x01\n' + filedata
@@ -121,18 +131,18 @@
computednode = hashrevisionsha1(revisiontext, p1, p2)
if computednode == node:
- return False
+ return True
# Censored files compare against the empty file.
if store.iscensored(store.rev(node)):
- return filedata != b''
+ return filedata == b''
# Renaming a file produces a different hash, even if the data
# remains unchanged. Check if that's the case.
if store.renamed(node):
- return store.read(node) != filedata
+ return store.read(node) == filedata
- return True
+ return False
def iterrevs(storelen, start=0, stop=None):
"""Iterate over revision numbers in a store."""
diff --git a/mercurial/filelog.py b/mercurial/filelog.py
--- a/mercurial/filelog.py
+++ b/mercurial/filelog.py
@@ -135,7 +135,7 @@
returns True if text is different than what is stored.
"""
- return storageutil.filerevisiondifferent(self, node, text)
+ return not storageutil.filedataequivalent(self, node, text)
def verifyintegrity(self, state):
return self._revlog.verifyintegrity(state)
To: indygreg, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list