Mercurial > kallithea
changeset 4935:6017996e4dcf
pullrequests: make sure union repo for "available updates" is made so its revision numbers are 100% org_scm compatible
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Fri, 20 Mar 2015 15:26:29 +0100 |
parents | d053efba3c0c |
children | bcc637ea79a8 |
files | kallithea/controllers/pullrequests.py |
diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/pullrequests.py Thu Mar 19 13:13:06 2015 +0100 +++ b/kallithea/controllers/pullrequests.py Fri Mar 20 15:26:29 2015 +0100 @@ -584,9 +584,12 @@ # also show changesets that not are descendants but would be merged in targethead = other_scm_instance.get_changeset(c.a_branch_name).raw_id if org_scm_instance.path != other_scm_instance.path: + # Note: org_scm_instance.path must come first so all + # valid revision numbers are 100% org_scm compatible + # - both for avail_revs and for revset results hgrepo = unionrepo.unionrepository(org_scm_instance.baseui, - other_scm_instance.path, - org_scm_instance.path) + org_scm_instance.path, + other_scm_instance.path) else: hgrepo = org_scm_instance._repo show = set(hgrepo.revs('::%ld & !::%s & !::%s',