Patchwork [7,of,9] unionrepo: use normal inheritance scheme to call revdiff

login
register
mail settings
Submitter Pierre-Yves David
Date Aug. 30, 2019, 4:39 p.m.
Message ID <425be1daf1bff57f7526.1567183176@nodosa.octopoid.net>
Download mbox | patch
Permalink /patch/41442/
State Accepted
Headers show

Comments

Pierre-Yves David - Aug. 30, 2019, 4:39 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1567181400 -7200
#      Fri Aug 30 18:10:00 2019 +0200
# Node ID 425be1daf1bff57f7526b74b7ed9ae07bf7ba55f
# Parent  365209d4ed95274c1a79c314de89872620755605
# EXP-Topic sidedata-prep
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 425be1daf1bf
unionrepo: use normal inheritance scheme to call revdiff

Patch

diff --git a/mercurial/unionrepo.py b/mercurial/unionrepo.py
--- a/mercurial/unionrepo.py
+++ b/mercurial/unionrepo.py
@@ -89,7 +89,7 @@  class unionrevlog(revlog.revlog):
                 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))