##// END OF EJS Templates
obsolescence: add test case D-1 for obsolescence markers exchange...
Pierre-Yves David -
r31969:face2b54 default
parent child Browse files
Show More
@@ -0,0 +1,176 b''
1 ============================================
2 Testing obsolescence markers push: Cases D.1
3 ============================================
4
5 Mercurial pushes obsolescences markers relevant to the "pushed-set", the set of
6 all changesets that requested to be "in sync" after the push (even if they are
7 already on both side).
8
9 This test belongs to a series of tests checking such set is properly computed
10 and applied. This does not tests "obsmarkers" discovery capabilities.
11
12 Category D: Partial Information Case
13 TestCase 1: Pruned changeset based on missing precursor of something not present
14 Variants:
15 # a: explicite push
16 # b: bare push
17
18 D.1 Pruned changeset based on missing precursor of something not present
19 ========================================================================
20
21 .. {{{
22 .. B βŠ—
23 .. |
24 .. A β—Œβ‡ β—” A'
25 .. |/
26 .. ● O
27 .. }}}
28 ..
29 .. Markers exist from:
30 ..
31 .. * `A ΓΈβ‡ o A'`
32 .. * B (prune)
33 ..
34 .. Command run:
35 ..
36 .. * hg push -r A'
37 .. * hg push
38 ..
39 .. Expected exchange:
40 ..
41 .. * `A ΓΈβ‡ o A'`
42 .. * B (prune)
43
44 Setup
45 -----
46
47 $ . $TESTDIR/testlib/exchange-obsmarker-util.sh
48
49 initial
50
51 $ setuprepos D.1
52 creating test repo for test case D.1
53 - pulldest
54 - main
55 - pushdest
56 cd into `main` and proceed with env setup
57 $ cd main
58 $ mkcommit A0
59 $ mkcommit B
60 $ hg up -q 0
61 $ mkcommit A1
62 created new head
63 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
64 $ hg prune -d '0 0' 'desc(B)'
65 $ hg strip --hidden -q 'desc(A0)'
66 $ hg log -G --hidden
67 @ e5ea8f9c7314 (draft): A1
68 |
69 o a9bdc8b26820 (public): O
70
71 $ inspect_obsmarkers
72 obsstore content
73 ================
74 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
75 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
76 $ cd ..
77 $ cd ..
78
79 $ cp -R D.1 D.1.a
80 $ cp -R D.1 D.1.b
81
82 Actual Test (explicit push)
83 ---------------------------
84
85 $ dotest D.1.a A1
86 ## Running testcase D.1.a
87 # testing echange of "A1" (e5ea8f9c7314)
88 ## initial state
89 # obstore: main
90 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
91 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
92 # obstore: pushdest
93 # obstore: pulldest
94 ## pushing "A1" from main to pushdest
95 pushing to pushdest
96 searching for changes
97 remote: adding changesets
98 remote: adding manifests
99 remote: adding file changes
100 remote: added 1 changesets with 1 changes to 1 files
101 remote: 2 new obsolescence markers
102 ## post push state
103 # obstore: main
104 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
105 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
106 # obstore: pushdest
107 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
108 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
109 # obstore: pulldest
110 ## pulling "e5ea8f9c7314" from main into pulldest
111 pulling from main
112 searching for changes
113 adding changesets
114 adding manifests
115 adding file changes
116 added 1 changesets with 1 changes to 1 files
117 2 new obsolescence markers
118 (run 'hg update' to get a working copy)
119 ## post pull state
120 # obstore: main
121 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
122 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
123 # obstore: pushdest
124 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
125 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
126 # obstore: pulldest
127 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
128 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
129
130 Actual Test (base push)
131 ---------------------------
132
133 $ dotest D.1.b
134 ## Running testcase D.1.b
135 ## initial state
136 # obstore: main
137 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
138 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
139 # obstore: pushdest
140 # obstore: pulldest
141 ## pushing from main to pushdest
142 pushing to pushdest
143 searching for changes
144 remote: adding changesets
145 remote: adding manifests
146 remote: adding file changes
147 remote: added 1 changesets with 1 changes to 1 files
148 remote: 2 new obsolescence markers
149 ## post push state
150 # obstore: main
151 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
152 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
153 # obstore: pushdest
154 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
155 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
156 # obstore: pulldest
157 ## pulling from main into pulldest
158 pulling from main
159 searching for changes
160 adding changesets
161 adding manifests
162 adding file changes
163 added 1 changesets with 1 changes to 1 files
164 2 new obsolescence markers
165 (run 'hg update' to get a working copy)
166 ## post pull state
167 # obstore: main
168 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
169 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
170 # obstore: pushdest
171 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
172 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
173 # obstore: pulldest
174 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
175 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
176
General Comments 0
You need to be logged in to leave comments. Login now