hgsubversion: adjust imports for the new module path

Summary:
hgsubversion now exists in hgext.hgsubversion, so the imports need to
be updated everywhere.

Test Plan: Ran the tests

Reviewers: singhsrb, #mercurial

Reviewed By: singhsrb

Differential Revision: https://phabricator.intern.facebook.com/D6698653

Signature: 6698653:1515628610:daad45a0e7566c784a4f5c8d7e6e5fed8976b92b

hgext/hgsubversion/hooks/updatemeta.py

@@ -3,29 +3,29 @@
 #
 # To install, add the following to your hgrc:
 # [hooks]
-# changegroup = python:hgsubversion.hooks.updatemeta.hook
+# changegroup = python:hgext.hgsubversion.hooks.updatemeta.hook
 
 # no-check-code -- see T24862348
 
 from mercurial import node
 
-import hgsubversion
-import hgsubversion.util
-import hgsubversion.svncommands
+import hgext.hgsubversion
+import hgext.hgsubversion.util
+import hgext.hgsubversion.svncommands
 
 def hook(ui, repo, **kwargs):
     updatemeta = False
     startrev = repo[node.bin(kwargs["node"])].rev()
     # Check each rev until we find one that contains svn metadata
     for rev in xrange(startrev, len(repo)):
-        svnrev = hgsubversion.util.getsvnrev(repo[rev])
+        svnrev = hgext.hgsubversion.util.getsvnrev(repo[rev])
         if svnrev and svnrev.startswith("svn:"):
             updatemeta = True
             break
 
     if updatemeta:
         try:
-            hgsubversion.svncommands.updatemeta(ui, repo, args=[])
+            hgext.hgsubversion.svncommands.updatemeta(ui, repo, args=[])
             ui.status("Updated svn metadata\n")
         except Exception, e:
             ui.warn("Failed to update svn metadata: %s" % str(e))

tests/hgsubversion/comprehensive/test_custom_layout.py

@@ -13,7 +13,7 @@ except ImportError:
     sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
     import test_util
 
-from hgsubversion import svnwrap
+from hgext.hgsubversion import svnwrap
 
 
 def _do_case(self, name, stupid):

tests/hgsubversion/comprehensive/test_rebuildmeta.py

@@ -17,9 +17,9 @@ from mercurial import hg
 from mercurial import localrepo
 from mercurial import util as hgutil
 
-from hgsubversion import svncommands
-from hgsubversion import svnmeta
-from hgsubversion import util
+from hgext.hgsubversion import svncommands
+from hgext.hgsubversion import svnmeta
+from hgext.hgsubversion import util
 
 # These test repositories have harmless skew in rebuildmeta for the
 # last-pulled-rev because the last rev in svn causes absolutely no

tests/hgsubversion/comprehensive/test_sqlite_revmap.py

@@ -28,7 +28,7 @@ except ImportError:
 import test_rebuildmeta
 import test_updatemeta
 
-from hgsubversion import svnmeta, maps
+from hgext.hgsubversion import svnmeta, maps
 
 
 class SqliteRevMapMixIn(object):

tests/hgsubversion/comprehensive/test_stupid_pull.py

@@ -13,7 +13,7 @@ except ImportError:
     sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
     import test_util
 
-from hgsubversion import svnwrap
+from hgext.hgsubversion import svnwrap
 
 
 def _do_case(self, name, layout):

tests/hgsubversion/comprehensive/test_updatemeta.py

@@ -16,7 +16,7 @@ import test_rebuildmeta
 from mercurial import context
 from mercurial import extensions
 
-from hgsubversion import svncommands
+from hgext.hgsubversion import svncommands
 
 
 

tests/hgsubversion/comprehensive/test_verify_and_startrev.py

@@ -11,7 +11,7 @@ except ImportError:
     sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
     import test_util
 
-from hgsubversion import verify
+from hgext.hgsubversion import verify
 
 # these fixtures contain no files at HEAD and would result in empty clones
 _skipshallow = set([

tests/hgsubversion/test_diff.py

@@ -1,6 +1,6 @@
 import test_util
 
-from hgsubversion import wrappers
+from hgext.hgsubversion import wrappers
 
 expected_diff_output = '''Index: alpha
 ===================================================================

tests/hgsubversion/test_externals.py

@@ -15,7 +15,7 @@ except (ImportError, AttributeError), e:
     print >> sys.stderr, 'test_externals: skipping .hgsub tests'
     subrepo = None
 
-from hgsubversion import svnexternals
+from hgext.hgsubversion import svnexternals
 
 class TestFetchExternals(test_util.TestBase):
     stupid_mode_tests = True

tests/hgsubversion/test_fetch_branches.py

@@ -7,7 +7,7 @@ import unittest
 from mercurial import error
 from mercurial import hg
 
-from hgsubversion import compathacks
+from hgext.hgsubversion import compathacks
 
 class TestFetchBranches(test_util.TestBase):
     stupid_mode_tests = True

tests/hgsubversion/test_fetch_command_regexes.py

@@ -2,7 +2,7 @@
 
 import unittest
 
-from hgsubversion import stupid
+from hgext.hgsubversion import stupid
 
 
 two_empties = """Index: __init__.py

tests/hgsubversion/test_fetch_mappings.py

@@ -9,9 +9,9 @@ import os
 from mercurial import commands
 from mercurial import node
 
-from hgsubversion import maps
-from hgsubversion import svncommands
-from hgsubversion import verify
+from hgext.hgsubversion import maps
+from hgext.hgsubversion import svncommands
+from hgext.hgsubversion import verify
 
 class MapTests(test_util.TestBase):
     stupid_mode_tests = True

tests/hgsubversion/test_helpers.py

@@ -3,7 +3,7 @@ import os, sys, unittest
 _rootdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.insert(0, _rootdir)
 
-from hgsubversion import editor
+from hgext.hgsubversion import editor
 
 class TestHelpers(unittest.TestCase):
     def test_filestore(self):

tests/hgsubversion/test_hooks.py

@@ -23,20 +23,20 @@ class TestHooks(test_util.TestBase):
         commands.clone(self.repo.ui, self.wc_path, new_wc_path)
         newrepo = hg.repository(test_util.testui(), new_wc_path)
         newrepo.ui.setconfig('hooks', 'changegroup.meta',
-                'python:hgsubversion.hooks.updatemeta.hook')
+                'python:hgext.hgsubversion.hooks.updatemeta.hook')
 
         # Commit a rev that should trigger svn meta update
         self.add_svn_rev(repo_path, {'trunk/alpha': 'Changed Again'})
         commands.pull(self.repo.ui, self.repo)
 
         self.called = False
-        import hgsubversion.svncommands
-        oldupdatemeta = hgsubversion.svncommands.updatemeta
+        from hgext.hgsubversion import svncommands
+        oldupdatemeta = svncommands.updatemeta
         def _updatemeta(ui, repo, args=[]):
             self.called = True
-        hgsubversion.svncommands.updatemeta = _updatemeta
+        svncommands.updatemeta = _updatemeta
 
         # Pull and make sure our updatemeta function gets called
         commands.pull(newrepo.ui, newrepo)
-        hgsubversion.svncommands.updatemeta = oldupdatemeta
+        svncommands.updatemeta = oldupdatemeta
         self.assertTrue(self.called)

tests/hgsubversion/test_pull.py

@@ -3,7 +3,7 @@ import test_util
 from mercurial import node
 from mercurial import util as hgutil
 from mercurial import commands
-from hgsubversion import verify
+from hgext.hgsubversion import verify
 
 class TestPull(test_util.TestBase):
     def setUp(self):

tests/hgsubversion/test_pull_fallback.py

@@ -2,7 +2,7 @@ import test_util
 
 import mercurial
 from mercurial import commands
-from hgsubversion import stupid
+from hgext.hgsubversion import stupid
 
 class TestPullFallback(test_util.TestBase):
     def setUp(self):

tests/hgsubversion/test_push_autoprops.py

@@ -2,7 +2,7 @@ import os
 
 import test_util
 
-from hgsubversion import svnwrap
+from hgext.hgsubversion import svnwrap
 
 class PushAutoPropsTests(test_util.TestBase):
     obsolete_mode_tests = True

tests/hgsubversion/test_push_command.py

@@ -17,8 +17,8 @@ from mercurial import node
 from mercurial import revlog
 from mercurial import util as hgutil
 
-from hgsubversion import util
-from hgsubversion import compathacks
+from hgext.hgsubversion import util
+from hgext.hgsubversion import compathacks
 
 import time
 
@@ -401,7 +401,7 @@ class PushTests(test_util.TestBase):
                             ],
                            parent='default',
                            message='commit to default')
-        from hgsubversion import svncommands
+        from hgext.hgsubversion import svncommands
         svncommands.rebuildmeta(u,
                                 self.repo,
                                 args=[test_util.fileurl(self.repo_path)])

tests/hgsubversion/test_revmap_migrate.py

@@ -1,6 +1,6 @@
 import test_util
 
-from hgsubversion import svnmeta, maps
+from hgext.hgsubversion import svnmeta, maps
 
 class TestRevMapMigrate(test_util.TestBase):
 

tests/hgsubversion/test_single_dir_clone.py

@@ -4,7 +4,7 @@ import test_util
 
 import shutil
 
-from hgsubversion import compathacks
+from hgext.hgsubversion import compathacks
 
 class TestSingleDirClone(test_util.TestBase):
     stupid_mode_tests = True

tests/hgsubversion/test_single_dir_push.py

@@ -9,7 +9,7 @@ from mercurial import context
 from mercurial import hg
 from mercurial import node
 
-from hgsubversion import compathacks
+from hgext.hgsubversion import compathacks
 
 class TestSingleDirPush(test_util.TestBase):
     stupid_mode_tests = True

tests/hgsubversion/test_svnwrap.py

@@ -7,7 +7,7 @@ import subprocess
 import tempfile
 import unittest
 
-from hgsubversion import svnwrap
+from hgext.hgsubversion import svnwrap
 
 class TestBasicRepoLayout(unittest.TestCase):
     def setUp(self):

tests/hgsubversion/test_tags.py

@@ -7,8 +7,8 @@ import os, cStringIO, difflib
 from mercurial import commands
 from mercurial import error
 
-from hgsubversion import compathacks
-from hgsubversion import svncommands
+from hgext.hgsubversion import compathacks
+from hgext.hgsubversion import svncommands
 
 class TestTags(test_util.TestBase):
     stupid_mode_tests = True

tests/hgsubversion/test_urls.py

@@ -4,8 +4,8 @@ import test_util
 
 import urllib
 
-from hgsubversion.svnwrap import parse_url
-from hgsubversion import svnrepo
+from hgext.hgsubversion.svnwrap import parse_url
+from hgext.hgsubversion import svnrepo
 
 class TestSubversionUrls(test_util.TestBase):
     def test_standard_url(self):

tests/hgsubversion/test_util.py

@@ -27,9 +27,9 @@ from mercurial import ui
 from mercurial import util as hgutil
 from mercurial import extensions
 
-from hgsubversion import compathacks
-from hgsubversion import svnrepo
-from hgsubversion import svnwrap
+from hgext.hgsubversion import compathacks
+from hgext.hgsubversion import svnrepo
+from hgext.hgsubversion import svnwrap
 
 try:
     from mercurial import obsolete
@@ -45,9 +45,9 @@ except AttributeError:
     else:
         SkipTest = None
 
-from hgsubversion import svnwrap
-from hgsubversion import util
-from hgsubversion import svnwrap
+from hgext.hgsubversion import svnwrap
+from hgext.hgsubversion import util
+from hgext.hgsubversion import svnwrap
 
 # Documentation for Subprocess.Popen() says:
 #   "Note that on Windows, you cannot set close_fds to true and
@@ -291,7 +291,7 @@ def fileurl(path):
 
 class _testui(ui.ui):
     def develwarn(self, msg, stacklevel=1, *args, **kwargs):
-        from hgsubversion import util
+        from hgext.hgsubversion import util
         if util.smartset is not None:
             config = args[0] if args else kwargs['config']
             raise Exception('flunked develwarn: %r (%r)' % (msg, config))

tests/hgsubversion/test_utility_commands.py

@@ -12,11 +12,11 @@ from mercurial import node
 from mercurial import commands
 from mercurial import util as hgutil
 
-from hgsubversion import util
-from hgsubversion import svncommands
-from hgsubversion import verify
-from hgsubversion import wrappers
-from hgsubversion import compathacks
+from hgext.hgsubversion import util
+from hgext.hgsubversion import svncommands
+from hgext.hgsubversion import verify
+from hgext.hgsubversion import wrappers
+from hgext.hgsubversion import compathacks
 
 expected_info_output = '''URL: %(repourl)s/%(branch)s
 Repository Root: %(repourl)s