This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9326

errors: use InputError for errors about bad paths
ClosedPublic

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

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG3175b0e0058b: errors: use InputError for errors about bad paths

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

PathPackages
Mmercurial/scmutil.py (4 lines)
Mtests/test-add.t (4 lines)
Mtests/test-copy.t (2 lines)
Mtests/test-eolfilename.t (12 lines)
Mtests/test-rename.t (2 lines)

Diff 23525

mercurial/scmutil.py

pass pass
if lbl.strip() != lbl: if lbl.strip() != lbl:
raise error.Abort(_(b"leading or trailing whitespace in name %r") % lbl) raise error.Abort(_(b"leading or trailing whitespace in name %r") % lbl)
def checkfilename(f): def checkfilename(f):
'''Check that the filename f is an acceptable filename for a tracked file''' '''Check that the filename f is an acceptable filename for a tracked file'''
if b'\r' in f or b'\n' in f: if b'\r' in f or b'\n' in f:
raise error.Abort( raise error.InputError(
_(b"'\\n' and '\\r' disallowed in filenames: %r") _(b"'\\n' and '\\r' disallowed in filenames: %r")
% pycompat.bytestr(f) % pycompat.bytestr(f)
) )
def checkportable(ui, f): def checkportable(ui, f):
'''Check if filename f is portable and warn or abort depending on config''' '''Check if filename f is portable and warn or abort depending on config'''
checkfilename(f) checkfilename(f)
abort, warn = checkportabilityalert(ui) abort, warn = checkportabilityalert(ui)
if abort or warn: if abort or warn:
msg = util.checkwinfilename(f) msg = util.checkwinfilename(f)
if msg: if msg:
msg = b"%s: %s" % (msg, procutil.shellquote(f)) msg = b"%s: %s" % (msg, procutil.shellquote(f))
if abort: if abort:
raise error.Abort(msg) raise error.InputError(msg)
ui.warn(_(b"warning: %s\n") % msg) ui.warn(_(b"warning: %s\n") % msg)
def checkportabilityalert(ui): def checkportabilityalert(ui):
'''check if the user's config requests nothing, a warning, or abort for '''check if the user's config requests nothing, a warning, or abort for
non-portable filenames''' non-portable filenames'''
val = ui.config(b'ui', b'portablefilenames') val = ui.config(b'ui', b'portablefilenames')
lval = val.lower() lval = val.lower()

tests/test-add.t

#if no-windows #if no-windows
$ echo foo > con.xml $ echo foo > con.xml
$ hg --config ui.portablefilenames=jump add con.xml $ hg --config ui.portablefilenames=jump add con.xml
abort: ui.portablefilenames value is invalid ('jump') abort: ui.portablefilenames value is invalid ('jump')
[30] [30]
$ hg --config ui.portablefilenames=abort add con.xml $ hg --config ui.portablefilenames=abort add con.xml
abort: filename contains 'con', which is reserved on Windows: con.xml abort: filename contains 'con', which is reserved on Windows: con.xml
[255] [10]
$ hg st $ hg st
A a A a
A b A b
? con.xml ? con.xml
$ hg add con.xml $ hg add con.xml
warning: filename contains 'con', which is reserved on Windows: con.xml warning: filename contains 'con', which is reserved on Windows: con.xml
$ hg st $ hg st
A a A a
A b A b
A con.xml A con.xml
$ hg forget con.xml $ hg forget con.xml
$ rm con.xml $ rm con.xml
#endif #endif
#if eol-in-paths #if eol-in-paths
$ echo bla > 'hello:world' $ echo bla > 'hello:world'
$ hg --config ui.portablefilenames=abort add $ hg --config ui.portablefilenames=abort add
adding hello:world adding hello:world
abort: filename contains ':', which is reserved on Windows: 'hello:world' abort: filename contains ':', which is reserved on Windows: 'hello:world'
[255] [10]
$ hg st $ hg st
A a A a
A b A b
? hello:world ? hello:world
$ hg --config ui.portablefilenames=ignore add $ hg --config ui.portablefilenames=ignore add
adding hello:world adding hello:world
$ hg st $ hg st
A a A a

tests/test-copy.t

$ mkdir part1 $ mkdir part1
$ cd part1 $ cd part1
$ hg init $ hg init
$ echo a > a $ echo a > a
$ hg add a $ hg add a
$ hg commit -m "1" $ hg commit -m "1"
$ hg status $ hg status
$ hg copy a b $ hg copy a b
$ hg --config ui.portablefilenames=abort copy a con.xml $ hg --config ui.portablefilenames=abort copy a con.xml
abort: filename contains 'con', which is reserved on Windows: con.xml abort: filename contains 'con', which is reserved on Windows: con.xml
[255] [10]
$ hg status $ hg status
A b A b
$ hg sum $ hg sum
parent: 0:c19d34741b0a tip parent: 0:c19d34741b0a tip
1 1
branch: default branch: default
commit: 1 copied commit: 1 copied
update: (current) update: (current)

tests/test-eolfilename.t

#require eol-in-paths #require eol-in-paths
https://bz.mercurial-scm.org/352 https://bz.mercurial-scm.org/352
test issue352 test issue352
$ hg init foo $ hg init foo
$ cd foo $ cd foo
$ A=`printf 'he\rllo'` $ A=`printf 'he\rllo'`
$ echo foo > "$A" $ echo foo > "$A"
$ hg add $ hg add
adding he\r (no-eol) (esc) adding he\r (no-eol) (esc)
llo llo
abort: '\n' and '\r' disallowed in filenames: 'he\rllo' abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
[255] [10]
$ hg ci -A -m m $ hg ci -A -m m
adding he\r (no-eol) (esc) adding he\r (no-eol) (esc)
llo llo
abort: '\n' and '\r' disallowed in filenames: 'he\rllo' abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
[255] [10]
$ rm "$A" $ rm "$A"
$ echo foo > "hell $ echo foo > "hell
> o" > o"
$ hg add $ hg add
adding hell adding hell
o o
abort: '\n' and '\r' disallowed in filenames: 'hell\no' abort: '\n' and '\r' disallowed in filenames: 'hell\no'
[255] [10]
$ hg ci -A -m m $ hg ci -A -m m
adding hell adding hell
o o
abort: '\n' and '\r' disallowed in filenames: 'hell\no' abort: '\n' and '\r' disallowed in filenames: 'hell\no'
[255] [10]
$ echo foo > "$A" $ echo foo > "$A"
$ hg debugwalk -v $ hg debugwalk -v
* matcher: * matcher:
<alwaysmatcher> <alwaysmatcher>
f he\r (no-eol) (esc) f he\r (no-eol) (esc)
llo he\r (no-eol) (esc) llo he\r (no-eol) (esc)
llo llo
f hell f hell
o hell o hell
o o
$ echo bla > quickfox $ echo bla > quickfox
$ hg add quickfox $ hg add quickfox
$ hg ci -m 2 $ hg ci -m 2
$ A=`printf 'quick\rfox'` $ A=`printf 'quick\rfox'`
$ hg cp quickfox "$A" $ hg cp quickfox "$A"
abort: '\n' and '\r' disallowed in filenames: 'quick\rfox' abort: '\n' and '\r' disallowed in filenames: 'quick\rfox'
[255] [10]
$ hg mv quickfox "$A" $ hg mv quickfox "$A"
abort: '\n' and '\r' disallowed in filenames: 'quick\rfox' abort: '\n' and '\r' disallowed in filenames: 'quick\rfox'
[255] [10]
https://bz.mercurial-scm.org/2036 https://bz.mercurial-scm.org/2036
$ cd .. $ cd ..
test issue2039 test issue2039
$ hg init bar $ hg init bar

tests/test-rename.t

$ hg init $ hg init
$ mkdir d1 d1/d11 d2 $ mkdir d1 d1/d11 d2
$ echo d1/a > d1/a $ echo d1/a > d1/a
$ echo d1/ba > d1/ba $ echo d1/ba > d1/ba
$ echo d1/a1 > d1/d11/a1 $ echo d1/a1 > d1/d11/a1
$ echo d1/b > d1/b $ echo d1/b > d1/b
$ echo d2/b > d2/b $ echo d2/b > d2/b
$ hg add d1/a d1/b d1/ba d1/d11/a1 d2/b $ hg add d1/a d1/b d1/ba d1/d11/a1 d2/b
$ hg commit -m "1" $ hg commit -m "1"
rename a single file rename a single file
$ hg rename d1/d11/a1 d2/c $ hg rename d1/d11/a1 d2/c
$ hg --config ui.portablefilenames=abort rename d1/a d1/con.xml $ hg --config ui.portablefilenames=abort rename d1/a d1/con.xml
abort: filename contains 'con', which is reserved on Windows: d1/con.xml abort: filename contains 'con', which is reserved on Windows: d1/con.xml
[255] [10]
$ hg sum $ hg sum
parent: 0:9b4b6e7b2c26 tip parent: 0:9b4b6e7b2c26 tip
1 1
branch: default branch: default
commit: 1 renamed commit: 1 renamed
update: (current) update: (current)
phases: 1 draft phases: 1 draft
$ hg status -C $ hg status -C