This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4556

unionrepo: dynamically create repository type from base repository
ClosedPublic

Authored by indygreg on Sep 12 2018, 10:02 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG23f2299e9e53: unionrepo: dynamically create repository type from base repository
Summary

This is basically the same thing we just did for bundlerepo except
for union repositories.

.. api::

``unionrepo.unionrepository()`` is no longer usable on its own.

To instantiate an instance, call ``unionrepo.instance()`` or
``unionrepo.makeunionrepository()``.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

Diff 10999

mercurial/unionrepo.py

return filelog.filelog.iscensored(self, rev) return filelog.filelog.iscensored(self, rev)
node = self.node(rev) node = self.node(rev)
return self.revlog2.iscensored(self.revlog2.rev(node)) return self.revlog2.iscensored(self.revlog2.rev(node))
class unionpeer(localrepo.localpeer): class unionpeer(localrepo.localpeer):
def canpush(self): def canpush(self):
return False return False
class unionrepository(localrepo.localrepository): class unionrepository(object):
def __init__(self, ui, path, path2): """Represents the union of data in 2 repositories.
localrepo.localrepository.__init__(self, ui, path)
self.ui.setconfig('phases', 'publish', False, 'unionrepo')
self._url = 'union:%s+%s' % (util.expandpath(path), Instances are not usable if constructed directly. Use ``instance()``
util.expandpath(path2)) or ``makeunionrepository()`` to create a usable instance.
self.repo2 = localrepo.localrepository(ui, path2) """
def __init__(self, repo2, url):
self.repo2 = repo2
self._url = url
self.ui.setconfig('phases', 'publish', False, 'unionrepo')
@localrepo.unfilteredpropertycache @localrepo.unfilteredpropertycache
def changelog(self): def changelog(self):
return unionchangelog(self.svfs, self.repo2.svfs) return unionchangelog(self.svfs, self.repo2.svfs)
def _clrev(self, rev2): def _clrev(self, rev2):
"""map from repo2 changelog rev to temporary rev in self.changelog""" """map from repo2 changelog rev to temporary rev in self.changelog"""
node = self.repo2.changelog.node(rev2) node = self.repo2.changelog.node(rev2)
if path.startswith('union:'): if path.startswith('union:'):
s = path.split(":", 1)[1].split("+", 1) s = path.split(":", 1)[1].split("+", 1)
if len(s) == 1: if len(s) == 1:
repopath, repopath2 = parentpath, s[0] repopath, repopath2 = parentpath, s[0]
else: else:
repopath, repopath2 = s repopath, repopath2 = s
else: else:
repopath, repopath2 = parentpath, path repopath, repopath2 = parentpath, path
return unionrepository(ui, repopath, repopath2)
return makeunionrepository(ui, repopath, repopath2)
def makeunionrepository(ui, repopath1, repopath2):
"""Make a union repository object from 2 local repo paths."""
repo1 = localrepo.instance(ui, repopath1, create=False)
repo2 = localrepo.instance(ui, repopath2, create=False)
url = 'union:%s+%s' % (util.expandpath(repopath1),
util.expandpath(repopath2))
class derivedunionrepository(unionrepository, repo1.__class__):
pass
repo = repo1
repo.__class__ = derivedunionrepository
unionrepository.__init__(repo1, repo2, url)
return repo