diff --git a/pagure/forms.py b/pagure/forms.py index dab81bb..3fce751 100644 --- a/pagure/forms.py +++ b/pagure/forms.py @@ -207,7 +207,7 @@ class IssueForm(IssueFormSimplied): class RequestPullForm(PagureForm): - ''' Form to create a request pull. ''' + ''' Form to create a pull request. ''' title = wtforms.TextField( 'Title*', [wtforms.validators.Required()] @@ -217,7 +217,7 @@ class RequestPullForm(PagureForm): class RemoteRequestPullForm(RequestPullForm): - ''' Form to create a remote request pull. ''' + ''' Form to create a remote pull request. ''' git_repo = wtforms.TextField( 'Git repo address*', [wtforms.validators.Required()] diff --git a/pagure/lib/git.py b/pagure/lib/git.py index abca818..adec451 100644 --- a/pagure/lib/git.py +++ b/pagure/lib/git.py @@ -1356,7 +1356,8 @@ def diff_pull_request( if repo_obj.is_empty: raise pagure.exceptions.PagureException( - 'Fork is empty, there are no commits to request pulling') + 'Fork is empty, there are no commits to create a pull request with' + ) if not orig_repo.is_empty \ and request.branch not in orig_repo.listall_branches(): diff --git a/pagure/templates/commits.html b/pagure/templates/commits.html index 5fb5baa..92a37dc 100644 --- a/pagure/templates/commits.html +++ b/pagure/templates/commits.html @@ -84,7 +84,7 @@ username=username, namespace=repo.namespace, branch_to=head, branch_from=branchname or 'master') }}"> - {% if g.repo_committer %}Request pull{% else %}Compare{% endif %} + {% if g.repo_committer %}Create pull request{% else %}Compare{% endif %} {% endif %} diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html index 4bd41a1..9c4f3d2 100644 --- a/pagure/templates/issues.html +++ b/pagure/templates/issues.html @@ -55,14 +55,14 @@ (100.0 * (oth_issues_cnt / total_issues_cnt))|round|int }}% of {% if status|lower in ['open', 'true'] %}closed{% else %}open{% - endif %} issues on {{ total_issues_cnt }} issues in total"> + endif %} issues of total {{ total_issues_cnt }} issues"> {% if (issues | length + oth_issues_cnt) %} + endif %} issues of total {{ total_issues_cnt }} issues"> {{ (100.0 * (issues_cnt / total_issues_cnt))|round|int }}% {% endif %} diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html index 338cbc5..26e44e2 100644 --- a/pagure/templates/repo_info.html +++ b/pagure/templates/repo_info.html @@ -316,7 +316,7 @@ $(function() { \ {{ head }} \
\ - Request pull \ + Create pull request \
'; /*$($('.bodycontent').find('.row').children()[0]).before(html);*/ {% if repo.is_fork %} diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index 2f60f5a..c1113b8 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -122,7 +122,7 @@ def _get_pr_info(repo_obj, orig_repo, branch_from, branch_to): diff = repo_commit.tree.diff_to_tree(swap=True) else: raise pagure.exceptions.PagureException( - 'Fork is empty, there are no commits to request pulling' + 'Fork is empty, there are no commits to create a pull request with' ) return(diff, diff_commits, orig_commit) @@ -137,7 +137,7 @@ def _get_pr_info(repo_obj, orig_repo, branch_from, branch_to): @APP.route('/fork////pull-requests/') @APP.route('/fork////pull-requests') def request_pulls(repo, username=None, namespace=None): - """ Request pulling the changes from the fork into the project. + """ Create a pull request with the changes from the fork into the project. """ status = flask.request.args.get('status', 'Open') assignee = flask.request.args.get('assignee', None) @@ -238,7 +238,7 @@ def request_pulls(repo, username=None, namespace=None): @APP.route( '/fork////pull-request/') def request_pull(repo, requestid, username=None, namespace=None): - """ Request pulling the changes from the fork into the project. + """ Create a pull request with the changes from the fork into the project. """ repo = flask.g.repo @@ -443,7 +443,7 @@ def request_pull_edit(repo, requestid, username=None, namespace=None): SESSION.add(request) try: SESSION.commit() - flask.flash('Request pull edited!') + flask.flash('Pull request edited!') except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() APP.logger.exception(err) @@ -749,7 +749,7 @@ def pull_request_edit_comment( methods=['POST']) @login_required def merge_request_pull(repo, requestid, username=None, namespace=None): - """ Request pulling the changes from the fork into the project. + """ Create a pull request with the changes from the fork into the project. """ form = pagure.forms.ConfirmationForm() @@ -828,7 +828,7 @@ def merge_request_pull(repo, requestid, username=None, namespace=None): methods=['POST']) @login_required def cancel_request_pull(repo, requestid, username=None, namespace=None): - """ Cancel request pulling request. + """ Cancel a pull request. """ form = pagure.forms.ConfirmationForm() @@ -855,7 +855,7 @@ def cancel_request_pull(repo, requestid, username=None, namespace=None): merged=False) try: SESSION.commit() - flask.flash('Request pull canceled!') + flask.flash('Pull request canceled!') except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() APP.logger.exception(err) @@ -1016,7 +1016,7 @@ def fork_project(repo, username=None, namespace=None): '..', methods=('GET', 'POST')) def new_request_pull( repo, branch_to, branch_from, username=None, namespace=None): - """ Request pulling the changes from the fork into the project. + """ Create a pull request with the changes from the fork into the project. """ branch_to = flask.request.values.get('branch_to', branch_to) @@ -1170,7 +1170,8 @@ def new_request_pull( methods=('GET', 'POST')) @login_required def new_remote_request_pull(repo, username=None, namespace=None): - """ Request pulling the changes from a remote fork into the project. + """ Create a pull request with the changes from a remote fork into the + project. """ confirm = flask.request.values.get('confirm', False) diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py index 8aff525..5335b11 100644 --- a/tests/test_pagure_flask_ui_fork.py +++ b/tests/test_pagure_flask_ui_fork.py @@ -717,7 +717,7 @@ class PagureFlaskForktests(tests.Modeltests): 'Overview - test - Pagure', output.data) self.assertIn( '\n Fork is empty, there are no ' - 'commits to request pulling', output.data) + 'commits to create a pull request with', output.data) shutil.rmtree(newpath) @@ -1089,7 +1089,7 @@ index 0000000..2a552bb 'Overview - test - Pagure', output.data) self.assertIn( '\n Fork is empty, there are no ' - 'commits to request pulling', output.data) + 'commits to create a pull request with', output.data) shutil.rmtree(newpath) @@ -1171,7 +1171,7 @@ index 0000000..2a552bb self.assertIn( 'Overview - test - Pagure', output.data) self.assertIn( - '\n Request pull canceled!', + '\n Pull request canceled!', output.data) @patch('pagure.lib.notify.send_email') @@ -1536,7 +1536,7 @@ index 0000000..2a552bb 'Overview - test - Pagure', output.data) self.assertIn( '\n Fork is empty, there are ' - 'no commits to request pulling', output.data) + 'no commits to create a pull request with', output.data) output = self.app.get('/test/new_issue') csrf_token = output.data.split( @@ -1554,7 +1554,7 @@ index 0000000..2a552bb 'Overview - test - Pagure', output.data) self.assertIn( '\n Fork is empty, there are ' - 'no commits to request pulling', output.data) + 'no commits to create a pull request with', output.data) shutil.rmtree(newpath) @@ -1590,7 +1590,7 @@ index 0000000..2a552bb 'Overview - test - Pagure', output.data) self.assertIn( '\n Fork is empty, there are ' - 'no commits to request pulling', output.data) + 'no commits to create a pull request with', output.data) shutil.rmtree(newpath)