kallithea Changeset - dd240b2b7a12

Changeset - dd240b2b7a12

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-08-15 18:25:38
marcin@python-works.com

Added optional flag to make_ui to not clean sqlalchemy Session.
Don't clear sqlalchemy session when using make_ui in admin repo form

2 files changed with 5 insertions and 5 deletions:

rhodecode/lib/utils.py

rhodecode/model/validators.py

0 comments (0 inline, 0 general)

rhodecode/lib/utils.py

➞

Show inline comments

@@ @@ -280,7 +280,7 @@ ui_sections = ['alias', 'auth', @@
                 'ui', 'web', ]
 def make_ui(read_from='file', path=None, checkpaths=True):
+def make_ui(read_from='file', path=None, checkpaths=True, clear_session=True):
     """
     A function that will read python rc files or database
     and make an mercurial ui object from read options
@@ @@ -325,7 +325,7 @@ def make_ui(read_from='file', path=None, @@
                 # force set push_ssl requirement to False, rhodecode
                 # handles that
                 baseui.setconfig(ui_.ui_section, ui_.ui_key, False)
+        if clear_session:
         meta.Session.remove()
     return baseui

rhodecode/model/validators.py

➞

Show inline comments

@@ @@ -377,10 +377,10 @@ def ValidCloneUri(): @@
                 ## initially check if it's at least the proper URL
                 ## or does it pass basic auth
                 MercurialRepository._check_url(url)
-                httppeer(make_ui('db'), url)._capabilities()
+                httppeer(ui, url)._capabilities()
             elif url.startswith('svn+http'):
                 from hgsubversion.svnrepo import svnremoterepo
-                svnremoterepo(make_ui('db'), url).capabilities
+                svnremoterepo(ui, url).capabilities
             elif url.startswith('git+http'):
                 raise NotImplementedError()
@@ @@ -410,7 +410,7 @@ def ValidCloneUri(): @@
                 pass
             else:
                 try:
                     url_handler(repo_type, url, make_ui('db'))
+                    url_handler(repo_type, url, make_ui('db', clear_session=False))
                 except Exception:
                     log.exception('Url validation failed')
                     msg = M(self, 'clone_uri')

0 comments (0 inline, 0 general)