# HG changeset patch # User Matt Mackall # Date 1155586020 18000 # Node ID 05257fd285918487533b8b585b85ed85ea5d2e48 # Parent bee4b7abcb0190189f1dfe7bc37e6e465798e489 filelog: add hash-based comparisons For status, rather than reconstruct full file versions from revlog for comparison, compare hashes. diff -r bee4b7abcb01 -r 05257fd28591 mercurial/filelog.py --- a/mercurial/filelog.py Mon Aug 14 14:42:15 2006 -0500 +++ b/mercurial/filelog.py Mon Aug 14 15:07:00 2006 -0500 @@ -65,6 +65,27 @@ return (m["copy"], bin(m["copyrev"])) return False + def cmp(self, node, text): + """compare text with a given file revision""" + + # for renames, we have to go the slow way + if self.renamed(node): + t2 = self.read(node) + return t2 == text + + p1, p2 = self.parents(node) + h = hash(text, p1, p2) + + return h != node + + def makenode(self, node, text): + """calculate a file nodeid for text, descended or possibly + unchanged from node""" + + if self.cmp(node, text): + return hash(text, node, nullid) + return node + def annotate(self, node): def decorate(text, rev): diff -r bee4b7abcb01 -r 05257fd28591 mercurial/localrepo.py --- a/mercurial/localrepo.py Mon Aug 14 14:42:15 2006 -0500 +++ b/mercurial/localrepo.py Mon Aug 14 15:07:00 2006 -0500 @@ -668,8 +668,7 @@ def fcmp(fn, mf): t1 = self.wread(fn) - t2 = self.file(fn).read(mf.get(fn, nullid)) - return cmp(t1, t2) + return self.file(fn).cmp(mf.get(fn, nullid), t1) def mfmatches(node): change = self.changelog.read(node)