From 048b7a7bbd34b1d081cad596a19e25084519a522 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Tue, 26 Feb 2019 09:25:00 +0100 Subject: [PATCH] hooks: fixed again unicode problems with new pull-request link generator --- rhodecode/lib/hooks_base.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rhodecode/lib/hooks_base.py b/rhodecode/lib/hooks_base.py index 80a830ed..adeceae4 100644 --- a/rhodecode/lib/hooks_base.py +++ b/rhodecode/lib/hooks_base.py @@ -270,7 +270,7 @@ def post_push(extras): # make lock is a tri state False, True, None. We only release lock on False if extras.make_lock is False and not is_shadow_repo(extras): Repository.unlock(Repository.get_by_repo_name(extras.repository)) - msg = 'Released lock on repo `%s`\n' % extras.repository + msg = 'Released lock on repo `{}`\n'.format(safe_str(extras.repository)) output += msg if extras.locked_by[0]: @@ -284,8 +284,8 @@ def post_push(extras): output += _http_ret.title if extras.new_refs: - tmpl = extras.server_url + '/' + extras.repository + \ - "/pull-request/new?{ref_type}={ref_name}" + tmpl = '{}/{}/pull-request/new?{{ref_type}}={{ref_name}}'.format( + safe_str(extras.server_url), safe_str(extras.repository)) for branch_name in extras.new_refs['branches']: output += 'RhodeCode: open pull request link: {}\n'.format(