Mercurial > hg
annotate tests/test-gendoc.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 | 1fdb1d909c79 |
children | 4a080cf31565 |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
20390
diff
changeset
|
1 #require docutils |
24043
1fdb1d909c79
test-gendoc: require gettext
Eric Sumner <ericsumner@fb.com>
parents:
22046
diff
changeset
|
2 #require gettext |
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
20390
diff
changeset
|
3 |
12427 | 4 Test document extraction |
9446
57d682d7d2da
test-gendoc: test documentation generation
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
5 |
12427 | 6 $ HGENCODING=UTF-8 |
7 $ export HGENCODING | |
20390
3fedc29a98bb
tests: use ls instead of find, all files are in the same directory
Simon Heimberg <simohe@besonet.ch>
parents:
19923
diff
changeset
|
8 $ { echo C; ls "$TESTDIR/../i18n"/*.po | sort; } | while read PO; do |
16350
4f795f5fbb0b
tests: make tests work if directory contains special characters
Thomas Arendsen Hein <thomas@intevation.de>
parents:
14475
diff
changeset
|
9 > LOCALE=`basename "$PO" .po` |
12427 | 10 > echo |
11 > echo "% extracting documentation from $LOCALE" | |
12 > echo ".. -*- coding: utf-8 -*-" > gendoc-$LOCALE.txt | |
13 > echo "" >> gendoc-$LOCALE.txt | |
19922
f27deed5c23f
tests: really test translations for rst syntax errors (issue4003)
Simon Heimberg <simohe@besonet.ch>
parents:
16350
diff
changeset
|
14 > LANGUAGE=$LOCALE python "$TESTDIR/../doc/gendoc.py" >> gendoc-$LOCALE.txt 2> /dev/null || exit |
12427 | 15 > |
19923
52bc80d0769f
tests: test-gendoc.t checks if anything was translated
Simon Heimberg <simohe@besonet.ch>
parents:
19922
diff
changeset
|
16 > if [ $LOCALE != C ]; then |
52bc80d0769f
tests: test-gendoc.t checks if anything was translated
Simon Heimberg <simohe@besonet.ch>
parents:
19922
diff
changeset
|
17 > cmp -s gendoc-C.txt gendoc-$LOCALE.txt && echo '** NOTHING TRANSLATED **' |
52bc80d0769f
tests: test-gendoc.t checks if anything was translated
Simon Heimberg <simohe@besonet.ch>
parents:
19922
diff
changeset
|
18 > fi |
52bc80d0769f
tests: test-gendoc.t checks if anything was translated
Simon Heimberg <simohe@besonet.ch>
parents:
19922
diff
changeset
|
19 > |
12427 | 20 > # We call runrst without adding "--halt warning" to make it report |
21 > # all errors instead of stopping on the first one. | |
22 > echo "checking for parse errors" | |
16350
4f795f5fbb0b
tests: make tests work if directory contains special characters
Thomas Arendsen Hein <thomas@intevation.de>
parents:
14475
diff
changeset
|
23 > python "$TESTDIR/../doc/runrst" html gendoc-$LOCALE.txt /dev/null |
12427 | 24 > done |
25 | |
26 % extracting documentation from C | |
27 checking for parse errors | |
28 | |
29 % extracting documentation from da | |
30 checking for parse errors | |
31 | |
32 % extracting documentation from de | |
33 checking for parse errors | |
34 | |
35 % extracting documentation from el | |
36 checking for parse errors | |
37 | |
38 % extracting documentation from fr | |
39 checking for parse errors | |
40 | |
41 % extracting documentation from it | |
42 checking for parse errors | |
43 | |
44 % extracting documentation from ja | |
45 checking for parse errors | |
46 | |
47 % extracting documentation from pt_BR | |
48 checking for parse errors | |
49 | |
50 % extracting documentation from ro | |
51 checking for parse errors | |
52 | |
14475
ac9a89dbdc00
test-gendoc: update for new Russian translation
Martin Geisler <mg@lazybytes.net>
parents:
12427
diff
changeset
|
53 % extracting documentation from ru |
ac9a89dbdc00
test-gendoc: update for new Russian translation
Martin Geisler <mg@lazybytes.net>
parents:
12427
diff
changeset
|
54 checking for parse errors |
ac9a89dbdc00
test-gendoc: update for new Russian translation
Martin Geisler <mg@lazybytes.net>
parents:
12427
diff
changeset
|
55 |
12427 | 56 % extracting documentation from sv |
57 checking for parse errors | |
58 | |
59 % extracting documentation from zh_CN | |
60 checking for parse errors | |
61 | |
62 % extracting documentation from zh_TW | |
63 checking for parse errors |