Mercurial > kallithea

changeset 5681:82ec506f7378

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pullrequests: try to improve usability of PR update functionality
author Mads Kiilerich <madski@unity3d.com>
date Mon, 01 Feb 2016 21:22:39 +0100
parents 38fa9fe39baa
children fff76ceb5e21
files kallithea/controllers/pullrequests.py kallithea/templates/pullrequests/pullrequest_show.html
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/controllers/pullrequests.py	Mon Feb 01 21:22:09 2016 +0100
+++ b/kallithea/controllers/pullrequests.py	Mon Feb 01 21:22:39 2016 +0100
@@ -611,7 +611,7 @@
                         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]
--- a/kallithea/templates/pullrequests/pullrequest_show.html	Mon Feb 01 21:22:09 2016 +0100
+++ b/kallithea/templates/pullrequests/pullrequest_show.html	Mon Feb 01 21:22:39 2016 +0100
@@ -202,6 +202,7 @@
                   %endfor
                 </table>
               </div>
+              <div class="msg-div">${_("Pull requests do not change once created. Select a revision and save to replace this pull request with a new one.")}</div>
               %endif
               <div class="msg-div">${c.update_msg_other}</div>
             </div>
@@ -282,7 +283,7 @@
         %if editable:
           <div class="buttons">
             ${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")}
           </div>
         %endif