kallithea Changeset - 752675cdd167

Changeset - 752675cdd167

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Marcin Kuzminski - 15 years ago 2010-06-28 18:24:53
marcin@python-works.com

made routes verification method based only on paths, since it's much faster and enough

2 files changed with 12 insertions and 6 deletions:

pylons_app/config/routing.py

pylons_app/lib/utils.py

0 comments (0 inline, 0 general)

pylons_app/config/routing.py

➞

Show inline comments

 """Routes configuration
 The more specific and detailed routes should be defined first so they
 may take precedent over the more generic routes. For more information
 refer to the routes manual at http://routes.groovie.org/docs/
 """
 from routes import Mapper
-from pylons_app.lib.utils import check_repo as cr
+from pylons_app.lib.utils import check_repo_fast as cr
 def make_map(config):
     """Create, configure and return the routes Mapper"""
     map = Mapper(directory=config['pylons.paths']['controllers'],
                  always_scan=config['debug'])
     map.minimization = False
     map.explicit = False
     # The ErrorController route (handles 404/500 error pages); it should
     # likely stay at the top, ensuring it can always be resolved
     map.connect('/error/{action}', controller='error')
     map.connect('/error/{action}/{id}', controller='error')

pylons_app/lib/utils.py

➞

Show inline comments

@@ @@ -44,40 +44,46 @@ def is_mercurial(environ): @@
         return True
     return False
 def check_repo_dir(paths):
     repos_path = paths[0][1].split('/')
     if repos_path[-1] in ['*', '**']:
         repos_path = repos_path[:-1]
     if repos_path[0] != '/':
         repos_path[0] = '/'
     if not os.path.isdir(os.path.join(*repos_path)):
         raise Exception('Not a valid repository in %s' % paths[0][1])
 def check_repo(repo_name, base_path):
 def check_repo_fast(repo_name, base_path):
     if os.path.isdir(os.path.join(base_path, repo_name)):return False
     return True
 def check_repo(repo_name, base_path, verify=True):
     repo_path = os.path.join(base_path, repo_name)
     try:
         if not check_repo_fast(repo_name, base_path):
             return False
         r = hg.repository(ui.ui(), repo_path)
         hg.verify(r)
         if verify:
             hg.verify(r)
         #here we hnow that repo exists it was verified
         log.info('%s repo is already created', repo_name)
         return False
         #raise Exception('Repo exists')
     except RepoError:
         #it means that there is no valid repo there...
         log.info('%s repo is free for creation', repo_name)
         #it means that there is no valid repo there...
         return True
 def make_ui(path=None, checkpaths=True):
     """
     A funcion that will read python rc files and make an ui from read options
     @param path: path to mercurial config file
     """
     if not path:
         log.error('repos config path is empty !')
     if not os.path.isfile(path):
         log.warning('Unable to read config file %s' % path)
         return False

0 comments (0 inline, 0 general)