Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-11 07:55:47 +01:00
Code Issues Packages Projects Releases Activity

Merged in matt_harbison/scm-manager/1.x (pull request #43)

Browse Source 
Load global Mercurial configuration in 4.1+ and minor hook tweaks
This commit is contained in:
Sebastian Sdorra
2019-01-24 20:35:42 +00:00
parent 628973ed7d 405dd67275
commit 78b2874a19
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/python/hgweb.py
View File

@@ -36,7 +36,11 @@ from mercurial.hgweb import hgweb, wsgicgi
demandimport.enable() demandimport.enable()
u = uimod.ui() try:
u = uimod.ui.load()
except AttributeError:
# For installations earlier than Mercurial 4.1
u = uimod.ui()
# pass SCM_HTTP_POST_ARGS to enable experimental httppostargs protocol of mercurial # pass SCM_HTTP_POST_ARGS to enable experimental httppostargs protocol of mercurial
# SCM_HTTP_POST_ARGS is set by HgCGIServlet # SCM_HTTP_POST_ARGS is set by HgCGIServlet

4
scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/python/scmhooks.py
View File

@@ -46,7 +46,7 @@ def printMessages(ui, msgs):
for line in msgs: for line in msgs:
if line.startswith("_e") or line.startswith("_n"): if line.startswith("_e") or line.startswith("_n"):
line = line[2:]; line = line[2:];
ui.warn(line); ui.warn('%s\n' % line.rstrip())
def callHookUrl(ui, repo, hooktype, node): def callHookUrl(ui, repo, hooktype, node):
abort = True abort = True
@@ -78,8 +78,10 @@ def callHookUrl(ui, repo, hooktype, node):
printMessages(ui, msg.splitlines(True)) printMessages(ui, msg.splitlines(True))
else: else:
ui.warn( "ERROR: scm-hook failed with an unknown error\n" ) ui.warn( "ERROR: scm-hook failed with an unknown error\n" )
ui.traceback()
except ValueError: except ValueError:
ui.warn( "scm-hook failed with an exception\n" ) ui.warn( "scm-hook failed with an exception\n" )
ui.traceback()
return abort return abort
def callback(ui, repo, hooktype, node=None, source=None, pending=None, **kwargs): def callback(ui, repo, hooktype, node=None, source=None, pending=None, **kwargs):