moving repofactory to scm module

 - removing the cross module dependency forcing
   the imports to be in particular order

Author: tulinkry

opengrok-tools/src/main/python/opengrok_tools/mirror.py

@@ -40,20 +40,17 @@
 
 from filelock import Timeout, FileLock
 
+from .scm.repofactory import get_repository
+from .scm.repository import RepositoryException
 from .utils.hook import run_hook
 from .utils.log import get_console_logger, get_class_basename, \
     print_exc_exit
 from .utils.opengrok import get_repos, get_config_value, get_repo_type
 from .utils.parsers import get_baseparser
 from .utils.readconfig import read_config
-from .utils.repofactory import get_repository
 from .utils.utils import is_exe, check_create_dir, get_int, diff_list, \
     is_web_uri
 
-# do not reorder this import, it must be imported after utils.
-# (for me) idea reorders the import to the top, causing an import error
-from .scm.repository import RepositoryException
-
 major_version = sys.version_info[0]
 if major_version < 3:
     print("Need Python 3, you are running {}".format(major_version))

opengrok-tools/src/main/python/opengrok_tools/scm/__init__.py

@@ -1,10 +1,11 @@
 from .cvs import CVSRepository
 from .git import GitRepository
 from .mercurial import MercurialRepository
+from .repo import RepoRepository
+from .repofactory import get_repository
 from .repository import Repository
 from .svn import SubversionRepository
 from .teamware import TeamwareRepository
-from .repo import RepoRepository
 
 __all__ = [
     'CVSRepository',
@@ -14,4 +15,5 @@
     'TeamwareRepository',
     'Repository',
     'RepoRepository',
+    'get_repository',
 ]

opengrok-tools/src/main/python/opengrok_tools/utils/repofactory.py renamed to opengrok-tools/src/main/python/opengrok_tools/scm/repofactory.py

@@ -21,12 +21,12 @@
 # Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
 #
 
-from ..scm.cvs import CVSRepository
-from ..scm.git import GitRepository
-from ..scm.mercurial import MercurialRepository
-from ..scm.svn import SubversionRepository
-from ..scm.teamware import TeamwareRepository
-from ..scm.repo import RepoRepository
+from .cvs import CVSRepository
+from .git import GitRepository
+from .mercurial import MercurialRepository
+from .repo import RepoRepository
+from .svn import SubversionRepository
+from .teamware import TeamwareRepository
 
 
 def get_repository(logger, path, repo_type, project, commands, env, hooks,

opengrok-tools/src/main/python/opengrok_tools/utils/__init__.py

@@ -4,7 +4,6 @@
 from . import opengrok
 from . import parsers
 from . import readconfig
-from . import repofactory
 from . import utils
 from . import webutil
 
@@ -14,7 +13,6 @@
     'command',
     'commandsequence',
     'hook',
-    'repofactory',
     'webutil',
     'readconfig',
     'parsers',