Mercurial > hg > mercurial-crew
annotate tests/test-pull-permission.t @ 26447:99e88320d665 stable
transplant: restore dirstate correctly at unexpected failure
Before this patch, transplant can't restore dirstate as expected at
failure other than one while patching. This causes:
- unexpected file status
- dirstate refers already rollback-ed parent
(only at failure of transplanting the 2nd or later revision)
To restore dirstate correctly also at unexpected failure, this patch
encloses scope of store lock and transaction by 'dirstateguard'.
This is temporary fixing for stable branch. See
DirstateTransactionPlan wiki page for detail about the future plan to
treat dirstate consistently around scope boundary of transaction.
https://mercurial.selenic.com/wiki/DirstateTransactionPlan
This patch also adds 'if lock' examination for safety
'lock.release()', because creating 'dirstateguard' object may fail
unexpectedly (e.g. IOError for saving dirstate).
BTW, in the test script, putting section header '[extensions]' into
'.hg/hgrc' is needed to fix incomplete disabling 'abort' extension at
4d1382fd96ff.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Thu, 30 Jul 2015 06:22:09 +0900 |
parents | 8fb6844a4ff1 |
children |
rev | line source |
---|---|
22047
8fb6844a4ff1
tests: change some #ifs to #requires
Matt Mackall <mpm@selenic.com>
parents:
20008
diff
changeset
|
1 #require unix-permissions no-root |
15492
10f302f5e9f6
tests: add missing 'hghave unix-permissions'
Mads Kiilerich <mads@kiilerich.com>
parents:
13956
diff
changeset
|
2 |
13956
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
12279
diff
changeset
|
3 $ hg init a |
12279 | 4 $ cd a |
5 $ echo foo > b | |
6 $ hg add b | |
7 $ hg ci -m "b" | |
1244
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
diff
changeset
|
8 |
12279 | 9 $ chmod -w .hg/store |
10 | |
11 $ cd .. | |
1244
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
diff
changeset
|
12 |
12279 | 13 $ hg clone a b |
14 requesting all changes | |
15 adding changesets | |
16 adding manifests | |
17 adding file changes | |
18 added 1 changesets with 1 changes to 1 files | |
19 updating to branch default | |
20 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1244
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
diff
changeset
|
21 |
12279 | 22 $ chmod +w a/.hg/store # let test clean up |
1750
955a7caf005c
make test-pull-permission cleanup correctly in case of errors
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1244
diff
changeset
|
23 |
12279 | 24 $ cd b |
25 $ hg verify | |
26 checking changesets | |
27 checking manifests | |
28 crosschecking files in changesets and manifests | |
29 checking files | |
30 1 files, 1 changesets, 1 total revisions | |
1750
955a7caf005c
make test-pull-permission cleanup correctly in case of errors
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1244
diff
changeset
|
31 |
16912
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15492
diff
changeset
|
32 $ cd .. |