| |
@@ -122,7 +122,7 @@
|
| |
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 @@
|
| |
@APP.route('/fork/<username>/<namespace>/<repo>/pull-requests/')
|
| |
@APP.route('/fork/<username>/<namespace>/<repo>/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 @@
|
| |
@APP.route(
|
| |
'/fork/<username>/<namespace>/<repo>/pull-request/<int:requestid>')
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
'<path:branch_to>..<path:branch_from>', 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 @@
|
| |
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)
|
| |
|
| |
In issues display:
- A typo, substitute "on" with "of"
It's called a "pull request" and people are used to it, don't try
to be smarter than the industry. Also, be consistent of how you call
it across the whole system.