Mercurial > evolve
view tests/test-exchange-B5.t @ 883:d2fa1061df16
evolve: do not exchange obsolescence markers when server refuse it
The server can be configured to refuse obsolescence markers exchange. See
changeset 48804a8d7472 for details about it. We respect server will in the
client.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Wed, 12 Mar 2014 13:01:32 -0700 |
parents | 07891b3308a2 |
children | 010c7e4aa820 |
line wrap: on
line source
Initial setup $ . $TESTDIR/_exc-util.sh === B.5 Push of a children of changeset which successors is pruned === .. This case Mirror A.4, with pruned changeset successors. .. .. {{{ .. B ◔ .. | .. A⇠ø⇠⊗ A' .. |/ .. ● O .. }}} .. .. Marker exist from: .. .. * `Aø⇠○ A'` .. * chain from A .. * `A'` .. .. Command run: .. .. * hg push -r B .. .. Expected exchange: .. .. * `Aø⇠○ A'` .. * chain from A .. * `A'` .. .. Extra Note: .. .. I'm not totally happy about this case and I believe some more complicated .. graph can result in behavior wuite confusing for the user (if some tool create .. prune maker in a the middle of a valid chain) $ setuprepos B.5 creating test repo for test case B.5 - pulldest - main - pushdest cd into `main` and proceed with env setup $ cd main $ mkcommit A0 $ mkcommit B $ hg up --quiet 0 $ mkcommit A1 created new head $ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'` $ hg prune -qd '0 0' . $ hg log -G --hidden x e5ea8f9c7314 (draft): A1 | | o 06055a7959d4 (draft): B | | | x 28b51eb45704 (draft): A0 |/ @ a9bdc8b26820 (public): O $ hg debugobsolete 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} $ cd .. $ cd .. $ cp -r B.5 B.5.a $ cp -r B.5 B.5.b Actual Test (explicite push version) ------------------------------------- $ dotest B.5.a B -f ## Running testcase B.5.a # testing echange of "B" (06055a7959d4) ## initial state # obstore: main 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} # obstore: pushdest # obstore: pulldest ## pushing "B" from main to pushdest pushing to pushdest searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files OBSEXC: computing relevant nodes OBSEXC: computing markers relevant to 3 nodes OBSEXC: encoding 2 markers OBSEXC: sending 1 pushkey payload (188 bytes) OBSEXC: DONE ## post push state # obstore: main 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} # obstore: pushdest 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} # obstore: pulldest ## pulling "06055a7959d4" from main into pulldest pulling from main searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files OBSEXC: pull obsolescence markers OBSEXC: merging obsolescence markers (150 bytes) OBSEXC: 2 markers added OBSEXC: DONE (run 'hg update' to get a working copy) 1 new unstable changesets ## post pull state # obstore: main 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} # obstore: pushdest 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} # obstore: pulldest 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} Actual Test (bare push version) ------------------------------------- $ dotest B.5.b B -f ## Running testcase B.5.b # testing echange of "B" (06055a7959d4) ## initial state # obstore: main 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} # obstore: pushdest # obstore: pulldest ## pushing "B" from main to pushdest pushing to pushdest searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files OBSEXC: computing relevant nodes OBSEXC: computing markers relevant to 3 nodes OBSEXC: encoding 2 markers OBSEXC: sending 1 pushkey payload (188 bytes) OBSEXC: DONE ## post push state # obstore: main 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} # obstore: pushdest 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} # obstore: pulldest ## pulling "06055a7959d4" from main into pulldest pulling from main searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files OBSEXC: pull obsolescence markers OBSEXC: merging obsolescence markers (150 bytes) OBSEXC: 2 markers added OBSEXC: DONE (run 'hg update' to get a working copy) 1 new unstable changesets ## post pull state # obstore: main 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} # obstore: pushdest 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} # obstore: pulldest 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}