Mercurial > public > src > rhodecode

changeset 2791:73cfc54c87d5 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed the push_ssl issues after mercurial 2.3 upgrade. Set always to false, since rhodecode handles that by dedicated middleware.
author Marcin Kuzminski <marcin@python-works.com>
date Sat, 04 Aug 2012 19:28:38 +0200
parents 2df8982bc40c
children ad0b61d9177a
files rhodecode/lib/utils.py rhodecode/model/db.py
diffstat 2 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/lib/utils.py	Sat Aug 04 18:55:20 2012 +0200
+++ b/rhodecode/lib/utils.py	Sat Aug 04 19:28:38 2012 +0200
@@ -312,10 +312,14 @@
 
         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
--- a/rhodecode/model/db.py	Sat Aug 04 18:55:20 2012 +0200
+++ b/rhodecode/model/db.py	Sat Aug 04 19:28:38 2012 +0200
@@ -735,10 +735,14 @@
 
         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