Patchwork [V2] tests: rewrite path in test-shelve.t for not being mangled on msys

login
register
mail settings
Submitter Simon Heimberg
Date Feb. 10, 2014, 11:05 p.m.
Message ID <f5cbdf0e62069e5917ac.1392073500@lapsi.heimberg.home>
Download mbox | patch
Permalink /patch/3546/
State Accepted
Commit ada289dfceb08dd9d6d8e0d4aed8e8c02846b24e
Headers show

Comments

Matt Mackall - Feb. 10, 2014, 10:28 p.m.
On Tue, 2014-02-11 at 00:05 +0100, Simon Heimberg wrote:
> # HG changeset patch
> # User Simon Heimberg <simohe@besonet.ch>
> # Date 1392069370 -3600
> # Node ID f5cbdf0e62069e5917ac53aa5754b2ddee799906
> # Parent  ce3623bb9edf23c18b74a26835fe59c779e799da
> tests: rewrite path in test-shelve.t for not being mangled on msys

Queued for default, thanks.
Simon Heimberg - Feb. 10, 2014, 11:05 p.m.
# HG changeset patch
# User Simon Heimberg <simohe@besonet.ch>
# Date 1392069370 -3600
# Node ID f5cbdf0e62069e5917ac53aa5754b2ddee799906
# Parent  ce3623bb9edf23c18b74a26835fe59c779e799da
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'.

Patch

diff -r ce3623bb9edf -r f5cbdf0e6206 contrib/check-code.py
--- a/contrib/check-code.py	Mon Jan 27 21:39:25 2014 +0100
+++ 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 -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),
diff -r ce3623bb9edf -r f5cbdf0e6206 tests/test-shelve.t
--- a/tests/test-shelve.t	Mon Jan 27 21:39:25 2014 +0100
+++ 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}'