# HG changeset patch # User Mads Kiilerich # Date 2019-09-04 23:26:18 # Node ID 90e50aa705ee591d558dde47591c12d13750af23 # Parent 1943c6f00cd8c1c110ecbf7bccdedde997ba20de hg: fix pull requests between repositories by using the makeunionrepository factory with Mercurial 4.8 Follow-up to 9ca238e56396 that missed one case ... diff --git a/kallithea/controllers/pullrequests.py b/kallithea/controllers/pullrequests.py --- a/kallithea/controllers/pullrequests.py +++ b/kallithea/controllers/pullrequests.py @@ -532,9 +532,14 @@ class PullrequestsController(BaseRepoCon # 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',