--- a/mercurial/util.py Sat Jun 09 13:17:58 2007 +0200
+++ b/mercurial/util.py Sat Jun 09 13:25:54 2007 +0200
@@ -77,7 +77,7 @@
return u.encode(_encoding, _encodingmode)
except UnicodeDecodeError, inst:
sub = s[max(0, inst.start-10), inst.start+10]
- raise Abort(_("decoding near '%s': %s!\n") % (sub, inst))
+ raise Abort(_("decoding near '%s': %s!") % (sub, inst))
# used by parsedate
defaultdateformats = (
@@ -650,7 +650,7 @@
parts = os.path.normcase(path).split(os.sep)
if (os.path.splitdrive(path)[0] or parts[0] in ('.hg', '')
or os.pardir in parts):
- raise Abort(_("path contains illegal component: %s\n") % path)
+ raise Abort(_("path contains illegal component: %s") % path)
def _makelock_file(info, pathname):
ld = os.open(pathname, os.O_CREAT | os.O_WRONLY | os.O_EXCL)
--- a/tests/test-rename.out Sat Jun 09 13:17:58 2007 +0200
+++ b/tests/test-rename.out Sat Jun 09 13:25:54 2007 +0200
@@ -284,19 +284,14 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
# check illegal path components
abort: path contains illegal component: .hg/foo
-
abort: ../foo not under root
abort: path contains illegal component: .hg/foo
-
! d1/d11/a1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
abort: path contains illegal component: .hg/a1
-
abort: ../a1 not under root
abort: path contains illegal component: .hg/a1
-
! d1/d11/a1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
abort: path contains illegal component: .hg/foo
-
abort: ../../../foo not under root
--- a/tests/test-walk.out Sat Jun 09 13:17:58 2007 +0200
+++ b/tests/test-walk.out Sat Jun 09 13:25:54 2007 +0200
@@ -164,7 +164,6 @@
hg debugwalk ../.hg
abort: path contains illegal component: .hg
-
cd ..
hg debugwalk -Ibeans
@@ -197,15 +196,12 @@
hg debugwalk .hg
abort: path contains illegal component: .hg
-
hg debugwalk beans/../.hg
abort: path contains illegal component: .hg
-
hg debugwalk beans/../.hg/data
abort: path contains illegal component: .hg/data
-
hg debugwalk beans/.hg
beans/.hg: No such file or directory