##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

transplant: restore dirstate correctly at unexpected failure...
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.
Pierre-Yves David - - Load All Authors

File last commit:

r25482:95f49013 default
r25879:99e88320 stable
Show More
test-debugbuilddag.t
330 lines | 5.3 KiB | text/troff | Tads3Lexer
/ tests / test-debugbuilddag.t
History | Source | Raw |Copy content |Copy permalink
Pradeepkumar Gayam
tests: unify test-debugbuilddag
 r11922
Peter Arrenbrecht
debugbuilddag: use memctx for speed...
 r14163 plain
Pradeepkumar Gayam
tests: unify test-debugbuilddag
 r11922
Martin Geisler
test-debugbuilddag: replace unneeded 'rm -rf' with 'rm -r'
 r14278 $ hg init
Martin Geisler
debugbuilddag: output progress information
 r14279 $ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' \
> --config extensions.progress= --config progress.assume-tty=1 \
> --config progress.delay=0 --config progress.refresh=0 \
Julien Cristau
tests: disable progress estimate in test-debugbuilddag.t...
 r16368 > --config progress.format=topic,bar,number \
Mads Kiilerich
tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup
 r17743 > --config progress.width=60
\r (no-eol) (esc)
building [ ] 0/12\r (no-eol) (esc)
building [ ] 0/12\r (no-eol) (esc)
building [==> ] 1/12\r (no-eol) (esc)
building [==> ] 1/12\r (no-eol) (esc)
building [======> ] 2/12\r (no-eol) (esc)
building [=========> ] 3/12\r (no-eol) (esc)
building [=============> ] 4/12\r (no-eol) (esc)
building [=============> ] 4/12\r (no-eol) (esc)
building [=============> ] 4/12\r (no-eol) (esc)
building [================> ] 5/12\r (no-eol) (esc)
building [====================> ] 6/12\r (no-eol) (esc)
building [=======================> ] 7/12\r (no-eol) (esc)
building [===========================> ] 8/12\r (no-eol) (esc)
building [===========================> ] 8/12\r (no-eol) (esc)
building [==============================> ] 9/12\r (no-eol) (esc)
building [==================================> ] 10/12\r (no-eol) (esc)
building [=====================================> ] 11/12\r (no-eol) (esc)
\r (no-eol) (esc)
Martin Geisler
debugbuilddag: output progress information
 r14279
Peter Arrenbrecht
debugbuilddag: use memctx for speed...
 r14163 tags
$ cat .hg/localtags
66f7d451a68b85ed82ff5fcc254daf50c74144bd f
bebd167eb94d257ace0e814aeb98e6972ed2970d p2
Pradeepkumar Gayam
tests: unify test-debugbuilddag
 r11922 dag
$ hg debugdag -t -b
+2:f
+3:p2
@temp*f+3
@default*/p2+2:tip
tip
$ hg id
Peter Arrenbrecht
debugbuilddag: use memctx for speed...
 r14163 000000000000
Pradeepkumar Gayam
tests: unify test-debugbuilddag
 r11922 glog
Martin Geisler
tests: don't load unnecessary graphlog extension...
 r20117 $ hg log -G --template '{rev}: {desc} [{branches}] @ {date}\n'
Peter Arrenbrecht
debugbuilddag: use memctx for speed...
 r14163 o 11: r11 [] @ 11.00
|
o 10: r10 [] @ 10.00
|
o 9: r9 [] @ 9.00
|\
| o 8: r8 [temp] @ 8.00
| |
| o 7: r7 [temp] @ 7.00
| |
| o 6: r6 [temp] @ 6.00
| |
| o 5: r5 [temp] @ 5.00
| |
o | 4: r4 [] @ 4.00
| |
o | 3: r3 [] @ 3.00
| |
o | 2: r2 [] @ 2.00
|/
o 1: r1 [] @ 1.00
|
o 0: r0 [] @ 0.00
Wagner Bruna
debugbuilddag: fix starting a dag on a non-default branch
 r16219 overwritten files, starting on a non-default branch
Peter Arrenbrecht
debugbuilddag: use memctx for speed...
 r14163
Martin Geisler
test-debugbuilddag: replace unneeded 'rm -rf' with 'rm -r'
 r14278 $ rm -r .hg
$ hg init
Wagner Bruna
debugbuilddag: fix starting a dag on a non-default branch
 r16219 $ hg debugbuilddag '@start.@default.:f +3:p2 @temp <f+4 @default /p2 +2' -q -o
Peter Arrenbrecht
debugbuilddag: use memctx for speed...
 r14163 tags
$ cat .hg/localtags
Wagner Bruna
debugbuilddag: fix starting a dag on a non-default branch
 r16219 f778700ebd50fcf282b23a4446bd155da6453eb6 f
bbccf169769006e2490efd2a02f11c3d38d462bd p2
Peter Arrenbrecht
debugbuilddag: use memctx for speed...
 r14163 dag
$ hg debugdag -t -b
Wagner Bruna
debugbuilddag: fix starting a dag on a non-default branch
 r16219 @start+1
@default+1:f
Peter Arrenbrecht
debugbuilddag: use memctx for speed...
 r14163 +3:p2
@temp*f+3
@default*/p2+2:tip
tip
$ hg id
000000000000
glog
Martin Geisler
tests: don't load unnecessary graphlog extension...
 r20117 $ hg log -G --template '{rev}: {desc} [{branches}] @ {date}\n'
Peter Arrenbrecht
debugbuilddag: use memctx for speed...
 r14163 o 11: r11 [] @ 11.00
Pradeepkumar Gayam
tests: unify test-debugbuilddag
 r11922 |
o 10: r10 [] @ 10.00
|
o 9: r9 [] @ 9.00
|\
| o 8: r8 [temp] @ 8.00
| |
| o 7: r7 [temp] @ 7.00
| |
| o 6: r6 [temp] @ 6.00
| |
| o 5: r5 [temp] @ 5.00
| |
o | 4: r4 [] @ 4.00
| |
o | 3: r3 [] @ 3.00
| |
o | 2: r2 [] @ 2.00
|/
o 1: r1 [] @ 1.00
|
Wagner Bruna
debugbuilddag: fix starting a dag on a non-default branch
 r16219 o 0: r0 [start] @ 0.00
Pradeepkumar Gayam
tests: unify test-debugbuilddag
 r11922
glog of
Martin Geisler
tests: don't load unnecessary graphlog extension...
 r20117 $ hg log -G --template '{rev}: {desc} [{branches}]\n' of
Peter Arrenbrecht
debugbuilddag: use memctx for speed...
 r14163 o 11: r11 []
Pradeepkumar Gayam
tests: unify test-debugbuilddag
 r11922 |
o 10: r10 []
|
o 9: r9 []
|\
| o 8: r8 [temp]
| |
| o 7: r7 [temp]
| |
| o 6: r6 [temp]
| |
| o 5: r5 [temp]
| |
o | 4: r4 []
| |
o | 3: r3 []
| |
o | 2: r2 []
|/
o 1: r1 []
|
Wagner Bruna
debugbuilddag: fix starting a dag on a non-default branch
 r16219 o 0: r0 [start]
Pradeepkumar Gayam
tests: unify test-debugbuilddag
 r11922
tags
$ hg tags -v
Wagner Bruna
debugbuilddag: fix starting a dag on a non-default branch
 r16219 tip 11:9ffe238a67a2
p2 4:bbccf1697690 local
f 1:f778700ebd50 local
Pradeepkumar Gayam
tests: unify test-debugbuilddag
 r11922 cat of
Peter Arrenbrecht
debugbuilddag: use memctx for speed...
 r14163 $ hg cat of --rev tip
Pradeepkumar Gayam
tests: unify test-debugbuilddag
 r11922 r11
Peter Arrenbrecht
debugbuilddag: use memctx for speed...
 r14163
Pradeepkumar Gayam
tests: unify test-debugbuilddag
 r11922 new and mergeable files
Martin Geisler
test-debugbuilddag: replace unneeded 'rm -rf' with 'rm -r'
 r14278 $ rm -r .hg
$ hg init
Pradeepkumar Gayam
tests: unify test-debugbuilddag
 r11922 $ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' -q -mn
dag
$ hg debugdag -t -b
+2:f
+3:p2
@temp*f+3
@default*/p2+2:tip
tip
$ hg id
Peter Arrenbrecht
debugbuilddag: use memctx for speed...
 r14163 000000000000
Pradeepkumar Gayam
tests: unify test-debugbuilddag
 r11922 glog
Martin Geisler
tests: don't load unnecessary graphlog extension...
 r20117 $ hg log -G --template '{rev}: {desc} [{branches}] @ {date}\n'
Peter Arrenbrecht
debugbuilddag: use memctx for speed...
 r14163 o 11: r11 [] @ 11.00
Pradeepkumar Gayam
tests: unify test-debugbuilddag
 r11922 |
o 10: r10 [] @ 10.00
|
o 9: r9 [] @ 9.00
|\
| o 8: r8 [temp] @ 8.00
| |
| o 7: r7 [temp] @ 7.00
| |
| o 6: r6 [temp] @ 6.00
| |
| o 5: r5 [temp] @ 5.00
| |
o | 4: r4 [] @ 4.00
| |
o | 3: r3 [] @ 3.00
| |
o | 2: r2 [] @ 2.00
|/
o 1: r1 [] @ 1.00
|
o 0: r0 [] @ 0.00
glog mf
Martin Geisler
tests: don't load unnecessary graphlog extension...
 r20117 $ hg log -G --template '{rev}: {desc} [{branches}]\n' mf
Peter Arrenbrecht
debugbuilddag: use memctx for speed...
 r14163 o 11: r11 []
Pradeepkumar Gayam
tests: unify test-debugbuilddag
 r11922 |
o 10: r10 []
|
o 9: r9 []
|\
| o 8: r8 [temp]
| |
| o 7: r7 [temp]
| |
| o 6: r6 [temp]
| |
| o 5: r5 [temp]
| |
o | 4: r4 []
| |
o | 3: r3 []
| |
o | 2: r2 []
|/
o 1: r1 []
|
o 0: r0 []
man r4
$ hg manifest -r4
mf
nf0
nf1
nf2
nf3
nf4
cat r4 mf
$ hg cat -r4 mf
0 r0
1
2 r1
3
4 r2
5
6 r3
7
8 r4
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
man r8
$ hg manifest -r8
mf
nf0
nf1
nf5
nf6
nf7
nf8
cat r8 mf
$ hg cat -r8 mf
0 r0
1
2 r1
3
4
5
6
7
8
9
10 r5
11
12 r6
13
14 r7
15
16 r8
17
18
19
20
21
22
23
man
Peter Arrenbrecht
debugbuilddag: use memctx for speed...
 r14163 $ hg manifest --rev tip
Pradeepkumar Gayam
tests: unify test-debugbuilddag
 r11922 mf
nf0
nf1
nf10
nf11
nf2
nf3
nf4
nf5
nf6
nf7
nf8
nf9
cat mf
Peter Arrenbrecht
debugbuilddag: use memctx for speed...
 r14163 $ hg cat mf --rev tip
Pradeepkumar Gayam
tests: unify test-debugbuilddag
 r11922 0 r0
1
2 r1
3
4 r2
5
6 r3
7
8 r4
9
10 r5
11
12 r6
13
14 r7
15
16 r8
17
18 r9
19
20 r10
21
22 r11
23
Peter Arrenbrecht
debugbuilddag: use memctx for speed...
 r14163