Mercurial > hg
annotate tests/test-push.t @ 32120:8ca9b3add033
cleanup: drop the deprecated 'localrepo.wfile' method
This was deprecated in favor of 'localrepo.wvfs.join'. We can now drop it for the
future 4.3.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Tue, 02 May 2017 02:04:55 +0200 |
parents | e58acb4fc510 |
children | 78fc540c53e1 08cfc4baf3ba |
rev | line source |
---|---|
30279
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
1 ================================== |
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
2 Basic testing for the push command |
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
3 ================================== |
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
4 |
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
5 Testing of the '--rev' flag |
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
6 =========================== |
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
7 |
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
8 $ hg init test-revflag |
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
9 $ hg -R test-revflag unbundle "$TESTDIR/bundles/remote.hg" |
14117
07708f4171f1
tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12279
diff
changeset
|
10 adding changesets |
07708f4171f1
tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12279
diff
changeset
|
11 adding manifests |
07708f4171f1
tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12279
diff
changeset
|
12 adding file changes |
07708f4171f1
tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12279
diff
changeset
|
13 added 9 changesets with 7 changes to 4 files (+1 heads) |
07708f4171f1
tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12279
diff
changeset
|
14 (run 'hg heads' to see heads, 'hg merge' to merge) |
1781
284fc722c342
add an optional argument to push only the specified revisions (push -r)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
15 |
12279 | 16 $ for i in 0 1 2 3 4 5 6 7 8; do |
17 > echo | |
30279
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
18 > hg init test-revflag-"$i" |
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
19 > hg -R test-revflag push -r "$i" test-revflag-"$i" |
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
20 > hg -R test-revflag-"$i" verify |
12279 | 21 > done |
22 | |
30279
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
23 pushing to test-revflag-0 |
12279 | 24 searching for changes |
25 adding changesets | |
26 adding manifests | |
27 adding file changes | |
28 added 1 changesets with 1 changes to 1 files | |
29 checking changesets | |
30 checking manifests | |
31 crosschecking files in changesets and manifests | |
32 checking files | |
33 1 files, 1 changesets, 1 total revisions | |
34 | |
30279
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
35 pushing to test-revflag-1 |
12279 | 36 searching for changes |
37 adding changesets | |
38 adding manifests | |
39 adding file changes | |
40 added 2 changesets with 2 changes to 1 files | |
41 checking changesets | |
42 checking manifests | |
43 crosschecking files in changesets and manifests | |
44 checking files | |
45 1 files, 2 changesets, 2 total revisions | |
46 | |
30279
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
47 pushing to test-revflag-2 |
12279 | 48 searching for changes |
49 adding changesets | |
50 adding manifests | |
51 adding file changes | |
52 added 3 changesets with 3 changes to 1 files | |
53 checking changesets | |
54 checking manifests | |
55 crosschecking files in changesets and manifests | |
56 checking files | |
57 1 files, 3 changesets, 3 total revisions | |
58 | |
30279
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
59 pushing to test-revflag-3 |
12279 | 60 searching for changes |
61 adding changesets | |
62 adding manifests | |
63 adding file changes | |
64 added 4 changesets with 4 changes to 1 files | |
65 checking changesets | |
66 checking manifests | |
67 crosschecking files in changesets and manifests | |
68 checking files | |
69 1 files, 4 changesets, 4 total revisions | |
70 | |
30279
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
71 pushing to test-revflag-4 |
12279 | 72 searching for changes |
73 adding changesets | |
74 adding manifests | |
75 adding file changes | |
76 added 2 changesets with 2 changes to 1 files | |
77 checking changesets | |
78 checking manifests | |
79 crosschecking files in changesets and manifests | |
80 checking files | |
81 1 files, 2 changesets, 2 total revisions | |
82 | |
30279
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
83 pushing to test-revflag-5 |
12279 | 84 searching for changes |
85 adding changesets | |
86 adding manifests | |
87 adding file changes | |
88 added 3 changesets with 3 changes to 1 files | |
89 checking changesets | |
90 checking manifests | |
91 crosschecking files in changesets and manifests | |
92 checking files | |
93 1 files, 3 changesets, 3 total revisions | |
94 | |
30279
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
95 pushing to test-revflag-6 |
12279 | 96 searching for changes |
97 adding changesets | |
98 adding manifests | |
99 adding file changes | |
100 added 4 changesets with 5 changes to 2 files | |
101 checking changesets | |
102 checking manifests | |
103 crosschecking files in changesets and manifests | |
104 checking files | |
105 2 files, 4 changesets, 5 total revisions | |
106 | |
30279
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
107 pushing to test-revflag-7 |
12279 | 108 searching for changes |
109 adding changesets | |
110 adding manifests | |
111 adding file changes | |
112 added 5 changesets with 6 changes to 3 files | |
113 checking changesets | |
114 checking manifests | |
115 crosschecking files in changesets and manifests | |
116 checking files | |
117 3 files, 5 changesets, 6 total revisions | |
118 | |
30279
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
119 pushing to test-revflag-8 |
12279 | 120 searching for changes |
121 adding changesets | |
122 adding manifests | |
123 adding file changes | |
124 added 5 changesets with 5 changes to 2 files | |
125 checking changesets | |
126 checking manifests | |
127 crosschecking files in changesets and manifests | |
128 checking files | |
129 2 files, 5 changesets, 5 total revisions | |
130 | |
30279
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
131 $ cd test-revflag-8 |
12279 | 132 |
30279
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
133 $ hg pull ../test-revflag-7 |
a8d2071c3373
test: rename 'test-push-r.t' to 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30278
diff
changeset
|
134 pulling from ../test-revflag-7 |
12279 | 135 searching for changes |
136 adding changesets | |
137 adding manifests | |
138 adding file changes | |
139 added 4 changesets with 2 changes to 3 files (+1 heads) | |
140 (run 'hg heads' to see heads, 'hg merge' to merge) | |
141 | |
142 $ hg verify | |
143 checking changesets | |
144 checking manifests | |
145 crosschecking files in changesets and manifests | |
146 checking files | |
147 4 files, 9 changesets, 7 total revisions | |
148 | |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16350
diff
changeset
|
149 $ cd .. |
30280
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
150 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
151 Test server side validation during push |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
152 ======================================= |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
153 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
154 $ hg init test-validation |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
155 $ cd test-validation |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
156 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
157 $ cat > .hg/hgrc <<EOF |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
158 > [server] |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
159 > validate=1 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
160 > EOF |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
161 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
162 $ echo alpha > alpha |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
163 $ echo beta > beta |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
164 $ hg addr |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
165 adding alpha |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
166 adding beta |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
167 $ hg ci -m 1 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
168 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
169 $ cd .. |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
170 $ hg clone test-validation test-validation-clone |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
171 updating to branch default |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
172 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
173 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
174 Test spurious filelog entries: |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
175 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
176 $ cd test-validation-clone |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
177 $ echo blah >> beta |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
178 $ cp .hg/store/data/beta.i tmp1 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
179 $ hg ci -m 2 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
180 $ cp .hg/store/data/beta.i tmp2 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
181 $ hg -q rollback |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
182 $ mv tmp2 .hg/store/data/beta.i |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
183 $ echo blah >> beta |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
184 $ hg ci -m '2 (corrupt)' |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
185 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
186 Expected to fail: |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
187 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
188 $ hg verify |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
189 checking changesets |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
190 checking manifests |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
191 crosschecking files in changesets and manifests |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
192 checking files |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
193 beta@1: dddc47b3ba30 not in manifests |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
194 2 files, 2 changesets, 4 total revisions |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
195 1 integrity errors encountered! |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
196 (first damaged changeset appears to be 1) |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
197 [1] |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
198 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
199 $ hg push |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
200 pushing to $TESTTMP/test-validation (glob) |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
201 searching for changes |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
202 adding changesets |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
203 adding manifests |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
204 adding file changes |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
205 transaction abort! |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
206 rollback completed |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
207 abort: received spurious file revlog entry |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
208 [255] |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
209 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
210 $ hg -q rollback |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
211 $ mv tmp1 .hg/store/data/beta.i |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
212 $ echo beta > beta |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
213 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
214 Test missing filelog entries: |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
215 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
216 $ cp .hg/store/data/beta.i tmp |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
217 $ echo blah >> beta |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
218 $ hg ci -m '2 (corrupt)' |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
219 $ mv tmp .hg/store/data/beta.i |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
220 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
221 Expected to fail: |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
222 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
223 $ hg verify |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
224 checking changesets |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
225 checking manifests |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
226 crosschecking files in changesets and manifests |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
227 checking files |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
228 beta@1: manifest refers to unknown revision dddc47b3ba30 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
229 2 files, 2 changesets, 2 total revisions |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
230 1 integrity errors encountered! |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
231 (first damaged changeset appears to be 1) |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
232 [1] |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
233 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
234 $ hg push |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
235 pushing to $TESTTMP/test-validation (glob) |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
236 searching for changes |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
237 adding changesets |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
238 adding manifests |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
239 adding file changes |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
240 transaction abort! |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
241 rollback completed |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
242 abort: missing file data for beta:dddc47b3ba30e54484720ce0f4f768a0f4b6efb9 - run hg verify |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
243 [255] |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
244 |
0269ab4f4371
tests: merge 'test-push-validation.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30279
diff
changeset
|
245 $ cd .. |
30281
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
246 |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
247 Test push hook locking |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
248 ===================== |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
249 |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
250 $ hg init 1 |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
251 |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
252 $ echo '[ui]' >> 1/.hg/hgrc |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
253 $ echo 'timeout = 10' >> 1/.hg/hgrc |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
254 |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
255 $ echo foo > 1/foo |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
256 $ hg --cwd 1 ci -A -m foo |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
257 adding foo |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
258 |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
259 $ hg clone 1 2 |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
260 updating to branch default |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
261 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
262 |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
263 $ hg clone 2 3 |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
264 updating to branch default |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
265 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
266 |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
267 $ cat <<EOF > $TESTTMP/debuglocks-pretxn-hook.sh |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
268 > hg debuglocks |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
269 > true |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
270 > EOF |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
271 $ echo '[hooks]' >> 2/.hg/hgrc |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
272 $ echo "pretxnchangegroup.a = sh $TESTTMP/debuglocks-pretxn-hook.sh" >> 2/.hg/hgrc |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
273 $ echo 'changegroup.push = hg push -qf ../1' >> 2/.hg/hgrc |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
274 |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
275 $ echo bar >> 3/foo |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
276 $ hg --cwd 3 ci -m bar |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
277 |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
278 $ hg --cwd 3 push ../2 --config devel.legacy.exchange=bundle1 |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
279 pushing to ../2 |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
280 searching for changes |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
281 adding changesets |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
282 adding manifests |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
283 adding file changes |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
284 added 1 changesets with 1 changes to 1 files |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
285 lock: user *, process * (*s) (glob) |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
286 wlock: free |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
287 |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
288 $ hg --cwd 1 --config extensions.strip= strip tip -q |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
289 $ hg --cwd 2 --config extensions.strip= strip tip -q |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
290 $ hg --cwd 3 push ../2 # bundle2+ |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
291 pushing to ../2 |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
292 searching for changes |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
293 adding changesets |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
294 adding manifests |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
295 adding file changes |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
296 added 1 changesets with 1 changes to 1 files |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
297 lock: user *, process * (*s) (glob) |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
298 wlock: user *, process * (*s) (glob) |
e58acb4fc510
tests: merge 'test-push-hook-lock.t' into 'test-push.t'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30280
diff
changeset
|
299 |