This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9443

tests: simplify and extend pull-bundle test using debugbuilddag
ClosedPublic

Authored by joerg.sonnenberger on Nov 28 2020, 7:55 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG35d5d1d8bcf0: tests: simplify and extend pull-bundle test using debugbuilddag

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

pulkit accepted this revision.Nov 29 2020, 8:51 AM
This revision is now accepted and ready to land.Nov 29 2020, 8:51 AM

Revision Contents
Changeset List

PathPackages
Mtests/test-pull-bundle.t (112 lines)

Diff 23778

tests/test-pull-bundle.t

#require no-chg #require no-chg
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ echo foo > foo $ hg debugbuilddag '+3<3+1'
$ hg ci -qAm 'add foo'
$ echo >> foo
$ hg ci -m 'change foo'
$ hg up -qC 0
$ echo bar > bar
$ hg ci -qAm 'add bar'
$ hg log $ hg log
changeset: 2:effea6de0384 changeset: 3:6100d3090acf
tag: tip tag: tip
parent: 0:bbd179dfa0a7 parent: 0:1ea73414a91b
user: test user: debugbuilddag
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:03 1970 +0000
summary: add bar summary: r3
changeset: 1:ed1b79f46b9a changeset: 2:01241442b3c2
user: test user: debugbuilddag
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:02 1970 +0000
summary: change foo summary: r2
changeset: 1:66f7d451a68b
user: debugbuilddag
date: Thu Jan 01 00:00:01 1970 +0000
summary: r1
changeset: 0:bbd179dfa0a7 changeset: 0:1ea73414a91b
user: test user: debugbuilddag
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: add foo summary: r0
$ cd .. $ cd ..
Test pullbundle functionality Test pullbundle functionality
$ cd repo $ cd repo
$ cat <<EOF > .hg/hgrc $ cat <<EOF > .hg/hgrc
> [server] > [server]
> pullbundle = True > pullbundle = True
> [experimental] > [experimental]
> evolution = True > evolution = True
> [extensions] > [extensions]
> blackbox = > blackbox =
> EOF > EOF
$ hg bundle --base null -r 0 .hg/0.hg $ hg bundle --base null -r 0 .hg/0.hg
1 changesets found 1 changesets found
$ hg bundle --base 0 -r 1 .hg/1.hg $ hg bundle --base 0 -r 1 .hg/1.hg
1 changesets found 1 changesets found
$ hg bundle --base 1 -r 2 .hg/2.hg $ hg bundle --base 1 -r 2 .hg/2.hg
1 changesets found 1 changesets found
$ hg bundle --base 1 -r 3 .hg/3.hg
1 changesets found
$ cat <<EOF > .hg/pullbundles.manifest $ cat <<EOF > .hg/pullbundles.manifest
> 2.hg BUNDLESPEC=none-v2 heads=effea6de0384e684f44435651cb7bd70b8735bd4 bases=bbd179dfa0a71671c253b3ae0aa1513b60d199fa > 3.hg BUNDLESPEC=none-v2 heads=6100d3090acf50ed11ec23196cec20f5bd7323aa bases=1ea73414a91b0920940797d8fc6a11e447f8ea1e
> 1.hg BUNDLESPEC=bzip2-v2 heads=ed1b79f46b9a29f5a6efa59cf12fcfca43bead5a bases=bbd179dfa0a71671c253b3ae0aa1513b60d199fa > 2.hg BUNDLESPEC=none-v2 heads=01241442b3c2bf3211e593b549c655ea65b295e3 bases=66f7d451a68b85ed82ff5fcc254daf50c74144bd
> 0.hg BUNDLESPEC=gzip-v2 heads=bbd179dfa0a71671c253b3ae0aa1513b60d199fa > 1.hg BUNDLESPEC=bzip2-v2 heads=66f7d451a68b85ed82ff5fcc254daf50c74144bd bases=1ea73414a91b0920940797d8fc6a11e447f8ea1e
> 0.hg BUNDLESPEC=gzip-v2 heads=1ea73414a91b0920940797d8fc6a11e447f8ea1e
> EOF > EOF
$ hg --config blackbox.track=debug --debug serve -p $HGPORT2 -d --pid-file=../repo.pid -E ../error.txt $ hg --config blackbox.track=debug --debug serve -p $HGPORT2 -d --pid-file=../repo.pid -E ../error.txt
listening at http://*:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (glob) (?) listening at http://*:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (glob) (?)
$ cat ../repo.pid >> $DAEMON_PIDS $ cat ../repo.pid >> $DAEMON_PIDS
$ cd .. $ cd ..
$ hg clone -r 0 http://localhost:$HGPORT2/ repo.pullbundle $ hg clone -r 0 http://localhost:$HGPORT2/ repo.pullbundle
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 0 changes to 0 files
new changesets bbd179dfa0a7 (1 drafts) new changesets 1ea73414a91b (1 drafts)
updating to branch default updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat error.txt $ cat error.txt
$ cd repo.pullbundle $ cd repo.pullbundle
$ hg pull -r 1 $ hg pull -r 1
pulling from http://localhost:$HGPORT2/ pulling from http://localhost:$HGPORT2/
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 0 changes to 0 files
new changesets ed1b79f46b9a (1 drafts) new changesets 66f7d451a68b (1 drafts)
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg pull -r 2 $ hg pull -r 3
pulling from http://localhost:$HGPORT2/ pulling from http://localhost:$HGPORT2/
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads) added 1 changesets with 0 changes to 0 files (+1 heads)
new changesets effea6de0384 (1 drafts) new changesets 6100d3090acf (1 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
$ cd .. $ cd ..
$ killdaemons.py $ killdaemons.py
$ grep 'sending pullbundle ' repo/.hg/blackbox.log $ grep 'sending pullbundle ' repo/.hg/blackbox.log
* sending pullbundle "0.hg" (glob) * sending pullbundle "0.hg" (glob)
* sending pullbundle "1.hg" (glob) * sending pullbundle "1.hg" (glob)
* sending pullbundle "2.hg" (glob) * sending pullbundle "3.hg" (glob)
$ rm repo/.hg/blackbox.log $ rm repo/.hg/blackbox.log
Test pullbundle functionality for incremental pulls Test pullbundle functionality for incremental pulls
$ cd repo $ cd repo
$ hg --config blackbox.track=debug --debug serve -p $HGPORT2 -d --pid-file=../repo.pid $ hg --config blackbox.track=debug --debug serve -p $HGPORT2 -d --pid-file=../repo.pid
listening at http://*:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (glob) (?) listening at http://*:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (glob) (?)
$ cat ../repo.pid >> $DAEMON_PIDS $ cat ../repo.pid >> $DAEMON_PIDS
$ cd .. $ cd ..
$ hg clone http://localhost:$HGPORT2/ repo.pullbundle2 $ hg clone http://localhost:$HGPORT2/ repo.pullbundle2
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 3 changesets with 3 changes to 3 files (+1 heads) adding changesets
new changesets bbd179dfa0a7:ed1b79f46b9a (3 drafts) adding manifests
adding file changes
added 4 changesets with 0 changes to 0 files (+1 heads)
new changesets 1ea73414a91b:01241442b3c2 (4 drafts)
updating to branch default updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ killdaemons.py $ killdaemons.py
$ grep 'sending pullbundle ' repo/.hg/blackbox.log $ grep 'sending pullbundle ' repo/.hg/blackbox.log
* sending pullbundle "0.hg" (glob) * sending pullbundle "0.hg" (glob)
* sending pullbundle "2.hg" (glob) * sending pullbundle "3.hg" (glob)
* sending pullbundle "1.hg" (glob) * sending pullbundle "1.hg" (glob)
* sending pullbundle "2.hg" (glob)
$ rm repo/.hg/blackbox.log $ rm repo/.hg/blackbox.log
Test pullbundle functionality for incoming Test pullbundle functionality for incoming
$ cd repo $ cd repo
$ hg --config blackbox.track=debug --debug serve -p $HGPORT2 -d --pid-file=../repo.pid $ hg --config blackbox.track=debug --debug serve -p $HGPORT2 -d --pid-file=../repo.pid
listening at http://*:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (glob) (?) listening at http://*:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (glob) (?)
$ cat ../repo.pid >> $DAEMON_PIDS $ cat ../repo.pid >> $DAEMON_PIDS
$ cd .. $ cd ..
$ hg clone http://localhost:$HGPORT2/ repo.pullbundle2a -r 0 $ hg clone http://localhost:$HGPORT2/ repo.pullbundle2a -r 0
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 0 changes to 0 files
new changesets bbd179dfa0a7 (1 drafts) new changesets 1ea73414a91b (1 drafts)
updating to branch default updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo.pullbundle2a $ cd repo.pullbundle2a
$ hg incoming -r ed1b79f46b9a $ hg incoming -r 66f7d451a68b
comparing with http://localhost:$HGPORT2/ comparing with http://localhost:$HGPORT2/
searching for changes searching for changes
changeset: 1:ed1b79f46b9a changeset: 1:66f7d451a68b
tag: tip tag: tip
user: test user: debugbuilddag
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:01 1970 +0000
summary: change foo summary: r1
$ cd .. $ cd ..
$ killdaemons.py $ killdaemons.py
$ grep 'sending pullbundle ' repo/.hg/blackbox.log $ grep 'sending pullbundle ' repo/.hg/blackbox.log
* sending pullbundle "0.hg" (glob) * sending pullbundle "0.hg" (glob)
* sending pullbundle "1.hg" (glob) * sending pullbundle "1.hg" (glob)
$ rm repo/.hg/blackbox.log $ rm repo/.hg/blackbox.log
Test recovery from misconfigured server sending no new data Test recovery from misconfigured server sending no new data
$ cd repo $ cd repo
$ cat <<EOF > .hg/pullbundles.manifest $ cat <<EOF > .hg/pullbundles.manifest
> 0.hg heads=ed1b79f46b9a29f5a6efa59cf12fcfca43bead5a bases=bbd179dfa0a71671c253b3ae0aa1513b60d199fa > 0.hg heads=66f7d451a68b85ed82ff5fcc254daf50c74144bd bases=1ea73414a91b0920940797d8fc6a11e447f8ea1e
> 0.hg heads=bbd179dfa0a71671c253b3ae0aa1513b60d199fa > 0.hg heads=1ea73414a91b0920940797d8fc6a11e447f8ea1e
> EOF > EOF
$ hg --config blackbox.track=debug --debug serve -p $HGPORT2 -d --pid-file=../repo.pid $ hg --config blackbox.track=debug --debug serve -p $HGPORT2 -d --pid-file=../repo.pid
listening at http://*:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (glob) (?) listening at http://*:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (glob) (?)
$ cat ../repo.pid >> $DAEMON_PIDS $ cat ../repo.pid >> $DAEMON_PIDS
$ cd .. $ cd ..
$ hg clone -r 0 http://localhost:$HGPORT2/ repo.pullbundle3 $ hg clone -r 0 http://localhost:$HGPORT2/ repo.pullbundle3
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 0 changes to 0 files
new changesets bbd179dfa0a7 (1 drafts) new changesets 1ea73414a91b (1 drafts)
updating to branch default updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo.pullbundle3 $ cd repo.pullbundle3
$ hg pull -r 1 $ hg pull -r 1
pulling from http://localhost:$HGPORT2/ pulling from http://localhost:$HGPORT2/
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 0 changesets with 0 changes to 1 files abort: 00changelog.i@66f7d451a68b: no node
abort: 00changelog.i@ed1b79f46b9a: no node
[255] [255]
$ cd .. $ cd ..
$ killdaemons.py $ killdaemons.py
$ grep 'sending pullbundle ' repo/.hg/blackbox.log $ grep 'sending pullbundle ' repo/.hg/blackbox.log
* sending pullbundle "0.hg" (glob) * sending pullbundle "0.hg" (glob)
* sending pullbundle "0.hg" (glob) * sending pullbundle "0.hg" (glob)
$ rm repo/.hg/blackbox.log $ rm repo/.hg/blackbox.log
Test processing when nodes used in the pullbundle.manifest end up being hidden Test processing when nodes used in the pullbundle.manifest end up being hidden
$ hg --repo repo debugobsolete ed1b79f46b9a29f5a6efa59cf12fcfca43bead5a $ hg --repo repo debugobsolete ed1b79f46b9a29f5a6efa59cf12fcfca43bead5a
1 new obsolescence markers 1 new obsolescence markers
obsoleted 1 changesets
$ hg serve --repo repo --config server.view=visible -p $HGPORT -d --pid-file=hg.pid -E errors.log $ hg serve --repo repo --config server.view=visible -p $HGPORT -d --pid-file=hg.pid -E errors.log
$ cat hg.pid >> $DAEMON_PIDS $ cat hg.pid >> $DAEMON_PIDS
$ hg clone http://localhost:$HGPORT repo-obs $ hg clone http://localhost:$HGPORT repo-obs
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 2 changes to 2 files added 1 changesets with 0 changes to 0 files
new changesets bbd179dfa0a7:effea6de0384 new changesets 1ea73414a91b (1 drafts)
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ killdaemons.py $ killdaemons.py