Show More
@@ -107,14 +107,15 Avoid long deadlock | |||
|
107 | 107 | |
|
108 | 108 | |
|
109 | 109 | $ cat << EOF >> ../txn-close.sh |
|
110 |
> rm -f |
|
|
111 |
> $RUNTESTDIR/testlib/wait-on-file 5 |
|
|
112 |
> rm -f |
|
|
110 | > rm -f "$TESTTMP/transaction-continue" | |
|
111 | > "$RUNTESTDIR/testlib/wait-on-file" 5 "$TESTTMP/transaction-continue" "$TESTTMP/transaction-waiting" | |
|
112 | > rm -f "$TESTTMP/transaction-waiting" | |
|
113 | 113 | > exit 1 |
|
114 | 114 | > EOF |
|
115 | ||
|
115 | 116 | $ cat << EOF >> .hg/hgrc |
|
116 | 117 | > [hooks] |
|
117 |
> pretxnclose.test = sh |
|
|
118 | > pretxnclose.test = sh "$TESTTMP/txn-close.sh" | |
|
118 | 119 | > EOF |
|
119 | 120 | |
|
120 | 121 | Check the overall logic is working, the transaction is holding the `lock` , but |
@@ -129,7 +130,7 not the `wlock`, then get aborted on a s | |||
|
129 | 130 | $ echo y | hg --config ui.interactive=yes debuglock --set-lock |
|
130 | 131 | abort: lock is already held |
|
131 | 132 | [255] |
|
132 |
$ touch |
|
|
133 | $ touch "$TESTTMP/transaction-continue" | |
|
133 | 134 | $ wait |
|
134 | 135 | $ hg phase --rev 0 |
|
135 | 136 | 0: draft |
@@ -144,11 +145,11 Changing tracked file | |||
|
144 | 145 | |
|
145 | 146 | $ hg status |
|
146 | 147 | $ hg phase --public --rev 0 2> ../log.err & |
|
147 |
$ |
|
|
148 | $ "$RUNTESTDIR/testlib/wait-on-file" 5 "$TESTTMP/transaction-waiting" | |
|
148 | 149 | $ hg forget default_a |
|
149 | 150 | $ hg status |
|
150 | 151 | R default_a |
|
151 |
$ touch |
|
|
152 | $ touch "$TESTTMP/transaction-continue" | |
|
152 | 153 | $ wait |
|
153 | 154 | $ hg status |
|
154 | 155 | R default_a |
@@ -160,12 +161,12 Changing branch from default | |||
|
160 | 161 | $ hg branch |
|
161 | 162 | default |
|
162 | 163 | $ hg phase --public --rev 0 2> ../log.err & |
|
163 |
$ |
|
|
164 | $ "$RUNTESTDIR/testlib/wait-on-file" 5 "$TESTTMP/transaction-waiting" | |
|
164 | 165 | $ hg branch celeste |
|
165 | 166 | marked working directory as branch celeste |
|
166 | 167 | $ hg branch |
|
167 | 168 | celeste |
|
168 |
$ touch |
|
|
169 | $ touch "$TESTTMP/transaction-continue" | |
|
169 | 170 | $ wait |
|
170 | 171 | $ hg branch |
|
171 | 172 | celeste |
@@ -177,12 +178,12 Changing branch from another one | |||
|
177 | 178 | $ hg branch |
|
178 | 179 | babar |
|
179 | 180 | $ hg phase --public --rev 0 2> ../log.err & |
|
180 |
$ |
|
|
181 | $ "$RUNTESTDIR/testlib/wait-on-file" 5 "$TESTTMP/transaction-waiting" | |
|
181 | 182 | $ hg branch celeste |
|
182 | 183 | marked working directory as branch celeste |
|
183 | 184 | $ hg branch |
|
184 | 185 | celeste |
|
185 |
$ touch |
|
|
186 | $ touch "$TESTTMP/transaction-continue" | |
|
186 | 187 | $ wait |
|
187 | 188 | $ hg branch |
|
188 | 189 | celeste |
@@ -194,12 +195,12 updating working copy | |||
|
194 | 195 | $ hg log --rev . -T '{desc}\n' |
|
195 | 196 | babar_m |
|
196 | 197 | $ hg phase --public --rev 0 2> ../log.err & |
|
197 |
$ $RUNTESTDIR/testlib/wait-on-file 5 |
|
|
198 | $ $RUNTESTDIR/testlib/wait-on-file 5 "$TESTTMP/transaction-waiting" | |
|
198 | 199 | $ hg update "parents(.)" --quiet |
|
199 | 200 | $ hg log --rev . -T '{desc}\n' |
|
200 | 201 | babar_l |
|
201 | 202 | $ hg st |
|
202 |
$ touch |
|
|
203 | $ touch "$TESTTMP/transaction-continue" | |
|
203 | 204 | $ wait |
|
204 | 205 | $ hg log --rev . -T '{desc}\n' |
|
205 | 206 | babar_l |
@@ -234,13 +235,13 Activating the bookmark during a transac | |||
|
234 | 235 | $ hg log -r . -T '= {activebookmark} =\n' |
|
235 | 236 | = = |
|
236 | 237 | $ hg phase --public --rev 0 2> ../log.err & |
|
237 |
$ $RUNTESTDIR/testlib/wait-on-file 5 |
|
|
238 | $ $RUNTESTDIR/testlib/wait-on-file 5 "$TESTTMP/transaction-waiting" | |
|
238 | 239 | $ hg up bar |
|
239 | 240 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
240 | 241 | (activating bookmark bar) |
|
241 | 242 | $ hg log -r . -T '= {activebookmark} =\n' |
|
242 | 243 | = bar = |
|
243 |
$ touch |
|
|
244 | $ touch "$TESTTMP/transaction-continue" | |
|
244 | 245 | $ wait |
|
245 | 246 | $ hg log -r . -T '= {activebookmark} =\n' |
|
246 | 247 | = bar = |
@@ -251,13 +252,13 Deactivating the bookmark | |||
|
251 | 252 | $ hg log -r . -T '= {activebookmark} =\n' |
|
252 | 253 | = bar = |
|
253 | 254 | $ hg phase --public --rev 0 2> ../log.err & |
|
254 |
$ $RUNTESTDIR/testlib/wait-on-file 5 |
|
|
255 | $ $RUNTESTDIR/testlib/wait-on-file 5 "$TESTTMP/transaction-waiting" | |
|
255 | 256 | $ hg up . |
|
256 | 257 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
257 | 258 | (leaving bookmark bar) |
|
258 | 259 | $ hg log -r . -T '= {activebookmark} =\n' |
|
259 | 260 | = = |
|
260 |
$ touch |
|
|
261 | $ touch "$TESTTMP/transaction-continue" | |
|
261 | 262 | $ wait |
|
262 | 263 | $ hg log -r . -T '= {activebookmark} =\n' |
|
263 | 264 | = = |
General Comments 0
You need to be logged in to leave comments.
Login now