# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1422564542 -3600
# Node ID 9df497f29cf2538f29440e66013bc7f864395082
# Parent  b5d330604a9d51fa9d0abce994bbde5b5da2aabd
pullrequests: handle update lists when using same branch name in (presumably) different repos

diff -r b5d330604a9d -r 9df497f29cf2 kallithea/controllers/pullrequests.py
--- 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()