This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10512

bzr: only support bzr conversion on Python3
ClosedPublic

Authored by Alphare on Apr 26 2021, 5:03 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa1e91a87a7c8: bzr: only support bzr conversion on Python3
Summary

Python 2 support will be dropped from Mercurial before anyone needs to do a
bzr -> hg conversion on Python 2 again. Bazaar tests were broken with the new
lib anyway, which we'll get into in the next patches.

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

Alphare created this revision.Apr 26 2021, 5:03 PM
pulkit accepted this revision.May 6 2021, 3:04 PM
This revision is now accepted and ready to land.May 6 2021, 3:04 PM
Alphare updated this revision to Diff 28427.Jun 3 2021, 4:44 AM
pulkit accepted this revision.Jun 4 2021, 5:59 AM
Alphare added a commit: rHGa1e91a87a7c8: bzr: only support bzr conversion on Python3.Jun 7 2021, 3:44 AM
Closed by commit rHGa1e91a87a7c8: bzr: only support bzr conversion on Python3 (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/hghave.py (5 lines)

Diff 28464

tests/hghave.py

msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY) msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
except ImportError: except ImportError:
pass pass
stdout = getattr(sys.stdout, 'buffer', sys.stdout) stdout = getattr(sys.stdout, 'buffer', sys.stdout)
stderr = getattr(sys.stderr, 'buffer', sys.stderr) stderr = getattr(sys.stderr, 'buffer', sys.stderr)
if sys.version_info[0] >= 3: is_not_python2 = sys.version_info[0] >= 3
if is_not_python2:
def _sys2bytes(p): def _sys2bytes(p):
if p is None: if p is None:
return p return p
return p.encode('utf-8') return p.encode('utf-8')
def _bytes2sys(p): def _bytes2sys(p):
if p is None: if p is None:
@check("baz", "GNU Arch baz client") @check("baz", "GNU Arch baz client")
def has_baz(): def has_baz():
return matchoutput('baz --version 2>&1', br'baz Bazaar version') return matchoutput('baz --version 2>&1', br'baz Bazaar version')
@check("bzr", "Canonical's Bazaar client") @check("bzr", "Canonical's Bazaar client")
def has_bzr(): def has_bzr():
if not is_not_python2:
return False
try: try:
import bzrlib import bzrlib
import bzrlib.bzrdir import bzrlib.bzrdir
import bzrlib.errors import bzrlib.errors
import bzrlib.revision import bzrlib.revision
import bzrlib.revisionspec import bzrlib.revisionspec
bzrlib.revisionspec.RevisionSpec bzrlib.revisionspec.RevisionSpec