D936: convert: fix the RevisionSpec import in the bzr module

singhsrb (Saurabh Singh) phabricator at mercurial-scm.org
Wed Oct 4 20:45:06 UTC 2017


singhsrb created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION 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
  
  This commit fixes the import which in turn fixes the tests.

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

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D936

AFFECTED FILES
  hgext/convert/bzr.py

CHANGE DETAILS

diff --git a/hgext/convert/bzr.py b/hgext/convert/bzr.py
--- a/hgext/convert/bzr.py
+++ b/hgext/convert/bzr.py
@@ -30,11 +30,12 @@
     import bzrlib.bzrdir
     import bzrlib.errors
     import bzrlib.revision
-    import bzrlib.revisionspec.RevisionSpec
+    import bzrlib.revisionspec
     bzrdir = bzrlib.bzrdir
     errors = bzrlib.errors
     revision = bzrlib.revision
     revisionspec = bzrlib.revisionspec
+    revisionspec.RevisionSpec
 except ImportError:
     pass
 



To: singhsrb, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list