Fix test-share and test-subrepo under Windows

tests/filtertmp.py

@@ -0,0 +1,14 b''
+#!/usr/bin/env python
+#
+# This used to be a simple sed call like:
+#
+#  $ sed "s:$HGTMP:*HGTMP*:"
+#
+# But $HGTMP has ':' under Windows which breaks the sed call.
+#
+import sys, os
+
+input = sys.stdin.read()
+input = input.replace(os.environ['HGTMP'], '$HGTMP')
+input = input.replace(os.sep, '/')
+sys.stdout.write(input)

tests/test-share

@@ -1,48 +1,48 b''
 #!/bin/sh
 
 echo "[extensions]"      >> $HGRCPATH
 echo "share = "          >> $HGRCPATH
 
 echo % prepare repo1
 hg init repo1
 cd repo1
 echo a > a
 hg commit -A -m'init'
 
 echo % share it
 cd ..
 hg share repo1 repo2
 
 echo % contents of repo2/.hg
 cd repo2
 [ -d .hg/store ] \
   && echo "fail: .hg/store should not exist" \
   || echo "pass: .hg/store does not exist"
 # Some sed versions appends newline, some don't, and some just fails
-(cat .hg/sharedpath; echo) | head -n1 | sed "s:$HGTMP:*HGTMP*:"
+(cat .hg/sharedpath; echo) | head -n1 | "$TESTDIR/filtertmp.py"
 
 echo % commit in shared clone
 echo a >> a
 hg commit -m'change in shared clone'
 
 echo % check original
 cd ../repo1
 hg log
 hg update
 cat a             # should be two lines of "a"
 
 echo % commit in original
 echo b > b
 hg commit -A -m'another file'
 
 echo % check in shared clone
 cd ../repo2
 hg log
 hg update
 cat b             # should exist with one "b"
 
 echo % hg serve shared clone
 hg serve -n test -p $HGPORT -d --pid-file=hg.pid
 cat hg.pid >> $DAEMON_PIDS
 
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/raw-file/'

tests/test-share.out

@@ -1,53 +1,53 b''
 % prepare repo1
 adding a
 % share it
 updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % contents of repo2/.hg
 pass: .hg/store does not exist
-*HGTMP*/test-share/repo1/.hg
+$HGTMP/test-share/repo1/.hg
 % commit in shared clone
 % check original
 changeset:   1:8af4dc49db9e
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     change in shared clone
 
 changeset:   0:d3873e73d99e
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     init
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 a
 a
 % commit in original
 adding b
 % check in shared clone
 changeset:   2:c2e0ac586386
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     another file
 
 changeset:   1:8af4dc49db9e
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     change in shared clone
 
 changeset:   0:d3873e73d99e
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     init
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 b
 % hg serve shared clone
 200 Script output follows
 
 
 -rw-r--r-- 4 a
 -rw-r--r-- 2 b
 
 

tests/test-subrepo

@@ -1,186 +1,188 b''
 #!/bin/sh
 
 rm -rf sub
 mkdir sub
 cd sub
 hg init t
 cd t
 
 echo % first revision, no sub
 echo a > a
 hg ci -Am0
 
 echo % add first sub
 echo s = s > .hgsub
 hg add .hgsub
 hg init s
 echo a > s/a
 hg -R s ci -Ams0
 hg ci -m1
 
 echo % add sub sub
 echo ss = ss > s/.hgsub
 hg init s/ss
 echo a > s/ss/a
 hg -R s add s/.hgsub
 hg -R s/ss add s/ss/a
 hg ci -m2
 
 echo % bump sub rev
 echo b > s/a
 hg -R s ci -ms1
 hg ci -m3
 
 echo % leave sub dirty
 echo c > s/a
 hg ci -m4
 hg tip -R s
 
 echo % check caching
 hg co 0
 hg debugsub
 echo % restore
 hg co
 hg debugsub
 
 echo % new branch for merge tests
 hg co 1
 echo t = t >> .hgsub
 hg init t
 echo t > t/t
 hg -R t add t
 echo % 5
 hg ci -m5 # add sub
 echo t2 > t/t
 echo % 6
 hg st -R s
 hg ci -m6 # change sub
 hg debugsub
 echo t3 > t/t
 echo % 7
 hg ci -m7 # change sub again for conflict test
 hg rm .hgsub
 echo % 8
 hg ci -m8 # remove sub
 
 echo % merge tests
 hg co -C 3
 hg merge 5 # test adding
 hg debugsub
 hg ci -m9
 hg merge 6 --debug # test change
 hg debugsub
 echo conflict > t/t
 hg ci -m10
 HGMERGE=internal:merge hg merge --debug 7 # test conflict
 echo % should conflict
 cat t/t
 
 echo % clone
 cd ..
 hg clone t tc
 cd tc
 hg debugsub
 
 echo % push
 echo bah > t/t
 hg ci -m11
 hg push | sed 's/ .*sub/ ...sub/g'
 
 echo % push -f
 echo bah > s/a
 hg ci -m12
 hg push | sed 's/ .*sub/ ...sub/g'
 hg push -f | sed 's/ .*sub/ ...sub/g'
 
 echo % update
 cd ../t
 hg up -C # discard our earlier merge
 echo blah > t/t
 hg ci -m13
 
 echo % pull
 cd ../tc
 hg pull | sed 's/ .*sub/ ...sub/g'
 hg up # should pull t
 cat t/t
 
 echo % bogus subrepo path aborts
 echo 'bogus=[boguspath' >> .hgsub
 hg ci -m 'bogus subrepo path'
 
 echo % issue 1986
 cd ..
 rm -rf sub
 hg init main
 cd main
 
 hg init s           # subrepo layout
 cd s                #
 echo a > a          #   o   5 br
 hg ci -Am1          #  /|
 hg branch br        # o |   4 default
 echo a >> a         # | |
 hg ci -m1           # | o   3 br
 hg up default       # |/|
 echo b > b          # o |   2 default
 hg ci -Am1          # | |
 hg up br            # | o   1 br
 hg merge tip        # |/
 hg ci -m1           # o     0 default
 hg up 2
 echo c > c
 hg ci -Am1
 hg up 3
 hg merge 4
 hg ci -m1
 
 cd ..                         # main repo layout:
 echo 's = s' > .hgsub         #
 hg -R s up 2                  #   * <-- try to merge default into br again
 hg ci -Am1                    # .`|
 hg branch br                  # . o   5 br      --> substate = 5
 echo b > b                    # . |
 hg -R s up 3                  # o |   4 default --> substate = 4
 hg ci -Am1                    # | |
 hg up default                 # | o   3 br      --> substate = 2
 echo c > c                    # |/|
 hg ci -Am1                    # o |   2 default --> substate = 2
 hg up 1                       # | |     
 hg merge 2                    # | o   1 br      --> substate = 3
 hg ci -m1                     # |/    
 hg up 2                       # o     0 default --> substate = 2
 hg -R s up 4
 echo d > d
 hg ci -Am1
 hg up 3
 hg -R s up 5
 echo e > e
 hg ci -Am1
 
 hg up 5
 hg merge 4    # try to merge default into br again
 cd ..
 
 echo % test repository cloning
 mkdir mercurial mercurial2
 hg init nested_absolute
 echo test > nested_absolute/foo
 hg -R nested_absolute add
 hg -R nested_absolute ci -mtest
 cd mercurial
 hg init nested_relative
 echo test2 > nested_relative/foo2
 hg -R nested_relative add
 hg -R nested_relative ci -mtest2
 hg init main
 echo nested_relative = ../nested_relative > main/.hgsub
 echo nested_absolute = `pwd`/nested_absolute >> main/.hgsub
 hg -R main add
 hg -R main ci -m "add subrepos"
 cd ..
 hg clone mercurial/main mercurial2/main
-cat mercurial2/main/nested_absolute/.hg/hgrc mercurial2/main/nested_relative/.hg/hgrc | sed "s:${PWD}:/tmp:"
+cat mercurial2/main/nested_absolute/.hg/hgrc \
+    mercurial2/main/nested_relative/.hg/hgrc \
+    | "$TESTDIR/filtertmp.py"
 rm -rf mercurial mercurial2
 
 exit 0

tests/test-subrepo.out

@@ -1,261 +1,261 b''
 % first revision, no sub
 adding a
 % add first sub
 adding a
 committing subrepository s
 % add sub sub
 committing subrepository s
 committing subrepository ss
 % bump sub rev
 committing subrepository s
 % leave sub dirty
 committing subrepository s
 changeset:   3:1c833a7a9e3a
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     4
 
 % check caching
 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 % restore
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 path s
  source   s
  revision 1c833a7a9e3a4445c711aaf0f012379cd0d4034e
 % new branch for merge tests
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding t/t
 % 5
 committing subrepository t
 created new head
 % 6
 committing subrepository t
 path s
  source   s
  revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4
 path t
  source   t
  revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
 % 7
 committing subrepository t
 % 8
 % merge tests
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 path s
  source   s
  revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
 path t
  source   t
  revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382
 created new head
   searching for copies back to rev 2
 resolving manifests
  overwrite None partial False
  ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4
  .hgsubstate: versions differ -> m
 update: .hgsubstate 1/1 files (100.00%)
 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
   subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg
 getting subrepo t
 resolving manifests
  overwrite True partial False
  ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a
  t: remote is newer -> g
 update: t 1/1 files (100.00%)
 getting t
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 path s
  source   s
  revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
 path t
  source   t
  revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
 committing subrepository t
   searching for copies back to rev 2
 resolving manifests
  overwrite None partial False
  ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf
  .hgsubstate: versions differ -> m
 update: .hgsubstate 1/1 files (100.00%)
 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
   subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg
 merging subrepo t
   searching for copies back to rev 2
 resolving manifests
  overwrite None partial False
  ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198
  t: versions differ -> m
 preserving t for resolve of t
 update: t 1/1 files (100.00%)
 picked tool 'internal:merge' for t (binary False symlink False)
 merging t
 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
 warning: conflicts during merge.
 merging t failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % should conflict
 <<<<<<< local
 conflict
 =======
 t3
 >>>>>>> other
 % clone
 updating to branch default
 pulling subrepo s
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 5 changes to 3 files
 pulling subrepo ss
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 pulling subrepo t
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 4 changes to 1 files (+1 heads)
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 path s
  source   s
  revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
 path t
  source   t
  revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e
 % push
 committing subrepository t
 pushing ...sub/t
 pushing ...subrepo ss
 searching for changes
 no changes found
 pushing ...subrepo s
 searching for changes
 no changes found
 pushing ...subrepo t
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 % push -f
 committing subrepository s
 abort: push creates new remote heads on branch 'default'!
 pushing ...sub/t
 pushing ...subrepo ss
 searching for changes
 no changes found
 pushing ...subrepo s
 searching for changes
 (did you forget to merge? use push -f to force)
 pushing ...subrepo t
 searching for changes
 no changes found
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 pushing ...sub/t
 pushing ...subrepo ss
 searching for changes
 no changes found
 pushing ...subrepo s
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 pushing ...subrepo t
 searching for changes
 no changes found
 searching for changes
 no changes found
 % update
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 committing subrepository t
 % pull
 pulling ...sub/t
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
 pulling subrepo t
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 blah
 % bogus subrepo path aborts
 abort: missing ] in subrepo source
 % issue 1986
 adding a
 marked working directory as branch br
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding b
 created new head
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding c
 created new head
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding .hgsub
 committing subrepository s
 marked working directory as branch br
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding b
 committing subrepository s
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding c
 created new head
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding d
 committing subrepository s
 created new head
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding e
 committing subrepository s
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % test repository cloning
 adding nested_absolute/foo
 adding nested_relative/foo2
 adding main/.hgsub
 committing subrepository nested_relative
 committing subrepository nested_absolute
 updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 [paths]
-default = /tmp/mercurial/main/nested_absolute
+default = $HGTMP/test-subrepo/sub/mercurial/main/nested_absolute
 [paths]
-default = /tmp/mercurial/main/nested_relative
+default = $HGTMP/test-subrepo/sub/mercurial/main/nested_relative