annotate tests/test-convert-filemap.t @ 14327:d943412e2fba

extdiff: grammar "allows to" -> "allows one to" The verb to allow requires a direct object. Lintian, a Debian tool to find common mistakes, reported it. I'm not a native english speaker but I think this is correct.
author Javi Merino <cibervicho@gmail.com>
date Sun, 15 May 2011 18:00:22 +0100
parents 1fe82c93b8e2
children 1e9451476bf8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
1
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
2 $ HGMERGE=true; export HGMERGE
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
3 $ echo '[extensions]' >> $HGRCPATH
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
4 $ echo 'graphlog =' >> $HGRCPATH
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
5 $ echo 'convert =' >> $HGRCPATH
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
6 $ glog()
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
7 > {
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
8 > hg glog --template '{rev} "{desc}" files: {files}\n' "$@"
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
9 > }
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
10 $ hg init source
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
11 $ cd source
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
12 $ echo foo > foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
13 $ echo baz > baz
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
14 $ mkdir -p dir/subdir
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
15 $ echo dir/file >> dir/file
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
16 $ echo dir/file2 >> dir/file2
14151
1fe82c93b8e2 convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents: 13968
diff changeset
17 $ echo dir/file3 >> dir/file3 # to be corrupted in rev 0
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
18 $ echo dir/subdir/file3 >> dir/subdir/file3
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
19 $ echo dir/subdir/file4 >> dir/subdir/file4
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
20 $ hg ci -d '0 0' -qAm '0: add foo baz dir/'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
21 $ echo bar > bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
22 $ echo quux > quux
14151
1fe82c93b8e2 convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents: 13968
diff changeset
23 $ echo dir/file4 >> dir/file4 # to be corrupted in rev 1
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
24 $ hg copy foo copied
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
25 $ hg ci -d '1 0' -qAm '1: add bar quux; copy foo to copied'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
26 $ echo >> foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
27 $ hg ci -d '2 0' -m '2: change foo'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
28 $ hg up -qC 1
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
29 $ echo >> bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
30 $ echo >> quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
31 $ hg ci -d '3 0' -m '3: change bar quux'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
32 created new head
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
33 $ hg up -qC 2
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
34 $ hg merge -qr 3
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
35 $ echo >> bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
36 $ echo >> baz
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
37 $ hg ci -d '4 0' -m '4: first merge; change bar baz'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
38 $ echo >> bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
39 $ echo 1 >> baz
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
40 $ echo >> quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
41 $ hg ci -d '5 0' -m '5: change bar baz quux'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
42 $ hg up -qC 4
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
43 $ echo >> foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
44 $ echo 2 >> baz
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
45 $ hg ci -d '6 0' -m '6: change foo baz'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
46 created new head
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
47 $ hg up -qC 5
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
48 $ hg merge -qr 6
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
49 $ echo >> bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
50 $ hg ci -d '7 0' -m '7: second merge; change bar'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
51 $ echo >> foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
52 $ hg ci -m '8: change foo'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
53 $ glog
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
54 @ 8 "8: change foo" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
55 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
56 o 7 "7: second merge; change bar" files: bar baz
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
57 |\
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
58 | o 6 "6: change foo baz" files: baz foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
59 | |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
60 o | 5 "5: change bar baz quux" files: bar baz quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
61 |/
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
62 o 4 "4: first merge; change bar baz" files: bar baz
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
63 |\
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
64 | o 3 "3: change bar quux" files: bar quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
65 | |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
66 o | 2 "2: change foo" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
67 |/
14151
1fe82c93b8e2 convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents: 13968
diff changeset
68 o 1 "1: add bar quux; copy foo to copied" files: bar copied dir/file4 quux
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
69 |
14151
1fe82c93b8e2 convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents: 13968
diff changeset
70 o 0 "0: add foo baz dir/" files: baz dir/file dir/file2 dir/file3 dir/subdir/file3 dir/subdir/file4 foo
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
71
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
72
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
73 final file versions in this repo:
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
74
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
75 $ hg manifest --debug
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
76 9463f52fe115e377cf2878d4fc548117211063f2 644 bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
77 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
78 7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644 copied
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
79 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir/file
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
80 75e6d3f8328f5f6ace6bf10b98df793416a09dca 644 dir/file2
14151
1fe82c93b8e2 convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents: 13968
diff changeset
81 e96dce0bc6a217656a3a410e5e6bec2c4f42bf7c 644 dir/file3
1fe82c93b8e2 convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents: 13968
diff changeset
82 6edd55f559cdce67132b12ca09e09cee08b60442 644 dir/file4
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
83 5fe139720576e18e34bcc9f79174db8897c8afe9 644 dir/subdir/file3
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
84 57a1c1511590f3de52874adfa04effe8a77d64af 644 dir/subdir/file4
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
85 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
86 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
87 $ hg debugrename copied
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
88 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
89 $ echo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
90
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
91 $ cd ..
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
92 $ splitrepo()
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
93 > {
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
94 > msg="$1"
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
95 > files="$2"
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
96 > opts=$3
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
97 > echo "% $files: $msg"
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
98 > prefix=`echo "$files" | sed -e 's/ /-/g'`
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
99 > fmap="$prefix.fmap"
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
100 > repo="$prefix.repo"
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
101 > for i in $files; do
12743
4c4aeaab2339 check-code: add 'no tab indent' check for unified tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 12529
diff changeset
102 > echo "include $i" >> "$fmap"
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
103 > done
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
104 > hg -q convert $opts --filemap "$fmap" --datesort source "$repo"
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
105 > hg up -q -R "$repo"
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
106 > glog -R "$repo"
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
107 > hg -R "$repo" manifest --debug
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
108 > }
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
109 $ splitrepo 'skip unwanted merges; use 1st parent in 1st merge, 2nd in 2nd' foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
110 % foo: skip unwanted merges; use 1st parent in 1st merge, 2nd in 2nd
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
111 @ 3 "8: change foo" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
112 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
113 o 2 "6: change foo baz" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
114 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
115 o 1 "2: change foo" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
116 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
117 o 0 "0: add foo baz dir/" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
118
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
119 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
120 $ splitrepo 'merges are not merges anymore' bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
121 % bar: merges are not merges anymore
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
122 @ 4 "7: second merge; change bar" files: bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
123 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
124 o 3 "5: change bar baz quux" files: bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
125 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
126 o 2 "4: first merge; change bar baz" files: bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
127 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
128 o 1 "3: change bar quux" files: bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
129 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
130 o 0 "1: add bar quux; copy foo to copied" files: bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
131
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
132 9463f52fe115e377cf2878d4fc548117211063f2 644 bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
133 $ splitrepo '1st merge is not a merge anymore; 2nd still is' baz
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
134 % baz: 1st merge is not a merge anymore; 2nd still is
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
135 @ 4 "7: second merge; change bar" files: baz
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
136 |\
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
137 | o 3 "6: change foo baz" files: baz
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
138 | |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
139 o | 2 "5: change bar baz quux" files: baz
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
140 |/
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
141 o 1 "4: first merge; change bar baz" files: baz
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
142 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
143 o 0 "0: add foo baz dir/" files: baz
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
144
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
145 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
146 $ splitrepo 'we add additional merges when they are interesting' 'foo quux'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
147 % foo quux: we add additional merges when they are interesting
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
148 @ 8 "8: change foo" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
149 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
150 o 7 "7: second merge; change bar" files:
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
151 |\
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
152 | o 6 "6: change foo baz" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
153 | |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
154 o | 5 "5: change bar baz quux" files: quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
155 |/
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
156 o 4 "4: first merge; change bar baz" files:
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
157 |\
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
158 | o 3 "3: change bar quux" files: quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
159 | |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
160 o | 2 "2: change foo" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
161 |/
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
162 o 1 "1: add bar quux; copy foo to copied" files: quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
163 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
164 o 0 "0: add foo baz dir/" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
165
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
166 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
167 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
168 $ splitrepo 'partial conversion' 'bar quux' '-r 3'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
169 % bar quux: partial conversion
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
170 @ 1 "3: change bar quux" files: bar quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
171 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
172 o 0 "1: add bar quux; copy foo to copied" files: bar quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
173
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
174 b79105bedc55102f394e90a789c9c380117c1b4a 644 bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
175 db0421cc6b685a458c8d86c7d5c004f94429ea23 644 quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
176 $ splitrepo 'complete the partial conversion' 'bar quux'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
177 % bar quux: complete the partial conversion
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
178 @ 4 "7: second merge; change bar" files: bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
179 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
180 o 3 "5: change bar baz quux" files: bar quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
181 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
182 o 2 "4: first merge; change bar baz" files: bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
183 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
184 o 1 "3: change bar quux" files: bar quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
185 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
186 o 0 "1: add bar quux; copy foo to copied" files: bar quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
187
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
188 9463f52fe115e377cf2878d4fc548117211063f2 644 bar
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
189 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
190 $ rm -r foo.repo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
191 $ splitrepo 'partial conversion' 'foo' '-r 3'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
192 % foo: partial conversion
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
193 @ 0 "0: add foo baz dir/" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
194
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
195 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
196 $ splitrepo 'complete the partial conversion' 'foo'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
197 % foo: complete the partial conversion
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
198 @ 3 "8: change foo" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
199 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
200 o 2 "6: change foo baz" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
201 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
202 o 1 "2: change foo" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
203 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
204 o 0 "0: add foo baz dir/" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
205
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
206 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
207 $ splitrepo 'copied file; source not included in new repo' copied
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
208 % copied: copied file; source not included in new repo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
209 @ 0 "1: add bar quux; copy foo to copied" files: copied
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
210
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
211 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 copied
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
212 $ hg --cwd copied.repo debugrename copied
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
213 copied not renamed
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
214 $ splitrepo 'copied file; source included in new repo' 'foo copied'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
215 % foo copied: copied file; source included in new repo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
216 @ 4 "8: change foo" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
217 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
218 o 3 "6: change foo baz" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
219 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
220 o 2 "2: change foo" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
221 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
222 o 1 "1: add bar quux; copy foo to copied" files: copied
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
223 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
224 o 0 "0: add foo baz dir/" files: foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
225
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
226 7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644 copied
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
227 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
228 $ hg --cwd foo-copied.repo debugrename copied
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
229 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
230 $ cat > renames.fmap <<EOF
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
231 > include dir
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
232 > exclude dir/file2
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
233 > rename dir dir2
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
234 > include foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
235 > include copied
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
236 > rename foo foo2
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
237 > rename copied copied2
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
238 > exclude dir/subdir
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
239 > include dir/subdir/file3
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
240 > EOF
14151
1fe82c93b8e2 convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents: 13968
diff changeset
241 $ rm source/.hg/store/data/dir/file3.i
1fe82c93b8e2 convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents: 13968
diff changeset
242 $ rm source/.hg/store/data/dir/file4.i
1fe82c93b8e2 convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents: 13968
diff changeset
243 $ hg -q convert --filemap renames.fmap --datesort source dummydest
1fe82c93b8e2 convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents: 13968
diff changeset
244 abort: data/dir/file3.i@e96dce0bc6a2: no match found!
1fe82c93b8e2 convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents: 13968
diff changeset
245 [255]
1fe82c93b8e2 convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents: 13968
diff changeset
246 $ hg -q convert --filemap renames.fmap --datesort --config convert.hg.ignoreerrors=1 source renames.repo
1fe82c93b8e2 convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents: 13968
diff changeset
247 ignoring: data/dir/file3.i@e96dce0bc6a2: no match found
1fe82c93b8e2 convert: also catch missing revlogs when introduced in repo roots
Mads Kiilerich <mads@kiilerich.com>
parents: 13968
diff changeset
248 ignoring: data/dir/file4.i@6edd55f559cd: no match found
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
249 $ hg up -q -R renames.repo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
250 $ glog -R renames.repo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
251 @ 4 "8: change foo" files: foo2
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
252 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
253 o 3 "6: change foo baz" files: foo2
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
254 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
255 o 2 "2: change foo" files: foo2
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
256 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
257 o 1 "1: add bar quux; copy foo to copied" files: copied2
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
258 |
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
259 o 0 "0: add foo baz dir/" files: dir2/file dir2/subdir/file3 foo2
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
260
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
261 $ hg -R renames.repo manifest --debug
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
262 d43feacba7a4f1f2080dde4a4b985bd8a0236d46 644 copied2
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
263 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir2/file
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
264 5fe139720576e18e34bcc9f79174db8897c8afe9 644 dir2/subdir/file3
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
265 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo2
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
266 $ hg --cwd renames.repo debugrename copied2
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
267 copied2 renamed from foo2:2ed2a3912a0b24502043eae84ee4b279c18b90dd
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
268
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
269 copied:
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
270
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
271 $ hg --cwd source cat copied
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
272 foo
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
273
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
274 copied2:
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
275
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
276 $ hg --cwd renames.repo cat copied2
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
277 foo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
278
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
279 filemap errors
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
280
12529
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
281 $ cat > errors.fmap <<EOF
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
282 > include dir/ # beware that comments changes error line numbers!
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
283 > exclude /dir
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
284 > rename dir//dir /dir//dir/ "out of sync"
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
285 > include
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
286 > EOF
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
287 $ hg -q convert --filemap errors.fmap source errors.repo
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
288 errors.fmap:1: superfluous / in exclude 'dir/'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
289 errors.fmap:3: superfluous / in include '/dir'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
290 errors.fmap:3: superfluous / in rename '/dir'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
291 errors.fmap:3: superfluous / in exclude 'dir//dir'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
292 errors.fmap:4: unknown directive 'out of sync'
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
293 errors.fmap:5: path to exclude is missing
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
294 abort: errors in filemap
00e7a7fdae7d tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents: 11680
diff changeset
295 [255]
13968
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
296
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
297 test branch closing revision pruning if branch is pruned
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
298
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
299 $ hg init branchpruning
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
300 $ cd branchpruning
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
301 $ hg branch foo
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
302 marked working directory as branch foo
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
303 $ echo a > a
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
304 $ hg ci -Am adda
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
305 adding a
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
306 $ hg ci --close-branch -m closefoo
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
307 $ hg up 0
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
308 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
309 $ hg branch empty
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
310 marked working directory as branch empty
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
311 $ hg ci -m emptybranch
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
312 $ hg ci --close-branch -m closeempty
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
313 $ hg up 0
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
314 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
315 $ hg branch default
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
316 marked working directory as branch default
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
317 $ echo b > b
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
318 $ hg ci -Am addb
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
319 adding b
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
320 $ hg ci --close-branch -m closedefault
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
321 $ cat > filemap <<EOF
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
322 > include b
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
323 > EOF
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
324 $ cd ..
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
325 $ hg convert branchpruning branchpruning-hg1
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
326 initializing destination branchpruning-hg1 repository
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
327 scanning source...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
328 sorting...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
329 converting...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
330 5 adda
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
331 4 closefoo
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
332 3 emptybranch
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
333 2 closeempty
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
334 1 addb
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
335 0 closedefault
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
336 $ glog -R branchpruning-hg1
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
337 o 5 "closedefault" files:
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
338 |
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
339 o 4 "addb" files: b
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
340 |
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
341 | o 3 "closeempty" files:
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
342 | |
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
343 | o 2 "emptybranch" files:
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
344 |/
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
345 | o 1 "closefoo" files:
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
346 |/
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
347 o 0 "adda" files: a
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
348
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
349
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
350 exercise incremental conversion at the same time
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
351
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
352 $ hg convert -r0 --filemap branchpruning/filemap branchpruning branchpruning-hg2
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
353 initializing destination branchpruning-hg2 repository
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
354 scanning source...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
355 sorting...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
356 converting...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
357 0 adda
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
358 $ hg convert -r4 --filemap branchpruning/filemap branchpruning branchpruning-hg2
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
359 scanning source...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
360 sorting...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
361 converting...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
362 0 addb
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
363 $ hg convert --filemap branchpruning/filemap branchpruning branchpruning-hg2
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
364 scanning source...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
365 sorting...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
366 converting...
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
367 3 closefoo
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
368 2 emptybranch
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
369 1 closeempty
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
370 0 closedefault
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
371 $ glog -R branchpruning-hg2
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
372 o 1 "closedefault" files:
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
373 |
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
374 o 0 "addb" files: b
82845434e974 convert: make filemap prune useless branch closing revs (issue2774)
Patrick Mezard <pmezard@gmail.com>
parents: 12743
diff changeset
375