Mercurial > hg
annotate tests/test-clone-pull-corruption.t @ 26631:e077ce385609
localrepo: restore dirstate to one before rollbacking if not parent-gone
'localrepository.rollback()' explicilty restores dirstate, only if at
least one of current parents of the working directory is removed at
rollbacking (a.k.a "parent-gone").
After DirstateTransactionPlan, 'dirstate.write()' will cause marking
'.hg/dirstate' as a file to be restored at rollbacking.
https://mercurial.selenic.com/wiki/DirstateTransactionPlan
Then, 'transaction.rollback()' restores '.hg/dirstate' regardless of
parents of the working directory at that time, and this causes
unexpected dirstate changes if not "parent-gone" (e.g. "hg update" to
another branch after "hg commit" or so, then "hg rollback").
To avoid such situation, this patch restores dirstate to one before
rollbacking if not "parent-gone".
before:
b1. restore dirstate explicitly, if "parent-gone"
after:
a1. save dirstate before actual rollbacking via dirstateguard
a2. restore dirstate via 'transaction.rollback()'
a3. if "parent-gone"
- discard backup (a1)
- restore dirstate from 'undo.dirstate'
a4. otherwise, restore dirstate from backup (a1)
Even though restoring dirstate at (a3) after (a2) seems redundant,
this patch keeps this existing code path, because:
- it isn't ensured that 'dirstate.write()' was invoked at least once
while transaction running
If not, '.hg/dirstate' isn't restored at (a2).
In addition to it, rude 3rd party extension invoking
'dirstate.write()' without 'repo' while transaction running (see
subsequent patches for detail) may break consistency of a file
backup-ed by transaction.
- this patch mainly focuses on changes for DirstateTransactionPlan
Restoring dirstate at (a3) itself should be cheaper enough than
rollbacking itself. Redundancy will be removed in next step.
Newly added test is almost meaningless at this point. It will be used
to detect regression while implementing delayed dirstate write out.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Tue, 13 Oct 2015 12:25:43 -0700 |
parents | b2c1ff96c1e1 |
children | eb586ed5d8ce |
rev | line source |
---|---|
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
1 Corrupt an hg repo with a pull started during an aborted commit |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
2 Create two repos, so that one of them can pull from the other one. |
1785
81ca1a9bd061
Added test cases for repo corruption fixed in 2e0a288ca93e (issue132)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
3 |
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
4 $ hg init source |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
5 $ cd source |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
6 $ touch foo |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
7 $ hg add foo |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
8 $ hg ci -m 'add foo' |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
9 $ hg clone . ../corrupted |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
10 updating to branch default |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
12 $ echo >> foo |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
13 $ hg ci -m 'change foo' |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
14 |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
15 Add a hook to wait 5 seconds and then abort the commit |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
16 |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
17 $ cd ../corrupted |
16962
d2fe9aaedcaf
test-clone-pull-corruption: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16913
diff
changeset
|
18 $ echo "[hooks]" >> .hg/hgrc |
24838
b2c1ff96c1e1
tests: use double quote to quote arguments in hook for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16962
diff
changeset
|
19 $ echo 'pretxncommit = sh -c "sleep 5; exit 1"' >> .hg/hgrc |
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
20 |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
21 start a commit... |
1785
81ca1a9bd061
Added test cases for repo corruption fixed in 2e0a288ca93e (issue132)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
22 |
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
23 $ touch bar |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
24 $ hg add bar |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
25 $ hg ci -m 'add bar' & |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
26 |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
27 ... and start a pull while the commit is still running |
1785
81ca1a9bd061
Added test cases for repo corruption fixed in 2e0a288ca93e (issue132)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
28 |
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
29 $ sleep 1 |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
30 $ hg pull ../source 2>/dev/null |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
31 pulling from ../source |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
32 transaction abort! |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
33 rollback completed |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
34 abort: pretxncommit hook exited with status 1 |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
35 searching for changes |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
36 adding changesets |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
37 adding manifests |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
38 adding file changes |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
39 added 1 changesets with 1 changes to 1 files |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
40 (run 'hg update' to get a working copy) |
1785
81ca1a9bd061
Added test cases for repo corruption fixed in 2e0a288ca93e (issue132)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
41 |
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
42 see what happened |
1785
81ca1a9bd061
Added test cases for repo corruption fixed in 2e0a288ca93e (issue132)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
43 |
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
44 $ wait |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
45 $ hg verify |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
46 checking changesets |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
47 checking manifests |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
48 crosschecking files in changesets and manifests |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
49 checking files |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
50 1 files, 2 changesets, 2 total revisions |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15445
diff
changeset
|
51 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15445
diff
changeset
|
52 $ cd .. |