# HG changeset patch # User Mads Kiilerich # Date 2016-02-01 21:22:39 # Node ID 82ec506f73787b248712b0cad0338cbf1295c1bd # Parent 38fa9fe39baafc4d0258b80fa2cf4cd9d2bacf99 pullrequests: try to improve usability of PR update functionality diff --git a/kallithea/controllers/pullrequests.py b/kallithea/controllers/pullrequests.py --- a/kallithea/controllers/pullrequests.py +++ b/kallithea/controllers/pullrequests.py @@ -611,7 +611,7 @@ class PullrequestsController(BaseRepoCon hgrepo = org_scm_instance._repo show = set(hgrepo.revs('::%ld & !::parents(%s) & !::%s', avail_revs, revs[0], targethead)) - c.update_msg = _('This pull request can be updated with changes on %s:') % c.cs_branch_name + c.update_msg = _('The following changes are available on %s:') % c.cs_branch_name else: show = set() avail_revs = set() # drop revs[0] diff --git a/kallithea/templates/pullrequests/pullrequest_show.html b/kallithea/templates/pullrequests/pullrequest_show.html --- a/kallithea/templates/pullrequests/pullrequest_show.html +++ b/kallithea/templates/pullrequests/pullrequest_show.html @@ -202,6 +202,7 @@ ${self.repo_context_bar('showpullrequest %endfor +
${_("Pull requests do not change once created. Select a revision and save to replace this pull request with a new one.")}
%endif
${c.update_msg_other}
@@ -282,7 +283,7 @@ ${self.repo_context_bar('showpullrequest %if editable:
${h.submit('pr-form-save',_('Save Changes'),class_="btn btn-small")} - ${h.submit('pr-form-clone',_('Save as New Pull Request'),class_="btn btn-small",disabled='disabled')} + ${h.submit('pr-form-clone',_('Save Updates as New Pull Request'),class_="btn btn-small",disabled='disabled')} ${h.reset('pr-form-reset',_('Cancel Changes'),class_="btn btn-small")}
%endif