kallithea Changeset - bc9a73adc216

Changeset - bc9a73adc216

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 15 years ago 2010-12-22 03:39:32
marcin@python-works.com

Added recursive scanning for repositories in directory

2 files changed with 25 insertions and 18 deletions:

rhodecode/lib/utils.py

rhodecode/model/scm.py

0 comments (0 inline, 0 general)

rhodecode/lib/utils.py

➞

Show inline comments

@@ @@ -107,37 +107,44 @@ def action_logger(user, action, repo, ip @@
         log.info('Adding user %s, action %s on %s', user_obj, action, repo)
     except:
         log.error(traceback.format_exc())
         sa.rollback()
-def get_repos(path, recursive=False, initial=False):
 def get_repos(path, recursive=False):
     """
     Scans given path for repos and return (name,(type,path)) tuple
     :param prefix:
     :param path:
     :param recursive:
     :param initial:
     :param path: path to scann for repositories
     :param recursive: recursive search and return names with subdirs in front
     """
     from vcs.utils.helpers import get_scm
     from vcs.exceptions import VCSError
     if path.endswith('/'):
         #add ending slash for better results
         path = path[:-1]
     def _get_repos(p):
         for dirpath in os.listdir(p):
             if os.path.isfile(os.path.join(p, dirpath)):
                 continue
             cur_path = os.path.join(p, dirpath)
     try:
         scm = get_scm(path)
     except:
         pass
     else:
         raise Exception('The given path %s should not be a repository got %s',
                         path, scm)
                 scm_info = get_scm(cur_path)
                 yield scm_info[1].split(path)[-1].lstrip('/'), scm_info
             except VCSError:
                 if not recursive:
                     continue
                 #check if this dir containts other repos for recursive scan
                 rec_path = os.path.join(p, dirpath)
                 if os.path.isdir(rec_path):
                     for inner_scm in _get_repos(rec_path):
                         yield inner_scm
     for dirpath in os.listdir(path):
         try:
             yield dirpath, get_scm(os.path.join(path, dirpath))
         except VCSError:
             pass
     return _get_repos(path)
 def check_repo_fast(repo_name, base_path):
     """
     Check given path for existence of directory
     :param repo_name:
     :param base_path:

rhodecode/model/scm.py

➞

Show inline comments

@@ @@ -38,13 +38,13 @@ from mercurial import ui @@
 from beaker.cache import cache_region, region_invalidate
 from rhodecode import BACKENDS
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import HasRepoPermissionAny
 from rhodecode.lib.utils import get_repos, make_ui, action_logger
+from rhodecode.lib.utils import get_repos as get_filesystem_repos, make_ui, action_logger
 from rhodecode.model import BaseModel
 from rhodecode.model.user import UserModel
 from rhodecode.model.db import Repository, RhodeCodeUi, CacheInvalidation, \
     UserFollowing, UserLog
 from rhodecode.model.caching_query import FromCache
@@ @@ -87,13 +87,13 @@ class ScmModel(BaseModel): @@
         log.info('scanning for repositories in %s', repos_path)
         if not isinstance(baseui, ui.ui):
             baseui = make_ui('db')
         repos_list = {}
-        for name, path in get_repos(repos_path):
+        for name, path in get_filesystem_repos(repos_path, recursive=True):
             try:
                 if repos_list.has_key(name):
                     raise RepositoryError('Duplicate repository name %s '
                                     'found in %s' % (name, path))
                 else:

0 comments (0 inline, 0 general)