135 with read_1(), read_2(): |
135 with read_1(), read_2(): |
136 yield |
136 yield |
137 |
137 |
138 def _chunk(self, rev): |
138 def _chunk(self, rev): |
139 if rev <= self.repotiprev: |
139 if rev <= self.repotiprev: |
140 return super(unionrevlog, self)._inner._chunk(rev) |
140 return super()._inner._chunk(rev) |
141 return self.revlog2._chunk(self.node(rev)) |
141 return self.revlog2._chunk(self.node(rev)) |
142 |
142 |
143 def revdiff(self, rev1, rev2): |
143 def revdiff(self, rev1, rev2): |
144 """return or calculate a delta between two revisions""" |
144 """return or calculate a delta between two revisions""" |
145 if rev1 > self.repotiprev and rev2 > self.repotiprev: |
145 if rev1 > self.repotiprev and rev2 > self.repotiprev: |
146 return self.revlog2.revdiff( |
146 return self.revlog2.revdiff( |
147 self.revlog2.rev(self.node(rev1)), |
147 self.revlog2.rev(self.node(rev1)), |
148 self.revlog2.rev(self.node(rev2)), |
148 self.revlog2.rev(self.node(rev2)), |
149 ) |
149 ) |
150 elif rev1 <= self.repotiprev and rev2 <= self.repotiprev: |
150 elif rev1 <= self.repotiprev and rev2 <= self.repotiprev: |
151 return super(unionrevlog, self).revdiff(rev1, rev2) |
151 return super().revdiff(rev1, rev2) |
152 |
152 |
153 return mdiff.textdiff(self.rawdata(rev1), self.rawdata(rev2)) |
153 return mdiff.textdiff(self.rawdata(rev1), self.rawdata(rev2)) |
154 |
154 |
155 def _revisiondata(self, nodeorrev, raw=False): |
155 def _revisiondata(self, nodeorrev, raw=False): |
156 if isinstance(nodeorrev, int): |
156 if isinstance(nodeorrev, int): |
163 if rev > self.repotiprev: |
163 if rev > self.repotiprev: |
164 # work around manifestrevlog NOT being a revlog |
164 # work around manifestrevlog NOT being a revlog |
165 revlog2 = getattr(self.revlog2, '_revlog', self.revlog2) |
165 revlog2 = getattr(self.revlog2, '_revlog', self.revlog2) |
166 func = revlog2._revisiondata |
166 func = revlog2._revisiondata |
167 else: |
167 else: |
168 func = super(unionrevlog, self)._revisiondata |
168 func = super()._revisiondata |
169 return func(node, raw=raw) |
169 return func(node, raw=raw) |
170 |
170 |
171 def addrevision( |
171 def addrevision( |
172 self, |
172 self, |
173 text, |
173 text, |