Mercurial > kallithea

changeset 5680:38fa9fe39baa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pullrequests: restore display of "Current revision - no change" at the bottom of the list of available updates Helps the user to understand that something can be selected.
author Mads Kiilerich <madski@unity3d.com>
date Mon, 01 Feb 2016 21:22:09 +0100
parents a78503ebf512
children 82ec506f7378
files kallithea/controllers/pullrequests.py kallithea/templates/pullrequests/pullrequest_show.html
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/controllers/pullrequests.py	Thu Sep 24 15:42:28 2015 +0200
+++ b/kallithea/controllers/pullrequests.py	Mon Feb 01 21:22:09 2016 +0100
@@ -609,7 +609,7 @@
                                                            other_scm_instance.path)
                     else:
                         hgrepo = org_scm_instance._repo
-                    show = set(hgrepo.revs('::%ld & !::%s & !::%s',
+                    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
                 else:
--- a/kallithea/templates/pullrequests/pullrequest_show.html	Thu Sep 24 15:42:28 2015 +0200
+++ b/kallithea/templates/pullrequests/pullrequest_show.html	Mon Feb 01 21:22:09 2016 +0100
@@ -185,7 +185,7 @@
                       %if cs.revision == c.cs_ranges[-1].revision:
                         <td>
                           %if editable:
-                            ${h.radio(name='updaterev', value='')}
+                            ${h.radio(name='updaterev', value='', checked=True)}
                           %endif
                         </td>
                         <td colspan="2">${_("Current revision - no change")}</td>