kallithea Changeset - 73cfc54c87d5

Changeset - 73cfc54c87d5

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-08-04 19:28:38
marcin@python-works.com

fixed the push_ssl issues after mercurial 2.3 upgrade.
Set always to false, since rhodecode handles that by dedicated middleware.

2 files changed with 10 insertions and 2 deletions:

rhodecode/lib/utils.py

rhodecode/model/db.py

0 comments (0 inline, 0 general)

rhodecode/lib/utils.py

➞

Show inline comments

@@ @@ -309,16 +309,20 @@ def make_ui(read_from='file', path=None, @@
         ret = sa.query(RhodeCodeUi)\
             .options(FromCache("sql_cache_short", "get_hg_ui_settings"))\
             .all()
         hg_ui = ret
         for ui_ in hg_ui:
-            if ui_.ui_active and ui_.ui_key != 'push_ssl':
             if ui_.ui_active:
                 log.debug('settings ui from db[%s]%s:%s', ui_.ui_section,
                           ui_.ui_key, ui_.ui_value)
                 baseui.setconfig(ui_.ui_section, ui_.ui_key, ui_.ui_value)
             if ui_.ui_key == 'push_ssl':
                 # force set push_ssl requirement to False, rhodecode
                 # handles that
                 baseui.setconfig(ui_.ui_section, ui_.ui_key, False)
         meta.Session.remove()
     return baseui
 def set_rhodecode_config(config):

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -732,16 +732,20 @@ class Repository(Base, BaseModel): @@
         ret = RhodeCodeUi.query()\
             .options(FromCache("sql_cache_short", "repository_repo_ui")).all()
         hg_ui = ret
         for ui_ in hg_ui:
-            if ui_.ui_active and ui_.ui_key != 'push_ssl':
             if ui_.ui_active:
                 log.debug('settings ui from db[%s]%s:%s', ui_.ui_section,
                           ui_.ui_key, ui_.ui_value)
                 baseui.setconfig(ui_.ui_section, ui_.ui_key, ui_.ui_value)
             if ui_.ui_key == 'push_ssl':
                 # force set push_ssl requirement to False, rhodecode
                 # handles that
                 baseui.setconfig(ui_.ui_section, ui_.ui_key, False)
         return baseui
     @classmethod
     def inject_ui(cls, repo, extras={}):
         from rhodecode.lib.vcs.backends.hg import MercurialRepository

0 comments (0 inline, 0 general)