[PATCH 1 of 3] convert: make subversion import transport locally

FUJIWARA Katsunori foozy at lares.dti.ne.jp
Fri Mar 11 08:00:21 EST 2016


# HG changeset patch
# User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
# Date 1457700944 -32400
#      Fri Mar 11 21:55:44 2016 +0900
# Node ID 59aa1b8645de514bf3f5da9e0c09e94321b92351
# Parent  bbbac228dfe71f641b525b5f352d37fde771f71e
convert: make subversion import transport locally

Introducing "absolute_import" feature in previous patch caused failure
of importing local module "transport".

diff --git a/hgext/convert/subversion.py b/hgext/convert/subversion.py
--- a/hgext/convert/subversion.py
+++ b/hgext/convert/subversion.py
@@ -22,7 +22,7 @@ from mercurial import (
 )
 from mercurial.i18n import _
 
-from . import common
+from . import common, transport
 
 StringIO = cStringIO.StringIO
 propertycache = util.propertycache
@@ -52,7 +52,6 @@ try:
     import svn.core
     import svn.ra
     import svn.delta
-    import transport
     import warnings
     warnings.filterwarnings('ignore',
             module='svn.core',


More information about the Mercurial-devel mailing list