This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5737

py3: convert info.name to bytes in subrepo.py
Needs RevisionPublic

Authored by pulkit on Jan 29 2019, 5:27 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Jan 29 2019, 5:27 PM
yuja added a subscriber: yuja.Jan 30 2019, 7:21 AM
for info in tar:

+ infoname = pycompat.bytestr(info.name)

So info.name would come from environment. It's probably better to use
encoding.strtolocal().

marmoute requested changes to this revision.Jan 23 2020, 12:11 PM
marmoute added a subscriber: marmoute.

moving to need revision according to yuya feedback

This revision now requires changes to proceed.Jan 23 2020, 12:11 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/subrepo.py (5 lines)

Diff 13559

mercurial/subrepo.py

# and objects with many subprocess calls. # and objects with many subprocess calls.
tarstream = self._gitcommand(['archive', revision], stream=True) tarstream = self._gitcommand(['archive', revision], stream=True)
tar = tarfile.open(fileobj=tarstream, mode=r'r|') tar = tarfile.open(fileobj=tarstream, mode=r'r|')
relpath = subrelpath(self) relpath = subrelpath(self)
progress = self.ui.makeprogress(_('archiving (%s)') % relpath, progress = self.ui.makeprogress(_('archiving (%s)') % relpath,
unit=_('files')) unit=_('files'))
progress.update(0) progress.update(0)
for info in tar: for info in tar:
infoname = pycompat.bytestr(info.name)
if info.isdir(): if info.isdir():
continue continue
if match and not match(info.name): if match and not match(infoname):
continue continue
if info.issym(): if info.issym():
data = info.linkname data = info.linkname
else: else:
data = tar.extractfile(info).read() data = tar.extractfile(info).read()
archiver.addfile(prefix + self._path + '/' + info.name, archiver.addfile(prefix + self._path + '/' + infoname,
info.mode, info.issym(), data) info.mode, info.issym(), data)
total += 1 total += 1
progress.increment() progress.increment()
progress.complete() progress.complete()
return total return total
@annotatesubrepoerror @annotatesubrepoerror