# HG changeset patch # User Mads Kiilerich # Date 2016-02-01 21:22:09 # Node ID 38fa9fe39baafc4d0258b80fa2cf4cd9d2bacf99 # Parent a78503ebf512199aa1b6ad8aaad1340c7d6aae0e 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. diff --git a/kallithea/controllers/pullrequests.py b/kallithea/controllers/pullrequests.py --- a/kallithea/controllers/pullrequests.py +++ b/kallithea/controllers/pullrequests.py @@ -609,7 +609,7 @@ class PullrequestsController(BaseRepoCon 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: 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 @@ -185,7 +185,7 @@ ${self.repo_context_bar('showpullrequest %if cs.revision == c.cs_ranges[-1].revision: %if editable: - ${h.radio(name='updaterev', value='')} + ${h.radio(name='updaterev', value='', checked=True)} %endif ${_("Current revision - no change")}