kallithea Changeset - fab4e18432ba

Changeset - fab4e18432ba

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 11 years ago 2015-01-21 17:35:11
madski@unity3d.com

pull request: for available changesets, also show changesets that not are descendants and thus not available but will be merged in

2 files changed with 4 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

@@ @@ -578,7 +578,9 @@ class PullrequestsController(BaseRepoCon @@
                 avail_revs = org_scm_instance._repo.revs('%s:: & branch(%s)',
                                                          revs[0], c.cs_branch_name)
                 if len(avail_revs) > 1: # more than just revs[0]
                     show = set(avail_revs)
                     # also show changesets that not are descendants but would be merged in
                     show = set(org_scm_instance._repo.revs('::%ld & !::%s & !::%s',
                                                            avail_revs, revs[0], c.a_branch_name))
                     c.update_msg = _('This pull request can be updated with changes on %s:') % c.cs_branch_name
                 else:
                     show = set()

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -189,7 +189,7 @@ ${self.repo_context_bar('showpullrequest @@
                         <td colspan="2">${_("Current revision - no change")}</td>
                       %else:
                         <td>
                           %if editable:
+                          %if editable and cs.revision in c.avail_revs:
                             ${h.radio(name='updaterev', value=cs.raw_id)}
                           %endif
                         </td>

0 comments (0 inline, 0 general)