Mercurial > hg-stable
changeset 14510:eccbb9980ada
dispatch: add repo to the request
allows callers of dispatch.dispatch to pass in
an initialized repo object to be used.
-R/--repository overrides the request repo.
| author | Idan Kamara <idankk86@gmail.com> |
|---|---|
| date | Thu, 02 Jun 2011 00:43:34 +0300 |
| parents | 4f695345979c |
| children | 30506b894359 |
| files | mercurial/dispatch.py |
| diffstat | 1 files changed, 26 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/dispatch.py Wed Jun 01 16:42:50 2011 -0500 +++ b/mercurial/dispatch.py Thu Jun 02 00:43:34 2011 +0300 @@ -12,9 +12,10 @@ import ui as uimod class request(object): - def __init__(self, args, ui=None): + def __init__(self, args, ui=None, repo=None): self.args = args self.ui = ui + self.repo = repo def run(): "run the command in sys.argv" @@ -592,26 +593,31 @@ repo = None cmdpats = args[:] if cmd not in commands.norepo.split(): - try: - repo = hg.repository(ui, path=path) - ui = repo.ui - if not repo.local(): - raise util.Abort(_("repository '%s' is not local") % path) - ui.setconfig("bundle", "mainreporoot", repo.root) - except error.RequirementError: - raise - except error.RepoError: - if cmd not in commands.optionalrepo.split(): - if args and not path: # try to infer -R from command args - repos = map(cmdutil.findrepo, args) - guess = repos[0] - if guess and repos.count(guess) == len(repos): - req.args = ['--repository', guess] + fullargs - return _dispatch(req) - if not path: - raise error.RepoError(_("no repository found in %r" - " (.hg not found)") % os.getcwd()) + # use the repo from the request only if we don't have -R + if not rpath: + repo = req.repo + + if not repo: + try: + repo = hg.repository(ui, path=path) + ui = repo.ui + if not repo.local(): + raise util.Abort(_("repository '%s' is not local") % path) + ui.setconfig("bundle", "mainreporoot", repo.root) + except error.RequirementError: raise + except error.RepoError: + if cmd not in commands.optionalrepo.split(): + if args and not path: # try to infer -R from command args + repos = map(cmdutil.findrepo, args) + guess = repos[0] + if guess and repos.count(guess) == len(repos): + req.args = ['--repository', guess] + fullargs + return _dispatch(req) + if not path: + raise error.RepoError(_("no repository found in %r" + " (.hg not found)") % os.getcwd()) + raise args.insert(0, repo) elif rpath: ui.warn(_("warning: --repository ignored\n"))