Mercurial > hg-stable
changeset 42837:a61a8f78da28
unionrepo: use normal inheritance scheme to call revdiff
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 30 Aug 2019 18:10:00 +0200 |
| parents | 3e2520acf17b |
| children | f8b5da997a39 |
| files | mercurial/unionrepo.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/unionrepo.py Fri Aug 30 18:08:35 2019 +0200 +++ b/mercurial/unionrepo.py Fri Aug 30 18:10:00 2019 +0200 @@ -89,7 +89,7 @@ self.revlog2.rev(self.node(rev1)), self.revlog2.rev(self.node(rev2))) elif rev1 <= self.repotiprev and rev2 <= self.repotiprev: - return self.baserevdiff(rev1, rev2) + return super(unionrevlog, self).revdiff(rev1, rev2) return mdiff.textdiff(self.rawdata(rev1), self.rawdata(rev2))