Mercurial > hg-stable
changeset 20423:ada289dfceb0
tests: rewrite path in test-shelve.t for not being mangled on msys
msys (on windows) converets '-R bundle:.XX/XX' to '-R bundle:;.XX/XX'. Avoid
this by writing '-R bundle://.XX/XX'. This is used more often than the
alternative work arounds like '-Rbundle://.XX/XX' or '-R bundle:Y/../.XX/XX'.
| author | Simon Heimberg <simohe@besonet.ch> |
|---|---|
| date | Mon, 10 Feb 2014 22:56:10 +0100 |
| parents | 98eadbfffa0e |
| children | 1da346bad3d8 |
| files | contrib/check-code.py tests/test-shelve.t |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/check-code.py Sun Feb 09 18:36:37 2014 -0600 +++ b/contrib/check-code.py Mon Feb 10 22:56:10 2014 +0100 @@ -150,6 +150,9 @@ "explicit exit code checks unnecessary"), (uprefix + r'set -e', "don't use set -e"), (uprefix + r'(\s|fi\b|done\b)', "use > for continued lines"), + (uprefix + r'.*:\.\S*/', "x:.y in a path does not work on msys, rewrite " + "as x://.y, or see `hg log -k msys` for alternatives", r'-\S+:\.|' #-Rxxx + 'hg pull -q file:../test'), # in test-pull.t which is skipped on windows (r'^ saved backup bundle to \$TESTTMP.*\.hg$', winglobmsg), (r'^ changeset .* references (corrupted|missing) \$TESTTMP/.*[^)]$', winglobmsg),
--- a/tests/test-shelve.t Sun Feb 09 18:36:37 2014 -0600 +++ b/tests/test-shelve.t Mon Feb 10 22:56:10 2014 +0100 @@ -565,7 +565,7 @@ $ hg shelve shelved as default 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg log -G --template '{rev} {desc|firstline} {author}' -R bundle:.hg/shelved/default.hg -r 'bundle()' + $ hg log -G --template '{rev} {desc|firstline} {author}' -R bundle://.hg/shelved/default.hg -r 'bundle()' o 4 changes to 'commit stuff' shelve@localhost | $ hg log -G --template '{rev} {desc|firstline} {author}'