annotate tests/test-exchange-A5.t @ 1042:86bd794f6037

evolve: stop pretending we are pulling markers when we don't If discovery did not found any unknown marker, we should not display the "pulling marker" message.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 08 Aug 2014 18:06:08 -0700
parents 640f3280559e
children f6e0cfca1bf0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
834
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
1
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
2
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
3 Initial setup
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
4
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
5 $ . $TESTDIR/_exc-util.sh
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
6
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
7
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
8 === A.5 partial reordering ===
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
9 ..
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
10 .. {{{
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
11 .. B ø⇠⇠
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
12 .. | ⇡
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
13 .. A ø⇠⇠⇠○ A'
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
14 .. | ⇡/
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
15 .. | ○ B'
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
16 .. |/
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
17 .. ● O
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
18 .. }}}
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
19 ..
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
20 .. Marker exist from:
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
21 ..
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
22 .. * `Aø⇠○ A'`
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
23 .. * `Bø⇠○ B'`
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
24 ..
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
25 .. Command run:
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
26 ..
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
27 .. * hg push -r B
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
28 ..
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
29 .. Expected exchange:
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
30 ..
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
31 .. * `Bø⇠○ B'`
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
32 ..
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
33 .. Expected Exclude:
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
34 ..
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
35 .. * `Aø⇠○ A'`
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
36
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
37
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
38 initial
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
39
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
40 $ setuprepos A.5
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
41 creating test repo for test case A.5
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
42 - pulldest
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
43 - main
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
44 - pushdest
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
45 cd into `main` and proceed with env setup
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
46 $ cd main
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
47 $ mkcommit A0
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
48 $ mkcommit B0
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
49 $ hg update 0
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
50 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
51 $ mkcommit B1
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
52 created new head
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
53 $ mkcommit A1
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
54 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
55 $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
56 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
57 $ hg log -G --hidden
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
58 @ 8c0a98c83722 (draft): A1
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
59 |
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
60 o f6298a8ac3a4 (draft): B1
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
61 |
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
62 | x 6e72f0a95b5e (draft): B0
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
63 | |
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
64 | x 28b51eb45704 (draft): A0
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
65 |/
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
66 o a9bdc8b26820 (public): O
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
67
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
68 $ hg debugobsolete
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
69 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 {'date': '', 'user': 'test'}
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
70 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
71 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 {'date': '', 'user': 'test'}
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
72 $ cd ..
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
73 $ cd ..
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
74
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
75 Actual Test
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
76 -----------
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
77
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
78 $ dotest A.5 B1
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
79 ## Running testcase A.5
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
80 # testing echange of "B1" (f6298a8ac3a4)
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
81 ## initial state
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
82 # obstore: main
905
b177fde040dd exchange: use fixed order for obstore content
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 834
diff changeset
83 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 {'date': '', 'user': 'test'}
834
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
84 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
905
b177fde040dd exchange: use fixed order for obstore content
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 834
diff changeset
85 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 {'date': '', 'user': 'test'}
834
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
86 # obstore: pushdest
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
87 # obstore: pulldest
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
88 ## pushing "B1" from main to pushdest
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
89 pushing to pushdest
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
90 searching for changes
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
91 adding changesets
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
92 adding manifests
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
93 adding file changes
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
94 added 1 changesets with 1 changes to 1 files
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
95 OBSEXC: computing relevant nodes
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
96 OBSEXC: computing markers relevant to 2 nodes
1037
bddee73b361e evolve: add "absolescence" in front of markers in the message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1001
diff changeset
97 OBSEXC: pushing 1 obsolescence markers (62 bytes)
834
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
98 OBSEXC: DONE
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
99 ## post push state
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
100 # obstore: main
905
b177fde040dd exchange: use fixed order for obstore content
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 834
diff changeset
101 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 {'date': '', 'user': 'test'}
834
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
102 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
905
b177fde040dd exchange: use fixed order for obstore content
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 834
diff changeset
103 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 {'date': '', 'user': 'test'}
834
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
104 # obstore: pushdest
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
105 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
106 # obstore: pulldest
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
107 ## pulling "f6298a8ac3a4" from main into pulldest
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
108 pulling from main
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
109 searching for changes
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
110 adding changesets
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
111 adding manifests
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
112 adding file changes
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
113 added 1 changesets with 1 changes to 1 files
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
114 OBSEXC: pull obsolescence markers
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
115 OBSEXC: merging obsolescence markers (62 bytes)
1040
640f3280559e evolve: add "obsolescence" in front of marked in the previous message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1037
diff changeset
116 OBSEXC: 1 obsolescence markers added
834
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
117 OBSEXC: DONE
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
118 (run 'hg update' to get a working copy)
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
119 ## post pull state
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
120 # obstore: main
905
b177fde040dd exchange: use fixed order for obstore content
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 834
diff changeset
121 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 {'date': '', 'user': 'test'}
834
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
122 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
905
b177fde040dd exchange: use fixed order for obstore content
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 834
diff changeset
123 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 {'date': '', 'user': 'test'}
834
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
124 # obstore: pushdest
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
125 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
126 # obstore: pulldest
4b8cf3d24160 exchange: add test case for A.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
127 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}