Patchwork [STABLE] doctest: convert matcher root to native path

login
register
mail settings
Submitter Matt Harbison
Date July 29, 2018, 5:19 a.m.
Message ID <op.zmwee4jj9lwrgf@envy>
Download mbox | patch
Permalink /patch/32963/
State New
Headers show

Comments

Matt Harbison - July 29, 2018, 5:19 a.m.
On Sat, 28 Jul 2018 03:48:52 -0400, Yuya Nishihara <yuya@tcha.org> wrote:

> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1532763395 -32400
> #      Sat Jul 28 16:36:35 2018 +0900
> # Branch stable
> # Node ID 39885c84a7c1fa65637d281188c51de06d9c0997
> # Parent  5b3b74e4b21442777f741df60fd81e52e220a182
> doctest: convert matcher root to native path

This did the trick, thanks.

It looks like the Windows bot went off the rails.  Unrelated to this  
patch, but running the tests locally, there are a couple of Windows  
specific failures.  The fileset one bugs me the most, and it looks like  
it's a very recent change.  I'll at least try to bisect them tomorrow  
night, but maybe you have some guesses I could test.


ERROR: test-fileset.t output changed
!

Patch

--- c:/Users/Matt/projects/hg/tests/test-removeemptydirs.t
+++ c:/Users/Matt/projects/hg/tests/test-removeemptydirs.t.err
@@ -87,8 +87,6 @@ 
    $ hg co -qr 'desc(first_rebase_source)'
    $ cd $TESTTMP/hgrebase/somedir
    $ hg --config extensions.rebase= rebase -qr . -d  
'desc(first_rebase_dest)'
-  current directory was removed
-  (consider changing to repo root: $TESTTMP/hgrebase)
    $ cd $TESTTMP/hgrebase/somedir
  (The current node is the rebased first_rebase_source on top of
  first_rebase_dest)
@@ -179,7 +177,7 @@ 
    > pick ff70a87b588f 0 add foo
    > fold 9992bb0ac0db 2 add baz
    > EOF
-  abort: $ENOENT$
+  abort: $ENOENT$: C:/MinGW/msys/1.0/dev/stdin
    [255]

  Go back to the repo root after losing it as part of that operation:
@@ -188,13 +186,13 @@ 
  Note the lack of a non-zero exit code from this function - it exits
  successfully, but doesn't really do anything.
    $ hg histedit --continue
-  9992bb0ac0db: cannot fold - working copy is not a descendant of  
previous commit 5c806432464a
-  saved backup bundle to  
$TESTTMP/issue5826_withrm/.hg/strip-backup/ff70a87b588f-e94f9789-histedit.hg
+  abort: no histedit in progress
+  [255]

    $ hg log -T '{rev}:{node|short} {desc}\n'
-  2:94e3f9fae1d6 fold-temp-revision 9992bb0ac0db
-  1:5c806432464a add foo
-  0:d17db4b0303a add bar
+  2:9992bb0ac0db add baz
+  1:6274c77c93c3 add bar
+  0:ff70a87b588f add foo

  Now test that again with experimental.removeemptydirs=false:
    $ hg init issue5826_norm

[...]

--- c:/Users/Matt/projects/hg/tests/test-fileset.t
+++ c:/Users/Matt/projects/hg/tests/test-fileset.t.err
@@ -410,6 +410,8 @@ 
    $ fileset 'eol(dos)'
    dos
    mixed
+  abort: $TESTTMP\repo\sub: Access is denied
+  [255]
    $ fileset 'eol(unix)'
    .hgignore
    .hgsub
@@ -420,11 +422,13 @@ 
    c1
    c2
    c3
-  con.xml
    mixed
-  unknown
+  abort: $TESTTMP\repo\sub: Access is denied
+  [255]
    $ fileset 'eol(mac)'
    mac
+  abort: $TESTTMP\repo\sub: Access is denied
+  [255]

  Test safety of 'encoding' on removed files

@@ -442,11 +446,11 @@ 
    c1
    c2
    c3
-  con.xml
    dos
    mac
    mixed
-  unknown
+  abort: $TESTTMP\repo\sub: Access is denied
+  [255]

  Test 'revs(...)'
  ================