[PATCH 3 of 3] tests: add missing globs for Windows

Augie Fackler raf at durin42.com
Mon Dec 22 14:54:17 CST 2014


On Fri, Dec 19, 2014 at 12:19:55AM -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison at yahoo.com>
> # Date 1418267386 18000
> #      Wed Dec 10 22:09:46 2014 -0500
> # Node ID f7a77857935e711bf996df90113ce59b70d13a61
> # Parent  a2dd116c635236b8d37f5ac20a07b185233cca07
> tests: add missing globs for Windows

Queued, thanks

>
> I couldn't figure out how to glob the first chunk for Windows, so it's been
> conditionalized.
>
> diff --git a/tests/test-commit.t b/tests/test-commit.t
> --- a/tests/test-commit.t
> +++ b/tests/test-commit.t
> @@ -531,9 +531,15 @@
>    > r.commitctx(c)
>    > EOF
>    $ $PYTHON evil-commit.py
> +#if windows
> +  $ hg co --clean tip
> +  abort: path contains illegal component: .h\xe2\x80\x8cg\\hgrc (esc)
> +  [255]
> +#else
>    $ hg co --clean tip
>    abort: path contains illegal component: .h\xe2\x80\x8cg/hgrc (esc)
>    [255]
> +#endif
>
>    $ hg rollback -f
>    repository tip rolled back to revision 1 (undo commit)
> @@ -550,7 +556,7 @@
>    > EOF
>    $ $PYTHON evil-commit.py
>    $ hg co --clean tip
> -  abort: path contains illegal component: HG~1/hgrc
> +  abort: path contains illegal component: HG~1/hgrc (glob)
>    [255]
>
>    $ hg rollback -f
> @@ -568,5 +574,5 @@
>    > EOF
>    $ $PYTHON evil-commit.py
>    $ hg co --clean tip
> -  abort: path contains illegal component: HG8B6C~2/hgrc
> +  abort: path contains illegal component: HG8B6C~2/hgrc (glob)
>    [255]
> diff --git a/tests/test-rebase-mq-skip.t b/tests/test-rebase-mq-skip.t
> --- a/tests/test-rebase-mq-skip.t
> +++ b/tests/test-rebase-mq-skip.t
> @@ -62,7 +62,7 @@
>    note: rebase of 3:148775c71080 created no changes to commit
>    rebase merging completed
>    updating mq patch p0.patch to 5:9ecc820b1737
> -  $TESTTMP/a/.hg/patches/p0.patch
> +  $TESTTMP/a/.hg/patches/p0.patch (glob)
>    2 changesets found
>    saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-backup.hg (glob)
>    2 changesets found
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel


More information about the Mercurial-devel mailing list