Mercurial > kallithea
changeset 4788:bfc304687f1c
pullrequests: show unrelated branch heads in the graph too, to visualize the situation
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 21 Jan 2015 17:35:11 +0100 |
| parents | fab4e18432ba |
| children | 21fdc69bd446 |
| files | kallithea/controllers/pullrequests.py |
| diffstat | 1 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/pullrequests.py Wed Jan 21 17:35:11 2015 +0100 +++ b/kallithea/controllers/pullrequests.py Wed Jan 21 17:35:11 2015 +0100 @@ -589,6 +589,9 @@ # 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))