##// END OF EJS Templates
disabled dotencode format for mercurial 1.7 usage and hg <=1.6 compatibility...
marcink -
r773:87677698 beta
parent child Browse files
Show More
@@ -149,6 +149,13 b' class DbManage(object):'
149 hooks4.ui_key = 'preoutgoing.pull_logger'
149 hooks4.ui_key = 'preoutgoing.pull_logger'
150 hooks4.ui_value = 'python:rhodecode.lib.hooks.log_pull_action'
150 hooks4.ui_value = 'python:rhodecode.lib.hooks.log_pull_action'
151
151
152 #for mercurial 1.7 set backward comapatibility with format
153
154 dotencode_disable = RhodeCodeUi()
155 dotencode_disable.ui_section = 'format'
156 dotencode_disable.ui_key = 'dotencode'
157 dotencode_disable.ui_section = 'false'
158
152
159
153 web1 = RhodeCodeUi()
160 web1 = RhodeCodeUi()
154 web1.ui_section = 'web'
161 web1.ui_section = 'web'
@@ -181,8 +188,6 b' class DbManage(object):'
181
188
182
189
183 try:
190 try:
184
185
186 self.sa.add(hooks1)
191 self.sa.add(hooks1)
187 self.sa.add(hooks2)
192 self.sa.add(hooks2)
188 self.sa.add(hooks3)
193 self.sa.add(hooks3)
@@ -194,6 +199,7 b' class DbManage(object):'
194 self.sa.add(paths)
199 self.sa.add(paths)
195 self.sa.add(hgsettings1)
200 self.sa.add(hgsettings1)
196 self.sa.add(hgsettings2)
201 self.sa.add(hgsettings2)
202 self.sa.add(dotencode_disable)
197 for k in ['ldap_active', 'ldap_host', 'ldap_port', 'ldap_ldaps',
203 for k in ['ldap_active', 'ldap_host', 'ldap_port', 'ldap_ldaps',
198 'ldap_dn_user', 'ldap_dn_pass', 'ldap_base_dn']:
204 'ldap_dn_user', 'ldap_dn_pass', 'ldap_base_dn']:
199
205
@@ -212,12 +212,15 b" def make_ui(read_from='file', path=None,"
212 ret = sa.query(RhodeCodeUi)\
212 ret = sa.query(RhodeCodeUi)\
213 .options(FromCache("sql_cache_short",
213 .options(FromCache("sql_cache_short",
214 "get_hg_ui_settings")).all()
214 "get_hg_ui_settings")).all()
215 meta.Session.remove()
215
216 hg_ui = ret
216 hg_ui = ret
217 for ui_ in hg_ui:
217 for ui_ in hg_ui:
218 if ui_.ui_active:
218 if ui_.ui_active:
219 log.debug('settings ui from db[%s]%s:%s', ui_.ui_section, ui_.ui_key, ui_.ui_value)
219 log.debug('settings ui from db[%s]%s:%s', ui_.ui_section,
220 ui_.ui_key, ui_.ui_value)
220 baseui.setconfig(ui_.ui_section, ui_.ui_key, ui_.ui_value)
221 baseui.setconfig(ui_.ui_section, ui_.ui_key, ui_.ui_value)
222
223 meta.Session.remove()
221 return baseui
224 return baseui
222
225
223
226
@@ -8,7 +8,7 b' requirements = ['
8 "Mako>=0.3.6",
8 "Mako>=0.3.6",
9 "vcs>=0.1.10",
9 "vcs>=0.1.10",
10 "pygments>=1.3.0",
10 "pygments>=1.3.0",
11 "mercurial>=1.6.4",
11 "mercurial>=1.7.1",
12 "whoosh>=1.3.1",
12 "whoosh>=1.3.1",
13 "celery>=2.1.3",
13 "celery>=2.1.3",
14 "py-bcrypt",
14 "py-bcrypt",
General Comments 0
You need to be logged in to leave comments. Login now