kallithea Changeset - 9df497f29cf2

Changeset - 9df497f29cf2

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 11 years ago 2015-01-29 21:49:02
madski@unity3d.com

pullrequests: handle update lists when using same branch name in (presumably) different repos

1 file changed with 2 insertions and 1 deletions:

kallithea/controllers/pullrequests.py

0 comments (0 inline, 0 general)

kallithea/controllers/pullrequests.py

➞

Show inline comments

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

0 comments (0 inline, 0 general)