| durin42 |
| hg-reviewers |
The previous commit introduced a mechanism to declare command intents.
This commit changes the repository and peer instantiation mechanism
so the intents are passed down to each repository and peer type so
they can do with them whatever they please.
Currently, nobody does anything with any intent.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/schemes.py (4 lines) | |||
| M | mercurial/bundlerepo.py (2 lines) | |||
| M | mercurial/dispatch.py (3 lines) | |||
| M | mercurial/hg.py (14 lines) | |||
| M | mercurial/httppeer.py (2 lines) | |||
| M | mercurial/localrepo.py (7 lines) | |||
| M | mercurial/sshpeer.py (2 lines) | |||
| M | mercurial/statichttprepo.py (2 lines) | |||
| M | mercurial/unionrepo.py (2 lines) |
| try: | try: | ||||
| self.parts = max(map(int, _partre.findall(self.url))) | self.parts = max(map(int, _partre.findall(self.url))) | ||||
| except ValueError: | except ValueError: | ||||
| self.parts = 0 | self.parts = 0 | ||||
| def __repr__(self): | def __repr__(self): | ||||
| return '<ShortRepository: %s>' % self.scheme | return '<ShortRepository: %s>' % self.scheme | ||||
| def instance(self, ui, url, create): | def instance(self, ui, url, create, intents=None): | ||||
| url = self.resolve(url) | url = self.resolve(url) | ||||
| return hg._peerlookup(url).instance(ui, url, create) | return hg._peerlookup(url).instance(ui, url, create, intents=intents) | ||||
| def resolve(self, url): | def resolve(self, url): | ||||
| # Should this use the util.url class, or is manual parsing better? | # Should this use the util.url class, or is manual parsing better? | ||||
| try: | try: | ||||
| url = url.split('://', 1)[1] | url = url.split('://', 1)[1] | ||||
| except IndexError: | except IndexError: | ||||
| raise error.Abort(_("no '://' in scheme url '%s'") % url) | raise error.Abort(_("no '://' in scheme url '%s'") % url) | ||||
| parts = url.split('/', self.parts) | parts = url.split('/', self.parts) | ||||
| p2rev = self.changelog.rev(p2) | p2rev = self.changelog.rev(p2) | ||||
| msg = _("setting parent to node %s that only exists in the bundle\n") | msg = _("setting parent to node %s that only exists in the bundle\n") | ||||
| if self.changelog.repotiprev < p1rev: | if self.changelog.repotiprev < p1rev: | ||||
| self.ui.warn(msg % nodemod.hex(p1)) | self.ui.warn(msg % nodemod.hex(p1)) | ||||
| if self.changelog.repotiprev < p2rev: | if self.changelog.repotiprev < p2rev: | ||||
| self.ui.warn(msg % nodemod.hex(p2)) | self.ui.warn(msg % nodemod.hex(p2)) | ||||
| return super(bundlerepository, self).setparents(p1, p2) | return super(bundlerepository, self).setparents(p1, p2) | ||||
| def instance(ui, path, create): | def instance(ui, path, create, intents=None): | ||||
| if create: | if create: | ||||
| raise error.Abort(_('cannot create new bundle repository')) | raise error.Abort(_('cannot create new bundle repository')) | ||||
| # internal config: bundle.mainreporoot | # internal config: bundle.mainreporoot | ||||
| parentpath = ui.config("bundle", "mainreporoot") | parentpath = ui.config("bundle", "mainreporoot") | ||||
| if not parentpath: | if not parentpath: | ||||
| # try to find the correct path to the working directory repo | # try to find the correct path to the working directory repo | ||||
| parentpath = cmdutil.findrepo(pycompat.getcwd()) | parentpath = cmdutil.findrepo(pycompat.getcwd()) | ||||
| if parentpath is None: | if parentpath is None: | ||||
| if repo: | if repo: | ||||
| # set the descriptors of the repo ui to those of ui | # set the descriptors of the repo ui to those of ui | ||||
| repo.ui.fin = ui.fin | repo.ui.fin = ui.fin | ||||
| repo.ui.fout = ui.fout | repo.ui.fout = ui.fout | ||||
| repo.ui.ferr = ui.ferr | repo.ui.ferr = ui.ferr | ||||
| else: | else: | ||||
| try: | try: | ||||
| repo = hg.repository(ui, path=path, | repo = hg.repository(ui, path=path, | ||||
| presetupfuncs=req.prereposetups) | presetupfuncs=req.prereposetups, | ||||
| intents=func.intents) | |||||
| if not repo.local(): | if not repo.local(): | ||||
| raise error.Abort(_("repository '%s' is not local") | raise error.Abort(_("repository '%s' is not local") | ||||
| % path) | % path) | ||||
| repo.ui.setconfig("bundle", "mainreporoot", repo.root, | repo.ui.setconfig("bundle", "mainreporoot", repo.root, | ||||
| 'repo') | 'repo') | ||||
| except error.RequirementError: | except error.RequirementError: | ||||
| raise | raise | ||||
| except error.RepoError: | except error.RepoError: | ||||
| if pathurl.islocal(): | if pathurl.islocal(): | ||||
| return util.posixfile(pathurl.localpath(), 'rb') | return util.posixfile(pathurl.localpath(), 'rb') | ||||
| else: | else: | ||||
| return url.open(ui, path) | return url.open(ui, path) | ||||
| # a list of (ui, repo) functions called for wire peer initialization | # a list of (ui, repo) functions called for wire peer initialization | ||||
| wirepeersetupfuncs = [] | wirepeersetupfuncs = [] | ||||
| def _peerorrepo(ui, path, create=False, presetupfuncs=None): | def _peerorrepo(ui, path, create=False, presetupfuncs=None, | ||||
| intents=None): | |||||
| """return a repository object for the specified path""" | """return a repository object for the specified path""" | ||||
| obj = _peerlookup(path).instance(ui, path, create) | obj = _peerlookup(path).instance(ui, path, create, intents=intents) | ||||
| ui = getattr(obj, "ui", ui) | ui = getattr(obj, "ui", ui) | ||||
| for f in presetupfuncs or []: | for f in presetupfuncs or []: | ||||
| f(ui, obj) | f(ui, obj) | ||||
| for name, module in extensions.extensions(ui): | for name, module in extensions.extensions(ui): | ||||
| hook = getattr(module, 'reposetup', None) | hook = getattr(module, 'reposetup', None) | ||||
| if hook: | if hook: | ||||
| hook(ui, obj) | hook(ui, obj) | ||||
| if not obj.local(): | if not obj.local(): | ||||
| for f in wirepeersetupfuncs: | for f in wirepeersetupfuncs: | ||||
| f(ui, obj) | f(ui, obj) | ||||
| return obj | return obj | ||||
| def repository(ui, path='', create=False, presetupfuncs=None): | def repository(ui, path='', create=False, presetupfuncs=None, intents=None): | ||||
| """return a repository object for the specified path""" | """return a repository object for the specified path""" | ||||
| peer = _peerorrepo(ui, path, create, presetupfuncs=presetupfuncs) | peer = _peerorrepo(ui, path, create, presetupfuncs=presetupfuncs, | ||||
| intents=intents) | |||||
| repo = peer.local() | repo = peer.local() | ||||
| if not repo: | if not repo: | ||||
| raise error.Abort(_("repository '%s' is not local") % | raise error.Abort(_("repository '%s' is not local") % | ||||
| (path or peer.url())) | (path or peer.url())) | ||||
| return repo.filtered('visible') | return repo.filtered('visible') | ||||
| def peer(uiorrepo, opts, path, create=False): | def peer(uiorrepo, opts, path, create=False, intents=None): | ||||
| '''return a repository peer for the specified path''' | '''return a repository peer for the specified path''' | ||||
| rui = remoteui(uiorrepo, opts) | rui = remoteui(uiorrepo, opts) | ||||
| return _peerorrepo(rui, path, create).peer() | return _peerorrepo(rui, path, create, intents=intents).peer() | ||||
| def defaultdest(source): | def defaultdest(source): | ||||
| '''return default destination of clone if none is given | '''return default destination of clone if none is given | ||||
| >>> defaultdest(b'foo') | >>> defaultdest(b'foo') | ||||
| 'foo' | 'foo' | ||||
| >>> defaultdest(b'/foo/bar') | >>> defaultdest(b'/foo/bar') | ||||
| 'bar' | 'bar' | ||||
| return API_PEERS[service]['init'](ui, respurl, apipath, opener, | return API_PEERS[service]['init'](ui, respurl, apipath, opener, | ||||
| requestbuilder, | requestbuilder, | ||||
| info['apis'][service]) | info['apis'][service]) | ||||
| # Failed to construct an API peer. Fall back to legacy. | # Failed to construct an API peer. Fall back to legacy. | ||||
| return httppeer(ui, path, respurl, opener, requestbuilder, | return httppeer(ui, path, respurl, opener, requestbuilder, | ||||
| info['v1capabilities']) | info['v1capabilities']) | ||||
| def instance(ui, path, create): | def instance(ui, path, create, intents=None): | ||||
| if create: | if create: | ||||
| raise error.Abort(_('cannot create new http repository')) | raise error.Abort(_('cannot create new http repository')) | ||||
| try: | try: | ||||
| if path.startswith('https:') and not urlmod.has_https: | if path.startswith('https:') and not urlmod.has_https: | ||||
| raise error.Abort(_('Python support for SSL and HTTPS ' | raise error.Abort(_('Python support for SSL and HTTPS ' | ||||
| 'is not installed')) | 'is not installed')) | ||||
| inst = makepeer(ui, path) | inst = makepeer(ui, path) | ||||
| # XXX shouldn't be dirstate covered by the wlock? | # XXX shouldn't be dirstate covered by the wlock? | ||||
| 'dirstate', | 'dirstate', | ||||
| # XXX bisect was still a bit too messy at the time | # XXX bisect was still a bit too messy at the time | ||||
| # this changeset was introduced. Someone should fix | # this changeset was introduced. Someone should fix | ||||
| # the remainig bit and drop this line | # the remainig bit and drop this line | ||||
| 'bisect.state', | 'bisect.state', | ||||
| } | } | ||||
| def __init__(self, baseui, path, create=False): | def __init__(self, baseui, path, create=False, intents=None): | ||||
| self.requirements = set() | self.requirements = set() | ||||
| self.filtername = None | self.filtername = None | ||||
| # wvfs: rooted at the repository root, used to access the working copy | # wvfs: rooted at the repository root, used to access the working copy | ||||
| self.wvfs = vfsmod.vfs(path, expandpath=True, realpath=True) | self.wvfs = vfsmod.vfs(path, expandpath=True, realpath=True) | ||||
| # vfs: rooted at .hg, used to access repo files outside of .hg/store | # vfs: rooted at .hg, used to access repo files outside of .hg/store | ||||
| self.vfs = None | self.vfs = None | ||||
| # svfs: usually rooted at .hg/store, used to access repository history | # svfs: usually rooted at .hg/store, used to access repository history | ||||
| # If this is a shared repository, this vfs may point to another | # If this is a shared repository, this vfs may point to another | ||||
| pass | pass | ||||
| return a | return a | ||||
| def undoname(fn): | def undoname(fn): | ||||
| base, name = os.path.split(fn) | base, name = os.path.split(fn) | ||||
| assert name.startswith('journal') | assert name.startswith('journal') | ||||
| return os.path.join(base, name.replace('journal', 'undo', 1)) | return os.path.join(base, name.replace('journal', 'undo', 1)) | ||||
| def instance(ui, path, create): | def instance(ui, path, create, intents=None): | ||||
| return localrepository(ui, util.urllocalpath(path), create) | return localrepository(ui, util.urllocalpath(path), create, | ||||
| intents=intents) | |||||
| def islocal(path): | def islocal(path): | ||||
| return True | return True | ||||
| def newreporequirements(repo): | def newreporequirements(repo): | ||||
| """Determine the set of requirements for a new local repository. | """Determine the set of requirements for a new local repository. | ||||
| Extensions can wrap this function to specify custom requirements for | Extensions can wrap this function to specify custom requirements for | ||||
| elif protoname == wireprototypes.SSHV2: | elif protoname == wireprototypes.SSHV2: | ||||
| return sshv2peer(ui, path, proc, stdin, stdout, stderr, caps, | return sshv2peer(ui, path, proc, stdin, stdout, stderr, caps, | ||||
| autoreadstderr=autoreadstderr) | autoreadstderr=autoreadstderr) | ||||
| else: | else: | ||||
| _cleanuppipes(ui, stdout, stdin, stderr) | _cleanuppipes(ui, stdout, stdin, stderr) | ||||
| raise error.RepoError(_('unknown version of SSH protocol: %s') % | raise error.RepoError(_('unknown version of SSH protocol: %s') % | ||||
| protoname) | protoname) | ||||
| def instance(ui, path, create): | def instance(ui, path, create, intents=None): | ||||
| """Create an SSH peer. | """Create an SSH peer. | ||||
| The returned object conforms to the ``wireprotov1peer.wirepeer`` interface. | The returned object conforms to the ``wireprotov1peer.wirepeer`` interface. | ||||
| """ | """ | ||||
| u = util.url(path, parsequery=False, parsefragment=False) | u = util.url(path, parsequery=False, parsefragment=False) | ||||
| if u.scheme != 'ssh' or not u.host or u.path is None: | if u.scheme != 'ssh' or not u.host or u.path is None: | ||||
| raise error.RepoError(_("couldn't parse location %s") % path) | raise error.RepoError(_("couldn't parse location %s") % path) | ||||
| _('cannot lock static-http repository')) | _('cannot lock static-http repository')) | ||||
| def lock(self, wait=True): | def lock(self, wait=True): | ||||
| raise error.Abort(_('cannot lock static-http repository')) | raise error.Abort(_('cannot lock static-http repository')) | ||||
| def _writecaches(self): | def _writecaches(self): | ||||
| pass # statichttprepository are read only | pass # statichttprepository are read only | ||||
| def instance(ui, path, create): | def instance(ui, path, create, intents=None): | ||||
| if create: | if create: | ||||
| raise error.Abort(_('cannot create new static-http repository')) | raise error.Abort(_('cannot create new static-http repository')) | ||||
| return statichttprepository(ui, path[7:]) | return statichttprepository(ui, path[7:]) | ||||
| return False | return False | ||||
| def peer(self): | def peer(self): | ||||
| return unionpeer(self) | return unionpeer(self) | ||||
| def getcwd(self): | def getcwd(self): | ||||
| return pycompat.getcwd() # always outside the repo | return pycompat.getcwd() # always outside the repo | ||||
| def instance(ui, path, create): | def instance(ui, path, create, intents=None): | ||||
| if create: | if create: | ||||
| raise error.Abort(_('cannot create new union repository')) | raise error.Abort(_('cannot create new union repository')) | ||||
| parentpath = ui.config("bundle", "mainreporoot") | parentpath = ui.config("bundle", "mainreporoot") | ||||
| if not parentpath: | if not parentpath: | ||||
| # try to find the correct path to the working directory repo | # try to find the correct path to the working directory repo | ||||
| parentpath = cmdutil.findrepo(pycompat.getcwd()) | parentpath = cmdutil.findrepo(pycompat.getcwd()) | ||||
| if parentpath is None: | if parentpath is None: | ||||
| parentpath = '' | parentpath = '' | ||||