kallithea Changeset - 9ca238e56396

Changeset - 9ca238e56396

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 7 years ago 2018-10-29 01:20:21
mads@kiilerich.com

hg: update diff between repositories to support Mercurial 4.8 by using the makeunionrepository factory

1 file changed with 8 insertions and 3 deletions:

kallithea/controllers/compare.py

0 comments (0 inline, 0 general)

kallithea/controllers/compare.py

➞

Show inline comments

@@ @@ -86,27 +86,32 @@ class CompareController(BaseRepoControll @@
         :param other_repo: repo object, most likely the fork of org_repo. It has
             all changesets that we need to obtain
         :param other_rev: revision we want out compare to be made on other_repo
         """
         ancestors = None
         if org_rev == other_rev:
             org_changesets = []
             other_changesets = []
         elif alias == 'hg':
             # case two independent repos
             if org_repo != other_repo:
                 hgrepo = unionrepo.unionrepository(other_repo.baseui,
                                                    other_repo.path,
                                                    org_repo.path)
                 try:
                     hgrepo = unionrepo.makeunionrepository(other_repo.baseui,
                                                            other_repo.path,
                                                            org_repo.path)
                 except AttributeError: # makeunionrepository was introduced in Mercurial 4.8 23f2299e9e53
                     hgrepo = unionrepo.unionrepository(other_repo.baseui,
                                                        other_repo.path,
                                                        org_repo.path)
                 # all ancestors of other_rev will be in other_repo and
                 # rev numbers from hgrepo can be used in other_repo - org_rev ancestors cannot
             # no remote compare do it on the same repository
             else:
                 hgrepo = other_repo._repo
             ancestors = [hgrepo[ancestor].hex() for ancestor in
                          hgrepo.revs("id(%s) & ::id(%s)", other_rev, org_rev)]
             if ancestors:
                 log.debug("shortcut found: %s is already an ancestor of %s", other_rev, org_rev)
             else:

0 comments (0 inline, 0 general)