# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 2008-02-17 11:53:57
# Node ID 09847b90beae30094fd579a420576e8535612d0d
# Parent  1c0e7afe824a05e27c9f272b023ad36b8e3a6e14

Report filenames with disallowed characters as suggested by Mika Eloranta
(see issue671)

diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -197,7 +197,8 @@ class dirstate(object):
 
     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)
diff --git a/tests/test-issue352.out b/tests/test-issue352.out
--- a/tests/test-issue352.out
+++ b/tests/test-issue352.out
@@ -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