This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7816

tests: stabilize test-subrepo-svn.t on Windows
ClosedPublic

Authored by mharbison72 on Jan 8 2020, 8:28 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe598c874b4af: tests: stabilize test-subrepo-svn.t on Windows
Summary

This partially reverts 991e4404e910, because the URL form of C:\... gets
escaped to C%3A/..., which breaks the substitution of $TESTTMP.

The forget command on 'notafile*' errored out with:

notafile*: The filename, directory name, or volume label syntax is incorrect

which I think is because '*' isn't a legal character in a file name (though I
can't trigger this directly from MSYS or cmd.exe for some reason).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Jan 8 2020, 8:28 PM
pulkit accepted this revision.Jan 14 2020, 10:02 AM
This revision is now accepted and ready to land.Jan 14 2020, 10:02 AM
pulkit added a comment.EditedJan 14 2020, 10:57 AM

The test now fails on linux.

--- /home/pulkit/repo/hgpush/tests/test-subrepo-svn.t
+++ /home/pulkit/repo/hgpush/tests/test-subrepo-svn.t.err
@@ -87,10 +87,10 @@
                
   $ hg debugsub                         
   path s                                        
-   source   file://*/svn-repo/src (glob)
+   source   file:/*/$TESTTMP/svn-repo/src (glob)
    revision 2                       
   path subdir/s     
-   source   file://*/svn-repo/src (glob)
+   source   file:/*/$TESTTMP/svn-repo/src (glob)
    revision 2
                                         
 change file in svn and hg, commit               
@@ -113,10 +113,10 @@
   At revision 3.
   $ hg debugsub                         
   path s                                        
-   source   file://*/svn-repo/src (glob)
+   source   file:/*/$TESTTMP/svn-repo/src (glob)
    revision 3                                        
   path subdir/s
-   source   file://*/svn-repo/src (glob)
+   source   file:/*/$TESTTMP/svn-repo/src (glob)                                                              
    revision 2

 missing svn file, commit should fail
@@ -235,10 +235,10 @@

   $ hg debugsub
   path s
-   source   file://*/svn-repo/src (glob)
+   source   file:/*/$TESTTMP/svn-repo/src (glob)
    revision 3
   path subdir/s
-   source   file://*/svn-repo/src (glob)
+   source   file:/*/$TESTTMP/svn-repo/src (glob)
    revision 2

 verify subrepo is contained within the repo directory

ERROR: test-subrepo-svn.t output changed
pulkit requested changes to this revision.Jan 14 2020, 10:58 AM
This revision now requires changes to proceed.Jan 14 2020, 10:58 AM
mharbison72 edited the summary of this revision. (Show Details)Jan 14 2020, 1:17 PM
mharbison72 updated this revision to Diff 19265.
pulkit accepted this revision.Jan 14 2020, 4:48 PM
This revision is now accepted and ready to land.Jan 14 2020, 4:48 PM
mharbison72 edited the summary of this revision. (Show Details)Jan 14 2020, 5:21 PM
mharbison72 updated this revision to Diff 19269.
pulkit accepted this revision.Jan 16 2020, 11:10 AM
mharbison72 added a commit: rHGe598c874b4af: tests: stabilize test-subrepo-svn.t on Windows.Jan 16 2020, 11:32 AM
Closed by commit rHGe598c874b4af: tests: stabilize test-subrepo-svn.t on Windows (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-subrepo-svn.t (22 lines)

Diff 19375

tests/test-subrepo-svn.t

$ hg ci -moops $ hg ci -moops
nothing changed nothing changed
[1] [1]
debugsub debugsub
$ hg debugsub $ hg debugsub
path s path s
source file:/*/$TESTTMP/svn-repo/src (glob) source file:/*/svn-repo/src (glob) (windows !)
source file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
revision 2 revision 2
path subdir/s path subdir/s
source file:/*/$TESTTMP/svn-repo/src (glob) source file:/*/svn-repo/src (glob) (windows !)
source file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
revision 2 revision 2
change file in svn and hg, commit change file in svn and hg, commit
$ echo a >> a $ echo a >> a
$ echo alpha >> s/alpha $ echo alpha >> s/alpha
$ hg sum $ hg sum
parent: 1:* tip (glob) parent: 1:* tip (glob)
1 1
branch: default branch: default
commit: 1 modified, 1 subrepos commit: 1 modified, 1 subrepos
update: (current) update: (current)
phases: 2 draft phases: 2 draft
$ hg commit --subrepos -m 'Message!' | filter_svn_output $ hg commit --subrepos -m 'Message!' | filter_svn_output
committing subrepository s committing subrepository s
Sending*s/alpha (glob) Sending*s/alpha (glob)
Committed revision 3. Committed revision 3.
Fetching external item into '*s/externals'* (glob) Fetching external item into '*s/externals'* (glob)
External at revision 1. External at revision 1.
At revision 3. At revision 3.
$ hg debugsub $ hg debugsub
path s path s
source file:/*/$TESTTMP/svn-repo/src (glob) source file:/*/svn-repo/src (glob) (windows !)
source file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
revision 3 revision 3
path subdir/s path subdir/s
source file:/*/$TESTTMP/svn-repo/src (glob) source file:/*/svn-repo/src (glob) (windows !)
source file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
revision 2 revision 2
missing svn file, commit should fail missing svn file, commit should fail
$ rm s/alpha $ rm s/alpha
$ hg commit --subrepos -m 'abort on missing file' $ hg commit --subrepos -m 'abort on missing file'
committing subrepository s committing subrepository s
abort: cannot commit missing svn entries (in subrepository "s") abort: cannot commit missing svn entries (in subrepository "s")
Checked out revision 2. Checked out revision 2.
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd tc $ cd tc
debugsub in clone debugsub in clone
$ hg debugsub $ hg debugsub
path s path s
source file:/*/$TESTTMP/svn-repo/src (glob) source file:/*/svn-repo/src (glob) (windows !)
source file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
revision 3 revision 3
path subdir/s path subdir/s
source file:/*/$TESTTMP/svn-repo/src (glob) source file:/*/svn-repo/src (glob) (windows !)
source file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
revision 2 revision 2
verify subrepo is contained within the repo directory verify subrepo is contained within the repo directory
$ "$PYTHON" -c "from __future__ import print_function; import os.path; print(os.path.exists('s'))" $ "$PYTHON" -c "from __future__ import print_function; import os.path; print(os.path.exists('s'))"
True True
update to nullrev (must delete the subrepo) update to nullrev (must delete the subrepo)
../archive-exclude/s ../archive-exclude/s
../archive-exclude/s/alpha ../archive-exclude/s/alpha
../archive-exclude/s/dir ../archive-exclude/s/dir
../archive-exclude/s/dir/epsilon.py ../archive-exclude/s/dir/epsilon.py
Test forgetting files, not implemented in svn subrepo, used to Test forgetting files, not implemented in svn subrepo, used to
traceback traceback
$ hg forget 'notafile*' $ hg forget 'notafile'
notafile*: $ENOENT$ notafile: $ENOENT$
[1] [1]
Test a subrepo referencing a just moved svn path. Last commit rev will Test a subrepo referencing a just moved svn path. Last commit rev will
be different from the revision, and the path will be different as be different from the revision, and the path will be different as
well. well.
$ cd "$WCROOT" $ cd "$WCROOT"
$ svn up > /dev/null $ svn up > /dev/null