Mercurial > hg
annotate tests/test-docker-packaging.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 | 7f49efcaa9b4 |
children | fc0f9714d077 |
rev | line source |
---|---|
26146
8c91726caeae
test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
1 #require test-repo slow docker |
8c91726caeae
test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
2 |
26148
7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents:
26146
diff
changeset
|
3 Ensure debuild doesn't run the testsuite, as that could get silly. |
7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents:
26146
diff
changeset
|
4 $ DEB_BUILD_OPTIONS=nocheck |
7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents:
26146
diff
changeset
|
5 $ export DEB_BUILD_OPTIONS |
26146
8c91726caeae
test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
6 $ OUTPUTDIR=`pwd` |
8c91726caeae
test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
7 $ export OUTPUTDIR |
8c91726caeae
test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
8 |
8c91726caeae
test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
9 $ cd "$TESTDIR"/.. |
8c91726caeae
test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
10 $ make docker-debian-jessie > $OUTPUTDIR/build.log 2>&1 |
8c91726caeae
test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
11 $ cd $OUTPUTDIR |
8c91726caeae
test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
12 $ ls *.deb |
26148
7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents:
26146
diff
changeset
|
13 mercurial-common_*.deb (glob) |
7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents:
26146
diff
changeset
|
14 mercurial_*.deb (glob) |
26146
8c91726caeae
test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
15 |
8c91726caeae
test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
16 We check debian package contents with portable tools so that when |
8c91726caeae
test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
17 we're on non-debian machines we can still test the packages that are |
8c91726caeae
test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
18 built using docker. |
26148
7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents:
26146
diff
changeset
|
19 |
7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents:
26146
diff
changeset
|
20 main deb should have .so but no .py |
7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents:
26146
diff
changeset
|
21 $ ar x mercurial_*.deb |
7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents:
26146
diff
changeset
|
22 $ tar tf data.tar* | egrep '(localrepo|parsers)' |
7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents:
26146
diff
changeset
|
23 ./usr/lib/python2.7/dist-packages/mercurial/parsers*.so (glob) |
7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents:
26146
diff
changeset
|
24 mercurial-common should have .py but no .so or .pyc |
7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents:
26146
diff
changeset
|
25 $ ar x mercurial-common_*.deb |
7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents:
26146
diff
changeset
|
26 $ tar tf data.tar* | egrep '(localrepo|parsers)' |
7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents:
26146
diff
changeset
|
27 ./usr/lib/python2.7/dist-packages/mercurial/localrepo.py |