##// END OF EJS Templates
subrepo: bytes/str cleanups on Git support...
Augie Fackler -
r41521:d4df6897 default draft
parent child Browse files
Show More
@@ -679,6 +679,7 b' test-strict.t'
679 test-strip-cross.t
679 test-strip-cross.t
680 test-strip.t
680 test-strip.t
681 test-subrepo-deep-nested-change.t
681 test-subrepo-deep-nested-change.t
682 test-subrepo-git.t
682 test-subrepo-missing.t
683 test-subrepo-missing.t
683 test-subrepo-paths.t
684 test-subrepo-paths.t
684 test-subrepo-recursion.t
685 test-subrepo-recursion.t
@@ -1284,7 +1284,7 b' class gitsubrepo(abstractsubrepo):'
1284 if stream:
1284 if stream:
1285 return p.stdout, None
1285 return p.stdout, None
1286
1286
1287 retdata = p.stdout.read().strip()
1287 retdata = pycompat.fsencode(p.stdout.read().strip())
1288 # wait for the child to exit to avoid race condition.
1288 # wait for the child to exit to avoid race condition.
1289 p.wait()
1289 p.wait()
1290
1290
@@ -1660,13 +1660,14 b' class gitsubrepo(abstractsubrepo):'
1660 for info in tar:
1660 for info in tar:
1661 if info.isdir():
1661 if info.isdir():
1662 continue
1662 continue
1663 if match and not match(info.name):
1663 bname = pycompat.fsencode(info.name)
1664 if match and not match(bname):
1664 continue
1665 continue
1665 if info.issym():
1666 if info.issym():
1666 data = info.linkname
1667 data = info.linkname
1667 else:
1668 else:
1668 data = tar.extractfile(info).read()
1669 data = tar.extractfile(info).read()
1669 archiver.addfile(prefix + self._path + '/' + info.name,
1670 archiver.addfile(prefix + self._path + '/' + bname,
1670 info.mode, info.issym(), data)
1671 info.mode, info.issym(), data)
1671 total += 1
1672 total += 1
1672 progress.increment()
1673 progress.increment()
General Comments 0
You need to be logged in to leave comments. Login now