Mercurial > public > mercurial-scm > hg
diff mercurial/filelog.py @ 2921:addb58e3b41c
redo merge with mpm.
previous merge at ef8ee4477019 was bad.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Wed, 16 Aug 2006 10:52:19 -0700 |
parents | db397c38005d |
children | b2138d846b27 |
line wrap: on
line diff
--- a/mercurial/filelog.py Tue Aug 15 11:28:50 2006 -0700 +++ b/mercurial/filelog.py Wed Aug 16 10:52:19 2006 -0700 @@ -65,26 +65,25 @@ return (m["copy"], bin(m["copyrev"])) return False + def size(self, rev): + """return the size of a given revision""" + + # for revisions with renames, we have to go the slow way + node = self.node(rev) + if self.renamed(node): + return len(self.read(node)) + + return revlog.size(self, rev) + 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 + return t2 != text - 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 + return revlog.cmp(self, node, text) def annotate(self, node):