Mercurial > kallithea

changeset 4803:9df497f29cf2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pullrequests: handle update lists when using same branch name in (presumably) different repos
author Mads Kiilerich <madski@unity3d.com>
date Thu, 29 Jan 2015 21:49:02 +0100
parents b5d330604a9d
children 5923d7474287
files kallithea/controllers/pullrequests.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/controllers/pullrequests.py	Thu Jan 29 21:48:31 2015 +0100
+++ b/kallithea/controllers/pullrequests.py	Thu Jan 29 21:49:02 2015 +0100
@@ -580,8 +580,9 @@
                                                          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()