mercurial/unionrepo.py
changeset 42827 a61a8f78da28
parent 42826 3e2520acf17b
child 42828 f8b5da997a39
equal deleted inserted replaced
42826:3e2520acf17b 42827:a61a8f78da28
    87         if rev1 > self.repotiprev and rev2 > self.repotiprev:
    87         if rev1 > self.repotiprev and rev2 > self.repotiprev:
    88             return self.revlog2.revdiff(
    88             return self.revlog2.revdiff(
    89                 self.revlog2.rev(self.node(rev1)),
    89                 self.revlog2.rev(self.node(rev1)),
    90                 self.revlog2.rev(self.node(rev2)))
    90                 self.revlog2.rev(self.node(rev2)))
    91         elif rev1 <= self.repotiprev and rev2 <= self.repotiprev:
    91         elif rev1 <= self.repotiprev and rev2 <= self.repotiprev:
    92             return self.baserevdiff(rev1, rev2)
    92             return super(unionrevlog, self).revdiff(rev1, rev2)
    93 
    93 
    94         return mdiff.textdiff(self.rawdata(rev1), self.rawdata(rev2))
    94         return mdiff.textdiff(self.rawdata(rev1), self.rawdata(rev2))
    95 
    95 
    96     def _revisiondata(self, nodeorrev, _df=None, raw=False):
    96     def _revisiondata(self, nodeorrev, _df=None, raw=False):
    97         if isinstance(nodeorrev, int):
    97         if isinstance(nodeorrev, int):