##// END OF EJS Templates
git: a little pycompat.bytestring() love to make this code work in py3...
Augie Fackler -
r41516:1c894365 default draft
parent child Browse files
Show More
@@ -116,6 +116,7 b' test-convert-cvs.t'
116 116 test-convert-cvsnt-mergepoints.t
117 117 test-convert-datesort.t
118 118 test-convert-filemap.t
119 test-convert-git.t
119 120 test-convert-hg-sink.t
120 121 test-convert-hg-source.t
121 122 test-convert-hg-startrev.t
@@ -13,6 +13,7 b' from mercurial import ('
13 13 config,
14 14 error,
15 15 node as nodemod,
16 pycompat,
16 17 )
17 18
18 19 from . import (
@@ -175,7 +176,8 b' class convert_git(common.converter_sourc'
175 176 self.catfilepipe[0].flush()
176 177 info = self.catfilepipe[1].readline().split()
177 178 if info[1] != ftype:
178 raise error.Abort(_('cannot read %r object at %s') % (ftype, rev))
179 raise error.Abort(_('cannot read %r object at %s') % (
180 pycompat.bytestr(ftype), rev))
179 181 size = int(info[2])
180 182 data = self.catfilepipe[1].read(size)
181 183 if len(data) < size:
@@ -294,7 +296,7 b' class convert_git(common.converter_sourc'
294 296 if not entry:
295 297 if not l.startswith(':'):
296 298 continue
297 entry = l.split()
299 entry = tuple(pycompat.bytestr(p) for p in l.split())
298 300 continue
299 301 f = l
300 302 if entry[4][0] == 'C':
General Comments 0
You need to be logged in to leave comments. Login now