Changeset - 9ca238e56396
[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 5 insertions and 0 deletions:
0 comments (0 inline, 0 general)
kallithea/controllers/compare.py
Show inline comments
 
@@ -92,12 +92,17 @@ class CompareController(BaseRepoControll
 
            org_changesets = []
 
            other_changesets = []
 

	
 
        elif alias == 'hg':
 
            # case two independent repos
 
            if org_repo != other_repo:
 
                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
 

	
0 comments (0 inline, 0 general)