1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264
|
=======================================================================
Check potential race condition around transaction and working copy data
=======================================================================
#testcases bookmarks-in-store bookmarks-wc-level
The transaction is garanteed to run with the lock, but may runs without the
wlock. So if the transaction backup/restore some content related to the
working-copy and protected by the wlock, we might run into trouble if another
process grab the wlock and modify them.
This test file is testing various cases where such parallel changes happens to
validate the transaction behavior.
Other is used to get a simple pull source. As pull is a simple way to create
transaction without the wlock.
Setup
=====
Avoid long deadlock
$ cat << EOF >> $HGRCPATH
> [ui]
> timeout=10
> EOF
#if bookmarks-in-store
$ cat << EOF >> $HGRCPATH
> [format]
> bookmarks-in-store = yes
> EOF
#endif
$ hg init repo
$ cd repo
$ for filename in a b c d e f g h i j k l m; do
> echo $filename > default_$filename
> hg add default_$filename
> hg commit --quiet --message default_$filename
> done
$ hg bookmark --rev . foo
$ hg branch babar
marked working directory as branch babar
(branches are permanent and global, did you want a bookmark?)
$ for filename in a b c d e f g h i j k l m; do
> echo $filename > babar_$filename
> hg add babar_$filename
> hg commit --quiet --message babar_$filename
> done
$ hg bookmark --rev . bar
$ hg up 'desc("default_m")'
0 files updated, 0 files merged, 13 files removed, 0 files unresolved
$ hg log -G -T '[{branch}] ({bookmarks}) {desc}\n'
o [babar] (bar) babar_m
|
o [babar] () babar_l
|
o [babar] () babar_k
|
o [babar] () babar_j
|
o [babar] () babar_i
|
o [babar] () babar_h
|
o [babar] () babar_g
|
o [babar] () babar_f
|
o [babar] () babar_e
|
o [babar] () babar_d
|
o [babar] () babar_c
|
o [babar] () babar_b
|
o [babar] () babar_a
|
@ [default] (foo) default_m
|
o [default] () default_l
|
o [default] () default_k
|
o [default] () default_j
|
o [default] () default_i
|
o [default] () default_h
|
o [default] () default_g
|
o [default] () default_f
|
o [default] () default_e
|
o [default] () default_d
|
o [default] () default_c
|
o [default] () default_b
|
o [default] () default_a
$ cat << EOF >> ../txn-close.sh
> rm -f "$TESTTMP/transaction-continue"
> "$RUNTESTDIR/testlib/wait-on-file" 5 "$TESTTMP/transaction-continue" "$TESTTMP/transaction-waiting"
> rm -f "$TESTTMP/transaction-waiting"
> exit 1
> EOF
$ cat << EOF >> .hg/hgrc
> [hooks]
> pretxnclose.test = sh "$TESTTMP/txn-close.sh"
> EOF
Check the overall logic is working, the transaction is holding the `lock` , but
not the `wlock`, then get aborted on a signal-file.
$ hg phase --rev 0
0: draft
$ hg phase --public --rev 0 2> ../log.err &
$ $RUNTESTDIR/testlib/wait-on-file 5 $TESTTMP/transaction-waiting
$ echo y | hg --config ui.interactive=yes debuglock --set-wlock
ready to release the lock (y)? y
$ echo y | hg --config ui.interactive=yes debuglock --set-lock
abort: lock is already held
[255]
$ touch "$TESTTMP/transaction-continue"
$ wait
$ hg phase --rev 0
0: draft
$ cat ../log.err
abort: pretxnclose.test hook exited with status 1
Actual testing
==============
Changing tracked file
---------------------
$ hg status
$ hg phase --public --rev 0 2> ../log.err &
$ "$RUNTESTDIR/testlib/wait-on-file" 5 "$TESTTMP/transaction-waiting"
$ hg forget default_a
$ hg status
R default_a
$ touch "$TESTTMP/transaction-continue"
$ wait
$ hg status
R default_a
$ hg revert --all --quiet
Changing branch from default
----------------------------
$ hg branch
default
$ hg phase --public --rev 0 2> ../log.err &
$ "$RUNTESTDIR/testlib/wait-on-file" 5 "$TESTTMP/transaction-waiting"
$ hg branch celeste
marked working directory as branch celeste
$ hg branch
celeste
$ touch "$TESTTMP/transaction-continue"
$ wait
$ hg branch
celeste
Changing branch from another one
--------------------------------
$ hg up babar --quiet
$ hg branch
babar
$ hg phase --public --rev 0 2> ../log.err &
$ "$RUNTESTDIR/testlib/wait-on-file" 5 "$TESTTMP/transaction-waiting"
$ hg branch celeste
marked working directory as branch celeste
$ hg branch
celeste
$ touch "$TESTTMP/transaction-continue"
$ wait
$ hg branch
celeste
updating working copy
---------------------
$ hg st
$ hg log --rev . -T '{desc}\n'
babar_m
$ hg phase --public --rev 0 2> ../log.err &
$ $RUNTESTDIR/testlib/wait-on-file 5 "$TESTTMP/transaction-waiting"
$ hg update "parents(.)" --quiet
$ hg log --rev . -T '{desc}\n'
babar_l
$ hg st
$ touch "$TESTTMP/transaction-continue"
$ wait
$ hg log --rev . -T '{desc}\n'
babar_l
$ hg st
$ hg purge --no-confirm
$ hg up --quiet babar
Activating a bookmark
---------------------
(without going through the bookmark command)
Show the activation/desactivation pattern that exist without taking the store
lock.
$ hg log -r . -T '= {activebookmark} =\n'
= =
$ hg up bar
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark bar)
$ hg log -r . -T '= {activebookmark} =\n'
= bar =
$ hg up .
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark bar)
$ hg log -r . -T '= {activebookmark} =\n'
= =
Activating the bookmark during a transaction
$ hg up . --quiet
$ hg log -r . -T '= {activebookmark} =\n'
= =
$ hg phase --public --rev 0 2> ../log.err &
$ $RUNTESTDIR/testlib/wait-on-file 5 "$TESTTMP/transaction-waiting"
$ hg up bar
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark bar)
$ hg log -r . -T '= {activebookmark} =\n'
= bar =
$ touch "$TESTTMP/transaction-continue"
$ wait
$ hg log -r . -T '= {activebookmark} =\n'
= bar =
Deactivating the bookmark
$ hg up bar --quiet
$ hg log -r . -T '= {activebookmark} =\n'
= bar =
$ hg phase --public --rev 0 2> ../log.err &
$ $RUNTESTDIR/testlib/wait-on-file 5 "$TESTTMP/transaction-waiting"
$ hg up .
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark bar)
$ hg log -r . -T '= {activebookmark} =\n'
= =
$ touch "$TESTTMP/transaction-continue"
$ wait
$ hg log -r . -T '= {activebookmark} =\n'
= =
|