|
|
==================================
|
|
|
Basic testing for the push command
|
|
|
==================================
|
|
|
|
|
|
Testing of the '--rev' flag
|
|
|
===========================
|
|
|
|
|
|
$ hg init test-revflag
|
|
|
$ hg -R test-revflag unbundle "$TESTDIR/bundles/remote.hg"
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 9 changesets with 7 changes to 4 files (+1 heads)
|
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
|
|
|
|
$ for i in 0 1 2 3 4 5 6 7 8; do
|
|
|
> echo
|
|
|
> hg init test-revflag-"$i"
|
|
|
> hg -R test-revflag push -r "$i" test-revflag-"$i"
|
|
|
> hg -R test-revflag-"$i" verify
|
|
|
> done
|
|
|
|
|
|
pushing to test-revflag-0
|
|
|
searching for changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 1 changesets with 1 changes to 1 files
|
|
|
checking changesets
|
|
|
checking manifests
|
|
|
crosschecking files in changesets and manifests
|
|
|
checking files
|
|
|
1 files, 1 changesets, 1 total revisions
|
|
|
|
|
|
pushing to test-revflag-1
|
|
|
searching for changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 2 changesets with 2 changes to 1 files
|
|
|
checking changesets
|
|
|
checking manifests
|
|
|
crosschecking files in changesets and manifests
|
|
|
checking files
|
|
|
1 files, 2 changesets, 2 total revisions
|
|
|
|
|
|
pushing to test-revflag-2
|
|
|
searching for changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 3 changesets with 3 changes to 1 files
|
|
|
checking changesets
|
|
|
checking manifests
|
|
|
crosschecking files in changesets and manifests
|
|
|
checking files
|
|
|
1 files, 3 changesets, 3 total revisions
|
|
|
|
|
|
pushing to test-revflag-3
|
|
|
searching for changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 4 changesets with 4 changes to 1 files
|
|
|
checking changesets
|
|
|
checking manifests
|
|
|
crosschecking files in changesets and manifests
|
|
|
checking files
|
|
|
1 files, 4 changesets, 4 total revisions
|
|
|
|
|
|
pushing to test-revflag-4
|
|
|
searching for changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 2 changesets with 2 changes to 1 files
|
|
|
checking changesets
|
|
|
checking manifests
|
|
|
crosschecking files in changesets and manifests
|
|
|
checking files
|
|
|
1 files, 2 changesets, 2 total revisions
|
|
|
|
|
|
pushing to test-revflag-5
|
|
|
searching for changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 3 changesets with 3 changes to 1 files
|
|
|
checking changesets
|
|
|
checking manifests
|
|
|
crosschecking files in changesets and manifests
|
|
|
checking files
|
|
|
1 files, 3 changesets, 3 total revisions
|
|
|
|
|
|
pushing to test-revflag-6
|
|
|
searching for changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 4 changesets with 5 changes to 2 files
|
|
|
checking changesets
|
|
|
checking manifests
|
|
|
crosschecking files in changesets and manifests
|
|
|
checking files
|
|
|
2 files, 4 changesets, 5 total revisions
|
|
|
|
|
|
pushing to test-revflag-7
|
|
|
searching for changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 5 changesets with 6 changes to 3 files
|
|
|
checking changesets
|
|
|
checking manifests
|
|
|
crosschecking files in changesets and manifests
|
|
|
checking files
|
|
|
3 files, 5 changesets, 6 total revisions
|
|
|
|
|
|
pushing to test-revflag-8
|
|
|
searching for changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 5 changesets with 5 changes to 2 files
|
|
|
checking changesets
|
|
|
checking manifests
|
|
|
crosschecking files in changesets and manifests
|
|
|
checking files
|
|
|
2 files, 5 changesets, 5 total revisions
|
|
|
|
|
|
$ cd test-revflag-8
|
|
|
|
|
|
$ hg pull ../test-revflag-7
|
|
|
pulling from ../test-revflag-7
|
|
|
searching for changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 4 changesets with 2 changes to 3 files (+1 heads)
|
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
|
|
|
|
$ hg verify
|
|
|
checking changesets
|
|
|
checking manifests
|
|
|
crosschecking files in changesets and manifests
|
|
|
checking files
|
|
|
4 files, 9 changesets, 7 total revisions
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
|
Test server side validation during push
|
|
|
=======================================
|
|
|
|
|
|
$ hg init test-validation
|
|
|
$ cd test-validation
|
|
|
|
|
|
$ cat > .hg/hgrc <<EOF
|
|
|
> [server]
|
|
|
> validate=1
|
|
|
> EOF
|
|
|
|
|
|
$ echo alpha > alpha
|
|
|
$ echo beta > beta
|
|
|
$ hg addr
|
|
|
adding alpha
|
|
|
adding beta
|
|
|
$ hg ci -m 1
|
|
|
|
|
|
$ cd ..
|
|
|
$ hg clone test-validation test-validation-clone
|
|
|
updating to branch default
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
|
Test spurious filelog entries:
|
|
|
|
|
|
$ cd test-validation-clone
|
|
|
$ echo blah >> beta
|
|
|
$ cp .hg/store/data/beta.i tmp1
|
|
|
$ hg ci -m 2
|
|
|
$ cp .hg/store/data/beta.i tmp2
|
|
|
$ hg -q rollback
|
|
|
$ mv tmp2 .hg/store/data/beta.i
|
|
|
$ echo blah >> beta
|
|
|
$ hg ci -m '2 (corrupt)'
|
|
|
|
|
|
Expected to fail:
|
|
|
|
|
|
$ hg verify
|
|
|
checking changesets
|
|
|
checking manifests
|
|
|
crosschecking files in changesets and manifests
|
|
|
checking files
|
|
|
beta@1: dddc47b3ba30 not in manifests
|
|
|
2 files, 2 changesets, 4 total revisions
|
|
|
1 integrity errors encountered!
|
|
|
(first damaged changeset appears to be 1)
|
|
|
[1]
|
|
|
|
|
|
$ hg push
|
|
|
pushing to $TESTTMP/test-validation (glob)
|
|
|
searching for changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
transaction abort!
|
|
|
rollback completed
|
|
|
abort: received spurious file revlog entry
|
|
|
[255]
|
|
|
|
|
|
$ hg -q rollback
|
|
|
$ mv tmp1 .hg/store/data/beta.i
|
|
|
$ echo beta > beta
|
|
|
|
|
|
Test missing filelog entries:
|
|
|
|
|
|
$ cp .hg/store/data/beta.i tmp
|
|
|
$ echo blah >> beta
|
|
|
$ hg ci -m '2 (corrupt)'
|
|
|
$ mv tmp .hg/store/data/beta.i
|
|
|
|
|
|
Expected to fail:
|
|
|
|
|
|
$ hg verify
|
|
|
checking changesets
|
|
|
checking manifests
|
|
|
crosschecking files in changesets and manifests
|
|
|
checking files
|
|
|
beta@1: manifest refers to unknown revision dddc47b3ba30
|
|
|
2 files, 2 changesets, 2 total revisions
|
|
|
1 integrity errors encountered!
|
|
|
(first damaged changeset appears to be 1)
|
|
|
[1]
|
|
|
|
|
|
$ hg push
|
|
|
pushing to $TESTTMP/test-validation (glob)
|
|
|
searching for changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
transaction abort!
|
|
|
rollback completed
|
|
|
abort: missing file data for beta:dddc47b3ba30e54484720ce0f4f768a0f4b6efb9 - run hg verify
|
|
|
[255]
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
|
Test push hook locking
|
|
|
=====================
|
|
|
|
|
|
$ hg init 1
|
|
|
|
|
|
$ echo '[ui]' >> 1/.hg/hgrc
|
|
|
$ echo 'timeout = 10' >> 1/.hg/hgrc
|
|
|
|
|
|
$ echo foo > 1/foo
|
|
|
$ hg --cwd 1 ci -A -m foo
|
|
|
adding foo
|
|
|
|
|
|
$ hg clone 1 2
|
|
|
updating to branch default
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
|
$ hg clone 2 3
|
|
|
updating to branch default
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
|
$ cat <<EOF > $TESTTMP/debuglocks-pretxn-hook.sh
|
|
|
> hg debuglocks
|
|
|
> true
|
|
|
> EOF
|
|
|
$ echo '[hooks]' >> 2/.hg/hgrc
|
|
|
$ echo "pretxnchangegroup.a = sh $TESTTMP/debuglocks-pretxn-hook.sh" >> 2/.hg/hgrc
|
|
|
$ echo 'changegroup.push = hg push -qf ../1' >> 2/.hg/hgrc
|
|
|
|
|
|
$ echo bar >> 3/foo
|
|
|
$ hg --cwd 3 ci -m bar
|
|
|
|
|
|
$ hg --cwd 3 push ../2 --config devel.legacy.exchange=bundle1
|
|
|
pushing to ../2
|
|
|
searching for changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 1 changesets with 1 changes to 1 files
|
|
|
lock: user *, process * (*s) (glob)
|
|
|
wlock: free
|
|
|
|
|
|
$ hg --cwd 1 --config extensions.strip= strip tip -q
|
|
|
$ hg --cwd 2 --config extensions.strip= strip tip -q
|
|
|
$ hg --cwd 3 push ../2 # bundle2+
|
|
|
pushing to ../2
|
|
|
searching for changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 1 changesets with 1 changes to 1 files
|
|
|
lock: user *, process * (*s) (glob)
|
|
|
wlock: user *, process * (*s) (glob)
|
|
|
|
|
|
Test bare push with multiple race checking options
|
|
|
--------------------------------------------------
|
|
|
|
|
|
$ hg init test-bare-push-no-concurrency
|
|
|
$ hg init test-bare-push-unrelated-concurrency
|
|
|
$ hg -R test-revflag push -r 0 test-bare-push-no-concurrency --config server.concurrent-push-mode=strict
|
|
|
pushing to test-bare-push-no-concurrency
|
|
|
searching for changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 1 changesets with 1 changes to 1 files
|
|
|
$ hg -R test-revflag push -r 0 test-bare-push-unrelated-concurrency --config server.concurrent-push-mode=check-related
|
|
|
pushing to test-bare-push-unrelated-concurrency
|
|
|
searching for changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 1 changesets with 1 changes to 1 files
|
|
|
|
