Mercurial > hg
annotate tests/test-convert-filemap.t @ 12740:b86c6954ec4c
serve: fix https mode and add test
The https mode failed in super because BaseRequestHandler is an old-style
class.
This introduces the first test of https client/server functionality - and
"hghave ssl". The test is currently only run on Python 2.6.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Sun, 17 Oct 2010 04:13:35 +0200 |
parents | 00e7a7fdae7d |
children | 4c4aeaab2339 |
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 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
17 $ echo dir/subdir/file3 >> dir/subdir/file3 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
18 $ echo dir/subdir/file4 >> dir/subdir/file4 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
19 $ 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
|
20 $ echo bar > bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
21 $ echo quux > quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
22 $ hg copy foo copied |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
23 $ 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
|
24 $ echo >> foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
25 $ hg ci -d '2 0' -m '2: change foo' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
26 $ hg up -qC 1 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
27 $ echo >> bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
28 $ echo >> quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
29 $ 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
|
30 created new head |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
31 $ hg up -qC 2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
32 $ hg merge -qr 3 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
33 $ echo >> bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
34 $ echo >> baz |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
35 $ 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
|
36 $ echo >> bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
37 $ echo 1 >> baz |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
38 $ echo >> quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
39 $ 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
|
40 $ hg up -qC 4 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
41 $ echo >> foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
42 $ echo 2 >> baz |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
43 $ 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
|
44 created new head |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
45 $ hg up -qC 5 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
46 $ hg merge -qr 6 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
47 $ echo >> bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
48 $ 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
|
49 $ echo >> foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
50 $ hg ci -m '8: change foo' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
51 $ glog |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
52 @ 8 "8: change foo" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
53 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
54 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
|
55 |\ |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
56 | o 6 "6: change foo baz" files: baz foo |
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 | 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
|
59 |/ |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
60 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
|
61 |\ |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
62 | o 3 "3: change bar quux" files: bar quux |
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 | 2 "2: change foo" files: foo |
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 1 "1: add bar quux; copy foo to copied" files: bar copied quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
67 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
68 o 0 "0: add foo baz dir/" files: baz dir/file dir/file2 dir/subdir/file3 dir/subdir/file4 foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
69 |
5379
d3e51dc804f8
mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
70 |
12529
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
71 final file versions in this repo: |
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 $ hg manifest --debug |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
74 9463f52fe115e377cf2878d4fc548117211063f2 644 bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
75 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
76 7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644 copied |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
77 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir/file |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
78 75e6d3f8328f5f6ace6bf10b98df793416a09dca 644 dir/file2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
79 5fe139720576e18e34bcc9f79174db8897c8afe9 644 dir/subdir/file3 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
80 57a1c1511590f3de52874adfa04effe8a77d64af 644 dir/subdir/file4 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
81 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
82 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
83 $ hg debugrename copied |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
84 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
85 $ echo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
86 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
87 $ cd .. |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
88 $ splitrepo() |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
89 > { |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
90 > msg="$1" |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
91 > files="$2" |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
92 > opts=$3 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
93 > echo "% $files: $msg" |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
94 > prefix=`echo "$files" | sed -e 's/ /-/g'` |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
95 > fmap="$prefix.fmap" |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
96 > repo="$prefix.repo" |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
97 > for i in $files; do |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
98 > echo "include $i" >> "$fmap" |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
99 > done |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
100 > hg -q convert $opts --filemap "$fmap" --datesort source "$repo" |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
101 > hg up -q -R "$repo" |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
102 > glog -R "$repo" |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
103 > hg -R "$repo" manifest --debug |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
104 > } |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
105 $ 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
|
106 % 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
|
107 @ 3 "8: change foo" files: foo |
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 o 2 "6: change foo baz" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
110 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
111 o 1 "2: 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 0 "0: add foo baz dir/" 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 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
116 $ splitrepo 'merges are not merges anymore' bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
117 % bar: merges are not merges anymore |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
118 @ 4 "7: second merge; change bar" files: bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
119 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
120 o 3 "5: change bar baz quux" files: bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
121 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
122 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
|
123 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
124 o 1 "3: change bar 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 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
|
127 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
128 9463f52fe115e377cf2878d4fc548117211063f2 644 bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
129 $ 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
|
130 % 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
|
131 @ 4 "7: second merge; change bar" files: baz |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
132 |\ |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
133 | o 3 "6: change foo baz" files: baz |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
134 | | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
135 o | 2 "5: change bar baz quux" 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 1 "4: first merge; change bar 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 0 "0: add foo baz dir/" 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 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
142 $ 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
|
143 % 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
|
144 @ 8 "8: change foo" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
145 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
146 o 7 "7: second merge; change bar" files: |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
147 |\ |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
148 | o 6 "6: change foo baz" 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 | 5 "5: change bar baz quux" files: quux |
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 4 "4: first merge; change bar baz" files: |
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 3 "3: change bar 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 | 2 "2: change foo" files: foo |
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 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
|
159 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
160 o 0 "0: add foo baz dir/" 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 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
163 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
164 $ splitrepo 'partial conversion' 'bar quux' '-r 3' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
165 % bar quux: partial conversion |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
166 @ 1 "3: change bar quux" files: bar quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
167 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
168 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
|
169 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
170 b79105bedc55102f394e90a789c9c380117c1b4a 644 bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
171 db0421cc6b685a458c8d86c7d5c004f94429ea23 644 quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
172 $ splitrepo 'complete the partial conversion' 'bar quux' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
173 % bar quux: complete the partial conversion |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
174 @ 4 "7: second merge; change bar" files: bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
175 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
176 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
|
177 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
178 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
|
179 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
180 o 1 "3: change bar 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 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
|
183 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
184 9463f52fe115e377cf2878d4fc548117211063f2 644 bar |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
185 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
186 $ rm -r foo.repo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
187 $ splitrepo 'partial conversion' 'foo' '-r 3' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
188 % foo: partial conversion |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
189 @ 0 "0: add foo baz dir/" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
190 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
191 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
192 $ splitrepo 'complete the partial conversion' 'foo' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
193 % foo: complete the partial conversion |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
194 @ 3 "8: change foo" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
195 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
196 o 2 "6: change foo baz" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
197 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
198 o 1 "2: 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 0 "0: add foo baz dir/" 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 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
203 $ 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
|
204 % copied: copied file; source not included in new repo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
205 @ 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
|
206 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
207 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 copied |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
208 $ hg --cwd copied.repo debugrename copied |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
209 copied not renamed |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
210 $ 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
|
211 % foo copied: copied file; source included in new repo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
212 @ 4 "8: change foo" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
213 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
214 o 3 "6: change foo baz" files: foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
215 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
216 o 2 "2: 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 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
|
219 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
220 o 0 "0: add foo baz dir/" 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 7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644 copied |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
223 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
224 $ hg --cwd foo-copied.repo debugrename copied |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
225 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
226 $ cat > renames.fmap <<EOF |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
227 > include dir |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
228 > exclude dir/file2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
229 > rename dir dir2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
230 > include foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
231 > include copied |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
232 > rename foo foo2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
233 > rename copied copied2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
234 > exclude dir/subdir |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
235 > include dir/subdir/file3 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
236 > EOF |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
237 $ hg -q convert --filemap renames.fmap --datesort source renames.repo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
238 $ hg up -q -R renames.repo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
239 $ glog -R renames.repo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
240 @ 4 "8: change foo" files: foo2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
241 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
242 o 3 "6: change foo baz" files: foo2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
243 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
244 o 2 "2: change foo" files: foo2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
245 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
246 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
|
247 | |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
248 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
|
249 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
250 $ hg -R renames.repo manifest --debug |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
251 d43feacba7a4f1f2080dde4a4b985bd8a0236d46 644 copied2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
252 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir2/file |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
253 5fe139720576e18e34bcc9f79174db8897c8afe9 644 dir2/subdir/file3 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
254 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
255 $ hg --cwd renames.repo debugrename copied2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
256 copied2 renamed from foo2:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
5379
d3e51dc804f8
mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
257 |
12529
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
258 copied: |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
259 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
260 $ hg --cwd source cat copied |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
261 foo |
5379
d3e51dc804f8
mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
262 |
12529
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
263 copied2: |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
264 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
265 $ hg --cwd renames.repo cat copied2 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
266 foo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
267 |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
268 filemap errors |
5379
d3e51dc804f8
mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
269 |
12529
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
270 $ cat > errors.fmap <<EOF |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
271 > include dir/ # beware that comments changes error line numbers! |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
272 > exclude /dir |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
273 > rename dir//dir /dir//dir/ "out of sync" |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
274 > include |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
275 > EOF |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
276 $ hg -q convert --filemap errors.fmap source errors.repo |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
277 errors.fmap:1: superfluous / in exclude 'dir/' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
278 errors.fmap:3: superfluous / in include '/dir' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
279 errors.fmap:3: superfluous / in rename '/dir' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
280 errors.fmap:3: superfluous / in exclude 'dir//dir' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
281 errors.fmap:4: unknown directive 'out of sync' |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
282 errors.fmap:5: path to exclude is missing |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
283 abort: errors in filemap |
00e7a7fdae7d
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com>
parents:
11680
diff
changeset
|
284 [255] |