This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6458

py3: fix test-convert-svn-sink.t
ClosedPublic

Authored by pulkit on May 29 2019, 2:41 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc004340dc687: py3: fix test-convert-svn-sink.t
Summary

In cases where the root commit is empty commit, None will be returned as
parents. This was implemented by 2c13e91ede6e.

This breaks test on py3 because b'%s' % None does not work. It does not matter
whether we return None or 'None' as we skipped converting to svn step by
doing an early return. So let's return 'None'.

I tried to patch all the users to convert None to 'None', but there were
more users than I expected. I hit 3 of them and decided to fix it this way
around.

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

pulkit created this revision.May 29 2019, 2:41 PM
Closed by commit rHGc004340dc687: py3: fix test-convert-svn-sink.t (authored by pulkit). · Explain WhyMay 31 2019, 9:15 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 15309

hgext/convert/subversion.py

output = self.run0('commit', output = self.run0('commit',
username=stringutil.shortuser(commit.author), username=stringutil.shortuser(commit.author),
file=messagefile, file=messagefile,
encoding='utf-8') encoding='utf-8')
try: try:
rev = self.commit_re.search(output).group(1) rev = self.commit_re.search(output).group(1)
except AttributeError: except AttributeError:
if not files: if not files:
return parents[0] if parents else None return parents[0] if parents else 'None'
self.ui.warn(_('unexpected svn output:\n')) self.ui.warn(_('unexpected svn output:\n'))
self.ui.warn(output) self.ui.warn(output)
raise error.Abort(_('unable to cope with svn output')) raise error.Abort(_('unable to cope with svn output'))
if commit.rev: if commit.rev:
self.run('propset', 'hg:convert-rev', commit.rev, self.run('propset', 'hg:convert-rev', commit.rev,
revprop=True, revision=rev) revprop=True, revision=rev)
if commit.branch and commit.branch != 'default': if commit.branch and commit.branch != 'default':
self.run('propset', 'hg:convert-branch', commit.branch, self.run('propset', 'hg:convert-branch', commit.branch,