##// END OF EJS Templates
bundlerepo: use raw revision in revdiff()...
Jun Wu -
r31837:37e79391 default
parent child Browse files
Show More
@@ -115,7 +115,8 b' class bundlerevlog(revlog.revlog):'
115 elif rev1 <= self.repotiprev and rev2 <= self.repotiprev:
115 elif rev1 <= self.repotiprev and rev2 <= self.repotiprev:
116 return revlog.revlog.revdiff(self, rev1, rev2)
116 return revlog.revlog.revdiff(self, rev1, rev2)
117
117
118 return mdiff.textdiff(self.revision(rev1), self.revision(rev2))
118 return mdiff.textdiff(self.revision(rev1, raw=True),
119 self.revision(rev2, raw=True))
119
120
120 def revision(self, nodeorrev, raw=False):
121 def revision(self, nodeorrev, raw=False):
121 """return an uncompressed revision of a given node or revision
122 """return an uncompressed revision of a given node or revision
@@ -216,5 +216,27 b''
216 $ hg bundle -R bundle.hg --base 1 bundle-again.hg -q 2>&1 | egrep -v '^(\*\*| )'
216 $ hg bundle -R bundle.hg --base 1 bundle-again.hg -q 2>&1 | egrep -v '^(\*\*| )'
217 [1]
217 [1]
218 $ hg -R bundle-again.hg log --stat -T '{rev} {desc}\n' base64 2>&1 | egrep -v '^(\*\*| )'
218 $ hg -R bundle-again.hg log --stat -T '{rev} {desc}\n' base64 2>&1 | egrep -v '^(\*\*| )'
219 Traceback (most recent call last):
219 5 branching
220 TypeError: Incorrect padding
220 base64 | 2 +-
221 1 files changed, 1 insertions(+), 1 deletions(-)
222
223 4 base64-4
224 base64 | 2 +-
225 1 files changed, 1 insertions(+), 1 deletions(-)
226
227 3 base64-three
228 base64 | 2 +-
229 1 files changed, 1 insertions(+), 1 deletions(-)
230
231 2 base64-two
232 base64 | 2 +-
233 1 files changed, 1 insertions(+), 1 deletions(-)
234
235 1 base64-single
236 base64 | 2 +-
237 1 files changed, 1 insertions(+), 1 deletions(-)
238
239 0 base64-0
240 base64 | 1 +
241 1 files changed, 1 insertions(+), 0 deletions(-)
242
General Comments 0
You need to be logged in to leave comments. Login now