This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9328

errors: raise InputError when given non-existent paths etc
ClosedPublic

Authored by martinvonz on Nov 16 2020, 7:26 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG96ca817ec192: errors: raise InputError when given non-existent paths etc

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 23527

mercurial/cmdutil.py

raise error.InputError( raise error.InputError(
_( _(
b'cannot partially commit a merge ' b'cannot partially commit a merge '
b'(use "hg commit" instead)' b'(use "hg commit" instead)'
) )
) )
def fail(f, msg): def fail(f, msg):
raise error.Abort(b'%s: %s' % (f, msg)) raise error.InputError(b'%s: %s' % (f, msg))
force = opts.get(b'force') force = opts.get(b'force')
if not force: if not force:
match = matchmod.badmatch(match, fail) match = matchmod.badmatch(match, fail)
status = repo.status(match=match) status = repo.status(match=match)
overrides = {(b'ui', b'commitsubrepos'): True} overrides = {(b'ui', b'commitsubrepos'): True}

mercurial/localrepo.py

Revision information is gathered from the working directory, Revision information is gathered from the working directory,
match can be used to filter the committed files. If editor is match can be used to filter the committed files. If editor is
supplied, it is called to get a commit message. supplied, it is called to get a commit message.
""" """
if extra is None: if extra is None:
extra = {} extra = {}
def fail(f, msg): def fail(f, msg):
raise error.Abort(b'%s: %s' % (f, msg)) raise error.InputError(b'%s: %s' % (f, msg))
if not match: if not match:
match = matchmod.always() match = matchmod.always()
if not force: if not force:
match.bad = fail match.bad = fail
# lock() for recent changelog (see issue4368) # lock() for recent changelog (see issue4368)

tests/test-commit-interactive.t

Abort for untracked Abort for untracked
$ touch untracked $ touch untracked
$ hg commit -i -m should-fail empty-rw untracked $ hg commit -i -m should-fail empty-rw untracked
abort: untracked: file not tracked! abort: untracked: file not tracked!
[255] [10]
$ rm untracked $ rm untracked
Record empty file Record empty file
$ hg commit -i -d '0 0' -m empty empty-rw<<EOF $ hg commit -i -d '0 0' -m empty empty-rw<<EOF
> y > y
> EOF > EOF
diff --git a/empty-rw b/empty-rw diff --git a/empty-rw b/empty-rw

tests/test-commit.t

$ echo bar > bar $ echo bar > bar
$ hg add bar $ hg add bar
$ rm bar $ rm bar
$ hg commit -m commit-8 $ hg commit -m commit-8
nothing changed (1 missing files, see 'hg status') nothing changed (1 missing files, see 'hg status')
[1] [1]
$ hg commit -m commit-8-2 bar $ hg commit -m commit-8-2 bar
abort: bar: file not found! abort: bar: file not found!
[255] [10]
$ hg -q revert -a --no-backup $ hg -q revert -a --no-backup
$ mkdir dir $ mkdir dir
$ echo boo > dir/file $ echo boo > dir/file
$ hg add $ hg add
adding dir/file adding dir/file
$ hg -v commit -m commit-9 dir $ hg -v commit -m commit-9 dir
committing files: committing files:
dir/file dir/file
committing manifest committing manifest
committing changelog committing changelog
committed changeset 4:1957363f1ced committed changeset 4:1957363f1ced
$ echo > dir.file $ echo > dir.file
$ hg add $ hg add
adding dir.file adding dir.file
$ hg commit -m commit-10 dir dir.file $ hg commit -m commit-10 dir dir.file
abort: dir: no match under directory! abort: dir: no match under directory!
[255] [10]
$ echo >> dir/file $ echo >> dir/file
$ mkdir bleh $ mkdir bleh
$ mkdir dir2 $ mkdir dir2
$ cd bleh $ cd bleh
$ hg commit -m commit-11 . $ hg commit -m commit-11 .
abort: bleh: no match under directory! abort: bleh: no match under directory!
[255] [10]
$ hg commit -m commit-12 ../dir ../dir2 $ hg commit -m commit-12 ../dir ../dir2
abort: dir2: no match under directory! abort: dir2: no match under directory!
[255] [10]
$ hg -v commit -m commit-13 ../dir $ hg -v commit -m commit-13 ../dir
committing files: committing files:
dir/file dir/file
committing manifest committing manifest
committing changelog committing changelog
committed changeset 5:a31d8f87544a committed changeset 5:a31d8f87544a
$ cd .. $ cd ..
$ hg commit -m commit-14 does-not-exist $ hg commit -m commit-14 does-not-exist
abort: does-not-exist: * (glob) abort: does-not-exist: * (glob)
[255] [10]
#if symlink #if symlink
$ ln -s foo baz $ ln -s foo baz
$ hg commit -m commit-15 baz $ hg commit -m commit-15 baz
abort: baz: file not tracked! abort: baz: file not tracked!
[255] [10]
$ rm baz $ rm baz
#endif #endif
$ touch quux $ touch quux
$ hg commit -m commit-16 quux $ hg commit -m commit-16 quux
abort: quux: file not tracked! abort: quux: file not tracked!
[255] [10]
$ echo >> dir/file $ echo >> dir/file
$ hg -v commit -m commit-17 dir/file $ hg -v commit -m commit-17 dir/file
committing files: committing files:
dir/file dir/file
committing manifest committing manifest
committing changelog committing changelog
committed changeset 6:32d054c9d085 committed changeset 6:32d054c9d085

tests/test-largefiles.t

M large3 M large3
A large5 A large5
A sub2/large6 A sub2/large6
A sub2/large7 A sub2/large7
$ hg rollback --quiet $ hg rollback --quiet
$ hg revert --quiet z $ hg revert --quiet z
$ hg commit -m "Empty subdir" z $ hg commit -m "Empty subdir" z
abort: z: no match under directory! abort: z: no match under directory!
[255] [10]
$ rm -rf z $ rm -rf z
$ hg ci -m "standin" .hglf $ hg ci -m "standin" .hglf
abort: file ".hglf" is a largefile standin abort: file ".hglf" is a largefile standin
(commit the largefile itself instead) (commit the largefile itself instead)
[255] [255]
Test "hg status" with combination of 'file pattern' and 'directory Test "hg status" with combination of 'file pattern' and 'directory
pattern' for largefiles: pattern' for largefiles:

tests/test-symlinks.t

$ cd .. $ cd ..
$ hg init b $ hg init b
$ cd b $ cd b
$ ln -s nothing dangling $ ln -s nothing dangling
$ hg commit -m 'commit symlink without adding' dangling $ hg commit -m 'commit symlink without adding' dangling
abort: dangling: file not tracked! abort: dangling: file not tracked!
[255] [10]
$ hg add dangling $ hg add dangling
$ hg commit -m 'add symlink' $ hg commit -m 'add symlink'
$ hg tip -v $ hg tip -v
changeset: 0:cabd88b706fc changeset: 0:cabd88b706fc
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000