This is an archive of the discontinued Mercurial Phabricator instance.

Differential D936

convert: fix the RevisionSpec import in the bzr module
ClosedPublic

Authored by singhsrb on Oct 4 2017, 4:45 PM.

Details

Reviewers
quark
durin42
Group Reviewers
hg-reviewers
Commits
rHG6bda8a9d8431: convert: fix the RevisionSpec import in the bzr module
Summary

This import was failing (because its invalid) which was resulting in
the following tests failing with chg running:

  • test-convert-bzr.t
  • test-convert-bzr-directories.t
  • test-convert-bzr-ghosts.t
  • test-convert-bzr-treeroot.t
  • test-convert-bzr-114.t
  • test-convert-bzr-merges.t

This commit fixes the import which in turn fixes the tests.

Test Plan

Ran the aforementioned tests with and without '--chg' option.

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

singhsrb created this revision.Oct 4 2017, 4:45 PM
singhsrb edited the summary of this revision. (Show Details)Oct 4 2017, 8:51 PM
singhsrb updated this revision to Diff 2444.

Updating D936: updating the summary to include test.

quark accepted this revision.Oct 5 2017, 12:47 AM
durin42 accepted this revision.Oct 5 2017, 11:07 AM
This revision is now accepted and ready to land.Oct 5 2017, 11:07 AM
Closed by commit rHG6bda8a9d8431: convert: fix the RevisionSpec import in the bzr module (authored by singhsrb). · Explain WhyOct 5 2017, 5:36 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/convert/bzr.py (3 lines)

Diff 2487

hgext/convert/bzr.py

'ElementPath', 'ElementPath',
]) ])
try: try:
# bazaar imports # bazaar imports
import bzrlib.bzrdir import bzrlib.bzrdir
import bzrlib.errors import bzrlib.errors
import bzrlib.revision import bzrlib.revision
import bzrlib.revisionspec.RevisionSpec import bzrlib.revisionspec
bzrdir = bzrlib.bzrdir bzrdir = bzrlib.bzrdir
errors = bzrlib.errors errors = bzrlib.errors
revision = bzrlib.revision revision = bzrlib.revision
revisionspec = bzrlib.revisionspec revisionspec = bzrlib.revisionspec
revisionspec.RevisionSpec
except ImportError: except ImportError:
pass pass
supportedkinds = ('file', 'symlink') supportedkinds = ('file', 'symlink')
class bzr_source(common.converter_source): class bzr_source(common.converter_source):
"""Reads Bazaar repositories by using the Bazaar Python libraries""" """Reads Bazaar repositories by using the Bazaar Python libraries"""