Mercurial > hg
comparison tests/test-bundle2-exchange.t @ 23437:94e2862dbcfb
push: elevate phase transaction to cover entire operation
This patch series is intended to allow bundle2 push reply part handlers to
make changes to the local repository; it has been developed in parallel with
an extension that allows the server to rebase incoming changesets while applying
them.
Most pushes already open a transaction in order to sync phase information.
This diff replaces that transaction with one that spans the entire push
operation.
This transaction will be used in a later patch to guard repository changes
made during the reply handler.
author | Eric Sumner <ericsumner@fb.com> |
---|---|
date | Fri, 21 Nov 2014 15:06:38 -0800 |
parents | ce209c9d0aad |
children | 414374cfb531 |
comparison
equal
deleted
inserted
replaced
23436:52db731b964d | 23437:94e2862dbcfb |
---|---|
174 remote: adding manifests | 174 remote: adding manifests |
175 remote: adding file changes | 175 remote: adding file changes |
176 remote: added 1 changesets with 0 changes to 0 files (-1 heads) | 176 remote: added 1 changesets with 0 changes to 0 files (-1 heads) |
177 remote: 1 new obsolescence markers | 177 remote: 1 new obsolescence markers |
178 updating bookmark book_eea1 | 178 updating bookmark book_eea1 |
179 pre-close-tip:02de42196ebe draft book_02de | |
180 postclose-tip:02de42196ebe draft book_02de | |
181 b2x-transactionclose hook: HG_SOURCE=push-response HG_URL=file:$TESTTMP/other | |
179 $ hg -R other log -G | 182 $ hg -R other log -G |
180 o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G | 183 o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G |
181 |\ | 184 |\ |
182 | o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | 185 | o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F |
183 | | | 186 | | |
252 updating bookmark book_5fdd | 255 updating bookmark book_5fdd |
253 remote: pre-close-tip:5fddd98957c8 draft book_5fdd | 256 remote: pre-close-tip:5fddd98957c8 draft book_5fdd |
254 remote: postclose-tip:5fddd98957c8 draft book_5fdd | 257 remote: postclose-tip:5fddd98957c8 draft book_5fdd |
255 remote: b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1 | 258 remote: b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1 |
256 remote: changegroup hook: HG_BUNDLE2-EXP=1 HG_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1 | 259 remote: changegroup hook: HG_BUNDLE2-EXP=1 HG_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1 |
260 pre-close-tip:02de42196ebe draft book_02de | |
261 postclose-tip:02de42196ebe draft book_02de | |
262 b2x-transactionclose hook: HG_SOURCE=push-response HG_URL=ssh://user@dummy/other | |
257 $ hg -R other log -G | 263 $ hg -R other log -G |
258 o 6:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_5fdd C | 264 o 6:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_5fdd C |
259 | | 265 | |
260 o 5:42ccdea3bb16 draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_42cc B | 266 o 5:42ccdea3bb16 draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_42cc B |
261 | | 267 | |
290 remote: adding manifests | 296 remote: adding manifests |
291 remote: adding file changes | 297 remote: adding file changes |
292 remote: added 1 changesets with 1 changes to 1 files | 298 remote: added 1 changesets with 1 changes to 1 files |
293 remote: 1 new obsolescence markers | 299 remote: 1 new obsolescence markers |
294 updating bookmark book_32af | 300 updating bookmark book_32af |
301 pre-close-tip:02de42196ebe draft book_02de | |
302 postclose-tip:02de42196ebe draft book_02de | |
303 b2x-transactionclose hook: HG_SOURCE=push-response HG_URL=http://localhost:$HGPORT2/ | |
295 $ cat other-error.log | 304 $ cat other-error.log |
296 | 305 |
297 Check final content. | 306 Check final content. |
298 | 307 |
299 $ hg -R other log -G | 308 $ hg -R other log -G |