Mercurial > hg-stable
changeset 13962:8b252e826c68
add: introduce a warning message for non-portable filenames (issue2756) (BC)
On POSIX platforms, the 'add', 'addremove', 'copy' and 'rename' commands now
warn if a file has a name that can't be checked out on Windows.
Example:
$ hg add con.xml
warning: filename contains 'con', which is reserved on Windows: 'con.xml'
$ hg status
A con.xml
The file is added despite the warning.
The warning is ON by default. It can be suppressed by setting the config option
'portablefilenames' in section 'ui' to 'ignore' or 'false':
$ hg --config ui.portablefilenames=ignore add con.xml
$ hg sta
A con.xml
If ui.portablefilenames is set to 'abort', then the command is aborted:
$ hg --config ui.portablefilenames=abort add con.xml
abort: filename contains 'con', which is reserved on Windows: 'con.xml'
On Windows, the ui.portablefilenames config setting is irrelevant and the
command is always aborted if a problematic filename is found.
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Tue, 19 Apr 2011 12:42:53 +0200 |
| parents | 1708a0cad774 |
| children | 616ad3f6fd33 |
| files | doc/hgrc.5.txt mercurial/cmdutil.py mercurial/context.py mercurial/scmutil.py tests/test-add.t tests/test-addremove.t tests/test-copy.t tests/test-hgweb-raw.t tests/test-rename.t tests/test-walk.t |
| diffstat | 10 files changed, 89 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/hgrc.5.txt Tue Apr 19 14:56:47 2011 +0200 +++ b/doc/hgrc.5.txt Tue Apr 19 12:42:53 2011 +0200 @@ -910,6 +910,16 @@ The conflict resolution program to use during a manual merge. For more information on merge tools see :hg:`help merge-tools`. For configuring merge tools see the merge-tools_ section. +``portablefilenames`` + Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``. + Default is ``warn``. + If set to ``warn`` (or ``true``), a warning message is printed on POSIX + platforms, if a file with a non-portable filename is added (e.g. a file + with a name that can't be created on Windows because it contains reserved + parts like ``AUX`` or reserved characters like ``:``). + If set to ``ignore`` (or ``false``), no warning is printed. + If set to ``abort``, the command is aborted. + On Windows, this configuration option is ignored and the command aborted. ``quiet`` Reduce the amount of output printed. True or False. Default is False. ``remotecmd``
--- a/mercurial/cmdutil.py Tue Apr 19 14:56:47 2011 +0200 +++ b/mercurial/cmdutil.py Tue Apr 19 12:42:53 2011 +0200 @@ -8,7 +8,7 @@ from node import hex, nullid, nullrev, short from i18n import _ import os, sys, errno, re, glob, tempfile -import util, templater, patch, error, encoding, templatekw +import util, scmutil, templater, patch, error, encoding, templatekw import match as matchmod import similar, revset, subrepo @@ -435,7 +435,7 @@ src = repo.wjoin(abssrc) state = repo.dirstate[abstarget] - util.checkfilename(abstarget) + scmutil.checkportable(ui, abstarget) # check for collisions prevsrc = targets.get(abstarget)
--- a/mercurial/context.py Tue Apr 19 14:56:47 2011 +0200 +++ b/mercurial/context.py Tue Apr 19 12:42:53 2011 +0200 @@ -7,7 +7,7 @@ from node import nullid, nullrev, short, hex from i18n import _ -import ancestor, bdiff, error, util, subrepo, patch, encoding +import ancestor, bdiff, error, util, scmutil, subrepo, patch, encoding import os, errno, stat propertycache = util.propertycache @@ -801,6 +801,7 @@ try: rejected = [] for f in list: + scmutil.checkportable(ui, join(f)) p = self._repo.wjoin(f) try: st = os.lstat(p)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mercurial/scmutil.py Tue Apr 19 12:42:53 2011 +0200 @@ -0,0 +1,27 @@ +# scmutil.py - Mercurial core utility functions +# +# Copyright Matt Mackall <mpm@selenic.com> +# +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2 or any later version. + +from i18n import _ +import util, error +import os + +def checkportable(ui, f): + '''Check if filename f is portable and warn or abort depending on config''' + util.checkfilename(f) + val = ui.config('ui', 'portablefilenames', 'warn') + lval = val.lower() + abort = os.name == 'nt' or lval == 'abort' + bval = util.parsebool(val) + if abort or lval == 'warn' or bval: + msg = util.checkwinfilename(f) + if msg: + if abort: + raise util.Abort("%s: %r" % (msg, f)) + ui.warn(_("warning: %s: %r\n") % (msg, f)) + elif bval is None and lval != 'ignore': + raise error.ConfigError( + _("ui.portablefilenames value is invalid ('%s')") % val)
--- a/tests/test-add.t Tue Apr 19 14:56:47 2011 +0200 +++ b/tests/test-add.t Tue Apr 19 12:42:53 2011 +0200 @@ -33,6 +33,41 @@ A a A b + $ echo foo > con.xml + $ hg --config ui.portablefilenames=jump add con.xml + abort: ui.portablefilenames value is invalid ('jump') + [255] + $ hg --config ui.portablefilenames=abort add con.xml + abort: filename contains 'con', which is reserved on Windows: 'con.xml' + [255] + $ hg st + A a + A b + ? con.xml + $ hg add con.xml + warning: filename contains 'con', which is reserved on Windows: 'con.xml' + $ hg st + A a + A b + A con.xml + $ echo bla > 'hello:world' + $ hg --config ui.portablefilenames=abort add + adding hello:world + abort: filename contains ':', which is reserved on Windows: 'hello:world' + [255] + $ hg st + A a + A b + A con.xml + ? hello:world + $ hg --config ui.portablefilenames=ignore add + adding hello:world + $ hg st + A a + A b + A con.xml + A hello:world + $ hg ci -m 0 --traceback should fail
--- a/tests/test-addremove.t Tue Apr 19 14:56:47 2011 +0200 +++ b/tests/test-addremove.t Tue Apr 19 12:42:53 2011 +0200 @@ -10,14 +10,17 @@ foo committed changeset 0:6f7f953567a2 $ cd dir/ - $ touch ../foo_2 bar_2 + $ touch ../foo_2 bar_2 con.xml $ hg -v addremove adding dir/bar_2 + adding dir/con.xml adding foo_2 + warning: filename contains 'con', which is reserved on Windows: 'dir/con.xml' $ hg -v commit -m "add 2" dir/bar_2 + dir/con.xml foo_2 - committed changeset 1:e65414bf35c5 + committed changeset 1:6bb597da00f1 $ cd .. $ hg init sim
--- a/tests/test-copy.t Tue Apr 19 14:56:47 2011 +0200 +++ b/tests/test-copy.t Tue Apr 19 12:42:53 2011 +0200 @@ -4,6 +4,9 @@ $ hg commit -m "1" $ hg status $ hg copy a b + $ hg --config ui.portablefilenames=abort copy a con.xml + abort: filename contains 'con', which is reserved on Windows: 'con.xml' + [255] $ hg status A b $ hg sum
--- a/tests/test-hgweb-raw.t Tue Apr 19 14:56:47 2011 +0200 +++ b/tests/test-hgweb-raw.t Tue Apr 19 12:42:53 2011 +0200 @@ -10,6 +10,7 @@ > care about things like that. > ENDSOME $ hg add 'sub/some "text".txt' + warning: filename contains '"', which is reserved on Windows: 'sub/some "text".txt' $ hg commit -d "1 0" -m "Just some text" $ hg serve -p $HGPORT -A access.log -E error.log -d --pid-file=hg.pid
--- a/tests/test-rename.t Tue Apr 19 14:56:47 2011 +0200 +++ b/tests/test-rename.t Tue Apr 19 12:42:53 2011 +0200 @@ -11,6 +11,9 @@ rename a single file $ hg rename d1/d11/a1 d2/c + $ hg --config ui.portablefilenames=abort rename d1/a d1/con.xml + abort: filename contains 'con', which is reserved on Windows: 'd1/con.xml' + [255] $ hg sum parent: 0:9b4b6e7b2c26 tip 1
--- a/tests/test-walk.t Tue Apr 19 14:56:47 2011 +0200 +++ b/tests/test-walk.t Tue Apr 19 12:42:53 2011 +0200 @@ -28,6 +28,7 @@ adding mammals/Procyonidae/coatimundi adding mammals/Procyonidae/raccoon adding mammals/skunk + warning: filename contains ':', which is reserved on Windows: 'glob:glob' $ hg commit -m "commit #0" $ hg debugwalk