##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

unionrepo: use normal inheritance scheme to call revdiff
marmoute -
r43095:a61a8f78 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -89,7 +89,7 b' class unionrevlog(revlog.revlog):'
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
General Comments 0
You need to be logged in to leave comments. Login now