This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5768

subrepo: bytes/str cleanups on Git support
ClosedPublic

Authored by durin42 on Jan 30 2019, 7:30 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG46ab0c6b28dc: subrepo: bytes/str cleanups on Git support
rHG1f0a176e41de: subrepo: bytes/str cleanups on Git support
rHGd4df6897e461: subrepo: bytes/str cleanups on Git support
rHG8b6a9ae832f1: subrepo: bytes/str cleanups on Git support
Summary

Git subrepo tests now pass on Python 3.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Jan 30 2019, 7:30 PM
durin42 updated this revision to Diff 13623.Jan 30 2019, 8:09 PM
Closed by commit rHG8b6a9ae832f1: subrepo: bytes/str cleanups on Git support (authored by durin42). · Explain WhyJan 30 2019, 8:12 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Jan 31 2019, 7:55 AM
  • retdata = p.stdout.read().strip()

+ retdata = pycompat.fsencode(p.stdout.read().strip())

Curious why subprocess output can be a unicode. Is it a sort of text-mode
stream?

spectral updated this revision to Diff 15303.May 30 2019, 5:16 PM
spectral added a subscriber: spectral.May 30 2019, 5:20 PM

Oops. A typo caused me to update this diff, please ignore that.

Revision Contents
Changeset List

PathPackages
Mcontrib/python3-whitelist (1 line)
Mmercurial/subrepo.py (7 lines)

Diff 13626

contrib/python3-whitelist

test-status-terse.t test-status-terse.t
test-status.t test-status.t
test-storage.py test-storage.py
test-stream-bundle-v2.t test-stream-bundle-v2.t
test-strict.t test-strict.t
test-strip-cross.t test-strip-cross.t
test-strip.t test-strip.t
test-subrepo-deep-nested-change.t test-subrepo-deep-nested-change.t
test-subrepo-git.t
test-subrepo-missing.t test-subrepo-missing.t
test-subrepo-paths.t test-subrepo-paths.t
test-subrepo-recursion.t test-subrepo-recursion.t
test-subrepo-relative-path.t test-subrepo-relative-path.t
test-subrepo-svn.t test-subrepo-svn.t
test-subrepo.t test-subrepo.t
test-symlink-os-yes-fs-no.py test-symlink-os-yes-fs-no.py
test-symlink-placeholder.t test-symlink-placeholder.t

mercurial/subrepo.py

bufsize=-1, bufsize=-1,
cwd=pycompat.rapply(procutil.tonativestr, cwd), cwd=pycompat.rapply(procutil.tonativestr, cwd),
env=procutil.tonativeenv(env), env=procutil.tonativeenv(env),
close_fds=procutil.closefds, close_fds=procutil.closefds,
stdout=subprocess.PIPE, stderr=errpipe) stdout=subprocess.PIPE, stderr=errpipe)
if stream: if stream:
return p.stdout, None return p.stdout, None
retdata = p.stdout.read().strip() retdata = pycompat.fsencode(p.stdout.read().strip())
# wait for the child to exit to avoid race condition. # wait for the child to exit to avoid race condition.
p.wait() p.wait()
if p.returncode != 0 and p.returncode != 1: if p.returncode != 0 and p.returncode != 1:
# there are certain error codes that are ok # there are certain error codes that are ok
command = commands[0] command = commands[0]
if command in ('cat-file', 'symbolic-ref'): if command in ('cat-file', 'symbolic-ref'):
return retdata, p.returncode return retdata, p.returncode
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:
if info.isdir(): if info.isdir():
continue continue
if match and not match(info.name): bname = pycompat.fsencode(info.name)
if match and not match(bname):
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 + '/' + bname,
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