This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6965

convert: use pycompat.fsencode()
ClosedPublic

Authored by indygreg on Oct 4 2019, 4:25 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG058c2468b2f5: convert: use pycompat.fsencode()
Summary

This avoids a
TypeError: Can't mix strings and bytes in path components.

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

indygreg created this revision.Oct 4 2019, 4:25 PM
indygreg set the repository for this revision to rHG Mercurial.Oct 6 2019, 10:41 AM
pulkit accepted this revision.Oct 6 2019, 10:43 AM
This revision is now accepted and ready to land.Oct 6 2019, 10:43 AM
indygreg added a commit: rHG058c2468b2f5: convert: use pycompat.fsencode().Oct 6 2019, 11:06 AM
Closed by commit rHG058c2468b2f5: convert: use pycompat.fsencode() (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/convert/gnuarch.py (2 lines)

Diff 16894

hgext/convert/gnuarch.py

if self.execmd == 'tla': if self.execmd == 'tla':
output = self.run0('tree-version', self.path) output = self.run0('tree-version', self.path)
else: else:
output = self.run0('tree-version', '-d', self.path) output = self.run0('tree-version', '-d', self.path)
self.treeversion = output.strip() self.treeversion = output.strip()
# Get name of temporary directory # Get name of temporary directory
version = self.treeversion.split('/') version = self.treeversion.split('/')
self.tmppath = os.path.join(tempfile.gettempdir(), self.tmppath = os.path.join(pycompat.fsencode(tempfile.gettempdir()),
'hg-%s' % version[1]) 'hg-%s' % version[1])
# Generate parents dictionary # Generate parents dictionary
self.parents[None] = [] self.parents[None] = []
treeversion = self.treeversion treeversion = self.treeversion
child = None child = None
while treeversion: while treeversion:
self.ui.status(_('analyzing tree version %s...\n') % treeversion) self.ui.status(_('analyzing tree version %s...\n') % treeversion)