This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9383

errors: raise InputError on bad repo arguments
ClosedPublic

Authored by martinvonz on Nov 24 2020, 1:05 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG8939062597f0: errors: raise InputError on bad repo arguments
Summary

I'm not sure if one of these should be StateError...

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.

Event Timeline

martinvonz created this revision.Nov 24 2020, 1:05 PM
mharbison72 accepted this revision.Nov 25 2020, 1:34 AM
This revision is now accepted and ready to land.Nov 25 2020, 1:34 AM
martinvonz added a commit: rHG8939062597f0: errors: raise InputError on bad repo arguments.Nov 25 2020, 1:38 AM
Closed by commit rHG8939062597f0: errors: raise InputError on bad repo arguments (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 23665

mercurial/dispatch.py

try: try:
repo = hg.repository( repo = hg.repository(
ui, ui,
path=path, path=path,
presetupfuncs=req.prereposetups, presetupfuncs=req.prereposetups,
intents=func.intents, intents=func.intents,
) )
if not repo.local(): if not repo.local():
raise error.Abort( raise error.InputError(
_(b"repository '%s' is not local") % path _(b"repository '%s' is not local") % path
) )
repo.ui.setconfig( repo.ui.setconfig(
b"bundle", b"mainreporoot", repo.root, b'repo' b"bundle", b"mainreporoot", repo.root, b'repo'
) )
except error.RequirementError: except error.RequirementError:
raise raise
except error.RepoError: except error.RepoError:
if rpath: # invalid -R path if rpath: # invalid -R path
raise raise
if not func.optionalrepo: if not func.optionalrepo:
if func.inferrepo and args and not path: if func.inferrepo and args and not path:
# try to infer -R from command args # try to infer -R from command args
repos = pycompat.maplist(cmdutil.findrepo, args) repos = pycompat.maplist(cmdutil.findrepo, args)
guess = repos[0] guess = repos[0]
if guess and repos.count(guess) == len(repos): if guess and repos.count(guess) == len(repos):
req.args = [b'--repository', guess] + fullargs req.args = [b'--repository', guess] + fullargs
req.earlyoptions[b'repository'] = guess req.earlyoptions[b'repository'] = guess
return _dispatch(req) return _dispatch(req)
if not path: if not path:
raise error.RepoError( raise error.InputError(
_( _(
b"no repository found in" b"no repository found in"
b" '%s' (.hg not found)" b" '%s' (.hg not found)"
) )
% encoding.getcwd() % encoding.getcwd()
) )
raise raise
if repo: if repo:

tests/test-alias.t

nothing changed nothing changed
[1] [1]
$ hg exit1 $ hg exit1
[1] [1]
#if no-outer-repo #if no-outer-repo
$ hg root $ hg root
abort: no repository found in '$TESTTMP' (.hg not found) abort: no repository found in '$TESTTMP' (.hg not found)
[255] [10]
$ hg --config alias.hgroot='!hg root' hgroot $ hg --config alias.hgroot='!hg root' hgroot
abort: no repository found in '$TESTTMP' (.hg not found) abort: no repository found in '$TESTTMP' (.hg not found)
[255] [10]
#endif #endif

tests/test-dispatch.t

[255] [255]
#if no-outer-repo #if no-outer-repo
No repo: No repo:
$ hg cat $ hg cat
abort: no repository found in '$TESTTMP' (.hg not found) abort: no repository found in '$TESTTMP' (.hg not found)
[255] [10]
#endif #endif
#if rmcwd #if rmcwd
Current directory removed: Current directory removed:
$ mkdir $TESTTMP/repo1 $ mkdir $TESTTMP/repo1

tests/test-globalopts.t

Implicit -R: Implicit -R:
$ hg ann a/a $ hg ann a/a
0: a 0: a
$ hg ann a/a a/a $ hg ann a/a a/a
0: a 0: a
$ hg ann a/a b/b $ hg ann a/a b/b
abort: no repository found in '$TESTTMP' (.hg not found) abort: no repository found in '$TESTTMP' (.hg not found)
[255] [10]
$ hg -R b ann a/a $ hg -R b ann a/a
abort: a/a not under root '$TESTTMP/b' abort: a/a not under root '$TESTTMP/b'
(consider using '--cwd b') (consider using '--cwd b')
[255] [255]
$ hg log $ hg log
abort: no repository found in '$TESTTMP' (.hg not found) abort: no repository found in '$TESTTMP' (.hg not found)
[255] [10]
#endif #endif
Abbreviation of long option: Abbreviation of long option:
$ hg --repo c tip $ hg --repo c tip
changeset: 1:b6c483daf290 changeset: 1:b6c483daf290
tag: tip tag: tip

tests/test-i18n.t

(Translations are optional) (Translations are optional)
#if gettext no-outer-repo #if gettext no-outer-repo
Test that translations are compiled and installed correctly. Test that translations are compiled and installed correctly.
Default encoding in tests is "ascii" and the translation is encoded Default encoding in tests is "ascii" and the translation is encoded
using the "replace" error handler: using the "replace" error handler:
$ LANGUAGE=pt_BR hg tip $ LANGUAGE=pt_BR hg tip
abortado: n?o foi encontrado um reposit?rio em '$TESTTMP' (.hg n?o encontrado) abortado: n?o foi encontrado um reposit?rio em '$TESTTMP' (.hg n?o encontrado)
[255] [10]
Using a more accommodating encoding: Using a more accommodating encoding:
$ HGENCODING=UTF-8 LANGUAGE=pt_BR hg tip $ HGENCODING=UTF-8 LANGUAGE=pt_BR hg tip
abortado: n\xc3\xa3o foi encontrado um reposit\xc3\xb3rio em '$TESTTMP' (.hg n\xc3\xa3o encontrado) (esc) abortado: n\xc3\xa3o foi encontrado um reposit\xc3\xb3rio em '$TESTTMP' (.hg n\xc3\xa3o encontrado) (esc)
[255] [10]
Different encoding: Different encoding:
$ HGENCODING=Latin-1 LANGUAGE=pt_BR hg tip $ HGENCODING=Latin-1 LANGUAGE=pt_BR hg tip
abortado: n\xe3o foi encontrado um reposit\xf3rio em '$TESTTMP' (.hg n\xe3o encontrado) (esc) abortado: n\xe3o foi encontrado um reposit\xf3rio em '$TESTTMP' (.hg n\xe3o encontrado) (esc)
[255] [10]
#endif #endif
#if gettext #if gettext
Test keyword search in translated help text: Test keyword search in translated help text:
$ HGENCODING=UTF-8 LANGUAGE=de hg help -k Aktualisiert $ HGENCODING=UTF-8 LANGUAGE=de hg help -k Aktualisiert

tests/test-update-branches.t

o 0:60829823a42a o 0:60829823a42a
Make sure update doesn't assume b1 is a repository if invoked from outside: Make sure update doesn't assume b1 is a repository if invoked from outside:
$ cd .. $ cd ..
$ hg update b1 $ hg update b1
abort: no repository found in '$TESTTMP' (.hg not found) abort: no repository found in '$TESTTMP' (.hg not found)
[255] [10]
$ cd b1 $ cd b1
Test helper functions: Test helper functions:
$ revtest () { $ revtest () {
> msg=$1 > msg=$1
> dirtyflag=$2 # 'clean', 'dirty' or 'dirtysub' > dirtyflag=$2 # 'clean', 'dirty' or 'dirtysub'
> startrev=$3 > startrev=$3