This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9329

errors: use InputError for some errors on `hg clone`
ClosedPublic

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

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGd68618954ade: errors: use InputError for some errors on `hg clone`

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Nov 16 2020, 7:26 PM
mharbison72 accepted this revision.Nov 17 2020, 1:14 AM
mharbison72 added a subscriber: mharbison72.

Queued, thanks

This revision is now accepted and ready to land.Nov 17 2020, 1:14 AM
martinvonz added a commit: rHGd68618954ade: errors: use InputError for some errors on `hg clone`.Nov 17 2020, 1:34 AM
Closed by commit rHGd68618954ade: errors: use InputError for some errors on `hg clone` (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hg.py (6 lines)
Mtests/test-bundle.t (2 lines)
Mtests/test-clone.t (8 lines)
Mtests/test-http-clone-r.t (2 lines)
Mtests/test-ssh-bundle1.t (2 lines)
Mtests/test-ssh.t (2 lines)

Diff 23513

mercurial/hg.py

ui.status(_(b"destination directory: %s\n") % dest) ui.status(_(b"destination directory: %s\n") % dest)
else: else:
dest = ui.expandpath(dest) dest = ui.expandpath(dest)
dest = util.urllocalpath(dest) dest = util.urllocalpath(dest)
source = util.urllocalpath(source) source = util.urllocalpath(source)
if not dest: if not dest:
raise error.Abort(_(b"empty destination path is not valid")) raise error.InputError(_(b"empty destination path is not valid"))
destvfs = vfsmod.vfs(dest, expandpath=True) destvfs = vfsmod.vfs(dest, expandpath=True)
if destvfs.lexists(): if destvfs.lexists():
if not destvfs.isdir(): if not destvfs.isdir():
raise error.Abort(_(b"destination '%s' already exists") % dest) raise error.InputError(_(b"destination '%s' already exists") % dest)
elif destvfs.listdir(): elif destvfs.listdir():
raise error.Abort(_(b"destination '%s' is not empty") % dest) raise error.InputError(_(b"destination '%s' is not empty") % dest)
createopts = {} createopts = {}
narrow = False narrow = False
if storeincludepats is not None: if storeincludepats is not None:
narrowspec.validatepatterns(storeincludepats) narrowspec.validatepatterns(storeincludepats)
narrow = True narrow = True

tests/test-bundle.t

$ rm -r full-clone $ rm -r full-clone
When cloning from a non-copiable repository into '', do not When cloning from a non-copiable repository into '', do not
recurse infinitely (issue2528) recurse infinitely (issue2528)
$ hg clone full.hg '' $ hg clone full.hg ''
abort: empty destination path is not valid abort: empty destination path is not valid
[255] [10]
test for https://bz.mercurial-scm.org/216 test for https://bz.mercurial-scm.org/216
Unbundle incremental bundles into fresh empty in one go Unbundle incremental bundles into fresh empty in one go
$ rm -r empty $ rm -r empty
$ hg init empty $ hg init empty
$ hg -R test bundle --base null -r 0 ../0.hg $ hg -R test bundle --base null -r 0 ../0.hg

tests/test-clone.t

crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 11 changesets with 11 changes to 2 files checked 11 changesets with 11 changes to 2 files
Invalid dest '' must abort: Invalid dest '' must abort:
$ hg clone . '' $ hg clone . ''
abort: empty destination path is not valid abort: empty destination path is not valid
[255] [10]
No update, with debug option: No update, with debug option:
#if hardlink #if hardlink
$ hg --debug clone -U . ../c --config progress.debug=true $ hg --debug clone -U . ../c --config progress.debug=true
linking: 1 files linking: 1 files
linking: 2 files linking: 2 files
linking: 3 files linking: 3 files
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 11 changesets with 11 changes to 2 files checked 11 changesets with 11 changes to 2 files
Invalid dest '' with --pull must abort (issue2528): Invalid dest '' with --pull must abort (issue2528):
$ hg clone --pull a '' $ hg clone --pull a ''
abort: empty destination path is not valid abort: empty destination path is not valid
[255] [10]
Clone to '.': Clone to '.':
$ mkdir h $ mkdir h
$ cd h $ cd h
$ hg clone ../a . $ hg clone ../a .
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
#endif #endif
Default destination, same directory Default destination, same directory
$ hg init q $ hg init q
$ hg clone q $ hg clone q
destination directory: q destination directory: q
abort: destination 'q' is not empty abort: destination 'q' is not empty
[255] [10]
destination directory not empty destination directory not empty
$ mkdir a $ mkdir a
$ echo stuff > a/a $ echo stuff > a/a
$ hg clone q a $ hg clone q a
abort: destination 'a' is not empty abort: destination 'a' is not empty
[255] [10]
#if unix-permissions no-root #if unix-permissions no-root
leave existing directory in place after clone failure leave existing directory in place after clone failure
$ hg init c $ hg init c
$ cd c $ cd c

tests/test-http-clone-r.t

checking files checking files
checked 9 changesets with 7 changes to 4 files checked 9 changesets with 7 changes to 4 files
$ cd .. $ cd ..
no default destination if url has no path: no default destination if url has no path:
$ hg clone http://localhost:$HGPORT/ $ hg clone http://localhost:$HGPORT/
abort: empty destination path is not valid abort: empty destination path is not valid
[255] [10]
$ cat error.log $ cat error.log

tests/test-ssh-bundle1.t

abort: unknown revision 'noNoNO'! abort: unknown revision 'noNoNO'!
[255] [255]
Test (non-)escaping of remote paths with spaces when cloning (issue3145): Test (non-)escaping of remote paths with spaces when cloning (issue3145):
$ hg clone --ssh "\"$PYTHON\" \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" $ hg clone --ssh "\"$PYTHON\" \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
destination directory: a repo destination directory: a repo
abort: destination 'a repo' is not empty abort: destination 'a repo' is not empty
[255] [10]
Test hg-ssh using a helper script that will restore PYTHONPATH (which might Test hg-ssh using a helper script that will restore PYTHONPATH (which might
have been cleared by a hg.exe wrapper) and invoke hg-ssh with the right have been cleared by a hg.exe wrapper) and invoke hg-ssh with the right
parameters: parameters:
$ cat > ssh.sh << EOF $ cat > ssh.sh << EOF
> userhost="\$1" > userhost="\$1"
> SSH_ORIGINAL_COMMAND="\$2" > SSH_ORIGINAL_COMMAND="\$2"

tests/test-ssh.t

abort: unknown revision 'noNoNO'! abort: unknown revision 'noNoNO'!
[255] [255]
Test (non-)escaping of remote paths with spaces when cloning (issue3145): Test (non-)escaping of remote paths with spaces when cloning (issue3145):
$ hg clone --ssh "\"$PYTHON\" \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" $ hg clone --ssh "\"$PYTHON\" \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
destination directory: a repo destination directory: a repo
abort: destination 'a repo' is not empty abort: destination 'a repo' is not empty
[255] [10]
Make sure hg is really paranoid in serve --stdio mode. It used to be Make sure hg is really paranoid in serve --stdio mode. It used to be
possible to get a debugger REPL by specifying a repo named --debugger. possible to get a debugger REPL by specifying a repo named --debugger.
$ hg -R --debugger serve --stdio $ hg -R --debugger serve --stdio
abort: potentially unsafe serve --stdio invocation: ['-R', '--debugger', 'serve', '--stdio'] abort: potentially unsafe serve --stdio invocation: ['-R', '--debugger', 'serve', '--stdio']
[255] [255]
$ hg -R --config=ui.debugger=yes serve --stdio $ hg -R --config=ui.debugger=yes serve --stdio
abort: potentially unsafe serve --stdio invocation: ['-R', '--config=ui.debugger=yes', 'serve', '--stdio'] abort: potentially unsafe serve --stdio invocation: ['-R', '--config=ui.debugger=yes', 'serve', '--stdio']