# HG changeset patch # User Marcin Kuzminski # Date 2019-03-26 12:20:02 # Node ID af8890114002f4c9a3091630f4e47e1c32b23de2 # Parent 357ea821ba5d7c8a0e00ecebf89dbc38edd00d6a svn: expose txn_id in pre-commit hooks so we can analyze it in pre transaction hooks. diff --git a/vcsserver/hooks.py b/vcsserver/hooks.py --- a/vcsserver/hooks.py +++ b/vcsserver/hooks.py @@ -623,7 +623,7 @@ def git_post_receive(unused_repo_path, r def _get_extras_from_txn_id(path, txn_id): extras = {} try: - cmd = ['svnlook', 'pget', + cmd = [settings.SVNLOOK_EXECUTABLE, 'pget', '-t', txn_id, '--revprop', path, 'rc-scm-extras'] stdout, stderr = subprocessio.run_command( @@ -638,7 +638,7 @@ def _get_extras_from_txn_id(path, txn_id def _get_extras_from_commit_id(commit_id, path): extras = {} try: - cmd = ['svnlook', 'pget', + cmd = [settings.SVNLOOK_EXECUTABLE, 'pget', '-r', commit_id, '--revprop', path, 'rc-scm-extras'] stdout, stderr = subprocessio.run_command( @@ -664,7 +664,7 @@ def svn_pre_commit(repo_path, commit_dat return 0 extras['hook_type'] = 'pre_commit' - extras['commit_ids'] = [] + extras['commit_ids'] = [txn_id] extras['txn_id'] = txn_id extras['new_refs'] = { 'total_commits': 1, diff --git a/vcsserver/settings.py b/vcsserver/settings.py --- a/vcsserver/settings.py +++ b/vcsserver/settings.py @@ -17,4 +17,6 @@ WIRE_ENCODING = 'UTF-8' GIT_EXECUTABLE = 'git' +SVN_EXECUTABLE = 'svn' +SVNLOOK_EXECUTABLE = 'svnlook' BINARY_DIR = ''