# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 2015-01-21 17:35:11
# Node ID bfc304687f1cb11b243f2bd157f7e782f50d196f
# Parent  fab4e18432bae0f11a9ed3d5c682c2442d2ef007

pullrequests: show unrelated branch heads in the graph too, to visualize the situation

diff --git a/kallithea/controllers/pullrequests.py b/kallithea/controllers/pullrequests.py
--- a/kallithea/controllers/pullrequests.py
+++ b/kallithea/controllers/pullrequests.py
@@ -589,6 +589,9 @@ class PullrequestsController(BaseRepoCon
                 # TODO: handle branch heads that not are tip-most
                 brevs = org_scm_instance._repo.revs('%s - %ld', c.cs_branch_name, avail_revs)
                 if brevs:
+                    # also show changesets that are on branch but neither ancestors nor descendants
+                    show.update(org_scm_instance._repo.revs('::%ld - ::%ld - ::%s', brevs, avail_revs, c.a_branch_name))
+                    show.add(revs[0]) # make sure graph shows this so we can see how they relate
                     c.update_msg_other = _('Note: Branch %s has another head: %s.') % (c.cs_branch_name,
                         h.short_id(org_scm_instance.get_changeset((max(brevs))).raw_id))