Mercurial > public > mercurial-scm > hg

comparison mercurial/unionrepo.py @ 51023:8520db304f01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog: drop more file description passing between private function They are no longer used as we are covered by the `reading` context
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 26 Sep 2023 02:54:50 +0200
parents 93a44c1ba0c6
children f70ce1aedbcb
comparison
equal deleted inserted replaced
51022:9011c38b4f65 51023:8520db304f01
125 else: 125 else:
126 read_2 = util.nullcontextmanager 126 read_2 = util.nullcontextmanager
127 with read_1(), read_2(): 127 with read_1(), read_2():
128 yield 128 yield
129 129
130 def _chunk(self, rev, df=None): 130 def _chunk(self, rev):
131 if rev <= self.repotiprev: 131 if rev <= self.repotiprev:
132 return revlog.revlog._chunk(self, rev) 132 return revlog.revlog._chunk(self, rev)
133 return self.revlog2._chunk(self.node(rev)) 133 return self.revlog2._chunk(self.node(rev))
134 134
135 def revdiff(self, rev1, rev2): 135 def revdiff(self, rev1, rev2):
142 elif rev1 <= self.repotiprev and rev2 <= self.repotiprev: 142 elif rev1 <= self.repotiprev and rev2 <= self.repotiprev:
143 return super(unionrevlog, self).revdiff(rev1, rev2) 143 return super(unionrevlog, self).revdiff(rev1, rev2)
144 144
145 return mdiff.textdiff(self.rawdata(rev1), self.rawdata(rev2)) 145 return mdiff.textdiff(self.rawdata(rev1), self.rawdata(rev2))
146 146
147 def _revisiondata(self, nodeorrev, _df=None, raw=False): 147 def _revisiondata(self, nodeorrev, raw=False):
148 if isinstance(nodeorrev, int): 148 if isinstance(nodeorrev, int):
149 rev = nodeorrev 149 rev = nodeorrev
150 node = self.node(rev) 150 node = self.node(rev)
151 else: 151 else:
152 node = nodeorrev 152 node = nodeorrev
156 # work around manifestrevlog NOT being a revlog 156 # work around manifestrevlog NOT being a revlog
157 revlog2 = getattr(self.revlog2, '_revlog', self.revlog2) 157 revlog2 = getattr(self.revlog2, '_revlog', self.revlog2)
158 func = revlog2._revisiondata 158 func = revlog2._revisiondata
159 else: 159 else:
160 func = super(unionrevlog, self)._revisiondata 160 func = super(unionrevlog, self)._revisiondata
161 return func(node, _df=_df, raw=raw) 161 return func(node, raw=raw)
162 162
163 def addrevision( 163 def addrevision(
164 self, 164 self,
165 text, 165 text,
166 transaction, 166 transaction,