Mercurial > public > mercurial-scm > hg

comparison mercurial/unionrepo.py @ 42826:3e2520acf17b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unionrepo: fix `revdiff` implementation to use `rawdata` The parent code is using rawdata so we should use it here. Before this change, union repo was probably broken with some flag processors.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 30 Aug 2019 18:08:35 +0200
parents 62a39c868b20
children a61a8f78da28
comparison
equal deleted inserted replaced
42825:62a39c868b20 42826:3e2520acf17b
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 self.baserevdiff(rev1, rev2)
93 93
94 return mdiff.textdiff(self.revision(rev1), self.revision(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):
98 rev = nodeorrev 98 rev = nodeorrev
99 node = self.node(rev) 99 node = self.node(rev)