core: move git/svn/hg into submodule

vcsserver/remote/__init__.py

@@ -0,0 +1,17 b''
+# RhodeCode VCSServer provides access to different vcs backends via network.
+# Copyright (C) 2014-2020 RhodeCode GmbH
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+

vcsserver/http_main.py

@@ -35,7 +35,6 b' import msgpack'
 import configparser
 
 from pyramid.config import Configurator
-from pyramid.settings import asbool, aslist
 from pyramid.wsgi import wsgiapp
 from pyramid.response import Response
 
@@ -69,7 +68,7 b' strict_vcs = True'
 
 git_import_err = None
 try:
-    from vcsserver.git import GitFactory, GitRemote
+    from vcsserver.remote.git import GitFactory, GitRemote
 except ImportError as e:
     GitFactory = None
     GitRemote = None
@@ -80,7 +79,7 b' except ImportError as e:'
 
 hg_import_err = None
 try:
-    from vcsserver.hg import MercurialFactory, HgRemote
+    from vcsserver.remote.hg import MercurialFactory, HgRemote
 except ImportError as e:
     MercurialFactory = None
     HgRemote = None
@@ -91,7 +90,7 b' except ImportError as e:'
 
 svn_import_err = None
 try:
-    from vcsserver.svn import SubversionFactory, SvnRemote
+    from vcsserver.remote.svn import SubversionFactory, SvnRemote
 except ImportError as e:
     SubversionFactory = None
     SvnRemote = None

vcsserver/tests/test_git.py

@@ -21,8 +21,7 b' import pytest'
 import dulwich.errors
 from mock import Mock, patch
 
-from vcsserver import git
-
+from vcsserver.remote import git
 
 SAMPLE_REFS = {
     'HEAD': 'fd627b9e0dd80b47be81af07c4a98518244ed2f7',

vcsserver/tests/test_hg.py

@@ -21,9 +21,10 b' import traceback'
 
 import pytest
 from mercurial.error import LookupError
-from mock import Mock, MagicMock, patch
+from mock import Mock, patch
 
-from vcsserver import exceptions, hg, hgcompat
+from vcsserver import exceptions, hgcompat
+from vcsserver.remote import hg
 
 
 class TestDiff(object):

vcsserver/tests/test_svn.py

@@ -44,7 +44,7 b" INVALID_CERTIFICATE_STDERR = '\\n'.join(["
 @pytest.mark.xfail(sys.platform == "cygwin",
                    reason="SVN not packaged for Cygwin")
 def test_import_remote_repository_certificate_error(stderr, expected_reason):
-    from vcsserver import svn
+    from vcsserver.remote import svn
     factory = mock.Mock()
     factory.repo = mock.Mock(return_value=mock.Mock())
 
@@ -63,7 +63,6 b' def test_import_remote_repository_certif'
 
 
 def test_svn_libraries_can_be_imported():
-    import svn
     import svn.client
     assert svn.client is not None
 
@@ -76,7 +75,7 b' def test_svn_libraries_can_be_imported()'
     ('http://', (None, None, 'http://')),
 ])
 def test_username_password_extraction_from_url(example_url, parts):
-    from vcsserver import svn
+    from vcsserver.remote import svn
 
     factory = mock.Mock()
     factory.repo = mock.Mock(return_value=mock.Mock())