Mercurial > kallithea
changeset 5504:9416093966a0 stable
pull requests: skip 'This pull request has already been merged' check for ranges; they have been "merged" to the ancestor from the beginning
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 16 Sep 2015 02:54:32 +0200 |
| parents | 0fa831892e32 |
| children | 41fe196eeaf5 |
| files | kallithea/controllers/pullrequests.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/pullrequests.py Wed Sep 16 02:54:32 2015 +0200 +++ b/kallithea/controllers/pullrequests.py Wed Sep 16 02:54:32 2015 +0200 @@ -591,7 +591,7 @@ # candidates: descendants of old head that are on the right branch # and not are the old head itself ... # and nothing at all if old head is a descendant of target ref name - if other_scm_instance._repo.revs('present(%s)::&%s', c.cs_ranges[-1].raw_id, c.a_branch_name): + if not c.is_range and other_scm_instance._repo.revs('present(%s)::&%s', c.cs_ranges[-1].raw_id, c.a_branch_name): c.update_msg = _('This pull request has already been merged to %s.') % c.a_branch_name elif c.pull_request.is_closed(): c.update_msg = _('This pull request has been closed and can not be updated.')