Patchwork test-subrepo: add globs for Windows

login
register
mail settings
Submitter Matt Harbison
Date April 15, 2015, 2:21 a.m.
Message ID <2737a6deeb161adccfc0.1429064496@Envy>
Download mbox | patch
Permalink /patch/8672/
State Changes Requested
Headers show

Comments

Matt Harbison - April 15, 2015, 2:21 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1429064445 14400
#      Tue Apr 14 22:20:45 2015 -0400
# Node ID 2737a6deeb161adccfc002011f507c96ae7fe364
# Parent  c560d8c687916cb70a6d54c2c9ddcb5c9e457be2
test-subrepo: add globs for Windows
Mads Kiilerich - April 15, 2015, 3:39 a.m.
On 04/14/2015 10:21 PM, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1429064445 14400
> #      Tue Apr 14 22:20:45 2015 -0400
> # Node ID 2737a6deeb161adccfc002011f507c96ae7fe364
> # Parent  c560d8c687916cb70a6d54c2c9ddcb5c9e457be2
> test-subrepo: add globs for Windows

But ... the diff is removing globs?

/Mads

> diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
> --- a/tests/test-subrepo.t
> +++ b/tests/test-subrepo.t
> @@ -935,10 +935,10 @@
>     $ echo sub/repo = sub/repo > .hgsub
>     $ hg add .hgsub
>     $ hg ci -mtest
> -  committing subrepository sub/repo (glob)
> +  committing subrepository sub/repo
>     $ echo test >> sub/repo/foo
>     $ hg ci -mtest
> -  committing subrepository sub/repo (glob)
> +  committing subrepository sub/repo
>     $ hg cat sub/repo/foo
>     test
>     test
> @@ -966,7 +966,7 @@
>     added 2 changesets with 3 changes to 2 files
>     (run 'hg update' to get a working copy)
>     $ hg -R issue1852b update
> -  abort: default path for subrepository not found (in subrepo sub/repo) (glob)
> +  abort: default path for subrepository not found (in subrepo sub/repo)
>     [255]
>   
>   Ensure a full traceback, not just the SubrepoAbort part
> @@ -990,14 +990,14 @@
>     adding manifests
>     adding file changes
>     added 1 changesets with 2 changes to 2 files
> -  cloning subrepo sub/repo from issue1852a/sub/repo (glob)
> +  cloning subrepo sub/repo from issue1852a/sub/repo
>     2 files updated, 0 files merged, 0 files removed, 0 files unresolved
>   
>   Try to push from the other side
>   
>     $ hg -R issue1852a push `pwd`/issue1852c
>     pushing to $TESTTMP/issue1852c (glob)
> -  pushing subrepo sub/repo to $TESTTMP/issue1852c/sub/repo (glob)
> +  pushing subrepo sub/repo to $TESTTMP/issue1852c/sub/repo
>     searching for changes
>     no changes found
>     searching for changes
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
Matt Harbison - April 15, 2015, 3:43 a.m.
On Tue, 14 Apr 2015 23:39:48 -0400, Mads Kiilerich <mads@kiilerich.com>  
wrote:

> On 04/14/2015 10:21 PM, Matt Harbison wrote:
>> # HG changeset patch
>> # User Matt Harbison <matt_harbison@yahoo.com>
>> # Date 1429064445 14400
>> #      Tue Apr 14 22:20:45 2015 -0400
>> # Node ID 2737a6deeb161adccfc002011f507c96ae7fe364
>> # Parent  c560d8c687916cb70a6d54c2c9ddcb5c9e457be2
>> test-subrepo: add globs for Windows
>
> But ... the diff is removing globs?
>
> /Mads

Oops.  Thanks, I misread the diff.  The test runner made these changes,  
otherwise it gets a '~' status.  I'll send a V2.
Matt Harbison - April 15, 2015, 4:28 a.m.
On Tue, 14 Apr 2015 23:43:45 -0400, Matt Harbison <mharbison72@gmail.com>  
wrote:

> On Tue, 14 Apr 2015 23:39:48 -0400, Mads Kiilerich <mads@kiilerich.com>  
> wrote:
>
>> On 04/14/2015 10:21 PM, Matt Harbison wrote:
>>> # HG changeset patch
>>> # User Matt Harbison <matt_harbison@yahoo.com>
>>> # Date 1429064445 14400
>>> #      Tue Apr 14 22:20:45 2015 -0400
>>> # Node ID 2737a6deeb161adccfc002011f507c96ae7fe364
>>> # Parent  c560d8c687916cb70a6d54c2c9ddcb5c9e457be2
>>> test-subrepo: add globs for Windows
>>
>> But ... the diff is removing globs?
>>
>> /Mads
>
> Oops.  Thanks, I misread the diff.  The test runner made these changes,  
> otherwise it gets a '~' status.  I'll send a V2.

Actually, this will end up being like 5bd04faaa3ee.  The test runner  
chokes because a glob isn't necessary for a test, but check-code.py wants  
it because another test still needs it.  I'll figure out where this  
changed before resubmitting tomorrow.

Patch

diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
--- a/tests/test-subrepo.t
+++ b/tests/test-subrepo.t
@@ -935,10 +935,10 @@ 
   $ echo sub/repo = sub/repo > .hgsub
   $ hg add .hgsub
   $ hg ci -mtest
-  committing subrepository sub/repo (glob)
+  committing subrepository sub/repo
   $ echo test >> sub/repo/foo
   $ hg ci -mtest
-  committing subrepository sub/repo (glob)
+  committing subrepository sub/repo
   $ hg cat sub/repo/foo
   test
   test
@@ -966,7 +966,7 @@ 
   added 2 changesets with 3 changes to 2 files
   (run 'hg update' to get a working copy)
   $ hg -R issue1852b update
-  abort: default path for subrepository not found (in subrepo sub/repo) (glob)
+  abort: default path for subrepository not found (in subrepo sub/repo)
   [255]
 
 Ensure a full traceback, not just the SubrepoAbort part
@@ -990,14 +990,14 @@ 
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files
-  cloning subrepo sub/repo from issue1852a/sub/repo (glob)
+  cloning subrepo sub/repo from issue1852a/sub/repo
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Try to push from the other side
 
   $ hg -R issue1852a push `pwd`/issue1852c
   pushing to $TESTTMP/issue1852c (glob)
-  pushing subrepo sub/repo to $TESTTMP/issue1852c/sub/repo (glob)
+  pushing subrepo sub/repo to $TESTTMP/issue1852c/sub/repo
   searching for changes
   no changes found
   searching for changes