engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pull-requests: change the naming from #NUM into !NUM.

Browse source 
- We'll later on enable global pattern matching and from now on refercing a pr should be
used with an ! not to confuse #NUM which is tickets/issues
This commit is contained in:
Daniel Dourvaris 2019-11-06 12:24:42 +01:00
parent 453a6ee9a2
commit 836aa041be
7 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rhodecode/lib/vcs/conf/settings.py
View file

@ -56,7 +56,7 @@ HOOKS_HOST = '127.0.0.1'
MERGE_MESSAGE_TMPL = (
u'Merge pull request #{pr_id} from {source_repo} {source_ref_name}\n\n '
u'Merge pull request !{pr_id} from {source_repo} {source_ref_name}\n\n '
u'{pr_title}')
MERGE_DRY_RUN_MESSAGE = 'dry_run_merge_message_from_rhodecode'
MERGE_DRY_RUN_USER = 'Dry-Run User'

6
rhodecode/templates/admin/my_account/my_account_pullrequests.mako
View file

@ -52,11 +52,11 @@ $(document).ready(function() {
{ data: {"_": "target_repo",
"sort": "target_repo"}, title: "${_('Target Repo')}", className: "td-targetrepo", orderable: false},
{ data: {"_": "name",
"sort": "name_raw"}, title: "${_('Name')}", className: "td-componentname", "type": "num" },
{ data: {"_": "author",
"sort": "author_raw"}, title: "${_('Author')}", className: "td-user", orderable: false },
"sort": "name_raw"}, title: "${_('Id')}", className: "td-componentname", "type": "num" },
{ data: {"_": "title",
"sort": "title"}, title: "${_('Title')}", className: "td-description" },
{ data: {"_": "author",
"sort": "author_raw"}, title: "${_('Author')}", className: "td-user", orderable: false },
{ data: {"_": "comments",
"sort": "comments_raw"}, title: "", className: "td-comments", orderable: false},
{ data: {"_": "updated_on",

4
rhodecode/templates/changeset/changeset_file_comment.mako
View file

@ -68,9 +68,9 @@
% if comment.pull_request:
<a href="${h.route_path('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id)}">
% if comment.status_change:
${_('pull request #%s') % comment.pull_request.pull_request_id}:
${_('pull request !{}').format(comment.pull_request.pull_request_id)}:
% else:
${_('pull request #%s') % comment.pull_request.pull_request_id}
${_('pull request !{}').format(comment.pull_request.pull_request_id)}
% endif
</a>
% else:

4
rhodecode/templates/data_table/_dt_elements.mako
View file

@ -371,9 +371,9 @@ ${h.style_metatag(tag_type, tag)|n,trim}
<%def name="pullrequest_name(pull_request_id, target_repo_name, short=False)">
<a href="${h.route_path('pullrequest_show',repo_name=target_repo_name,pull_request_id=pull_request_id)}">
% if short:
#${pull_request_id}
!${pull_request_id}
% else:
${_('Pull request #%(pr_number)s') % {'pr_number': pull_request_id,}}
${_('Pull request !{}').format(pull_request_id)}
% endif
</a>
</%def>

4
rhodecode/templates/pullrequests/pullrequest_show.mako
View file

@ -3,7 +3,7 @@
<%namespace name="dt" file="/data_table/_dt_elements.mako"/>
<%def name="title()">
${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)}
${_('{} Pull Request !{}').format(c.repo_name, c.pull_request.pull_request_id)}
%if c.rhodecode_name:
&middot; ${h.branding(c.rhodecode_name)}
%endif
@ -45,7 +45,7 @@
<div class="summary-details block-left">
<% summary = lambda n:{False:'summary-short'}.get(n) %>
<div class="pr-details-title">
<a href="${h.route_path('pull_requests_global', pull_request_id=c.pull_request.pull_request_id)}">${_('Pull request #%s') % c.pull_request.pull_request_id}</a> ${_('From')} ${h.format_date(c.pull_request.created_on)}
<a href="${h.route_path('pull_requests_global', pull_request_id=c.pull_request.pull_request_id)}">${_('Pull request !{}').format(c.pull_request.pull_request_id)}</a> ${_('From')} ${h.format_date(c.pull_request.created_on)}
%if c.allowed_to_update:
<div id="delete_pullrequest" class="pull-right action_button ${'' if c.allowed_to_delete else 'disabled' }" style="clear:inherit;padding: 0">
% if c.allowed_to_delete:

6
rhodecode/templates/pullrequests/pullrequests.mako
View file

@ -78,11 +78,11 @@ $(document).ready(function() {
{ data: {"_": "status",
"sort": "status"}, title: "", className: "td-status", orderable: false},
{ data: {"_": "name",
"sort": "name_raw"}, title: "${_('Name')}", className: "td-componentname", "type": "num" },
{ data: {"_": "author",
"sort": "author_raw"}, title: "${_('Author')}", className: "td-user", orderable: false },
"sort": "name_raw"}, title: "${_('Id')}", className: "td-componentname", "type": "num" },
{ data: {"_": "title",
"sort": "title"}, title: "${_('Title')}", className: "td-description" },
{ data: {"_": "author",
"sort": "author_raw"}, title: "${_('Author')}", className: "td-user", orderable: false },
{ data: {"_": "comments",
"sort": "comments_raw"}, title: "", className: "td-comments", orderable: false},
{ data: {"_": "updated_on",

6
rhodecode/tests/models/test_pullrequest.py
View file

@ -296,7 +296,7 @@ class TestPullRequestModel(object):
Session().commit()
message = (
u'Merge pull request #{pr_id} from {source_repo} {source_ref_name}'
u'Merge pull request !{pr_id} from {source_repo} {source_ref_name}'
u'\n\n {pr_title}'.format(
pr_id=pull_request.pull_request_id,
source_repo=safe_unicode(
@ -340,7 +340,7 @@ class TestPullRequestModel(object):
assert pull_request.pull_request_state == PullRequest.STATE_CREATED
message = (
u'Merge pull request #{pr_id} from {source_repo} {source_ref_name}'
u'Merge pull request !{pr_id} from {source_repo} {source_ref_name}'
u'\n\n {pr_title}'.format(
pr_id=pull_request.pull_request_id,
source_repo=safe_unicode(
@ -379,7 +379,7 @@ class TestPullRequestModel(object):
Session().commit()
message = (
u'Merge pull request #{pr_id} from {source_repo} {source_ref_name}'
u'Merge pull request !{pr_id} from {source_repo} {source_ref_name}'
u'\n\n {pr_title}'.format(
pr_id=pull_request.pull_request_id,
source_repo=safe_unicode(