kallithea Changeset - 82ec506f7378

Changeset - 82ec506f7378

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 10 years ago 2016-02-01 21:22:39
madski@unity3d.com

pullrequests: try to improve usability of PR update functionality

2 files changed with 3 insertions and 2 deletions:

kallithea/controllers/pullrequests.py

kallithea/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -608,13 +608,13 @@ class PullrequestsController(BaseRepoCon @@
                                                            org_scm_instance.path,
                                                            other_scm_instance.path)
                     else:
                         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]
                     c.update_msg = _('No changesets found for updating this pull request.')
                 # TODO: handle branch heads that not are tip-most

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -199,12 +199,13 @@ ${self.repo_context_bar('showpullrequest @@
                         <td><div class="message" style="white-space:normal; height:1.1em; max-width: 500px; padding:0">${h.urlify_commit(cs.message, c.repo_name)}</div></td>
                       %endif
                     </tr>
                   %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>
         </div>
       </div>
     </div>
@@ @@ -279,13 +280,13 @@ ${self.repo_context_bar('showpullrequest @@
     </div>
     <div class="form" style="clear:both">
       <div class="fields">
         %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
       </div>
     </div>
   ${h.end_form()}

0 comments (0 inline, 0 general)