Show More
@@ -142,9 +142,11 b' perfstatus' | |||
|
142 | 142 | $ hg perfdirstatedirs |
|
143 | 143 | $ hg perfdirstatefoldmap |
|
144 | 144 | $ hg perfdirstatewrite |
|
145 | #if repofncache | |
|
145 | 146 | $ hg perffncacheencode |
|
146 | 147 | $ hg perffncacheload |
|
147 | 148 | $ hg perffncachewrite |
|
149 | #endif | |
|
148 | 150 | $ hg perfheads |
|
149 | 151 | $ hg perfindex |
|
150 | 152 | $ hg perfloadmarkers |
@@ -182,7 +182,8 b' break it' | |||
|
182 | 182 | sorting... |
|
183 | 183 | converting... |
|
184 | 184 | 4 init |
|
185 | ignoring: data/b.i@1e88685f5dde: no match found | |
|
185 | ignoring: data/b.i@1e88685f5dde: no match found (reporevlogstore !) | |
|
186 | ignoring: data/b/index@1e88685f5dde: no node (reposimplestore !) | |
|
186 | 187 | 3 changeall |
|
187 | 188 | 2 changebagain |
|
188 | 189 | 1 merge |
@@ -8,6 +8,7 b'' | |||
|
8 | 8 | $ echo a > a |
|
9 | 9 | $ hg ci -Am adda |
|
10 | 10 | adding a |
|
11 | #if reporevlogstore | |
|
11 | 12 | $ hg debugrevlog -m |
|
12 | 13 | format : 1 |
|
13 | 14 | flags : inline, generaldelta |
@@ -35,12 +36,14 b'' | |||
|
35 | 36 | uncompressed data size (min/max/avg) : 43 / 43 / 43 |
|
36 | 37 | full revision size (min/max/avg) : 44 / 44 / 44 |
|
37 | 38 | delta size (min/max/avg) : 0 / 0 / 0 |
|
39 | #endif | |
|
38 | 40 | |
|
39 | 41 | Test debugindex, with and without the --verbose/--debug flag |
|
40 | 42 | $ hg debugindex a |
|
41 | 43 | rev linkrev nodeid p1 p2 |
|
42 | 44 | 0 0 b789fdd96dc2 000000000000 000000000000 |
|
43 | 45 | |
|
46 | #if no-reposimplestore | |
|
44 | 47 | $ hg --verbose debugindex a |
|
45 | 48 | rev offset length linkrev nodeid p1 p2 |
|
46 | 49 | 0 0 3 0 b789fdd96dc2 000000000000 000000000000 |
@@ -48,11 +51,13 b' Test debugindex, with and without the --' | |||
|
48 | 51 | $ hg --debug debugindex a |
|
49 | 52 | rev offset length linkrev nodeid p1 p2 |
|
50 | 53 | 0 0 3 0 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 |
|
54 | #endif | |
|
51 | 55 | |
|
52 | 56 | $ hg debugindex -f 1 a |
|
53 | 57 | rev flag size link p1 p2 nodeid |
|
54 | 58 | 0 0000 2 0 -1 -1 b789fdd96dc2 |
|
55 | 59 | |
|
60 | #if no-reposimplestore | |
|
56 | 61 | $ hg --verbose debugindex -f 1 a |
|
57 | 62 | rev flag offset length size link p1 p2 nodeid |
|
58 | 63 | 0 0000 0 3 2 0 -1 -1 b789fdd96dc2 |
@@ -60,9 +65,11 b' Test debugindex, with and without the --' | |||
|
60 | 65 | $ hg --debug debugindex -f 1 a |
|
61 | 66 | rev flag offset length size link p1 p2 nodeid |
|
62 | 67 | 0 0000 0 3 2 0 -1 -1 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
|
68 | #endif | |
|
63 | 69 | |
|
64 | 70 | debugdelta chain basic output |
|
65 | 71 | |
|
72 | #if reporevlogstore | |
|
66 | 73 | $ hg debugdeltachain -m |
|
67 | 74 | rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio |
|
68 | 75 | 0 1 1 -1 base 44 43 44 1.02326 44 0 0.00000 |
@@ -176,6 +183,7 b' Test max chain len' | |||
|
176 | 183 | $ hg ci -m a |
|
177 | 184 | $ printf 'h\n' >> a |
|
178 | 185 | $ hg ci -m a |
|
186 | ||
|
179 | 187 | $ hg debugrevlog -d a |
|
180 | 188 | # rev p1rev p2rev start end deltastart base p1 p2 rawsize totalsize compression heads chainlen |
|
181 | 189 | 0 -1 -1 0 ??? 0 0 0 0 ??? ???? ? 1 0 (glob) |
@@ -187,6 +195,7 b' Test max chain len' | |||
|
187 | 195 | 6 5 -1 ??? ??? ??? ??? ??? 0 ??? ???? ? 1 1 (glob) |
|
188 | 196 | 7 6 -1 ??? ??? ??? ??? ??? 0 ??? ???? ? 1 2 (glob) |
|
189 | 197 | 8 7 -1 ??? ??? ??? ??? ??? 0 ??? ???? ? 1 3 (glob) |
|
198 | #endif | |
|
190 | 199 | |
|
191 | 200 | Test debuglocks command: |
|
192 | 201 |
@@ -470,6 +470,7 b' disable pull-based clones' | |||
|
470 | 470 | (remove --pull if specified or upgrade Mercurial) |
|
471 | 471 | [255] |
|
472 | 472 | |
|
473 | #if no-reposimplestore | |
|
473 | 474 | ... but keep stream clones working |
|
474 | 475 | |
|
475 | 476 | $ hg clone --stream --noupdate http://localhost:$HGPORT1/ test-stream-clone |
@@ -479,6 +480,7 b' disable pull-based clones' | |||
|
479 | 480 | searching for changes |
|
480 | 481 | no changes found |
|
481 | 482 | $ cat error.log |
|
483 | #endif | |
|
482 | 484 | |
|
483 | 485 | ... and also keep partial clones and pulls working |
|
484 | 486 | $ hg clone http://localhost:$HGPORT1 --rev 0 test-partial-clone |
@@ -80,8 +80,14 b' new directories are setgid' | |||
|
80 | 80 | 00660 ./.hg/store/00manifest.i |
|
81 | 81 | 00770 ./.hg/store/data/ |
|
82 | 82 | 00770 ./.hg/store/data/dir/ |
|
83 | 00660 ./.hg/store/data/dir/bar.i | |
|
84 | 00660 ./.hg/store/data/foo.i | |
|
83 | 00660 ./.hg/store/data/dir/bar.i (reporevlogstore !) | |
|
84 | 00660 ./.hg/store/data/foo.i (reporevlogstore !) | |
|
85 | 00770 ./.hg/store/data/dir/bar/ (reposimplestore !) | |
|
86 | 00660 ./.hg/store/data/dir/bar/b80de5d138758541c5f05265ad144ab9fa86d1db (reposimplestore !) | |
|
87 | 00660 ./.hg/store/data/dir/bar/index (reposimplestore !) | |
|
88 | 00770 ./.hg/store/data/foo/ (reposimplestore !) | |
|
89 | 00660 ./.hg/store/data/foo/b80de5d138758541c5f05265ad144ab9fa86d1db (reposimplestore !) | |
|
90 | 00660 ./.hg/store/data/foo/index (reposimplestore !) | |
|
85 | 91 | 00660 ./.hg/store/fncache (repofncache !) |
|
86 | 92 | 00660 ./.hg/store/phaseroots |
|
87 | 93 | 00660 ./.hg/store/undo |
@@ -126,8 +132,14 b' group can still write everything' | |||
|
126 | 132 | 00660 ../push/.hg/store/00manifest.i |
|
127 | 133 | 00770 ../push/.hg/store/data/ |
|
128 | 134 | 00770 ../push/.hg/store/data/dir/ |
|
129 | 00660 ../push/.hg/store/data/dir/bar.i | |
|
130 | 00660 ../push/.hg/store/data/foo.i | |
|
135 | 00660 ../push/.hg/store/data/dir/bar.i (reporevlogstore !) | |
|
136 | 00660 ../push/.hg/store/data/foo.i (reporevlogstore !) | |
|
137 | 00770 ../push/.hg/store/data/dir/bar/ (reposimplestore !) | |
|
138 | 00660 ../push/.hg/store/data/dir/bar/b80de5d138758541c5f05265ad144ab9fa86d1db (reposimplestore !) | |
|
139 | 00660 ../push/.hg/store/data/dir/bar/index (reposimplestore !) | |
|
140 | 00770 ../push/.hg/store/data/foo/ (reposimplestore !) | |
|
141 | 00660 ../push/.hg/store/data/foo/b80de5d138758541c5f05265ad144ab9fa86d1db (reposimplestore !) | |
|
142 | 00660 ../push/.hg/store/data/foo/index (reposimplestore !) | |
|
131 | 143 | 00660 ../push/.hg/store/fncache (repofncache !) |
|
132 | 144 | 00660 ../push/.hg/store/undo |
|
133 | 145 | 00660 ../push/.hg/store/undo.backupfiles |
@@ -97,7 +97,8 b' TODO: this should be successful' | |||
|
97 | 97 | remote: adding file changes |
|
98 | 98 | remote: transaction abort! |
|
99 | 99 | remote: rollback completed |
|
100 | remote: abort: data/inside2/f.i@4a1aa07735e6: unknown parent! | |
|
100 | remote: abort: data/inside2/f.i@4a1aa07735e6: unknown parent! (reporevlogstore !) | |
|
101 | remote: abort: data/inside2/f/index@4a1aa07735e6: no node! (reposimplestore !) | |
|
101 | 102 | abort: stream ended unexpectedly (got 0 bytes, expected 4) |
|
102 | 103 | [255] |
|
103 | 104 |
@@ -196,7 +196,9 b' widen narrow spec again, but exclude a f' | |||
|
196 | 196 | comparing with ssh://user@dummy/master |
|
197 | 197 | searching for changes |
|
198 | 198 | looking for local changes to affected paths |
|
199 | deleting data/dir1/dirA/bar.i | |
|
199 | deleting data/dir1/dirA/bar.i (reporevlogstore !) | |
|
200 | deleting data/dir1/dirA/bar/0eca1d0cbdaea4651d1d04d71976a6d2d9bfaae5 (reposimplestore !) | |
|
201 | deleting data/dir1/dirA/bar/index (reposimplestore !) | |
|
200 | 202 | no changes found |
|
201 | 203 | saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob) |
|
202 | 204 | adding changesets |
@@ -254,7 +256,9 b' widen narrow spec yet again, excluding a' | |||
|
254 | 256 | comparing with ssh://user@dummy/master |
|
255 | 257 | searching for changes |
|
256 | 258 | looking for local changes to affected paths |
|
257 | deleting data/dir1/dirA/foo.i | |
|
259 | deleting data/dir1/dirA/foo.i (reporevlogstore !) | |
|
260 | deleting data/dir1/dirA/foo/162caeb3d55dceb1fee793aa631ac8c73fcb8b5e (reposimplestore !) | |
|
261 | deleting data/dir1/dirA/foo/index (reposimplestore !) | |
|
258 | 262 | no changes found |
|
259 | 263 | saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob) |
|
260 | 264 | adding changesets |
@@ -116,6 +116,7 b' Also verify we can apply the bundle with' | |||
|
116 | 116 | $ hg strip . |
|
117 | 117 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
118 | 118 | saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob) |
|
119 | #if repobundlerepo | |
|
119 | 120 | $ hg pull .hg/strip-backup/*-backup.hg |
|
120 | 121 | pulling from .hg/strip-backup/*-backup.hg (glob) |
|
121 | 122 | searching for changes |
@@ -131,7 +132,6 b' Also verify we can apply the bundle with' | |||
|
131 | 132 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
132 | 133 | saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob) |
|
133 | 134 | |
|
134 | #if repobundlerepo | |
|
135 | 135 | $ hg incoming .hg/strip-backup/*-backup.hg |
|
136 | 136 | comparing with .hg/strip-backup/*-backup.hg (glob) |
|
137 | 137 | changeset: 0:* (glob) |
@@ -1449,10 +1449,12 b' Test ability to pull changeset with loca' | |||
|
1449 | 1449 | phase-heads -- {} |
|
1450 | 1450 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 draft |
|
1451 | 1451 | |
|
1452 | #if repobundlerepo | |
|
1452 | 1453 | $ hg pull .hg/strip-backup/e008cf283490-*-backup.hg |
|
1453 | 1454 | pulling from .hg/strip-backup/e008cf283490-ede36964-backup.hg |
|
1454 | 1455 | searching for changes |
|
1455 | 1456 | no changes found |
|
1457 | #endif | |
|
1456 | 1458 | $ hg debugobsolete |
|
1457 | 1459 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
|
1458 | 1460 | $ hg log -G |
@@ -1,4 +1,4 b'' | |||
|
1 | #require unix-permissions no-root | |
|
1 | #require unix-permissions no-root reporevlogstore | |
|
2 | 2 | |
|
3 | 3 | $ hg init t |
|
4 | 4 | $ cd t |
@@ -539,6 +539,7 b' initial setup' | |||
|
539 | 539 | |
|
540 | 540 | Pulling from bundle does not alter phases of changeset not present in the bundle |
|
541 | 541 | |
|
542 | #if repobundlerepo | |
|
542 | 543 | $ hg bundle --base 1 -r 6 -r 3 ../partial-bundle.hg |
|
543 | 544 | 5 changesets found |
|
544 | 545 | $ hg pull ../partial-bundle.hg |
@@ -568,6 +569,7 b' Pulling from bundle does not alter phase' | |||
|
568 | 569 | | |
|
569 | 570 | o 0 public a-A - 054250a37db4 |
|
570 | 571 | |
|
572 | #endif | |
|
571 | 573 | |
|
572 | 574 | Pushing to Publish=False (unknown changeset) |
|
573 | 575 |
@@ -742,12 +742,14 b" Verify bundles don't get overwritten:" | |||
|
742 | 742 | saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-e68910bd-backup.hg |
|
743 | 743 | $ ls .hg/strip-backup |
|
744 | 744 | 3903775176ed-e68910bd-backup.hg |
|
745 | #if repobundlerepo | |
|
745 | 746 | $ hg pull -q -r 3903775176ed .hg/strip-backup/3903775176ed-e68910bd-backup.hg |
|
746 | 747 | $ hg strip -r 0 |
|
747 | 748 | saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg |
|
748 | 749 | $ ls .hg/strip-backup |
|
749 | 750 | 3903775176ed-54390173-backup.hg |
|
750 | 751 | 3903775176ed-e68910bd-backup.hg |
|
752 | #endif | |
|
751 | 753 | $ cd .. |
|
752 | 754 | |
|
753 | 755 | Test that we only bundle the stripped changesets (issue4736) |
@@ -813,6 +815,7 b' Check bundle behavior:' | |||
|
813 | 815 | |
|
814 | 816 | $ hg bundle -r 'desc(mergeCD)' --base 'desc(commitC)' ../issue4736.hg |
|
815 | 817 | 2 changesets found |
|
818 | #if repobundlerepo | |
|
816 | 819 | $ hg log -r 'bundle()' -R ../issue4736.hg |
|
817 | 820 | changeset: 3:6625a5168474 |
|
818 | 821 | parent: 1:eca11cf91c71 |
@@ -828,6 +831,7 b' Check bundle behavior:' | |||
|
828 | 831 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
829 | 832 | summary: mergeCD |
|
830 | 833 | |
|
834 | #endif | |
|
831 | 835 | |
|
832 | 836 | check strip behavior |
|
833 | 837 | |
@@ -872,6 +876,7 b' check strip behavior' | |||
|
872 | 876 | |
|
873 | 877 | strip backup content |
|
874 | 878 | |
|
879 | #if repobundlerepo | |
|
875 | 880 | $ hg log -r 'bundle()' -R .hg/strip-backup/6625a5168474-*-backup.hg |
|
876 | 881 | changeset: 3:6625a5168474 |
|
877 | 882 | parent: 1:eca11cf91c71 |
@@ -887,6 +892,9 b' strip backup content' | |||
|
887 | 892 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
888 | 893 | summary: mergeCD |
|
889 | 894 | |
|
895 | ||
|
896 | #endif | |
|
897 | ||
|
890 | 898 | Check that the phase cache is properly invalidated after a strip with bookmark. |
|
891 | 899 | |
|
892 | 900 | $ cat > ../stripstalephasecache.py << EOF |
@@ -183,12 +183,12 b' Clone main' | |||
|
183 | 183 | updating [===========================================>] 3/3\r (no-eol) (esc) |
|
184 | 184 | \r (no-eol) (esc) |
|
185 | 185 | \r (no-eol) (esc) |
|
186 |
linking [ <=> ] 1\r (no-eol) (esc) ( |
|
|
187 |
linking [ <=> ] 2\r (no-eol) (esc) ( |
|
|
188 |
linking [ <=> ] 3\r (no-eol) (esc) ( |
|
|
189 |
linking [ <=> ] 4\r (no-eol) (esc) ( |
|
|
190 |
linking [ <=> ] 5\r (no-eol) (esc) ( |
|
|
191 |
linking [ <=> ] 6\r (no-eol) (esc) ( |
|
|
186 | linking [ <=> ] 1\r (no-eol) (esc) (reporevlogstore !) | |
|
187 | linking [ <=> ] 2\r (no-eol) (esc) (reporevlogstore !) | |
|
188 | linking [ <=> ] 3\r (no-eol) (esc) (reporevlogstore !) | |
|
189 | linking [ <=> ] 4\r (no-eol) (esc) (reporevlogstore !) | |
|
190 | linking [ <=> ] 5\r (no-eol) (esc) (reporevlogstore !) | |
|
191 | linking [ <=> ] 6\r (no-eol) (esc) (reporevlogstore !) | |
|
192 | 192 |
linking [ |
|
193 | 193 |
linking [ |
|
194 | 194 |
linking [ |
General Comments 0
You need to be logged in to leave comments.
Login now