[PATCH 3 of 3] tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup

Mads Kiilerich mads at kiilerich.com
Sun Oct 14 19:48:11 CDT 2012


Adrian Buehlmann wrote, On 10/13/2012 08:49 AM:
> On 2012-10-10 01:41, Mads Kiilerich wrote:
>> # HG changeset patch
>> # User Mads Kiilerich <mads at kiilerich.com>
>> # Date 1349825874 -7200
>> # Node ID 9aa7a6a4ad367a48d7efe347cd0925325d278c54
>> # Parent  2d3adfec4624db760777ac23c003f3a9b335aa5b
>> tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup
> I haven't followed closely enough what you are doing here (sorry). Just in case
> you haven't seen it, this seems to fail on Windows with (just don't update past
> the unrelated 76b73ce0ffac fchmod bug):
>
>    $ PATH="/mingw/bin:/bin:`pwd`/..:/c/python" python run-tests.py --local test-subrepo-recursion.t
>
>    --- C:\Users\adi\hgrepos\hg-main\tests\test-subrepo-recursion.t
>    +++ C:\Users\adi\hgrepos\hg-main\tests\test-subrepo-recursion.t.err
>    @@ -282,10 +282,10 @@
>       archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
>                                                                   \r (no-eol) (esc)
>       \r (no-eol) (esc)
>    -  archiving (foo/bar) [                                 ] 0/1\r (no-eol) (esc)
>    -  archiving (foo/bar) [                                 ] 0/1\r (no-eol) (esc)
>    -  archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
>    -  archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
>    +  archiving (foo\\bar) [                                 ] 0/1\r (no-eol) (esc)
>    +  archiving (foo\\bar) [                                 ] 0/1\r (no-eol) (esc)
>    +  archiving (foo\\bar) [================================>] 1/1\r (no-eol) (esc)
>    +  archiving (foo\\bar) [================================>] 1/1\r (no-eol) (esc)
>                                                                   \r (no-eol) (esc)

Thank you for the heads up.

I have posted a not-completely-trivial fix.

/Mads


More information about the Mercurial-devel mailing list