Mercurial > hg-stable
annotate tests/test-import-bypass.t @ 24258:093e8a5e995f
commands.import: accept a prefix option
The --prefix option is meant to be relative to the root rather than the current
working directory. This is for consistency with the rest of 'hg import' --
paths in patches are otherwise considered to be relative to the root.
In upcoming patches we'll hook this option up to the patch functions.
--exact with --prefix is currently disallowed because I can't really come up
with sensible semantics for it, especially when only part of the patch is
preserved.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Fri, 06 Mar 2015 22:56:19 -0800 |
parents | c63a09b6b337 |
children | 76225ab5a5da |
rev | line source |
---|---|
14611 | 1 $ echo "[extensions]" >> $HGRCPATH |
2 $ echo "purge=" >> $HGRCPATH | |
3 | |
4 $ shortlog() { | |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
16913
diff
changeset
|
5 > hg log -G --template '{rev}:{node|short} {author} {date|hgdate} - {branch} - {desc|firstline}\n' |
14611 | 6 > } |
7 | |
8 Test --bypass with other options | |
9 | |
10 $ hg init repo-options | |
11 $ cd repo-options | |
12 $ echo a > a | |
13 $ hg ci -Am adda | |
14 adding a | |
15 $ echo a >> a | |
16 $ hg branch foo | |
17 marked working directory as branch foo | |
15615 | 18 (branches are permanent and global, did you want a bookmark?) |
14611 | 19 $ hg ci -Am changea |
20 $ hg export . > ../test.diff | |
21 $ hg up null | |
22 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
23 | |
24 Test importing an existing revision | |
22277
e116abad3afa
import: disallow meaningless combination of "--exact" and "--edit"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21417
diff
changeset
|
25 (this also tests that "hg import" disallows combination of '--exact' |
e116abad3afa
import: disallow meaningless combination of "--exact" and "--edit"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21417
diff
changeset
|
26 and '--edit') |
14611 | 27 |
22277
e116abad3afa
import: disallow meaningless combination of "--exact" and "--edit"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21417
diff
changeset
|
28 $ hg import --bypass --exact --edit ../test.diff |
e116abad3afa
import: disallow meaningless combination of "--exact" and "--edit"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21417
diff
changeset
|
29 abort: cannot use --exact with --edit |
e116abad3afa
import: disallow meaningless combination of "--exact" and "--edit"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21417
diff
changeset
|
30 [255] |
e116abad3afa
import: disallow meaningless combination of "--exact" and "--edit"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21417
diff
changeset
|
31 $ hg import --bypass --exact ../test.diff |
14611 | 32 applying ../test.diff |
33 $ shortlog | |
34 o 1:4e322f7ce8e3 test 0 0 - foo - changea | |
35 | | |
36 o 0:07f494440405 test 0 0 - default - adda | |
37 | |
38 | |
39 Test failure without --exact | |
40 | |
41 $ hg import --bypass ../test.diff | |
42 applying ../test.diff | |
43 unable to find 'a' for patching | |
44 abort: patch failed to apply | |
45 [255] | |
46 $ hg st | |
47 $ shortlog | |
48 o 1:4e322f7ce8e3 test 0 0 - foo - changea | |
49 | | |
50 o 0:07f494440405 test 0 0 - default - adda | |
51 | |
52 | |
53 Test --user, --date and --message | |
54 | |
55 $ hg up 0 | |
56 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
57 $ hg import --bypass --u test2 -d '1 0' -m patch2 ../test.diff | |
58 applying ../test.diff | |
59 $ cat .hg/last-message.txt | |
60 patch2 (no-eol) | |
61 $ shortlog | |
62 o 2:2e127d1da504 test2 1 0 - default - patch2 | |
63 | | |
64 | o 1:4e322f7ce8e3 test 0 0 - foo - changea | |
65 |/ | |
66 @ 0:07f494440405 test 0 0 - default - adda | |
67 | |
15198
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
68 $ hg rollback |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
69 repository tip rolled back to revision 1 (undo import) |
14611 | 70 |
71 Test --import-branch | |
22277
e116abad3afa
import: disallow meaningless combination of "--exact" and "--edit"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21417
diff
changeset
|
72 (this also tests that editor is not invoked for '--bypass', if the |
e116abad3afa
import: disallow meaningless combination of "--exact" and "--edit"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21417
diff
changeset
|
73 patch contains the commit message, regardless of '--edit') |
14611 | 74 |
22277
e116abad3afa
import: disallow meaningless combination of "--exact" and "--edit"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21417
diff
changeset
|
75 $ HGEDITOR=cat hg import --bypass --import-branch --edit ../test.diff |
14611 | 76 applying ../test.diff |
77 $ shortlog | |
78 o 1:4e322f7ce8e3 test 0 0 - foo - changea | |
79 | | |
80 @ 0:07f494440405 test 0 0 - default - adda | |
81 | |
15198
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
82 $ hg rollback |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
83 repository tip rolled back to revision 1 (undo import) |
14611 | 84 |
85 Test --strip | |
86 | |
87 $ hg import --bypass --strip 0 - <<EOF | |
88 > # HG changeset patch | |
89 > # User test | |
90 > # Date 0 0 | |
91 > # Branch foo | |
92 > # Node ID 4e322f7ce8e3e4203950eac9ece27bf7e45ffa6c | |
93 > # Parent 07f4944404050f47db2e5c5071e0e84e7a27bba9 | |
94 > changea | |
95 > | |
96 > diff -r 07f494440405 -r 4e322f7ce8e3 a | |
97 > --- a Thu Jan 01 00:00:00 1970 +0000 | |
98 > +++ a Thu Jan 01 00:00:00 1970 +0000 | |
99 > @@ -1,1 +1,2 @@ | |
100 > a | |
101 > +a | |
102 > EOF | |
103 applying patch from stdin | |
15198
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
104 $ hg rollback |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
105 repository tip rolled back to revision 1 (undo import) |
14611 | 106 |
107 Test unsupported combinations | |
108 | |
109 $ hg import --bypass --no-commit ../test.diff | |
110 abort: cannot use --no-commit with --bypass | |
111 [255] | |
112 $ hg import --bypass --similarity 50 ../test.diff | |
113 abort: cannot use --similarity with --bypass | |
114 [255] | |
24258
093e8a5e995f
commands.import: accept a prefix option
Siddharth Agarwal <sid0@fb.com>
parents:
22947
diff
changeset
|
115 $ hg import --exact --prefix dir/ ../test.diff |
093e8a5e995f
commands.import: accept a prefix option
Siddharth Agarwal <sid0@fb.com>
parents:
22947
diff
changeset
|
116 abort: cannot use --exact with --prefix |
093e8a5e995f
commands.import: accept a prefix option
Siddharth Agarwal <sid0@fb.com>
parents:
22947
diff
changeset
|
117 [255] |
14611 | 118 |
119 Test commit editor | |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
120 (this also tests that editor is invoked, if the patch doesn't contain |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
121 the commit message, regardless of '--edit') |
14611 | 122 |
16124
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
15623
diff
changeset
|
123 $ cat > ../test.diff <<EOF |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
15623
diff
changeset
|
124 > diff -r 07f494440405 -r 4e322f7ce8e3 a |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
15623
diff
changeset
|
125 > --- a/a Thu Jan 01 00:00:00 1970 +0000 |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
15623
diff
changeset
|
126 > +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
15623
diff
changeset
|
127 > @@ -1,1 +1,2 @@ |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
15623
diff
changeset
|
128 > -a |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
15623
diff
changeset
|
129 > +b |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
15623
diff
changeset
|
130 > +c |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
15623
diff
changeset
|
131 > EOF |
14611 | 132 $ HGEDITOR=cat hg import --bypass ../test.diff |
133 applying ../test.diff | |
134 | |
135 | |
136 HG: Enter commit message. Lines beginning with 'HG:' are removed. | |
137 HG: Leave message empty to abort commit. | |
138 HG: -- | |
139 HG: user: test | |
140 HG: branch 'default' | |
141 HG: changed a | |
142 abort: empty commit message | |
143 [255] | |
144 | |
145 Test patch.eol is handled | |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
146 (this also tests that editor is not invoked for '--bypass', if the |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
147 commit message is explicitly specified, regardless of '--edit') |
14611 | 148 |
22947
c63a09b6b337
tests: use $PYTHON instead of hardcoding python
Augie Fackler <raf@durin42.com>
parents:
22278
diff
changeset
|
149 $ $PYTHON -c 'file("a", "wb").write("a\r\n")' |
14611 | 150 $ hg ci -m makeacrlf |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20117
diff
changeset
|
151 $ HGEDITOR=cat hg import -m 'should fail because of eol' --edit --bypass ../test.diff |
14611 | 152 applying ../test.diff |
153 patching file a | |
154 Hunk #1 FAILED at 0 | |
155 abort: patch failed to apply | |
156 [255] | |
157 $ hg --config patch.eol=auto import -d '0 0' -m 'test patch.eol' --bypass ../test.diff | |
158 applying ../test.diff | |
159 $ shortlog | |
16124
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
15623
diff
changeset
|
160 o 3:c606edafba99 test 0 0 - default - test patch.eol |
14611 | 161 | |
162 @ 2:872023de769d test 0 0 - default - makeacrlf | |
163 | | |
164 | o 1:4e322f7ce8e3 test 0 0 - foo - changea | |
165 |/ | |
166 o 0:07f494440405 test 0 0 - default - adda | |
167 | |
168 | |
169 Test applying multiple patches | |
170 | |
171 $ hg up -qC 0 | |
172 $ echo e > e | |
173 $ hg ci -Am adde | |
174 adding e | |
175 created new head | |
176 $ hg export . > ../patch1.diff | |
177 $ hg up -qC 1 | |
178 $ echo f > f | |
179 $ hg ci -Am addf | |
180 adding f | |
181 $ hg export . > ../patch2.diff | |
182 $ cd .. | |
183 $ hg clone -r1 repo-options repo-multi1 | |
184 adding changesets | |
185 adding manifests | |
186 adding file changes | |
187 added 2 changesets with 2 changes to 1 files | |
188 updating to branch foo | |
189 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
190 $ cd repo-multi1 | |
191 $ hg up 0 | |
192 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
193 $ hg import --bypass ../patch1.diff ../patch2.diff | |
194 applying ../patch1.diff | |
195 applying ../patch2.diff | |
196 $ shortlog | |
197 o 3:bc8ca3f8a7c4 test 0 0 - default - addf | |
198 | | |
199 o 2:16581080145e test 0 0 - default - adde | |
200 | | |
201 | o 1:4e322f7ce8e3 test 0 0 - foo - changea | |
202 |/ | |
203 @ 0:07f494440405 test 0 0 - default - adda | |
204 | |
205 | |
206 Test applying multiple patches with --exact | |
207 | |
208 $ cd .. | |
209 $ hg clone -r1 repo-options repo-multi2 | |
210 adding changesets | |
211 adding manifests | |
212 adding file changes | |
213 added 2 changesets with 2 changes to 1 files | |
214 updating to branch foo | |
215 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
216 $ cd repo-multi2 | |
217 $ hg import --bypass --exact ../patch1.diff ../patch2.diff | |
218 applying ../patch1.diff | |
219 applying ../patch2.diff | |
220 $ shortlog | |
221 o 3:d60cb8989666 test 0 0 - foo - addf | |
222 | | |
223 | o 2:16581080145e test 0 0 - default - adde | |
224 | | | |
225 @ | 1:4e322f7ce8e3 test 0 0 - foo - changea | |
226 |/ | |
227 o 0:07f494440405 test 0 0 - default - adda | |
228 | |
229 | |
230 $ cd .. | |
231 | |
22278
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22277
diff
changeset
|
232 Test avoiding editor invocation at applying the patch with --exact |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22277
diff
changeset
|
233 even if commit message is empty |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22277
diff
changeset
|
234 |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22277
diff
changeset
|
235 $ cd repo-options |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22277
diff
changeset
|
236 |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22277
diff
changeset
|
237 $ echo a >> a |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22277
diff
changeset
|
238 $ hg commit -m ' ' |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22277
diff
changeset
|
239 $ hg tip -T "{node}\n" |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22277
diff
changeset
|
240 1b77bc7d1db9f0e7f1716d515b630516ab386c89 |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22277
diff
changeset
|
241 $ hg export -o ../empty-log.diff . |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22277
diff
changeset
|
242 $ hg update -q -C ".^1" |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22277
diff
changeset
|
243 $ hg --config extensions.strip= strip -q tip |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22277
diff
changeset
|
244 $ HGEDITOR=cat hg import --exact --bypass ../empty-log.diff |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22277
diff
changeset
|
245 applying ../empty-log.diff |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22277
diff
changeset
|
246 $ hg tip -T "{node}\n" |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22277
diff
changeset
|
247 1b77bc7d1db9f0e7f1716d515b630516ab386c89 |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22277
diff
changeset
|
248 |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22277
diff
changeset
|
249 $ cd .. |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22277
diff
changeset
|
250 |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16124
diff
changeset
|
251 #if symlink execbit |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16124
diff
changeset
|
252 |
14611 | 253 Test complicated patch with --exact |
254 | |
255 $ hg init repo-exact | |
256 $ cd repo-exact | |
257 $ echo a > a | |
258 $ echo c > c | |
259 $ echo d > d | |
260 $ echo e > e | |
261 $ echo f > f | |
262 $ chmod +x f | |
263 $ ln -s c linkc | |
264 $ hg ci -Am t | |
265 adding a | |
266 adding c | |
267 adding d | |
268 adding e | |
269 adding f | |
270 adding linkc | |
271 $ hg cp a aa1 | |
272 $ echo b >> a | |
273 $ echo b > b | |
274 $ hg add b | |
275 $ hg cp a aa2 | |
276 $ echo aa >> aa2 | |
277 $ chmod +x e | |
278 $ chmod -x f | |
279 $ ln -s a linka | |
280 $ hg rm d | |
281 $ hg rm linkc | |
282 $ hg mv c cc | |
283 $ hg ci -m patch | |
284 $ hg export --git . > ../test.diff | |
285 $ hg up -C null | |
286 0 files updated, 0 files merged, 7 files removed, 0 files unresolved | |
287 $ hg purge | |
288 $ hg st | |
289 $ hg import --bypass --exact ../test.diff | |
290 applying ../test.diff | |
291 | |
292 The patch should have matched the exported revision and generated no additional | |
293 data. If not, diff both heads to debug it. | |
294 | |
295 $ shortlog | |
296 o 1:2978fd5c8aa4 test 0 0 - default - patch | |
297 | | |
298 o 0:a0e19e636a43 test 0 0 - default - t | |
299 | |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16124
diff
changeset
|
300 #endif |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
301 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
302 $ cd .. |