Mercurial > hg
changeset 18450:4f9a52858512
scmutil: localize and improve 'not under root' message
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Fri, 18 Jan 2013 01:24:29 +0100 |
| parents | 20462259b92a |
| children | d6b3b36f1db2 |
| files | mercurial/scmutil.py tests/test-globalopts.t tests/test-parents.t tests/test-rename.t tests/test-symlinks.t tests/test-walk.t |
| diffstat | 6 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/scmutil.py Fri Jan 18 01:23:51 2013 +0100 +++ b/mercurial/scmutil.py Fri Jan 18 01:24:29 2013 +0100 @@ -435,7 +435,7 @@ break name = dirname - raise util.Abort('%s not under root' % myname) + raise util.Abort(_("%s not under root '%s'") % (myname, root)) def walkrepos(path, followsym=False, seen_dirs=None, recurse=False): '''yield every hg repository under path, always recursively.
--- a/tests/test-globalopts.t Fri Jan 18 01:23:51 2013 +0100 +++ b/tests/test-globalopts.t Fri Jan 18 01:24:29 2013 +0100 @@ -87,7 +87,7 @@ abort: no repository found in '$TESTTMP' (.hg not found)! [255] $ hg -R b ann a/a - abort: a/a not under root + abort: a/a not under root '$TESTTMP/b' [255] $ hg log abort: no repository found in '$TESTTMP' (.hg not found)!
--- a/tests/test-parents.t Fri Jan 18 01:23:51 2013 +0100 +++ b/tests/test-parents.t Fri Jan 18 01:24:29 2013 +0100 @@ -71,7 +71,7 @@ $ hg parents -r 2 ../a - abort: ../a not under root + abort: ../a not under root '$TESTTMP/repo' [255]
--- a/tests/test-rename.t Fri Jan 18 01:23:51 2013 +0100 +++ b/tests/test-rename.t Fri Jan 18 01:24:29 2013 +0100 @@ -593,7 +593,7 @@ [255] $ hg status -C $ hg rename d1/d11/a1 ../foo - abort: ../foo not under root + abort: ../foo not under root '$TESTTMP' [255] $ hg status -C @@ -612,7 +612,7 @@ [255] $ hg status -C $ hg rename d1/d11/a1 .. - abort: ../a1 not under root (glob) + abort: ../a1 not under root '$TESTTMP' [255] $ hg status -C @@ -631,7 +631,7 @@ [255] $ hg status -C $ (cd d1/d11; hg rename ../../d2/b ../../../foo) - abort: ../../../foo not under root + abort: ../../../foo not under root '$TESTTMP' [255] $ hg status -C
--- a/tests/test-symlinks.t Fri Jan 18 01:23:51 2013 +0100 +++ b/tests/test-symlinks.t Fri Jan 18 01:24:29 2013 +0100 @@ -82,7 +82,7 @@ this should fail $ hg status ../z && { echo hg mistakenly exited with status 0; exit 1; } || : - abort: ../z not under root + abort: ../z not under root '$TESTTMP/x' $ cd ..
--- a/tests/test-walk.t Fri Jan 18 01:23:51 2013 +0100 +++ b/tests/test-walk.t Fri Jan 18 01:24:29 2013 +0100 @@ -181,10 +181,10 @@ f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon f mammals/skunk mammals/skunk $ hg debugwalk .. - abort: .. not under root + abort: .. not under root '$TESTTMP/t' [255] $ hg debugwalk beans/../.. - abort: beans/../.. not under root + abort: beans/../.. not under root '$TESTTMP/t' [255] $ hg debugwalk .hg abort: path contains illegal component: .hg (glob) @@ -209,7 +209,7 @@ f beans/pinto beans/pinto f beans/turtle beans/turtle $ hg debugwalk `pwd`/.. - abort: $TESTTMP/t/.. not under root + abort: $TESTTMP/t/.. not under root '$TESTTMP/t' [255] Test patterns: