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