Mercurial > hg
annotate tests/test-convert-splicemap.t @ 50916:98b8836d0e82
hgweb: use sysstr to set attribute on diff option
Attribute identifier should be `str` not `bytes`.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 01 Sep 2023 12:09:54 +0200 |
parents | 58a309e9cf80 |
children |
rev | line source |
---|---|
8047
04c62275cbc7
convert: better mapfile parsing errors (issue1581/1)
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
1 |
12531
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
2 $ echo "[extensions]" >> $HGRCPATH |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
3 $ echo "convert=" >> $HGRCPATH |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
4 $ glog() |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
5 > { |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
19120
diff
changeset
|
6 > hg log -G --template '{rev}:{node|short} "{desc|firstline}"\ |
16106
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
7 > files: {files}\n' "$@" |
12531
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
8 > } |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
9 $ hg init repo1 |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
10 $ cd repo1 |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
11 $ echo a > a |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
12 $ hg ci -Am adda |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
13 adding a |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
14 $ echo b > b |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
15 $ echo a >> a |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
16 $ hg ci -Am addb |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
17 adding b |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
18 $ PARENTID1=`hg id --debug -i` |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
19 $ echo c > c |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
20 $ hg ci -Am addc |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
21 adding c |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
22 $ PARENTID2=`hg id --debug -i` |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
23 $ cd .. |
16106
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
24 $ glog -R repo1 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
25 @ 2:e55c719b85b6 "addc" files: c |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
26 | |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
27 o 1:6d4c2037ddc2 "addb" files: a b |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
28 | |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
29 o 0:07f494440405 "adda" files: a |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
30 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
31 |
12531
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
32 $ hg init repo2 |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
33 $ cd repo2 |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
34 $ echo b > a |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
35 $ echo d > d |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
36 $ hg ci -Am addaandd |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
37 adding a |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
38 adding d |
19120
58e782f076e7
splicemap: improve error handling when source is hg (issue2084)
Ben Goswami <bengoswami@fb.com>
parents:
16480
diff
changeset
|
39 $ INVALIDID1=afd12345af |
58e782f076e7
splicemap: improve error handling when source is hg (issue2084)
Ben Goswami <bengoswami@fb.com>
parents:
16480
diff
changeset
|
40 $ INVALIDID2=28173x36ddd1e67bf7098d541130558ef5534a86 |
12531
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
41 $ CHILDID1=`hg id --debug -i` |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
42 $ echo d >> d |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
43 $ hg ci -Am changed |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
44 $ CHILDID2=`hg id --debug -i` |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
45 $ echo e > e |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
46 $ hg ci -Am adde |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
47 adding e |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
48 $ cd .. |
16106
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
49 $ glog -R repo2 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
50 @ 2:a39b65753b0a "adde" files: e |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
51 | |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
52 o 1:e4ea00df9189 "changed" files: d |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
53 | |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
54 o 0:527cdedf31fb "addaandd" files: a d |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
55 |
8047
04c62275cbc7
convert: better mapfile parsing errors (issue1581/1)
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
56 |
19120
58e782f076e7
splicemap: improve error handling when source is hg (issue2084)
Ben Goswami <bengoswami@fb.com>
parents:
16480
diff
changeset
|
57 test invalid splicemap1 |
12531
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
58 |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
59 $ cat > splicemap <<EOF |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
60 > $CHILDID2 |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
61 > EOF |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
62 $ hg convert --splicemap splicemap repo2 repo1 |
16105
ebaa0aa749e2
convert: turn splicemap into a simple dictionary
Patrick Mezard <patrick@mezard.eu>
parents:
15608
diff
changeset
|
63 abort: syntax error in splicemap(1): child parent1[,parent2] expected |
12531
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
64 [255] |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
65 |
19120
58e782f076e7
splicemap: improve error handling when source is hg (issue2084)
Ben Goswami <bengoswami@fb.com>
parents:
16480
diff
changeset
|
66 test invalid splicemap2 |
58e782f076e7
splicemap: improve error handling when source is hg (issue2084)
Ben Goswami <bengoswami@fb.com>
parents:
16480
diff
changeset
|
67 |
58e782f076e7
splicemap: improve error handling when source is hg (issue2084)
Ben Goswami <bengoswami@fb.com>
parents:
16480
diff
changeset
|
68 $ cat > splicemap <<EOF |
58e782f076e7
splicemap: improve error handling when source is hg (issue2084)
Ben Goswami <bengoswami@fb.com>
parents:
16480
diff
changeset
|
69 > $CHILDID2 $PARENTID1, $PARENTID2, $PARENTID2 |
58e782f076e7
splicemap: improve error handling when source is hg (issue2084)
Ben Goswami <bengoswami@fb.com>
parents:
16480
diff
changeset
|
70 > EOF |
58e782f076e7
splicemap: improve error handling when source is hg (issue2084)
Ben Goswami <bengoswami@fb.com>
parents:
16480
diff
changeset
|
71 $ hg convert --splicemap splicemap repo2 repo1 |
58e782f076e7
splicemap: improve error handling when source is hg (issue2084)
Ben Goswami <bengoswami@fb.com>
parents:
16480
diff
changeset
|
72 abort: syntax error in splicemap(1): child parent1[,parent2] expected |
58e782f076e7
splicemap: improve error handling when source is hg (issue2084)
Ben Goswami <bengoswami@fb.com>
parents:
16480
diff
changeset
|
73 [255] |
58e782f076e7
splicemap: improve error handling when source is hg (issue2084)
Ben Goswami <bengoswami@fb.com>
parents:
16480
diff
changeset
|
74 |
58e782f076e7
splicemap: improve error handling when source is hg (issue2084)
Ben Goswami <bengoswami@fb.com>
parents:
16480
diff
changeset
|
75 test invalid splicemap3 |
58e782f076e7
splicemap: improve error handling when source is hg (issue2084)
Ben Goswami <bengoswami@fb.com>
parents:
16480
diff
changeset
|
76 |
58e782f076e7
splicemap: improve error handling when source is hg (issue2084)
Ben Goswami <bengoswami@fb.com>
parents:
16480
diff
changeset
|
77 $ cat > splicemap <<EOF |
58e782f076e7
splicemap: improve error handling when source is hg (issue2084)
Ben Goswami <bengoswami@fb.com>
parents:
16480
diff
changeset
|
78 > $INVALIDID1 $INVALIDID2 |
58e782f076e7
splicemap: improve error handling when source is hg (issue2084)
Ben Goswami <bengoswami@fb.com>
parents:
16480
diff
changeset
|
79 > EOF |
58e782f076e7
splicemap: improve error handling when source is hg (issue2084)
Ben Goswami <bengoswami@fb.com>
parents:
16480
diff
changeset
|
80 $ hg convert --splicemap splicemap repo2 repo1 |
58e782f076e7
splicemap: improve error handling when source is hg (issue2084)
Ben Goswami <bengoswami@fb.com>
parents:
16480
diff
changeset
|
81 abort: splicemap entry afd12345af is not a valid revision identifier |
58e782f076e7
splicemap: improve error handling when source is hg (issue2084)
Ben Goswami <bengoswami@fb.com>
parents:
16480
diff
changeset
|
82 [255] |
58e782f076e7
splicemap: improve error handling when source is hg (issue2084)
Ben Goswami <bengoswami@fb.com>
parents:
16480
diff
changeset
|
83 |
12531
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
84 splice repo2 on repo1 |
8047
04c62275cbc7
convert: better mapfile parsing errors (issue1581/1)
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
85 |
12531
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
86 $ cat > splicemap <<EOF |
16106
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
87 > $CHILDID1 $PARENTID1 |
12531
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
88 > $CHILDID2 $PARENTID2,$CHILDID1 |
16190
9479c28a22bf
convert: ignore blank lines in mapfiles (issue3286)
Patrick Mezard <patrick@mezard.eu>
parents:
16162
diff
changeset
|
89 > |
12531
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
90 > EOF |
16106
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
91 $ cat splicemap |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
92 527cdedf31fbd5ea708aa14eeecf53d4676f38db 6d4c2037ddc2cb2627ac3a244ecce35283268f8e |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
93 e4ea00df91897da3079a10fab658c1eddba6617b e55c719b85b60e5102fac26110ba626e7cb6b7dc,527cdedf31fbd5ea708aa14eeecf53d4676f38db |
16190
9479c28a22bf
convert: ignore blank lines in mapfiles (issue3286)
Patrick Mezard <patrick@mezard.eu>
parents:
16162
diff
changeset
|
94 |
12531
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
95 $ hg clone repo1 target1 |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
96 updating to branch default |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
97 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
98 $ hg convert --splicemap splicemap repo2 target1 |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
99 scanning source... |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
100 sorting... |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
101 converting... |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
102 2 addaandd |
26812
58a309e9cf80
convert: fix Python syntax in 'splice in' message
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
103 spliced in 6d4c2037ddc2cb2627ac3a244ecce35283268f8e as parents of 527cdedf31fbd5ea708aa14eeecf53d4676f38db |
12531
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
104 1 changed |
26812
58a309e9cf80
convert: fix Python syntax in 'splice in' message
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
105 spliced in e55c719b85b60e5102fac26110ba626e7cb6b7dc and 527cdedf31fbd5ea708aa14eeecf53d4676f38db as parents of e4ea00df91897da3079a10fab658c1eddba6617b |
12531
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
106 0 adde |
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
107 $ glog -R target1 |
16106
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
108 o 5:16bc847b02aa "adde" files: e |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
109 | |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
110 o 4:e30e4fee3418 "changed" files: d |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
111 |\ |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
112 | o 3:e673348c3a3c "addaandd" files: a d |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
113 | | |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
114 @ | 2:e55c719b85b6 "addc" files: c |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
115 |/ |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
116 o 1:6d4c2037ddc2 "addb" files: a b |
12531
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
117 | |
16106
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
118 o 0:07f494440405 "adda" files: a |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
119 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
120 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
121 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
122 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
123 Test splicemap and conversion order |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
124 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
125 $ hg init ordered |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
126 $ cd ordered |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
127 $ echo a > a |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
128 $ hg ci -Am adda |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
129 adding a |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
130 $ hg branch branch |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
131 marked working directory as branch branch |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
132 (branches are permanent and global, did you want a bookmark?) |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
133 $ echo a >> a |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
134 $ hg ci -Am changea |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
135 $ echo a >> a |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
136 $ hg ci -Am changeaagain |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
137 $ hg up 0 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
138 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
139 $ echo b > b |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
140 $ hg ci -Am addb |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
141 adding b |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
142 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
143 We want 2 to depend on 1 and 3. Since 3 is always converted after 2, |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
144 the bug should be exhibited with all conversion orders. |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
145 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
146 $ cat > ../splicemap <<EOF |
16480
123f96c4d454
tests: fix bashism in test-convert-splicemap.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16190
diff
changeset
|
147 > `(hg id -r 2 -i --debug)` `(hg id -r 1 -i --debug)`, `(hg id -r 3 -i --debug)` |
16106
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
148 > EOF |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
149 $ cd .. |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
150 $ cat splicemap |
16118
d554a3dcae5a
convert: tolerate spaces between splicemap parent ids (issue3203)
Patrick Mezard <patrick@mezard.eu>
parents:
16106
diff
changeset
|
151 7c364e7fa7d70ae525610c016317ed717b519d97 717d54d67e6c31fd75ffef2ff3042bdd98418437, 102a90ea7b4a3361e4082ed620918c261189a36a |
16106
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
152 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
153 Test regular conversion |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
154 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
155 $ hg convert --splicemap splicemap ordered ordered-hg1 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
156 initializing destination ordered-hg1 repository |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
157 scanning source... |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
158 sorting... |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
159 converting... |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
160 3 adda |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
161 2 changea |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
162 1 addb |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
163 0 changeaagain |
26812
58a309e9cf80
convert: fix Python syntax in 'splice in' message
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
164 spliced in 717d54d67e6c31fd75ffef2ff3042bdd98418437 and 102a90ea7b4a3361e4082ed620918c261189a36a as parents of 7c364e7fa7d70ae525610c016317ed717b519d97 |
16106
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
165 $ glog -R ordered-hg1 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
166 o 3:4cb04b9afbf2 "changeaagain" files: a |
12531
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
167 |\ |
16106
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
168 | o 2:102a90ea7b4a "addb" files: b |
12531
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
169 | | |
16106
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
170 o | 1:717d54d67e6c "changea" files: a |
12531
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
171 |/ |
16106
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
172 o 0:07f494440405 "adda" files: a |
12531
a1cbcc1a21f6
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com>
parents:
10119
diff
changeset
|
173 |
16106
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
174 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
175 Test conversion with parent revisions already in dest, using source |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
176 and destination identifiers. Test unknown splicemap target. |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
177 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
178 $ hg convert -r1 ordered ordered-hg2 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
179 initializing destination ordered-hg2 repository |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
180 scanning source... |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
181 sorting... |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
182 converting... |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
183 1 adda |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
184 0 changea |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
185 $ hg convert -r3 ordered ordered-hg2 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
186 scanning source... |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
187 sorting... |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
188 converting... |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
189 0 addb |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
190 $ cat > splicemap <<EOF |
16480
123f96c4d454
tests: fix bashism in test-convert-splicemap.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16190
diff
changeset
|
191 > `(hg -R ordered id -r 2 -i --debug)` \ |
123f96c4d454
tests: fix bashism in test-convert-splicemap.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16190
diff
changeset
|
192 > `(hg -R ordered-hg2 id -r 1 -i --debug)`,\ |
123f96c4d454
tests: fix bashism in test-convert-splicemap.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16190
diff
changeset
|
193 > `(hg -R ordered-hg2 id -r 2 -i --debug)` |
16106
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
194 > deadbeef102a90ea7b4a3361e4082ed620918c26 deadbeef102a90ea7b4a3361e4082ed620918c27 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
195 > EOF |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
196 $ hg convert --splicemap splicemap ordered ordered-hg2 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
197 scanning source... |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
198 splice map revision deadbeef102a90ea7b4a3361e4082ed620918c26 is not being converted, ignoring |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
199 sorting... |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
200 converting... |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
201 0 changeaagain |
26812
58a309e9cf80
convert: fix Python syntax in 'splice in' message
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
202 spliced in 717d54d67e6c31fd75ffef2ff3042bdd98418437 and 102a90ea7b4a3361e4082ed620918c261189a36a as parents of 7c364e7fa7d70ae525610c016317ed717b519d97 |
16106
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
203 $ glog -R ordered-hg2 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
204 o 3:4cb04b9afbf2 "changeaagain" files: a |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
205 |\ |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
206 | o 2:102a90ea7b4a "addb" files: b |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
207 | | |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
208 o | 1:717d54d67e6c "changea" files: a |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
209 |/ |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
210 o 0:07f494440405 "adda" files: a |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
211 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
212 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
213 Test empty conversion |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
214 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
215 $ hg convert --splicemap splicemap ordered ordered-hg2 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
216 scanning source... |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
217 splice map revision deadbeef102a90ea7b4a3361e4082ed620918c26 is not being converted, ignoring |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
218 sorting... |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
219 converting... |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
220 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
221 Test clonebranches |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
222 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
223 $ hg --config convert.hg.clonebranches=true convert \ |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
224 > --splicemap splicemap ordered ordered-hg3 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
225 initializing destination ordered-hg3 repository |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
226 scanning source... |
16162
7e279d475669
convert: fix typos in error messages
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
16118
diff
changeset
|
227 abort: revision 717d54d67e6c31fd75ffef2ff3042bdd98418437 not found in destination repository (lookups with clonebranches=true are not implemented) |
16106
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
228 [255] |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
229 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
230 Test invalid dependency |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
231 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
232 $ cat > splicemap <<EOF |
16480
123f96c4d454
tests: fix bashism in test-convert-splicemap.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16190
diff
changeset
|
233 > `(hg -R ordered id -r 2 -i --debug)` \ |
16106
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
234 > deadbeef102a90ea7b4a3361e4082ed620918c26,\ |
16480
123f96c4d454
tests: fix bashism in test-convert-splicemap.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16190
diff
changeset
|
235 > `(hg -R ordered-hg2 id -r 2 -i --debug)` |
16106
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
236 > EOF |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
237 $ hg convert --splicemap splicemap ordered ordered-hg4 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
238 initializing destination ordered-hg4 repository |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
239 scanning source... |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
240 abort: unknown splice map parent: deadbeef102a90ea7b4a3361e4082ed620918c26 |
d75aa756149b
convert: use splicemap entries when sorting revisions (issue1748)
Patrick Mezard <patrick@mezard.eu>
parents:
16105
diff
changeset
|
241 [255] |