Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Report filenames with disallowed characters as suggested by Mika Eloranta
authorThomas Arendsen Hein <thomas@intevation.de>
Sun, 17 Feb 2008 12:53:57 +0100
changeset 6138 09847b90beae
parent 6137 1c0e7afe824a
child 6139 989467e8e3a9
Report filenames with disallowed characters as suggested by Mika Eloranta (see issue671)
mercurial/dirstate.py file | annotate | diff | comparison | revisions
tests/test-issue352.out file | annotate | diff | comparison | revisions 
--- a/mercurial/dirstate.py	Sat Feb 16 18:12:30 2008 +0100
+++ b/mercurial/dirstate.py	Sun Feb 17 12:53:57 2008 +0100
@@ -197,7 +197,8 @@
 
     def _incpathcheck(self, f):
         if '\r' in f or '\n' in f:
-            raise util.Abort(_("'\\n' and '\\r' disallowed in filenames"))
+            raise util.Abort(_("'\\n' and '\\r' disallowed in filenames: %r")
+                             % f)
         # shadows
         if f in self._dirs:
             raise util.Abort(_('directory %r already in dirstate') % f)
--- a/tests/test-issue352.out	Sat Feb 16 18:12:30 2008 +0100
+++ b/tests/test-issue352.out	Sun Feb 17 12:53:57 2008 +0100
@@ -1,13 +1,13 @@
 adding he
llo
-abort: '\n' and '\r' disallowed in filenames
+abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
 adding he
llo
-abort: '\n' and '\r' disallowed in filenames
+abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
 adding hell
 o
-abort: '\n' and '\r' disallowed in filenames
+abort: '\n' and '\r' disallowed in filenames: 'hell\no'
 adding hell
 o
-abort: '\n' and '\r' disallowed in filenames
+abort: '\n' and '\r' disallowed in filenames: 'hell\no'
 f  he
llo  he
llo
 f  hell
 o  hell
mercurial