Mercurial > hg
annotate tests/test-encode.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 | f2719b387380 |
children | 538353b80676 |
rev | line source |
---|---|
12416 | 1 Test encode/decode filters |
1258 | 2 |
12416 | 3 $ hg init |
4 $ cat > .hg/hgrc <<EOF | |
5 > [encode] | |
6 > not.gz = tr [:lower:] [:upper:] | |
7 > *.gz = gzip -d | |
8 > [decode] | |
9 > not.gz = tr [:upper:] [:lower:] | |
10 > *.gz = gzip | |
11 > EOF | |
12 $ echo "this is a test" | gzip > a.gz | |
13 $ echo "this is a test" > not.gz | |
14 $ hg add * | |
15 $ hg ci -m "test" | |
1258 | 16 |
12416 | 17 no changes |
18 | |
19 $ hg status | |
20 $ touch * | |
21 | |
22 no changes | |
23 | |
24 $ hg status | |
25 | |
26 check contents in repo are encoded | |
1258 | 27 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12416
diff
changeset
|
28 $ hg debugdata a.gz 0 |
12416 | 29 this is a test |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12416
diff
changeset
|
30 $ hg debugdata not.gz 0 |
12416 | 31 THIS IS A TEST |
32 | |
33 check committed content was decoded | |
1258 | 34 |
12416 | 35 $ gunzip < a.gz |
36 this is a test | |
37 $ cat not.gz | |
38 this is a test | |
39 $ rm * | |
40 $ hg co -C | |
41 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1258 | 42 |
12416 | 43 check decoding of our new working dir copy |
1258 | 44 |
12416 | 45 $ gunzip < a.gz |
46 this is a test | |
47 $ cat not.gz | |
48 this is a test | |
1258 | 49 |
12416 | 50 check hg cat operation |
6093
f5b00b6e426a
Option --decode for hg cat to apply decode filters.
Jesse Glick <jesse.glick@sun.com>
parents:
3853
diff
changeset
|
51 |
12416 | 52 $ hg cat a.gz |
53 this is a test | |
54 $ hg cat --decode a.gz | gunzip | |
55 this is a test | |
56 $ mkdir subdir | |
57 $ cd subdir | |
58 $ hg -R .. cat ../a.gz | |
59 this is a test | |
60 $ hg -R .. cat --decode ../a.gz | gunzip | |
61 this is a test | |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
14182
diff
changeset
|
62 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
14182
diff
changeset
|
63 $ cd .. |