Show More
@@ -105,8 +105,8 b' class bundlerevlog(revlog.revlog):' | |||||
105 | elif rev1 <= self.repotiprev and rev2 <= self.repotiprev: |
|
105 | elif rev1 <= self.repotiprev and rev2 <= self.repotiprev: | |
106 | return revlog.revlog.revdiff(self, rev1, rev2) |
|
106 | return revlog.revlog.revdiff(self, rev1, rev2) | |
107 |
|
107 | |||
108 |
return mdiff.textdiff(self.r |
|
108 | return mdiff.textdiff(self.rawdata(rev1), | |
109 |
self.r |
|
109 | self.rawdata(rev2)) | |
110 |
|
110 | |||
111 | def revision(self, nodeorrev, _df=None, raw=False): |
|
111 | def revision(self, nodeorrev, _df=None, raw=False): | |
112 | """return an uncompressed revision of a given node or revision |
|
112 | """return an uncompressed revision of a given node or revision | |
@@ -153,7 +153,7 b' class bundlerevlog(revlog.revlog):' | |||||
153 | # Revlog subclasses may override 'revision' method to modify format of |
|
153 | # Revlog subclasses may override 'revision' method to modify format of | |
154 | # content retrieved from revlog. To use bundlerevlog with such class one |
|
154 | # content retrieved from revlog. To use bundlerevlog with such class one | |
155 | # needs to override 'baserevision' and make more specific call here. |
|
155 | # needs to override 'baserevision' and make more specific call here. | |
156 |
return revlog.revlog.r |
|
156 | return revlog.revlog.rawdata(self, nodeorrev) | |
157 |
|
157 | |||
158 | def addrevision(self, *args, **kwargs): |
|
158 | def addrevision(self, *args, **kwargs): | |
159 | raise NotImplementedError |
|
159 | raise NotImplementedError | |
@@ -184,7 +184,7 b' class bundlechangelog(bundlerevlog, chan' | |||||
184 | oldfilter = self.filteredrevs |
|
184 | oldfilter = self.filteredrevs | |
185 | try: |
|
185 | try: | |
186 | self.filteredrevs = () |
|
186 | self.filteredrevs = () | |
187 |
return changelog.changelog.r |
|
187 | return changelog.changelog.rawdata(self, nodeorrev) | |
188 | finally: |
|
188 | finally: | |
189 | self.filteredrevs = oldfilter |
|
189 | self.filteredrevs = oldfilter | |
190 |
|
190 | |||
@@ -209,7 +209,7 b' class bundlemanifest(bundlerevlog, manif' | |||||
209 | if node in self.fulltextcache: |
|
209 | if node in self.fulltextcache: | |
210 | result = '%s' % self.fulltextcache[node] |
|
210 | result = '%s' % self.fulltextcache[node] | |
211 | else: |
|
211 | else: | |
212 |
result = manifest.manifestrevlog.r |
|
212 | result = manifest.manifestrevlog.rawdata(self, nodeorrev) | |
213 | return result |
|
213 | return result | |
214 |
|
214 | |||
215 | def dirlog(self, d): |
|
215 | def dirlog(self, d): | |
@@ -227,7 +227,7 b' class bundlefilelog(filelog.filelog):' | |||||
227 | cgunpacker, linkmapper) |
|
227 | cgunpacker, linkmapper) | |
228 |
|
228 | |||
229 | def baserevision(self, nodeorrev): |
|
229 | def baserevision(self, nodeorrev): | |
230 |
return filelog.filelog.r |
|
230 | return filelog.filelog.rawdata(self, nodeorrev) | |
231 |
|
231 | |||
232 | class bundlepeer(localrepo.localpeer): |
|
232 | class bundlepeer(localrepo.localpeer): | |
233 | def canpush(self): |
|
233 | def canpush(self): |
General Comments 0
You need to be logged in to leave comments.
Login now