This is an archive of the discontinued Mercurial Phabricator instance.

Differential D177

pushrebase: fix typo
ClosedPublic

Authored by • jeroenv on Jul 24 2017, 5:20 AM.
Tags
None
Subscribers
None

Details

Reviewers
ryanmce
Group Reviewers
Restricted Project
Commits
rFBHGX163cc759a0a9: pushrebase: fix typo
Test Plan

unit tests

Diff Detail

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

Event Timeline

• jeroenv created this revision.Jul 24 2017, 5:20 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 24 2017, 5:20 AM
ryanmce accepted this revision.Jul 24 2017, 5:30 AM
This revision is now accepted and ready to land.Jul 24 2017, 5:30 AM
Closed by commit rFBHGX163cc759a0a9: pushrebase: fix typo (authored by • jeroenv). · Explain WhyJul 25 2017, 7:31 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 399

hgext3rd/pushrebase.py

onto = op.repo[nullid] onto = op.repo[nullid]
else: else:
onto = maxcommonanc[0] onto = maxcommonanc[0]
return onto return onto
def printpushmessage(op, revs, bundle): def printpushmessage(op, revs, bundle):
# Notify the user of what is being pushed # Notify the user of what is being pushed
plural = 's' if len(revs) > 1 else '' plural = 's' if len(revs) > 1 else ''
op.repo.ui.warn(_("pushing %s changset%s:\n") % (len(revs), plural)) op.repo.ui.warn(_("pushing %s changeset%s:\n") % (len(revs), plural))
maxoutput = 10 maxoutput = 10
for i in range(0, min(len(revs), maxoutput)): for i in range(0, min(len(revs), maxoutput)):
firstline = bundle[revs[i]].description().split('\n')[0][:50] firstline = bundle[revs[i]].description().split('\n')[0][:50]
op.repo.ui.warn((" %s %s\n") % (revs[i], firstline)) op.repo.ui.warn((" %s %s\n") % (revs[i], firstline))
if len(revs) > maxoutput + 1: if len(revs) > maxoutput + 1:
op.repo.ui.warn((" ...\n")) op.repo.ui.warn((" ...\n"))
firstline = bundle[revs[-1]].description().split('\n')[0][:50] firstline = bundle[revs[-1]].description().split('\n')[0][:50]

tests/test-pull-createmarkers-hide-later.t

grafting 2:948715751816 "add b" grafting 2:948715751816 "add b"
$ land_amend $ land_amend
$ hg graft -r 3 $ hg graft -r 3
grafting 3:0e229072f723 "add c" grafting 3:0e229072f723 "add c"
$ land_amend $ land_amend
$ hg push -r . --to master $ hg push -r . --to master
pushing rev cc68f5e5f8d6 to destination ssh://user@dummy/server bookmark master pushing rev cc68f5e5f8d6 to destination ssh://user@dummy/server bookmark master
searching for changes searching for changes
remote: pushing 2 changsets: remote: pushing 2 changesets:
remote: e0672eeeb97c add b remote: e0672eeeb97c add b
remote: cc68f5e5f8d6 add c remote: cc68f5e5f8d6 add c
updating bookmark master updating bookmark master
Strip the commits we just landed. Strip the commits we just landed.
$ hg update -r 1 $ hg update -r 1
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg update -r 7 $ hg update -r 7
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg graft -r 4 $ hg graft -r 4
grafting 4:e4b5974890c0 "add d" grafting 4:e4b5974890c0 "add d"
$ land_amend $ land_amend
$ hg push -r . --to master $ hg push -r . --to master
pushing rev 296f9d37d5c1 to destination ssh://user@dummy/server bookmark master pushing rev 296f9d37d5c1 to destination ssh://user@dummy/server bookmark master
searching for changes searching for changes
remote: pushing 1 changset: remote: pushing 1 changeset:
remote: 296f9d37d5c1 add d remote: 296f9d37d5c1 add d
updating bookmark master updating bookmark master
And strip the commit we just landed. And strip the commit we just landed.
$ hg update -r 7 $ hg update -r 7
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg strip -r 9 $ hg strip -r 9

tests/test-pull-createmarkers.t

The first client works on several diffs while the second client lands one of her diff The first client works on several diffs while the second client lands one of her diff
$ cd otherclient $ cd otherclient
$ mkcommit b $ mkcommit b
$ hg push --to master $ hg push --to master
pushing rev 2e73b79a63d8 to destination ssh://user@dummy/server bookmark master pushing rev 2e73b79a63d8 to destination ssh://user@dummy/server bookmark master
searching for changes searching for changes
remote: pushing 1 changset: remote: pushing 1 changeset:
remote: 2e73b79a63d8 add b remote: 2e73b79a63d8 add b
updating bookmark master updating bookmark master
$ cd ../client $ cd ../client
$ mkcommit c 123 # 123 is the phabricator rev number (see function above) $ mkcommit c 123 # 123 is the phabricator rev number (see function above)
$ mkcommit d 124 "https://phabricator.intern.facebook.com" $ mkcommit d 124 "https://phabricator.intern.facebook.com"
$ mkcommit e 131 $ mkcommit e 131
$ hg log -G -T '{rev} "{desc}" {remotebookmarks}' $ hg log -G -T '{rev} "{desc}" {remotebookmarks}'
@ 4 "add e @ 4 "add e
| |
| Differential Revision: https://phabricator.fb.com/D131" | Differential Revision: https://phabricator.fb.com/D131"
o 3 "add d o 3 "add d
| |
| Differential Revision: https://phabricator.intern.facebook.com/D124" | Differential Revision: https://phabricator.intern.facebook.com/D124"
o 2 "add c o 2 "add c
| |
| Differential Revision: https://phabricator.fb.com/D123" | Differential Revision: https://phabricator.fb.com/D123"
o 1 "add secondcommit" default/master o 1 "add secondcommit" default/master
| |
o 0 "add initial" o 0 "add initial"
$ hg push --to master $ hg push --to master
pushing rev d5895ab36037 to destination ssh://user@dummy/server bookmark master pushing rev d5895ab36037 to destination ssh://user@dummy/server bookmark master
searching for changes searching for changes
remote: pushing 3 changsets: remote: pushing 3 changesets:
remote: 1a07332e9fa1 add c remote: 1a07332e9fa1 add c
remote: ee96b78ae17d add d remote: ee96b78ae17d add d
remote: d5895ab36037 add e remote: d5895ab36037 add e
remote: 4 new changesets from the server will be downloaded remote: 4 new changesets from the server will be downloaded
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 4 changesets with 1 changes to 4 files (+1 heads) added 4 changesets with 1 changes to 4 files (+1 heads)

tests/test-pushrebase-fastmanifest.t

> EOF > EOF
Test that pushing to a remotename gets rebased (client1 -> client2) Test that pushing to a remotename gets rebased (client1 -> client2)
$ cd ../client1 $ cd ../client1
$ hg push --to mybook ssh://user@dummy/client2 $ hg push --to mybook ssh://user@dummy/client2
pushing to ssh://user@dummy/client2 pushing to ssh://user@dummy/client2
searching for changes searching for changes
remote: pushing 1 changset: remote: pushing 1 changeset:
remote: eb7a4df38d10 dummy commit remote: eb7a4df38d10 dummy commit

tests/test-pushrebase-manifests.t

blocking. There shouldn't be any "[client1 push]" output here. blocking. There shouldn't be any "[client1 push]" output here.
$ cd ../client2 $ cd ../client2
$ hg push --to default | \sed "s/^/[client2 push] /" $ hg push --to default | \sed "s/^/[client2 push] /"
[client2 push] pushing to ssh://user@dummy/server [client2 push] pushing to ssh://user@dummy/server
[client2 push] searching for changes [client2 push] searching for changes
[client2 push] remote: read manifest outside the lock :) [client2 push] remote: read manifest outside the lock :)
[client2 push] remote: read manifest outside the lock :) [client2 push] remote: read manifest outside the lock :)
[client2 push] remote: (?) [client2 push] remote: (?)
[client2 push] remote: pushing 1 changset: [client2 push] remote: pushing 1 changeset:
[client2 push] remote: 4ab7e28729f6 c2 => yyy (second) [client2 push] remote: 4ab7e28729f6 c2 => yyy (second)
[client2 push] remote: read flat manifest :( [client2 push] remote: read flat manifest :(
[client2 push] remote: (?) [client2 push] remote: (?)
[client2 push] remote: 2 new changesets from the server will be downloaded [client2 push] remote: 2 new changesets from the server will be downloaded
[client2 push] adding changesets [client2 push] adding changesets
[client2 push] adding manifests [client2 push] adding manifests
[client2 push] adding file changes [client2 push] adding file changes
[client2 push] added 2 changesets with 1 changes to 2 files (+1 heads) [client2 push] added 2 changesets with 1 changes to 2 files (+1 heads)
...then allow it through. ...then allow it through.
$ cd ../server $ cd ../server
$ touch .hg/flag $ touch .hg/flag
$ wait $ wait
[client1 push] pushing to ssh://user@dummy/server [client1 push] pushing to ssh://user@dummy/server
[client1 push] searching for changes [client1 push] searching for changes
[client1 push] remote: read manifest outside the lock :) [client1 push] remote: read manifest outside the lock :)
[client1 push] remote: read manifest outside the lock :) [client1 push] remote: read manifest outside the lock :)
[client1 push] remote: pushing 2 changsets: [client1 push] remote: pushing 2 changesets:
[client1 push] remote: 8cf3b846b3a4 c1 => xxx (third) [client1 push] remote: 8cf3b846b3a4 c1 => xxx (third)
[client1 push] remote: 1fe62957ca8a c1 => baz (fourth) [client1 push] remote: 1fe62957ca8a c1 => baz (fourth)
[client1 push] remote: read flat manifest :( [client1 push] remote: read flat manifest :(
[client1 push] remote: (?) [client1 push] remote: (?)
[client1 push] remote: read flat manifest :( [client1 push] remote: read flat manifest :(
[client1 push] remote: (?) [client1 push] remote: (?)
[client1 push] remote: 4 new changesets from the server will be downloaded [client1 push] remote: 4 new changesets from the server will be downloaded
[client1 push] adding changesets [client1 push] adding changesets

tests/test-pushrebase-protection.t

abort: this repository requires that you enable the pushrebase extension and push using 'hg push --to' abort: this repository requires that you enable the pushrebase extension and push using 'hg push --to'
[255] [255]
Pushrebase pushes should be allowed Pushrebase pushes should be allowed
$ hg push --config "extensions.bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py" --config "extensions.pushrebase=$TESTDIR/../hgext3rd/pushrebase.py" --to master -B master $ hg push --config "extensions.bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py" --config "extensions.pushrebase=$TESTDIR/../hgext3rd/pushrebase.py" --to master -B master
pushing to $TESTTMP/server (glob) pushing to $TESTTMP/server (glob)
searching for changes searching for changes
pushing 1 changset: pushing 1 changeset:
1846eede8b68 b 1846eede8b68 b
exporting bookmark master exporting bookmark master
Bookmark pushes should not be affected by the block Bookmark pushes should not be affected by the block
$ hg book -r ".^" master -f $ hg book -r ".^" master -f
$ hg push -B master $ hg push -B master
pushing to $TESTTMP/server (glob) pushing to $TESTTMP/server (glob)

tests/test-pushrebase-remotenames.t

@ 1 "client's commit" @ 1 "client's commit"
| |
o 0 "initial" default/master o 0 "initial" default/master
$ hg push --to master $ hg push --to master
pushing rev 5c3cfb78df2f to destination ssh://user@dummy/server bookmark master pushing rev 5c3cfb78df2f to destination ssh://user@dummy/server bookmark master
searching for changes searching for changes
remote: pushing 1 changset: remote: pushing 1 changeset:
remote: 5c3cfb78df2f client's commit remote: 5c3cfb78df2f client's commit
remote: 2 new changesets from the server will be downloaded remote: 2 new changesets from the server will be downloaded
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 1 changes to 2 files (+1 heads) added 2 changesets with 1 changes to 2 files (+1 heads)
updating bookmark master updating bookmark master
searching for changes searching for changes
abort: not creating new remote bookmark abort: not creating new remote bookmark
(use --create to create a new bookmark) (use --create to create a new bookmark)
[255] [255]
$ hg -R client push --to newbook --create $ hg -R client push --to newbook --create
pushing rev 5c3cfb78df2f to destination ssh://user@dummy/server bookmark newbook pushing rev 5c3cfb78df2f to destination ssh://user@dummy/server bookmark newbook
searching for changes searching for changes
remote: pushing 1 changset: remote: pushing 1 changeset:
remote: 5c3cfb78df2f client's commit remote: 5c3cfb78df2f client's commit
exporting bookmark newbook exporting bookmark newbook
$ hg -R server book $ hg -R server book
* master 2:796d44dcaae0 * master 2:796d44dcaae0
newbook 3:5c3cfb78df2f newbook 3:5c3cfb78df2f
$ hg -R server log -G -T '{rev} "{desc}" {bookmarks}' $ hg -R server log -G -T '{rev} "{desc}" {bookmarks}'
o 3 "client's commit" newbook o 3 "client's commit" newbook
| |
@ 1 "cc" @ 1 "cc"
| |
o 0 "aa" o 0 "aa"
$ hg -R client push --to bm $ hg -R client push --to bm
pushing rev 5db65b93a12b to destination ssh://user@dummy/server bookmark bm pushing rev 5db65b93a12b to destination ssh://user@dummy/server bookmark bm
searching for changes searching for changes
remote: moved bookmark to rev 1 remote: moved bookmark to rev 1
remote: pushing 1 changset: remote: pushing 1 changeset:
remote: 5db65b93a12b cc remote: 5db65b93a12b cc
remote: 2 new changesets from the server will be downloaded remote: 2 new changesets from the server will be downloaded
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 1 changes to 2 files (+1 heads) added 2 changesets with 1 changes to 2 files (+1 heads)
updating bookmark bm updating bookmark bm
$ hg -R server log -G -T '{rev} "{desc}" {bookmarks}' $ hg -R server log -G -T '{rev} "{desc}" {bookmarks}'
|/ |/
o 0 "aa" o 0 "aa"
$ hg -R client push --to bm $ hg -R client push --to bm
pushing rev efec53e7b035 to destination ssh://user@dummy/server bookmark bm pushing rev efec53e7b035 to destination ssh://user@dummy/server bookmark bm
searching for changes searching for changes
remote: moved bookmark to rev 1 remote: moved bookmark to rev 1
remote: pushing 2 changsets: remote: pushing 2 changesets:
remote: 5db65b93a12b cc remote: 5db65b93a12b cc
remote: efec53e7b035 dd remote: efec53e7b035 dd
remote: 1 new changeset from the server will be downloaded remote: 1 new changeset from the server will be downloaded
remote: transaction abort! remote: transaction abort!
remote: rollback completed remote: rollback completed
abort: updating bookmark bm failed! abort: updating bookmark bm failed!
[255] [255]
> bundle2-exp=True > bundle2-exp=True
> EOF > EOF
$ hg up master $ hg up master
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo b >> a && hg commit -Aqm b $ echo b >> a && hg commit -Aqm b
$ hg push -f --to master $ hg push -f --to master
pushing rev 1846eede8b68 to destination * (glob) pushing rev 1846eede8b68 to destination * (glob)
searching for changes searching for changes
remote: pushing 1 changset: remote: pushing 1 changeset:
remote: 1846eede8b68 b remote: 1846eede8b68 b
updating bookmark master updating bookmark master
$ hg pull $ hg pull
pulling from * (glob) pulling from * (glob)
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
$ hg book feature -t default/master $ hg book feature -t default/master
$ echo b > b && hg commit -Aqm b $ echo b > b && hg commit -Aqm b
$ cd ../trackingserver $ cd ../trackingserver
$ echo c > c && hg commit -Aqm c $ echo c > c && hg commit -Aqm c
$ cd ../trackingclient $ cd ../trackingclient
$ hg push $ hg push
pushing rev d2ae7f538514 to destination ssh://user@dummy/trackingserver bookmark master pushing rev d2ae7f538514 to destination ssh://user@dummy/trackingserver bookmark master
searching for changes searching for changes
remote: pushing 1 changset: remote: pushing 1 changeset:
remote: d2ae7f538514 b remote: d2ae7f538514 b
remote: 2 new changesets from the server will be downloaded remote: 2 new changesets from the server will be downloaded
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 1 changes to 2 files (+1 heads) added 2 changesets with 1 changes to 2 files (+1 heads)
updating bookmark master updating bookmark master
$ hg log -T '{rev} {desc}' -G $ hg log -T '{rev} {desc}' -G

tests/test-pushrebase.t

sending listkeys command sending listkeys command
received listkey for "bookmarks": 0 bytes received listkey for "bookmarks": 0 bytes
validated revset for rebase validated revset for rebase
2 changesets found 2 changesets found
list of changesets: list of changesets:
46a2df24e27273bb06dbf28b085fcc2e911bf986 46a2df24e27273bb06dbf28b085fcc2e911bf986
0e3997dc073308e42715a44d345466690abfd09a 0e3997dc073308e42715a44d345466690abfd09a
sending unbundle command sending unbundle command
remote: pushing 2 changsets: remote: pushing 2 changesets:
remote: 46a2df24e272 b => xxx remote: 46a2df24e272 b => xxx
remote: 0e3997dc0733 b => baz remote: 0e3997dc0733 b => baz
remote: 3 new changesets from the server will be downloaded remote: 3 new changesets from the server will be downloaded
adding changesets adding changesets
add changeset add0c792bfce add changeset add0c792bfce
add changeset 6a6d9484552c add changeset 6a6d9484552c
add changeset 4cfedb0dc25f add changeset 4cfedb0dc25f
adding manifests adding manifests
$ log -r tip $ log -r tip
@ b => quux [draft:741fd2094512] @ b => quux [draft:741fd2094512]
| |
~ ~
$ hg push --to default $ hg push --to default
pushing to ssh://user@dummy/server pushing to ssh://user@dummy/server
searching for changes searching for changes
remote: pushing 1 changset: remote: pushing 1 changeset:
remote: 741fd2094512 b => quux remote: 741fd2094512 b => quux
$ cd ../server $ cd ../server
$ hg update default $ hg update default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ log $ log
@ b => quux [public:741fd2094512] @ b => quux [public:741fd2094512]
| |
o a => bar [public:add0c792bfce] o a => bar [public:add0c792bfce]
| |
o initial [public:2bb9d20e471c] o initial [public:2bb9d20e471c]
$ hg push --to master -B master $ hg push --to master -B master
pushing to ssh://user@dummy/server pushing to ssh://user@dummy/server
searching for changes searching for changes
remote: pushing 5 changsets: remote: pushing 5 changesets:
remote: e6b7549904cd branch left remote: e6b7549904cd branch left
remote: add5ec74853d branch start remote: add5ec74853d branch start
remote: 5a0cbf3df4ef branch middle remote: 5a0cbf3df4ef branch middle
remote: 2c0c699d7086 merge remote: 2c0c699d7086 merge
remote: 9007d6a204f8 on top of merge remote: 9007d6a204f8 on top of merge
remote: 6 new changesets from the server will be downloaded remote: 6 new changesets from the server will be downloaded
adding changesets adding changesets
adding manifests adding manifests
| |
o a => bar [public:add0c792bfce] o a => bar [public:add0c792bfce]
| |
o initial [public:2bb9d20e471c] o initial [public:2bb9d20e471c]
$ hg push --to default $ hg push --to default
pushing to ssh://user@dummy/server pushing to ssh://user@dummy/server
searching for changes searching for changes
remote: pushing 2 changsets: remote: pushing 2 changesets:
remote: 9467a8ee5d0d b => k remote: 9467a8ee5d0d b => k
remote: e73acfaeee82 b => foobar remote: e73acfaeee82 b => foobar
remote: 4 new changesets from the server will be downloaded remote: 4 new changesets from the server will be downloaded
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 4 changesets with 2 changes to 4 files (+1 heads) added 4 changesets with 2 changes to 4 files (+1 heads)
2 new obsolescence markers 2 new obsolescence markers
$ hg book master $ hg book master
$ echo 'babar' > b $ echo 'babar' > b
$ commit 'b => babar' $ commit 'b => babar'
$ hg log -r master -T"{node}\n" $ hg log -r master -T"{node}\n"
56b2e094996609874ae1c9aae1626bfba61d07d8 56b2e094996609874ae1c9aae1626bfba61d07d8
$ hg push --to master $ hg push --to master
pushing to ssh://user@dummy/server pushing to ssh://user@dummy/server
searching for changes searching for changes
remote: pushing 1 changset: remote: pushing 1 changeset:
remote: 56b2e0949966 b => babar remote: 56b2e0949966 b => babar
updating bookmark master updating bookmark master
$ hg log -r master -R ../server -T"{node}\n" $ hg log -r master -R ../server -T"{node}\n"
56b2e094996609874ae1c9aae1626bfba61d07d8 56b2e094996609874ae1c9aae1626bfba61d07d8
Test pushing bookmark with no new commit Test pushing bookmark with no new commit
$ hg book stable -r fb983dc509b6 $ hg book stable -r fb983dc509b6
$ echo >> file && hg ci -Aqm first $ echo >> file && hg ci -Aqm first
$ echo >> file && hg ci -Aqm second $ echo >> file && hg ci -Aqm second
$ echo >> file && hg ci -Aqm last $ echo >> file && hg ci -Aqm last
$ hg push --to master -B master $ hg push --to master -B master
pushing to $TESTTMP/hookserver (glob) pushing to $TESTTMP/hookserver (glob)
searching for changes 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_SOURCE=push (glob) prepushrebase hook: HG_BUNDLE2=1 HG_HOOKNAME=prepushrebase HG_HOOKTYPE=prepushrebase HG_HOOK_BUNDLEPATH=* HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_NODE_ONTO=e95be919ac60f0c114075e32a0a4301afabadb60 HG_SOURCE=push (glob)
prechangegroup hook: HG_BUNDLE2=1 HG_HOOKNAME=prechangegroup HG_HOOKTYPE=prechangegroup HG_SOURCE=push HG_TXNID=TXN:* HG_URL=file:$TESTTMP/hookserver (glob) prechangegroup hook: HG_BUNDLE2=1 HG_HOOKNAME=prechangegroup HG_HOOKTYPE=prechangegroup HG_SOURCE=push HG_TXNID=TXN:* HG_URL=file:$TESTTMP/hookserver (glob)
pushing 3 changsets: pushing 3 changesets:
4fcee35c508c first 4fcee35c508c first
11be4ca7f3f4 second 11be4ca7f3f4 second
a5e72ac0df88 last a5e72ac0df88 last
pretxnchangegroup hook: HG_BUNDLE2=1 HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_NODE_LAST=a5e72ac0df8881afef34132987e8ae78d2e6cb13 HG_PENDING=$TESTTMP/hookserver 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_SOURCE=push HG_TXNID=TXN:* HG_URL=file:$TESTTMP/hookserver (glob)
prepushkey hook: HG_BUNDLE2=1 HG_HOOKNAME=prepushkey HG_HOOKTYPE=prepushkey HG_KEY=a5e72ac0df8881afef34132987e8ae78d2e6cb13 HG_NAMESPACE=phases HG_NEW=0 HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_OLD=1 HG_PENDING=$TESTTMP/hookserver HG_PHASES_MOVED=1 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=a5e72ac0df8881afef34132987e8ae78d2e6cb13 HG_NAMESPACE=phases HG_NEW=0 HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_OLD=1 HG_PENDING=$TESTTMP/hookserver HG_PHASES_MOVED=1 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_PHASES_MOVED=1 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_PHASES_MOVED=1 HG_SOURCE=push HG_TXNID=TXN:* HG_URL=file:$TESTTMP/hookserver (glob)
pretxnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_HOOKNAME=pretxnclose HG_HOOKTYPE=pretxnclose HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_PENDING=$TESTTMP/hookserver HG_PHASES_MOVED=1 HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=file:$TESTTMP/hookserver (glob) pretxnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_HOOKNAME=pretxnclose HG_HOOKTYPE=pretxnclose HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_PENDING=$TESTTMP/hookserver HG_PHASES_MOVED=1 HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=file:$TESTTMP/hookserver (glob)
txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_HOOKNAME=txnclose HG_HOOKTYPE=txnclose HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_PHASES_MOVED=1 HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=file:$TESTTMP/hookserver (glob) txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_HOOKNAME=txnclose HG_HOOKTYPE=txnclose HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_PHASES_MOVED=1 HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=file:$TESTTMP/hookserver (glob)
> EOF > EOF
$ cat >> ../rewritedate/.hg/hgrc <<EOF $ cat >> ../rewritedate/.hg/hgrc <<EOF
> [extensions] > [extensions]
> daterewrite=$TESTTMP/daterewrite.py > daterewrite=$TESTTMP/daterewrite.py
> EOF > EOF
$ hg push --to master $ hg push --to master
pushing to $TESTTMP/rewritedate (glob) pushing to $TESTTMP/rewritedate (glob)
searching for changes searching for changes
pushing 1 changset: pushing 1 changeset:
d5e255ef74f8 c d5e255ef74f8 c
1 new changeset from the server will be downloaded 1 new changeset from the server will be downloaded
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 0 changes to 1 files added 1 changesets with 0 changes to 1 files
1 new obsolescence markers 1 new obsolescence markers
obsoleted 1 changesets obsoleted 1 changesets
$ hg up -q 3 $ hg up -q 3
$ echo y >> y $ echo y >> y
$ hg commit -qAm y $ hg commit -qAm y
$ hg merge -q 4 $ hg merge -q 4
$ hg commit -qm merge $ hg commit -qm merge
$ hg push --to master $ hg push --to master
pushing to $TESTTMP/rewritedate (glob) pushing to $TESTTMP/rewritedate (glob)
searching for changes searching for changes
pushing 3 changsets: pushing 3 changesets:
a5f9a9a43049 x a5f9a9a43049 x
c1392466a61e y c1392466a61e y
4514adb1f536 merge 4514adb1f536 merge
3 new changesets from the server will be downloaded 3 new changesets from the server will be downloaded
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 3 changesets with 0 changes to 2 files (+1 heads) added 3 changesets with 0 changes to 2 files (+1 heads)
$ echo b >> b && hg commit -Aqm 'add b' $ echo b >> b && hg commit -Aqm 'add b'
$ hg up -q null $ hg up -q null
$ echo c >> c && hg commit -Aqm 'add c' $ echo c >> c && hg commit -Aqm 'add c'
$ hg merge -q 1 $ hg merge -q 1
$ hg commit -m 'merge b and c' $ hg commit -m 'merge b and c'
$ hg push --to master $ hg push --to master
pushing to $TESTTMP/p2mergeserver (glob) pushing to $TESTTMP/p2mergeserver (glob)
searching for changes searching for changes
pushing 3 changsets: pushing 3 changesets:
cde40f86152f add b cde40f86152f add b
6c337f0241b3 add c 6c337f0241b3 add c
4ae459502279 merge b and c 4ae459502279 merge b and c
3 new changesets from the server will be downloaded 3 new changesets from the server will be downloaded
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 0 changes to 2 files added 2 changesets with 0 changes to 2 files
> EOF > EOF
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo b >> a && hg commit -Aqm b $ echo b >> a && hg commit -Aqm b
$ hg book master $ hg book master
$ hg push -f --to master -B master $ hg push -f --to master -B master
pushing to $TESTTMP/forcepushserver (glob) pushing to $TESTTMP/forcepushserver (glob)
searching for changes searching for changes
pushing 1 changset: pushing 1 changeset:
1846eede8b68 b 1846eede8b68 b
exporting bookmark master exporting bookmark master
$ hg pull $ hg pull
pulling from $TESTTMP/forcepushserver (glob) pulling from $TESTTMP/forcepushserver (glob)
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
> evolution = all > evolution = all
> [paths] > [paths]
> default = ../server1 > default = ../server1
> EOF > EOF
$ hg push -r . --to default $ hg push -r . --to default
pushing to $TESTTMP/server1 (glob) pushing to $TESTTMP/server1 (glob)
searching for changes searching for changes
pushing 1 changset: pushing 1 changeset:
045279cde9f0 a2 045279cde9f0 a2
2 new changesets from the server will be downloaded 2 new changesets from the server will be downloaded
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 1 changes to 2 files (+1 heads) added 2 changesets with 1 changes to 2 files (+1 heads)
1 new obsolescence markers 1 new obsolescence markers
obsoleted 1 changesets obsoleted 1 changesets

tests/test-treemanifest-server.t

> EOF > EOF
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> EOF > EOF
$ hg push --to mybook $ hg push --to mybook
pushing to ssh://user@dummy/master pushing to ssh://user@dummy/master
searching for changes searching for changes
remote: pushing 1 changset: remote: pushing 1 changeset:
remote: 15486e46ccf6 add subdir2/z remote: 15486e46ccf6 add subdir2/z
remote: error: pushes must contain tree manifests when the server has pushrebase.forcetreereceive enabled remote: error: pushes must contain tree manifests when the server has pushrebase.forcetreereceive enabled
abort: push failed on remote abort: push failed on remote
[255] [255]
Test pushing only trees with commit hooks Test pushing only trees with commit hooks
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [treemanifest] > [treemanifest]
abort: push failed on remote abort: push failed on remote
[255] [255]
$ mv ../master/.hg/hgrc.bak ../master/.hg/hgrc $ mv ../master/.hg/hgrc.bak ../master/.hg/hgrc
Test pushing only trees (no flats) with pushrebase creates trees on the server Test pushing only trees (no flats) with pushrebase creates trees on the server
$ hg push --to mybook $ hg push --to mybook
pushing to ssh://user@dummy/master pushing to ssh://user@dummy/master
searching for changes searching for changes
remote: pushing 1 changset: remote: pushing 1 changeset:
remote: 15486e46ccf6 add subdir2/z remote: 15486e46ccf6 add subdir2/z
$ ls ../master/.hg/store/meta $ ls ../master/.hg/store/meta
subdir subdir
subdir2 subdir2
$ cd ../master $ cd ../master
Verify flat was updated and tree was updated, even though only tree was sent Verify flat was updated and tree was updated, even though only tree was sent
$ hg debugdata .hg/store/00manifest.i 1 $ hg debugdata .hg/store/00manifest.i 1