annotate tests/test-flags.t @ 42044:bb271ec2fbfb

compression: introduce a `storage.revlog.zstd.level` configuration This option control the zstd compression level used when compressing revlog chunk. The usage of zstd for revlog compression has not graduated from experimental yet, but we intend to fix that soon. The option name for the compression level is more straight forward to pick, so this changesets comes first. Having a dedicated option for each compression engine is useful because they don't support the same range of values. I ran the same measurement as for the zlib compression level (in the parent changesets). The variation in repository size is stay mostly in the same (small) range. The "read/write" performance see smallish variation, but are overall much better than zlib. Write performance show the same tend of having better write performance for when reaching high-end compression. Again, we don't intend to change the default zstd compression level (currently: 3) in this series. However this is worth investigating in the future. The Performance comparison of zlib vs zstd is quite impressive. The repository size stay in the same range, but the performance are much better in all situations. Comparison summary ================== We are looking at: - performance range for zlib - performance range for zstd - comparison of default zstd (level-3) to default zlib (level 6) - comparison of the slowest zstd time to the fastest zlib time Read performance: ----------------- | zlib | zstd | cmp | f2s mercurial | 0.170159 - 0.189219 | 0.144127 - 0.149624 | 80% | 88% pypy | 2.679217 - 2.768691 | 1.532317 - 1.705044 | 60% | 63% netbeans | 122.477027 - 141.620281 | 72.996346 - 89.731560 | 58% | 73% mozilla | 147.867662 - 170.572118 | 91.700995 - 105.853099 | 56% | 71% Write performance: ------------------ | zlib | zstd | cmp | f2s mercurial | 53.250304 - 56.2936129 | 40.877025 - 45.677286 | 75% | 86% pypy | 460.721984 - 476.589918 | 270.545409 - 301.002219 | 63% | 65% netbeans | 520.560316 - 715.930400 | 370.356311 - 428.329652 | 55% | 82% mozilla | 739.803002 - 987.056093 | 505.152906 - 591.930683 | 57% | 80% Raw data -------- repo alg lvl .hg/store size 00manifest.d read write mercurial zlib 1 49,402,813 5,963,475 0.170159 53.250304 mercurial zlib 6 47,197,397 5,875,730 0.182820 56.264320 mercurial zlib 9 47,121,596 5,849,781 0.189219 56.293612 mercurial zstd 1 49,737,084 5,966,355 0.144127 40.877025 mercurial zstd 3 48,961,867 5,895,208 0.146376 42.268142 mercurial zstd 5 48,200,592 5,938,676 0.149624 43.162875 mercurial zstd 10 47,833,520 5,913,353 0.145185 44.012489 mercurial zstd 15 47,314,604 5,728,679 0.147686 45.677286 mercurial zstd 20 47,330,502 5,830,539 0.145789 45.025407 mercurial zstd 22 47,330,076 5,830,539 0.143996 44.690460 pypy zlib 1 370,830,572 28,462,425 2.679217 460.721984 pypy zlib 6 340,112,317 27,648,747 2.768691 467.537158 pypy zlib 9 338,360,736 27,639,003 2.763495 476.589918 pypy zstd 1 362,377,479 27,916,214 1.532317 270.545409 pypy zstd 3 354,137,693 27,905,988 1.686718 294.951509 pypy zstd 5 342,640,043 27,655,774 1.705044 301.002219 pypy zstd 10 334,224,327 27,164,493 1.567287 285.186239 pypy zstd 15 329,000,363 26,645,965 1.637729 299.561332 pypy zstd 20 324,534,039 26,199,547 1.526813 302.149827 pypy zstd 22 324,530,595 26,198,932 1.525718 307.821218 netbeans zlib 1 1,281,847,810 165,495,457 122.477027 520.560316 netbeans zlib 6 1,205,284,353 159,161,207 139.876147 715.930400 netbeans zlib 9 1,197,135,671 155,034,586 141.620281 678.297064 netbeans zstd 1 1,259,581,737 160,840,613 72.996346 370.356311 netbeans zstd 3 1,232,978,122 157,691,551 81.622317 396.733087 netbeans zstd 5 1,208,034,075 160,246,880 83.080549 364.342626 netbeans zstd 10 1,188,624,176 156,083,417 79.323935 403.594602 netbeans zstd 15 1,176,973,589 153,859,477 89.731560 428.329652 netbeans zstd 20 1,162,958,258 151,147,535 82.842667 392.335349 netbeans zstd 22 1,162,707,029 151,150,220 82.565695 402.840655 mozilla zlib 1 2,775,497,186 298,527,987 147.867662 751.263721 mozilla zlib 6 2,596,856,420 286,597,671 170.572118 987.056093 mozilla zlib 9 2,587,542,494 287,018,264 163.622338 739.803002 mozilla zstd 1 2,723,159,348 286,617,532 91.700995 570.042751 mozilla zstd 3 2,665,055,001 286,152,013 95.240155 561.412805 mozilla zstd 5 2,607,819,817 288,060,030 101.978048 505.152906 mozilla zstd 10 2,558,761,085 283,967,648 104.113481 497.771202 mozilla zstd 15 2,526,216,060 275,581,300 105.853099 591.930683 mozilla zstd 20 2,485,114,806 266,478,859 95.268795 576.515389 mozilla zstd 22 2,484,869,080 266,456,505 94.429282 572.785537
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 27 Mar 2019 18:35:59 +0100
parents d0abd7949ea3
children ccd76e292be5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
22046
7a9cbb315d84 tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents: 18337
diff changeset
1 #require execbit
15442
db0340f4b507 tests: use 'hghave execbit' for tests that manipulate x bit in file system
Mads Kiilerich <mads@kiilerich.com>
parents: 14182
diff changeset
2
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
3 $ umask 027
13956
ffb5c09ba822 tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents: 12156
diff changeset
4
ffb5c09ba822 tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents: 12156
diff changeset
5 $ hg init test1
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
6 $ cd test1
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
7 $ touch a b
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
8 $ hg add a b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
9 $ hg ci -m "added a b"
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
10
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
11 $ cd ..
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
12 $ hg clone test1 test3
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
13 updating to branch default
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
14 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
13956
ffb5c09ba822 tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents: 12156
diff changeset
15
ffb5c09ba822 tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents: 12156
diff changeset
16 $ hg init test2
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
17 $ cd test2
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
18 $ hg pull ../test1
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
19 pulling from ../test1
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
20 requesting all changes
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
21 adding changesets
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
22 adding manifests
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
23 adding file changes
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
24 added 1 changesets with 2 changes to 2 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 22046
diff changeset
25 new changesets 22a449e20da5
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
26 (run 'hg update' to get a working copy)
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
27 $ hg co
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
28 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
29 $ chmod +x a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
30 $ hg ci -m "chmod +x a"
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
31
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
32 the changelog should mention file a:
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
33
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
34 $ hg tip --template '{files}\n'
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
35 a
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
36
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
37 $ cd ../test1
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
38 $ echo 123 >>a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
39 $ hg ci -m "a updated"
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
40
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
41 $ hg pull ../test2
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
42 pulling from ../test2
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
43 searching for changes
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
44 adding changesets
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
45 adding manifests
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
46 adding file changes
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
47 added 1 changesets with 0 changes to 0 files (+1 heads)
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 22046
diff changeset
48 new changesets 7f4313b42a34
38250
d0abd7949ea3 phases: use "published" in the phase movement message
Boris Feld <boris.feld@octobus.net>
parents: 38249
diff changeset
49 1 local changesets published
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
50 (run 'hg heads' to see heads, 'hg merge' to merge)
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
51 $ hg heads
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
52 changeset: 2:7f4313b42a34
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
53 tag: tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
54 parent: 0:22a449e20da5
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
55 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
56 date: Thu Jan 01 00:00:00 1970 +0000
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
57 summary: chmod +x a
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
58
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
59 changeset: 1:c6ecefc45368
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
60 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
61 date: Thu Jan 01 00:00:00 1970 +0000
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
62 summary: a updated
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
63
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
64 $ hg history
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
65 changeset: 2:7f4313b42a34
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
66 tag: tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
67 parent: 0:22a449e20da5
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
68 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
69 date: Thu Jan 01 00:00:00 1970 +0000
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
70 summary: chmod +x a
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
71
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
72 changeset: 1:c6ecefc45368
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
73 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
74 date: Thu Jan 01 00:00:00 1970 +0000
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
75 summary: a updated
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
76
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
77 changeset: 0:22a449e20da5
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
78 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
79 date: Thu Jan 01 00:00:00 1970 +0000
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
80 summary: added a b
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
81
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
82
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
83 $ hg -v merge
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
84 resolving manifests
18334
44bda93df90e merge: changing the mode of a file is also an update
Mads Kiilerich <mads@kiilerich.com>
parents: 17132
diff changeset
85 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
86 (branch merge, don't forget to commit)
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
87 $ cat a
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
88 123
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
89 $ [ -x a ]
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
90
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
91 $ cd ../test3
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
92 $ echo 123 >>b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
93 $ hg ci -m "b updated"
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
94
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
95 $ hg pull ../test2
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
96 pulling from ../test2
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
97 searching for changes
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
98 adding changesets
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
99 adding manifests
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
100 adding file changes
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
101 added 1 changesets with 0 changes to 0 files (+1 heads)
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 22046
diff changeset
102 new changesets 7f4313b42a34
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
103 (run 'hg heads' to see heads, 'hg merge' to merge)
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
104 $ hg heads
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
105 changeset: 2:7f4313b42a34
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
106 tag: tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
107 parent: 0:22a449e20da5
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
108 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
109 date: Thu Jan 01 00:00:00 1970 +0000
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
110 summary: chmod +x a
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
111
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
112 changeset: 1:dc57ead75f79
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
113 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
114 date: Thu Jan 01 00:00:00 1970 +0000
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
115 summary: b updated
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
116
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
117 $ hg history
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
118 changeset: 2:7f4313b42a34
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
119 tag: tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
120 parent: 0:22a449e20da5
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
121 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
122 date: Thu Jan 01 00:00:00 1970 +0000
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
123 summary: chmod +x a
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
124
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
125 changeset: 1:dc57ead75f79
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
126 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
127 date: Thu Jan 01 00:00:00 1970 +0000
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
128 summary: b updated
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
129
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
130 changeset: 0:22a449e20da5
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
131 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
132 date: Thu Jan 01 00:00:00 1970 +0000
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
133 summary: added a b
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
134
3321
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2283
diff changeset
135
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
136 $ hg -v merge
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
137 resolving manifests
18334
44bda93df90e merge: changing the mode of a file is also an update
Mads Kiilerich <mads@kiilerich.com>
parents: 17132
diff changeset
138 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
139 (branch merge, don't forget to commit)
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
140
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
141 $ ls -l ../test[123]/a > foo
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
142 $ cut -b 1-10 < foo
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
143 -rwxr-x---
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
144 -rwxr-x---
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
145 -rwxr-x---
3321
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2283
diff changeset
146
14182
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 13956
diff changeset
147 $ hg debugindex a
37283
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
148 rev linkrev nodeid p1 p2
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
149 0 0 b80de5d13875 000000000000 000000000000
14182
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 13956
diff changeset
150 $ hg debugindex -R ../test2 a
37283
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
151 rev linkrev nodeid p1 p2
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
152 0 0 b80de5d13875 000000000000 000000000000
14182
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 13956
diff changeset
153 $ hg debugindex -R ../test1 a
37283
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
154 rev linkrev nodeid p1 p2
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
155 0 0 b80de5d13875 000000000000 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
156 1 1 7fe919cc0336 b80de5d13875 000000000000
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 15442
diff changeset
157
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 15442
diff changeset
158 $ cd ..