Mercurial > kallithea
changeset 7883:90e50aa705ee stable
hg: fix pull requests between repositories by using the makeunionrepository factory with Mercurial 4.8
Follow-up to 9ca238e56396 that missed one case ...
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Wed, 04 Sep 2019 23:26:18 +0200 |
| parents | 1943c6f00cd8 |
| children | 011164f79bdb |
| files | kallithea/controllers/pullrequests.py |
| diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/pullrequests.py Wed Jul 31 21:31:23 2019 +0200 +++ b/kallithea/controllers/pullrequests.py Wed Sep 04 23:26:18 2019 +0200 @@ -532,9 +532,14 @@ # 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, - org_scm_instance.path, - other_scm_instance.path) + try: + hgrepo = unionrepo.makeunionrepository(org_scm_instance.baseui, + org_scm_instance.path, + other_scm_instance.path) + except AttributeError: # makeunionrepository was introduced in Mercurial 4.8 23f2299e9e53 + hgrepo = unionrepo.unionrepository(org_scm_instance.baseui, + org_scm_instance.path, + other_scm_instance.path) else: hgrepo = org_scm_instance._repo show = set(hgrepo.revs('::%ld & !::parents(%s) & !::%s',