# HG changeset patch # User Matt Mackall # Date 2007-07-26 17:02:58 # Node ID 72082bfced9a3a6409c02ca237541f7ed0c52db7 # Parent 825516d16b25f9bd9b96eaa0e401e6b8aa85350b revlog: minor revdiff reorganization diff --git a/mercurial/revlog.py b/mercurial/revlog.py --- a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -885,13 +885,11 @@ class revlog(object): def revdiff(self, rev1, rev2): """return or calculate a delta between two revisions""" - b1 = self.base(rev1) - b2 = self.base(rev2) - if b1 == b2 and rev1 + 1 == rev2: + if rev1 + 1 == rev2 and self.base(rev1) == self.base(rev2): return self.chunk(rev2) - else: - return mdiff.textdiff(self.revision(self.node(rev1)), - self.revision(self.node(rev2))) + + return mdiff.textdiff(self.revision(self.node(rev1)), + self.revision(self.node(rev2))) def revision(self, node): """return an uncompressed revision of a given"""