comparison tests/test-exchange-B4.t @ 840:6689b9d351f7

exchange: add test case for B.4
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 03 Mar 2014 20:00:45 -0800
parents
children 010c7e4aa820
comparison
equal deleted inserted replaced
839:b4f696ad9dee 840:6689b9d351f7
1
2 Initial setup
3
4 $ . $TESTDIR/_exc-util.sh
5
6 === B.4 Pruned changeset on common part of history ===
7
8 .. {{{
9 .. ⊗ C
10 .. | ● B
11 .. | |
12 .. | ● A
13 .. |/
14 .. ● O
15 .. }}}
16 ..
17 .. Marker exist from:
18 ..
19 .. * C (prune)
20 ..
21 .. Command run:
22 ..
23 .. * hg push -r B
24 .. * hg push
25 ..
26 .. Expected exchange:
27 ..
28 .. * prune for C
29
30
31 $ setuprepos B.4
32 creating test repo for test case B.4
33 - pulldest
34 - main
35 - pushdest
36 cd into `main` and proceed with env setup
37 $ cd main
38 $ mkcommit A
39 $ mkcommit B
40 $ hg phase --public .
41 $ hg push ../pushdest
42 pushing to ../pushdest
43 searching for changes
44 adding changesets
45 adding manifests
46 adding file changes
47 added 2 changesets with 2 changes to 2 files
48 $ hg push ../pulldest
49 pushing to ../pulldest
50 searching for changes
51 adding changesets
52 adding manifests
53 adding file changes
54 added 2 changesets with 2 changes to 2 files
55 $ hg update -q 0
56 $ mkcommit C
57 created new head
58 $ hg prune -qd '0 0' .
59 $ hg log -G --hidden
60 x 7f7f229b13a6 (draft): C
61 |
62 | o f6fbb35d8ac9 (public): B
63 | |
64 | o f5bc6836db60 (public): A
65 |/
66 @ a9bdc8b26820 (public): O
67
68 $ hg debugobsolete
69 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
70 $ cd ..
71 $ cd ..
72
73
74 $ cp -r B.4 B.4.a
75 $ cp -r B.4 B.4.b
76
77 Actual Test (explicite push version)
78 -----------------------------------
79
80 $ dotest B.4.a O
81 ## Running testcase B.4.a
82 # testing echange of "O" (a9bdc8b26820)
83 ## initial state
84 # obstore: main
85 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
86 # obstore: pushdest
87 # obstore: pulldest
88 ## pushing "O" from main to pushdest
89 pushing to pushdest
90 searching for changes
91 no changes found
92 OBSEXC: computing relevant nodes
93 OBSEXC: computing markers relevant to 1 nodes
94 OBSEXC: encoding 1 markers
95 OBSEXC: sending 1 pushkey payload (112 bytes)
96 OBSEXC: DONE
97 ## post push state
98 # obstore: main
99 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
100 # obstore: pushdest
101 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
102 # obstore: pulldest
103 ## pulling "a9bdc8b26820" from main into pulldest
104 pulling from main
105 no changes found
106 OBSEXC: pull obsolescence markers
107 OBSEXC: merging obsolescence markers (89 bytes)
108 OBSEXC: 1 markers added
109 OBSEXC: DONE
110 ## post pull state
111 # obstore: main
112 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
113 # obstore: pushdest
114 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
115 # obstore: pulldest
116 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
117
118 Actual Test (bare push version)
119 -----------------------------------
120
121 $ dotest B.4.b
122 ## Running testcase B.4.b
123 ## initial state
124 # obstore: main
125 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
126 # obstore: pushdest
127 # obstore: pulldest
128 ## pushing from main to pushdest
129 pushing to pushdest
130 searching for changes
131 no changes found
132 OBSEXC: computing relevant nodes
133 OBSEXC: computing markers relevant to 3 nodes
134 OBSEXC: encoding 1 markers
135 OBSEXC: sending 1 pushkey payload (112 bytes)
136 OBSEXC: DONE
137 ## post push state
138 # obstore: main
139 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
140 # obstore: pushdest
141 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
142 # obstore: pulldest
143 ## pulling from main into pulldest
144 pulling from main
145 searching for changes
146 no changes found
147 OBSEXC: pull obsolescence markers
148 OBSEXC: merging obsolescence markers (89 bytes)
149 OBSEXC: 1 markers added
150 OBSEXC: DONE
151 ## post pull state
152 # obstore: main
153 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
154 # obstore: pushdest
155 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
156 # obstore: pulldest
157 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}