mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +03:00
98d9269874
Summary: Create a fork of the Mercurial code that we can use to build server rpms. The hg servers will continue to exist for a few more months while we move the darkstorm and ediscovery use cases off them. In the mean time, we want to start making breaking changes to the client, so let's create a stable copy of the hg code to produce rpms for the hg servers. The fork is based off c7770c78d, the latest hg release. This copies the files as is, then adds some minor tweaks to get it to build: - Disables some lint checks that appear to be bypassed by path - sed replace eden/scm with eden/hg-server - Removed a dependency on scm/telemetry from the edenfs-client tests since scm/telemetry pulls in the original eden/scm/lib/configparser which conflicts with the hg-server conflict parser. allow-large-files Reviewed By: quark-zju Differential Revision: D27632557 fbshipit-source-id: b2f442f4ec000ea08e4d62de068750832198e1f4
1038 lines
28 KiB
Perl
1038 lines
28 KiB
Perl
#chg-compatible
|
|
|
|
$ disable treemanifest
|
|
TODO: configure mutation
|
|
$ configure dummyssh
|
|
$ enable remotenames
|
|
|
|
Setup
|
|
|
|
$ setconfig ui.username="nobody <no.reply@fb.com>"
|
|
|
|
$ commit() {
|
|
> hg commit -d "0 0" -A -m "$@"
|
|
> }
|
|
|
|
$ log() {
|
|
> hg log -G -T "{desc} [{phase}:{node|short}] {bookmarks}" "$@"
|
|
> }
|
|
|
|
Set up server repository
|
|
|
|
$ hg init server
|
|
$ cd server
|
|
$ echo foo > a
|
|
$ echo foo > b
|
|
$ commit 'initial'
|
|
adding a
|
|
adding b
|
|
$ hg bookmark main
|
|
|
|
Set up client repository
|
|
|
|
$ cd ..
|
|
$ hg clone ssh://user@dummy/server client -q
|
|
$ cd client
|
|
$ echo "[extensions]" >> .hg/hgrc
|
|
$ echo "pushrebase =" >> .hg/hgrc
|
|
|
|
Without server extension
|
|
|
|
$ cd ../server
|
|
$ echo 'bar' > a
|
|
$ commit 'a => bar'
|
|
|
|
$ cd ../client
|
|
$ hg rm b
|
|
$ commit 'b => xxx'
|
|
$ echo 'baz' > b
|
|
$ hg add b
|
|
$ commit 'b => baz'
|
|
|
|
$ echo "[experimental]" >> .hg/hgrc
|
|
$ echo "bundle2-exp = True" >> .hg/hgrc
|
|
|
|
$ echo "[experimental]" >> ../server/.hg/hgrc
|
|
$ echo "bundle2-exp = True" >> ../server/.hg/hgrc
|
|
|
|
Stack of non-conflicting commits should be accepted
|
|
|
|
$ cd ../server
|
|
$ echo "[extensions]" >> .hg/hgrc
|
|
$ echo "pushrebase =" >> .hg/hgrc
|
|
$ log
|
|
@ a => bar [draft:add0c792bfce] main
|
|
│
|
|
o initial [draft:2bb9d20e471c]
|
|
|
|
|
|
$ cd ../client
|
|
$ log
|
|
@ b => baz [draft:0e3997dc0733]
|
|
│
|
|
o b => xxx [draft:46a2df24e272]
|
|
│
|
|
o initial [public:2bb9d20e471c]
|
|
|
|
$ hg push --to main --config devel.bundle2.debug=1 --debug 2>&1 | tee stuff | grep -v bundle2-
|
|
running * (glob)
|
|
sending hello command
|
|
sending between command
|
|
remote: 425
|
|
remote: capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash unbundlereplay batch streamreqs=generaldelta,lz4revlog,revlogv1 stream_option bundle2=HG20%0Ab2x%253Arebase%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Alistkeys%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps unbundle=HG10GZ,HG10BZ,HG10UN
|
|
remote: 1
|
|
pushing rev 0e3997dc0733 to destination ssh://user@dummy/server bookmark main
|
|
query 1; heads
|
|
sending batch command
|
|
searching for changes
|
|
local heads: 1; remote heads: 1 (explicit: 0); initial common: 0
|
|
sampling from both directions (1 of 1)
|
|
sampling undecided commits (1 of 1)
|
|
query 2; still undecided: 1, sample size is: 1
|
|
sending known command
|
|
2 total queries in *s (glob)
|
|
preparing listkeys for "bookmarks" with pattern "['main']"
|
|
sending listkeyspatterns command
|
|
received listkey for "bookmarks": 45 bytes
|
|
validated revset for rebase
|
|
2 changesets found
|
|
list of changesets:
|
|
46a2df24e27273bb06dbf28b085fcc2e911bf986
|
|
0e3997dc073308e42715a44d345466690abfd09a
|
|
sending unbundle command
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
adding a revisions
|
|
adding b revisions
|
|
added 3 changesets with 1 changes to 2 files
|
|
updating bookmark main
|
|
preparing listkeys for "bookmarks"
|
|
sending listkeys command
|
|
received listkey for "bookmarks": 45 bytes
|
|
remote: pushing 2 changesets:
|
|
remote: 46a2df24e272 b => xxx
|
|
remote: 0e3997dc0733 b => baz
|
|
remote: 3 new changesets from the server will be downloaded
|
|
resolving manifests
|
|
branchmerge: False, force: False, partial: False
|
|
ancestor: 0e3997dc0733, local: 0e3997dc0733+, remote: 4cfedb0dc25f
|
|
a: remote is newer -> g
|
|
getting a
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ log -R ../server
|
|
o b => baz [draft:4cfedb0dc25f] main
|
|
│
|
|
o b => xxx [draft:6a6d9484552c]
|
|
│
|
|
@ a => bar [draft:add0c792bfce]
|
|
│
|
|
o initial [draft:2bb9d20e471c]
|
|
|
|
|
|
Check that we did not generate any check:heads parts
|
|
|
|
$ grep check:heads stuff
|
|
[1]
|
|
$ rm stuff
|
|
|
|
$ cd ../server
|
|
$ hg update main
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ log
|
|
@ b => baz [draft:4cfedb0dc25f] main
|
|
│
|
|
o b => xxx [draft:6a6d9484552c]
|
|
│
|
|
o a => bar [draft:add0c792bfce]
|
|
│
|
|
o initial [draft:2bb9d20e471c]
|
|
|
|
$ hg debugstrip -r 6a6d9484552c82e5f21b4ed4fce375930812f88c
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ cd ../client
|
|
$ hg debugstrip add0c792bfce89610d277fd5b1e32f5287994d1d
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg up 0e3997dc0733
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ log
|
|
@ b => baz [draft:0e3997dc0733]
|
|
│
|
|
o b => xxx [draft:46a2df24e272]
|
|
│
|
|
o initial [draft:2bb9d20e471c]
|
|
|
|
|
|
Push using changegroup2
|
|
|
|
$ hg push --to main
|
|
pushing rev 0e3997dc0733 to destination ssh://user@dummy/server bookmark main
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 3 changesets with 0 changes to 2 files
|
|
updating bookmark main
|
|
remote: pushing 2 changesets:
|
|
remote: 46a2df24e272 b => xxx
|
|
remote: 0e3997dc0733 b => baz
|
|
remote: 3 new changesets from the server will be downloaded
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ log -R ../server
|
|
o b => baz [draft:4cfedb0dc25f] main
|
|
│
|
|
o b => xxx [draft:6a6d9484552c]
|
|
│
|
|
@ a => bar [draft:add0c792bfce]
|
|
│
|
|
o initial [draft:2bb9d20e471c]
|
|
|
|
|
|
$ cd ../client
|
|
$ hg debugstrip 46a2df24e27273bb06dbf28b085fcc2e911bf986
|
|
$ hg pull
|
|
pulling from ssh://user@dummy/server
|
|
searching for changes
|
|
no changes found
|
|
$ hg update default
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
Regular commits should go through without changing hash
|
|
|
|
$ cd ../client
|
|
$ echo '[experimental]' >> .hg/hgrc
|
|
$ echo 'bundle2.pushback = True' >> .hg/hgrc
|
|
|
|
$ echo 'quux' > b
|
|
$ commit 'b => quux'
|
|
$ log -r tip
|
|
@ b => quux [draft:741fd2094512]
|
|
│
|
|
~
|
|
|
|
$ hg push --to main
|
|
pushing rev 741fd2094512 to destination ssh://user@dummy/server bookmark main
|
|
searching for changes
|
|
updating bookmark main
|
|
remote: pushing 1 changeset:
|
|
remote: 741fd2094512 b => quux
|
|
|
|
$ log
|
|
@ b => quux [public:741fd2094512]
|
|
│
|
|
o b => baz [public:4cfedb0dc25f]
|
|
│
|
|
o b => xxx [public:6a6d9484552c]
|
|
│
|
|
o a => bar [public:add0c792bfce]
|
|
│
|
|
o initial [public:2bb9d20e471c]
|
|
|
|
$ cd ../server
|
|
$ hg update main
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ log
|
|
@ b => quux [draft:741fd2094512] main
|
|
│
|
|
o b => baz [draft:4cfedb0dc25f]
|
|
│
|
|
o b => xxx [draft:6a6d9484552c]
|
|
│
|
|
o a => bar [draft:add0c792bfce]
|
|
│
|
|
o initial [draft:2bb9d20e471c]
|
|
|
|
|
|
Stack with conflict in tail should abort
|
|
|
|
$ cd ../server
|
|
$ echo 'baz' > a
|
|
$ commit 'a => baz'
|
|
|
|
$ cd ../client
|
|
$ echo 'quux' > a
|
|
$ commit 'a => quux'
|
|
$ echo 'foofoo' > b
|
|
$ commit 'b => foofoo'
|
|
$ hg push --to main
|
|
pushing rev e9ea9556a371 to destination ssh://user@dummy/server bookmark main
|
|
searching for changes
|
|
remote: conflicting changes in:
|
|
a
|
|
remote: (pull and rebase your changes locally, then try again)
|
|
abort: push failed on remote
|
|
[255]
|
|
|
|
$ hg debugstrip 'max(desc(a))'
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd ../server
|
|
$ log
|
|
@ a => baz [draft:fb983dc509b6] main
|
|
│
|
|
o b => quux [draft:741fd2094512]
|
|
│
|
|
o b => baz [draft:4cfedb0dc25f]
|
|
│
|
|
o b => xxx [draft:6a6d9484552c]
|
|
│
|
|
o a => bar [draft:add0c792bfce]
|
|
│
|
|
o initial [draft:2bb9d20e471c]
|
|
|
|
|
|
Stack with conflict in head should abort
|
|
|
|
$ cd ../client
|
|
$ echo 'foofoo' > b
|
|
$ commit 'b => foofoo'
|
|
$ echo 'quux' > a
|
|
$ commit 'a => quux'
|
|
$ hg push --to main
|
|
pushing rev f691c6db9875 to destination ssh://user@dummy/server bookmark main
|
|
searching for changes
|
|
remote: conflicting changes in:
|
|
a
|
|
remote: (pull and rebase your changes locally, then try again)
|
|
abort: push failed on remote
|
|
[255]
|
|
|
|
$ hg debugstrip 'max(desc(b))'
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ cd ../server
|
|
$ log
|
|
@ a => baz [draft:fb983dc509b6] main
|
|
│
|
|
o b => quux [draft:741fd2094512]
|
|
│
|
|
o b => baz [draft:4cfedb0dc25f]
|
|
│
|
|
o b => xxx [draft:6a6d9484552c]
|
|
│
|
|
o a => bar [draft:add0c792bfce]
|
|
│
|
|
o initial [draft:2bb9d20e471c]
|
|
|
|
Pushing a merge should rebase only the latest side of the merge
|
|
|
|
$ hg book master -r tip
|
|
$ cd ../client
|
|
$ hg pull -q > /dev/null
|
|
$ hg debugstrip -q -r tip
|
|
$ hg up 741fd2094512
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo "tux" > other
|
|
$ hg add other
|
|
$ hg commit -qm "branch left"
|
|
$ hg book master -r tip
|
|
$ hg up -q 6a6d9484552c82e5f21b4ed4fce375930812f88c
|
|
$ echo branched > c
|
|
$ hg commit -Aqm "branch start"
|
|
$ echo branched2 > c
|
|
$ hg commit -qm "branch middle"
|
|
$ hg merge -q master
|
|
$ hg commit -qm "merge"
|
|
$ echo ontopofmerge > c
|
|
$ hg commit -qm "on top of merge"
|
|
$ hg book master -r tip
|
|
moving bookmark 'master' forward from e6b7549904cd
|
|
$ hg debugmakepublic 741fd2094512
|
|
$ log
|
|
@ on top of merge [draft:9007d6a204f8] master
|
|
│
|
|
o merge [draft:2c0c699d7086]
|
|
├─╮
|
|
│ o branch middle [draft:5a0cbf3df4ef]
|
|
│ │
|
|
│ o branch start [draft:add5ec74853d]
|
|
│ │
|
|
o │ branch left [draft:e6b7549904cd]
|
|
│ │
|
|
o │ b => quux [public:741fd2094512]
|
|
│ │
|
|
o │ b => baz [public:4cfedb0dc25f]
|
|
├─╯
|
|
o b => xxx [public:6a6d9484552c]
|
|
│
|
|
o a => bar [public:add0c792bfce]
|
|
│
|
|
o initial [public:2bb9d20e471c]
|
|
|
|
$ log -R ../server
|
|
@ a => baz [draft:fb983dc509b6] main master
|
|
│
|
|
o b => quux [draft:741fd2094512]
|
|
│
|
|
o b => baz [draft:4cfedb0dc25f]
|
|
│
|
|
o b => xxx [draft:6a6d9484552c]
|
|
│
|
|
o a => bar [draft:add0c792bfce]
|
|
│
|
|
o initial [draft:2bb9d20e471c]
|
|
|
|
$ hg push --to main
|
|
pushing rev 9007d6a204f8 to destination ssh://user@dummy/server bookmark main
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 4 changesets with 0 changes to 3 files
|
|
updating bookmark main
|
|
remote: pushing 5 changesets:
|
|
remote: e6b7549904cd branch left
|
|
remote: add5ec74853d branch start
|
|
remote: 5a0cbf3df4ef branch middle
|
|
remote: 2c0c699d7086 merge
|
|
remote: 9007d6a204f8 on top of merge
|
|
remote: 6 new changesets from the server will be downloaded
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd ../server
|
|
$ log
|
|
o on top of merge [draft:54b35e8b58eb] main
|
|
│
|
|
o merge [draft:5a512eb2b3f8]
|
|
├─╮
|
|
│ o branch middle [draft:5a0cbf3df4ef]
|
|
│ │
|
|
│ o branch start [draft:add5ec74853d]
|
|
│ │
|
|
o │ branch left [draft:cf07bdf4226e]
|
|
│ │
|
|
@ │ a => baz [draft:fb983dc509b6] master
|
|
│ │
|
|
o │ b => quux [draft:741fd2094512]
|
|
│ │
|
|
o │ b => baz [draft:4cfedb0dc25f]
|
|
├─╯
|
|
o b => xxx [draft:6a6d9484552c]
|
|
│
|
|
o a => bar [draft:add0c792bfce]
|
|
│
|
|
o initial [draft:2bb9d20e471c]
|
|
|
|
- Verify the content of the merge files is correct
|
|
$ hg cat -r "main^" c
|
|
branched2
|
|
$ hg cat -r "main^" other
|
|
tux
|
|
|
|
$ hg debugstrip -r add5ec74853d -q
|
|
$ cd ../client
|
|
$ hg debugstrip -r add5ec74853d -q
|
|
$ hg book -d master
|
|
$ hg -R ../server book -d master
|
|
|
|
With evolution enabled, should set obsolescence markers
|
|
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [extensions]
|
|
> rebase =
|
|
>
|
|
> [experimental]
|
|
> evolution = createmarkers
|
|
> EOF
|
|
|
|
$ cd ../client
|
|
$ hg debugstrip -qr fb983dc509b6
|
|
$ hg debugstrip -qr e6b7549904cd2a7991ef25bc2e0fd910801af2cd
|
|
$ hg up -q 741fd2094512
|
|
$ hg mv b k
|
|
$ commit 'b => k'
|
|
$ hg mv k b
|
|
$ echo 'foobar' > b
|
|
$ commit 'b => foobar'
|
|
$ log
|
|
@ b => foobar [draft:e73acfaeee82]
|
|
│
|
|
o b => k [draft:9467a8ee5d0d]
|
|
│
|
|
o b => quux [public:741fd2094512]
|
|
│
|
|
o b => baz [public:4cfedb0dc25f]
|
|
│
|
|
o b => xxx [public:6a6d9484552c]
|
|
│
|
|
o a => bar [public:add0c792bfce]
|
|
│
|
|
o initial [public:2bb9d20e471c]
|
|
|
|
$ hg push --to main
|
|
pushing rev e73acfaeee82 to destination ssh://user@dummy/server bookmark main
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 4 changesets with 0 changes to 4 files
|
|
updating bookmark main
|
|
remote: pushing 2 changesets:
|
|
remote: 9467a8ee5d0d b => k
|
|
remote: e73acfaeee82 b => foobar
|
|
remote: 4 new changesets from the server will be downloaded
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hg pull
|
|
pulling from ssh://user@dummy/server
|
|
searching for changes
|
|
no changes found
|
|
$ hg up d53a62ed14be
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ log
|
|
@ b => foobar [public:d53a62ed14be]
|
|
│
|
|
o b => k [public:0d76868c25e6]
|
|
│
|
|
o branch left [public:cf07bdf4226e]
|
|
│
|
|
o a => baz [public:fb983dc509b6]
|
|
│
|
|
o b => quux [public:741fd2094512]
|
|
│
|
|
o b => baz [public:4cfedb0dc25f]
|
|
│
|
|
o b => xxx [public:6a6d9484552c]
|
|
│
|
|
o a => bar [public:add0c792bfce]
|
|
│
|
|
o initial [public:2bb9d20e471c]
|
|
|
|
|
|
$ cd ../server
|
|
$ hg log -r 0d76868c25e6 -T '{file_copies}\n'
|
|
k (b)
|
|
$ log
|
|
o b => foobar [draft:d53a62ed14be] main
|
|
│
|
|
o b => k [draft:0d76868c25e6]
|
|
│
|
|
o branch left [draft:cf07bdf4226e]
|
|
│
|
|
@ a => baz [draft:fb983dc509b6]
|
|
│
|
|
o b => quux [draft:741fd2094512]
|
|
│
|
|
o b => baz [draft:4cfedb0dc25f]
|
|
│
|
|
o b => xxx [draft:6a6d9484552c]
|
|
│
|
|
o a => bar [draft:add0c792bfce]
|
|
│
|
|
o initial [draft:2bb9d20e471c]
|
|
|
|
Test pushing master bookmark, fast forward
|
|
|
|
$ hg book -r fb983dc509b6 master
|
|
$ cd ../client
|
|
$ hg book master
|
|
$ echo 'babar' > b
|
|
$ commit 'b => babar'
|
|
$ hg log -r master -T"{node}\n"
|
|
56b2e094996609874ae1c9aae1626bfba61d07d8
|
|
$ hg push --to master
|
|
pushing rev 56b2e0949966 to destination ssh://user@dummy/server bookmark master
|
|
searching for changes
|
|
updating bookmark master
|
|
remote: pushing 1 changeset:
|
|
remote: 56b2e0949966 b => babar
|
|
$ hg log -r master -R ../server -T"{node}\n"
|
|
56b2e094996609874ae1c9aae1626bfba61d07d8
|
|
|
|
Test pushing bookmark with no new commit
|
|
|
|
$ hg book stable -r fb983dc509b6
|
|
$ hg book stable -r "fb983dc509b6^" -R ../server
|
|
$ hg push -r stable --to stable
|
|
pushing rev fb983dc509b6 to destination ssh://user@dummy/server bookmark stable
|
|
searching for changes
|
|
no changes found
|
|
updating bookmark stable
|
|
[1]
|
|
$ hg log -r stable -R ../server
|
|
commit: fb983dc509b6
|
|
bookmark: stable
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: a => baz
|
|
|
|
|
|
$ cd ..
|
|
|
|
Test that the prepushrebase hook can run against the bundle repo
|
|
|
|
$ cat >> $TESTTMP/prerebase.sh <<EOF
|
|
> hg log -r tip
|
|
> echo "Checking if lock exists (it should not):"
|
|
> ls -l .hg/store/lock
|
|
> EOF
|
|
$ chmod a+x $TESTTMP/prerebase.sh
|
|
$ hg init prepushrebaseserver
|
|
$ cd prepushrebaseserver
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [hooks]
|
|
> prepushrebase = $TESTTMP/prerebase.sh
|
|
> [extensions]
|
|
> pushrebase=
|
|
> [experimental]
|
|
> bundle2lazylocking = True
|
|
> EOF
|
|
$ touch a && hg add a && hg commit -qm a
|
|
$ hg book master
|
|
$ cd ..
|
|
|
|
$ hg clone ssh://user@dummy/prepushrebaseserver prepushrebaseclient
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd prepushrebaseclient
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> pushrebase=
|
|
> EOF
|
|
$ touch b && hg add b && hg commit -qm b
|
|
$ hg push --to master
|
|
pushing rev 0e067c57feba to destination ssh://user@dummy/prepushrebaseserver bookmark master
|
|
searching for changes
|
|
remote: prepushrebase hook exited with status * (glob)
|
|
remote: commit: 0e067c57feba
|
|
remote: user: test
|
|
remote: date: Thu Jan 01 00:00:00 1970 +0000
|
|
remote: summary: b
|
|
remote:
|
|
remote: Checking if lock exists (it should not):
|
|
remote: ls: *.hg/store/lock*: $ENOENT$ (glob)
|
|
abort: push failed on remote
|
|
[255]
|
|
|
|
$ cd ..
|
|
|
|
Test that hooks are fired with the correct variables
|
|
|
|
$ hg init hookserver
|
|
$ cd hookserver
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [hooks]
|
|
> changegroup = python "$RUNTESTDIR/printenv.py" changegroup
|
|
> outgoing = python "$RUNTESTDIR/printenv.py" outgoing
|
|
> prechangegroup = python "$RUNTESTDIR/printenv.py" prechangegroup
|
|
> preoutgoing = python "$RUNTESTDIR/printenv.py" preoutgoing
|
|
> pretxnchangegroup = python "$RUNTESTDIR/printenv.py" pretxnchangegroup
|
|
> txnclose = python "$RUNTESTDIR/printenv.py" txnclose
|
|
> pretxnclose = python "$RUNTESTDIR/printenv.py" pretxnclose
|
|
> prepushrebase = python "$RUNTESTDIR/printenv.py" prepushrebase
|
|
> prepushkey = python "$RUNTESTDIR/printenv.py" prepushkey
|
|
> [extensions]
|
|
> pushrebase=
|
|
> EOF
|
|
$ touch file && hg ci -Aqm initial
|
|
pretxnclose hook: HG_HOOKNAME=pretxnclose HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/hookserver HG_SHAREDPENDING=$TESTTMP/hookserver HG_TXNID=TXN:$ID$ HG_TXNNAME=commit
|
|
txnclose hook: HG_HOOKNAME=txnclose HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=commit
|
|
$ hg bookmark master
|
|
pretxnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=pretxnclose HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/hookserver HG_SHAREDPENDING=$TESTTMP/hookserver HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
|
|
txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose HG_HOOKTYPE=txnclose HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob)
|
|
$ cd ../
|
|
|
|
$ hg clone hookserver hookclient
|
|
preoutgoing hook: HG_HOOKNAME=preoutgoing HG_HOOKTYPE=preoutgoing HG_SOURCE=clone
|
|
outgoing hook: HG_HOOKNAME=outgoing HG_HOOKTYPE=outgoing HG_NODE=0000000000000000000000000000000000000000 HG_SOURCE=clone
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd hookclient
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> pushrebase=
|
|
> EOF
|
|
$ hg update master
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo >> file && hg ci -Aqm first
|
|
$ echo >> file && hg ci -Aqm second
|
|
$ echo >> file && hg ci -Aqm last
|
|
$ hg push --to master
|
|
pushing rev a5e72ac0df88 to destination $TESTTMP/hookserver bookmark master
|
|
searching for changes
|
|
prepushrebase hook: HG_BUNDLE2=1 HG_HOOKNAME=prepushrebase HG_HOOKTYPE=prepushrebase HG_HOOK_BUNDLEPATH=* HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_NODE_ONTO=e95be919ac60f0c114075e32a0a4301afabadb60 HG_ONTO=master HG_SOURCE=push (glob)
|
|
pushing 3 changesets:
|
|
4fcee35c508c first
|
|
11be4ca7f3f4 second
|
|
a5e72ac0df88 last
|
|
prechangegroup hook: HG_BUNDLE2=1 HG_HOOKNAME=prechangegroup HG_HOOKTYPE=prechangegroup HG_SOURCE=push HG_TXNID=TXN:* HG_URL=file:$TESTTMP/hookserver (glob)
|
|
pretxnchangegroup hook: HG_BUNDLE2=1 HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_NODE_LAST=a5e72ac0df8881afef34132987e8ae78d2e6cb13 HG_PENDING=$TESTTMP/hookserver HG_SHAREDPENDING=$TESTTMP/hookserver HG_SOURCE=push HG_TXNID=TXN:* HG_URL=file:$TESTTMP/hookserver (glob)
|
|
prepushkey hook: HG_BUNDLE2=1 HG_HOOKNAME=prepushkey HG_HOOKTYPE=prepushkey HG_KEY=master HG_NAMESPACE=bookmarks HG_NEW=a5e72ac0df8881afef34132987e8ae78d2e6cb13 HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_OLD=e95be919ac60f0c114075e32a0a4301afabadb60 HG_PENDING=$TESTTMP/hookserver HG_SHAREDPENDING=$TESTTMP/hookserver HG_SOURCE=push HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/hookserver
|
|
pretxnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_HOOKNAME=pretxnclose HG_HOOKTYPE=pretxnclose HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_PENDING=$TESTTMP/hookserver HG_SHAREDPENDING=$TESTTMP/hookserver HG_SOURCE=push HG_TXNID=TXN:$ID$ HG_TXNNAME=push HG_URL=file:$TESTTMP/hookserver
|
|
txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_HOOKNAME=txnclose HG_HOOKTYPE=txnclose HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_SOURCE=push HG_TXNID=TXN:$ID$ HG_TXNNAME=push HG_URL=file:$TESTTMP/hookserver
|
|
changegroup hook: HG_BUNDLE2=1 HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_NODE_LAST=a5e72ac0df8881afef34132987e8ae78d2e6cb13 HG_SOURCE=push HG_TXNID=TXN:* HG_URL=file:$TESTTMP/hookserver (glob)
|
|
updating bookmark master
|
|
|
|
|
|
$ cd ../
|
|
|
|
Test that failing prechangegroup hooks block the push
|
|
|
|
$ hg init hookserver2
|
|
$ cd hookserver2
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [hooks]
|
|
> prechangegroup = exit 1
|
|
> [extensions]
|
|
> pushrebase=
|
|
> EOF
|
|
$ touch file && hg ci -Aqm initial
|
|
$ hg bookmark master
|
|
$ cd ../
|
|
|
|
$ hg clone hookserver2 hookclient2
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd hookclient2
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> pushrebase=
|
|
> EOF
|
|
$ hg update master
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo >> file && hg ci -Aqm first
|
|
$ echo >> file && hg ci -Aqm second
|
|
$ echo >> file && hg ci -Aqm last
|
|
$ hg push --to master
|
|
pushing rev a5e72ac0df88 to destination $TESTTMP/hookserver2 bookmark master
|
|
searching for changes
|
|
pushing 3 changesets:
|
|
4fcee35c508c first
|
|
11be4ca7f3f4 second
|
|
a5e72ac0df88 last
|
|
abort: prechangegroup hook exited with status 1
|
|
[255]
|
|
|
|
$ cd ..
|
|
|
|
Test date rewriting
|
|
|
|
$ hg init rewritedate
|
|
$ cd rewritedate
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> pushrebase=
|
|
> [pushrebase]
|
|
> rewritedates = True
|
|
> EOF
|
|
$ touch a && hg commit -Aqm a
|
|
$ touch b && hg commit -Aqm b
|
|
$ hg book master
|
|
$ cd ..
|
|
|
|
$ hg clone rewritedate rewritedateclient
|
|
updating to branch default
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd rewritedateclient
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> pushrebase=
|
|
> EOF
|
|
$ hg up 'desc(a)'
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ touch c && hg commit -Aqm c
|
|
|
|
$ cat > $TESTTMP/daterewrite.py <<EOF
|
|
> import sys, time
|
|
> from edenscm.mercurial import extensions
|
|
> def extsetup(ui):
|
|
> def faketime(orig):
|
|
> return 1000000000
|
|
> extensions.wrapfunction(time, 'time', faketime)
|
|
> EOF
|
|
$ cat >> ../rewritedate/.hg/hgrc <<EOF
|
|
> [extensions]
|
|
> daterewrite=$TESTTMP/daterewrite.py
|
|
> EOF
|
|
$ hg push --to master
|
|
pushing rev d5e255ef74f8 to destination $TESTTMP/rewritedate bookmark master
|
|
searching for changes
|
|
pushing 1 changeset:
|
|
d5e255ef74f8 c
|
|
1 new changeset from the server will be downloaded
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 0 changes to 1 files
|
|
updating bookmark master
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg log -G -T '{desc} {date|isodate}'
|
|
@ c 2001-09-09 01:46 +0000
|
|
│
|
|
o b 1970-01-01 00:00 +0000
|
|
│
|
|
o a 1970-01-01 00:00 +0000
|
|
|
|
Test date rewriting with a merge commit
|
|
|
|
$ hg up -q 'desc(a)'
|
|
$ echo x >> x
|
|
$ hg commit -qAm x
|
|
$ hg up -q 'max(desc(c))'
|
|
$ echo y >> y
|
|
$ hg commit -qAm y
|
|
$ hg merge -q 'desc(x)'
|
|
$ hg commit -qm merge
|
|
$ hg push --to master
|
|
pushing rev 4514adb1f536 to destination $TESTTMP/rewritedate bookmark master
|
|
searching for changes
|
|
pushing 3 changesets:
|
|
a5f9a9a43049 x
|
|
c1392466a61e y
|
|
4514adb1f536 merge
|
|
3 new changesets from the server will be downloaded
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 3 changesets with 0 changes to 2 files
|
|
updating bookmark master
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ cd ..
|
|
|
|
Test pushrebase on merge commit where master is on the p2 side
|
|
|
|
$ hg init p2mergeserver
|
|
$ cd p2mergeserver
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> pushrebase=
|
|
> EOF
|
|
$ echo a >> a && hg commit -Aqm 'add a'
|
|
$ hg bookmark master
|
|
|
|
$ cd ..
|
|
$ hg clone -q p2mergeserver p2mergeclient
|
|
$ cd p2mergeclient
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> pushrebase=
|
|
> EOF
|
|
$ hg up -q null
|
|
$ echo b >> b && hg commit -Aqm 'add b'
|
|
$ hg up -q null
|
|
$ echo c >> c && hg commit -Aqm 'add c'
|
|
$ hg merge -q cde40f86152f76163041ff50d68d2e8fddc1b46b
|
|
$ hg commit -m 'merge b and c'
|
|
$ hg push --to master
|
|
pushing rev 4ae459502279 to destination $TESTTMP/p2mergeserver bookmark master
|
|
searching for changes
|
|
pushing 3 changesets:
|
|
cde40f86152f add b
|
|
6c337f0241b3 add c
|
|
4ae459502279 merge b and c
|
|
3 new changesets from the server will be downloaded
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 2 changesets with 0 changes to 2 files
|
|
updating bookmark master
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg -R ../p2mergeserver log -G -T '{desc}'
|
|
o merge b and c
|
|
├─╮
|
|
│ o add c
|
|
│
|
|
o add b
|
|
│
|
|
@ add a
|
|
|
|
$ hg -R ../p2mergeserver manifest -r 7c3bad9141dcb46ff89abf5f61856facd56e476c
|
|
a
|
|
b
|
|
$ hg -R ../p2mergeserver manifest -r 'desc(merge)'
|
|
a
|
|
b
|
|
c
|
|
$ cd ..
|
|
|
|
Test force pushes
|
|
$ hg init forcepushserver
|
|
$ cd forcepushserver
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> pushrebase=
|
|
> EOF
|
|
$ hg bookmark master
|
|
$ echo a > a && hg commit -Aqm a
|
|
$ cd ..
|
|
|
|
$ hg clone forcepushserver forcepushclient
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd forcepushserver
|
|
$ echo a >> a && hg commit -Aqm aa
|
|
|
|
$ cd ../forcepushclient
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> pushrebase=
|
|
> EOF
|
|
$ hg up 'desc(a)'
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo b >> a && hg commit -Aqm b
|
|
$ hg push -f --to master
|
|
pushing rev 1846eede8b68 to destination $TESTTMP/forcepushserver bookmark master
|
|
searching for changes
|
|
pushing 1 changeset:
|
|
1846eede8b68 b
|
|
updating bookmark master
|
|
$ hg pull
|
|
pulling from $TESTTMP/forcepushserver (glob)
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
$ hg log -G -T '{desc} {bookmarks}'
|
|
o aa
|
|
│
|
|
│ @ b
|
|
├─╯
|
|
o a
|
|
|
|
Make sure that no hg-bundle-* files left
|
|
(the '|| true' and '*' prefix is because ls has different behavior on linux
|
|
and osx)
|
|
$ ls ../server/.hg/hg-bundle-* || true
|
|
ls: *../server/.hg/hg-bundle-*: $ENOENT$ (glob)
|
|
|
|
Server with obsstore disabled can still send obsmarkers useful to client, and
|
|
phase is updated correctly with the marker information.
|
|
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [experimental]
|
|
> evolution =
|
|
> EOF
|
|
|
|
$ cd ..
|
|
$ hg init server1
|
|
$ cd server1
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> pushrebase=
|
|
> EOF
|
|
$ echo a > a
|
|
$ hg commit -m a -A a -q
|
|
$ hg bookmark main
|
|
$ cd ..
|
|
|
|
$ cp -R server1 client1
|
|
$ cd server1
|
|
$ echo b > b
|
|
$ hg commit -m b -A b -q
|
|
|
|
$ cd ../client1
|
|
$ echo a2 >> a
|
|
$ hg commit -m a2
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [experimental]
|
|
> evolution = all
|
|
> [paths]
|
|
> default = ../server1
|
|
> EOF
|
|
|
|
$ hg book -i BOOK
|
|
$ hg push -r . --to main
|
|
pushing rev 045279cde9f0 to destination $TESTTMP/server1 bookmark main
|
|
searching for changes
|
|
pushing 1 changeset:
|
|
045279cde9f0 a2
|
|
2 new changesets from the server will be downloaded
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 2 changesets with 1 changes to 2 files
|
|
updating bookmark main
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg up tip -q
|
|
$ log --hidden
|
|
@ a2 [public:722505d780e3] BOOK main
|
|
│
|
|
o b [public:d2ae7f538514]
|
|
│
|
|
│ x a2 [draft:045279cde9f0]
|
|
├─╯
|
|
o a [public:cb9a9f314b8b]
|
|
|
|
$ log
|
|
@ a2 [public:722505d780e3] BOOK main
|
|
│
|
|
o b [public:d2ae7f538514]
|
|
│
|
|
o a [public:cb9a9f314b8b]
|
|
|
|
Push a file-copy changeset and the copy source gets modified by others:
|
|
|
|
$ cd $TESTTMP
|
|
$ hg init server2
|
|
$ cd server2
|
|
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> pushrebase=
|
|
> EOF
|
|
|
|
$ echo 1 > A
|
|
$ hg commit -m A -A A
|
|
$ hg bookmark main
|
|
|
|
$ cd ..
|
|
$ cp -R server2 client2
|
|
|
|
$ cd client2
|
|
$ hg cp A B
|
|
$ hg commit -m 'Copy A to B'
|
|
|
|
$ cd ../server2
|
|
$ echo 2 >> A
|
|
$ hg commit -m 'Modify A' A
|
|
|
|
$ cd ../client2
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [experimental]
|
|
> evolution = all
|
|
> [paths]
|
|
> default = ../server2
|
|
> EOF
|
|
|
|
$ hg push -r . --to main
|
|
pushing rev 40d149b24655 to destination $TESTTMP/server2 bookmark main
|
|
searching for changes
|
|
abort: conflicting changes in:
|
|
A
|
|
(pull and rebase your changes locally, then try again)
|
|
[255]
|
|
|
|
Push an already-public changeset and confirm it is rejected
|
|
|
|
$ hg update -q '.^'
|
|
$ echo 2 > C
|
|
$ hg commit -m C -A C
|
|
$ hg debugmakepublic -r.
|
|
$ hg push -r . --to main
|
|
pushing rev 3850a85c4706 to destination $TESTTMP/server2 bookmark main
|
|
searching for changes
|
|
abort: cannot rebase public changesets: 3850a85c4706
|
|
[255]
|
|
|
|
$ echo 3 >> C
|
|
$ hg commit -m C2
|
|
$ echo 4 >> C
|
|
$ hg commit -m C3
|
|
$ echo 5 >> C
|
|
$ hg commit -m C4
|
|
$ hg debugmakepublic -r.
|
|
$ hg push -r . --to main
|
|
pushing rev 5d92bb0ab776 to destination $TESTTMP/server2 bookmark main
|
|
searching for changes
|
|
abort: cannot rebase public changesets: 3850a85c4706, 50b1220b7c4e, de211a1843b7, ...
|
|
[255]
|