1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
|
#!/bin/sh
# Copyright (c) 2006 Karl Hasselström
test_description='Test the import command'
. ./test-lib.sh
test_expect_success \
'Initialize the StGIT repository' \
'
cp $STG_ROOT/t/t1800-import/foo.txt . &&
stg add foo.txt &&
git commit -a -m "initial version" &&
stg init
'
test_expect_success \
'Apply a patch created with "git diff"' \
'
stg import $STG_ROOT/t/t1800-import/git-diff &&
[ $(git cat-file -p $(stg id) \
| grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") = 1 ] &&
stg delete ..
'
test_expect_success \
'Apply a patch from a URL' \
'
stg import -u file://$STG_ROOT/t/t1800-import/git-diff &&
[ $(git cat-file -p $(stg id) \
| grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") = 1 ] &&
stg delete ..
'
test_expect_success \
'Apply a patch created with "git diff" using -p1' \
'
stg import -p1 $STG_ROOT/t/t1800-import/git-diff &&
[ $(git cat-file -p $(stg id) \
| grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") = 1 ] &&
stg delete ..
'
test_expect_success \
'Apply a patch created with "git diff" using -p0' \
'
stg import -p0 $STG_ROOT/t/t1800-import/git-diff-p0 &&
[ $(git cat-file -p $(stg id) \
| grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") = 1 ] &&
stg delete ..
'
test_expect_success \
'Apply a patch created with "git diff" using -p2' \
'
! stg import -p2 $STG_ROOT/t/t1800-import/git-diff &&
[ $(git cat-file -p $(stg id) \
| grep -c "tree a5850c97490398571d41d6304dd940800550f507") = 1 ] &&
stg delete ..
'
test_expect_success \
'Apply a patch created with "git diff" from a subdirectory' \
'
mkdir subdir && cd subdir &&
stg import $STG_ROOT/t/t1800-import/git-diff &&
[ $(git cat-file -p $(stg id) \
| grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") = 1 ] &&
stg delete .. &&
cd ..
'
test_expect_success \
'Apply a patch created with GNU diff' \
'
stg import $STG_ROOT/t/t1800-import/gnu-diff &&
[ $(git cat-file -p $(stg id) \
| grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") = 1 ] &&
stg delete ..
'
test_expect_success \
'Apply a patch created with "stg export"' \
'
stg import $STG_ROOT/t/t1800-import/stg-export &&
[ $(git cat-file -p $(stg id) \
| grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") = 1 ] &&
stg delete ..
'
test_expect_success \
'Apply a patch from an 8bit-encoded e-mail' \
'
stg import -m $STG_ROOT/t/t1800-import/email-8bit &&
[ $(git cat-file -p $(stg id) \
| grep -c "tree 030be42660323ff2a1958f9ee79589a4f3fbee2f") = 1 ] &&
[ $(git cat-file -p $(stg id) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
stg delete ..
'
test_expect_success \
'Apply a patch from latin1-encoded email specifying utf-8 charset' \
'
iconv -f UTF8 -t LATIN1 -o email-latin1 $STG_ROOT/t/t1800-import/email-8bit &&
stg import -m email-latin1 &&
[ $(git cat-file -p $(stg id) \
| grep -c "tree cf0f9884fdb30bca14d2411e1711f6ae413c9213") = 1 ] &&
[ $(git cat-file -p $(stg id) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
stg delete ..
'
test_expect_success \
'Apply a patch from email with quoted "From" header' \
'
stg import -m $STG_ROOT/t/t1800-import/email-quoted-from &&
[ $(git cat-file -p $(stg id) \
| grep -c "tree 030be42660323ff2a1958f9ee79589a4f3fbee2f") = 1 ] &&
[ $(git cat-file -p $(stg id) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
stg delete ..
'
test_expect_success \
'Apply a patch from a QP-encoded e-mail' \
'
stg import -m $STG_ROOT/t/t1800-import/email-qp &&
[ $(git cat-file -p $(stg id) \
| grep -c "tree 030be42660323ff2a1958f9ee79589a4f3fbee2f") = 1 ] &&
[ $(git cat-file -p $(stg id) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
stg delete ..
'
test_expect_success \
'Apply several patches from an mbox file' \
'
stg import -M $STG_ROOT/t/t1800-import/email-mbox &&
[ $(git cat-file -p $(stg id change-1) \
| grep -c "tree 401bef82cd9fb403aba18f480a63844416a2e023") = 1 ] &&
[ $(git cat-file -p $(stg id change-1) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
[ $(git cat-file -p $(stg id change-2) \
| grep -c "tree e49dbce010ec7f441015a8c64bce0b99108af4cc") = 1 ] &&
[ $(git cat-file -p $(stg id change-2) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
[ $(git cat-file -p $(stg id change-3) \
| grep -c "tree 166bbaf27a44aee21ba78c98822a741e6f7d78f5") = 1 ] &&
[ $(git cat-file -p $(stg id change-3) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
stg delete ..
'
test_expect_success \
'Apply several patches from an mbox file from stdin' \
'
cat $STG_ROOT/t/t1800-import/email-mbox | stg import -M &&
[ $(git cat-file -p $(stg id change-1) \
| grep -c "tree 401bef82cd9fb403aba18f480a63844416a2e023") = 1 ] &&
[ $(git cat-file -p $(stg id change-1) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
[ $(git cat-file -p $(stg id change-2) \
| grep -c "tree e49dbce010ec7f441015a8c64bce0b99108af4cc") = 1 ] &&
[ $(git cat-file -p $(stg id change-2) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
[ $(git cat-file -p $(stg id change-3) \
| grep -c "tree 166bbaf27a44aee21ba78c98822a741e6f7d78f5") = 1 ] &&
[ $(git cat-file -p $(stg id change-3) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
stg delete ..
'
test_expect_success \
'Apply a bzip2 patch created with "git diff"' \
'
bzip2 -c $STG_ROOT/t/t1800-import/git-diff > \
$STG_ROOT/t/t1800-import/bzip2-git-diff &&
stg import $STG_ROOT/t/t1800-import/bzip2-git-diff &&
[ $(git cat-file -p $(stg id) \
| grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") = 1 ] &&
rm $STG_ROOT/t/t1800-import/bzip2-git-diff &&
stg delete ..
'
test_expect_success \
'Apply a bzip2 patch with a .bz2 suffix' \
'
bzip2 -c $STG_ROOT/t/t1800-import/git-diff > \
$STG_ROOT/t/t1800-import/git-diff.bz2 &&
stg import $STG_ROOT/t/t1800-import/git-diff.bz2 &&
[ $(git cat-file -p $(stg id) \
| grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") = 1 ] &&
rm $STG_ROOT/t/t1800-import/git-diff.bz2 &&
stg delete ..
'
test_expect_success \
'Apply a gzip patch created with GNU diff' \
'
gzip -c $STG_ROOT/t/t1800-import/gnu-diff > \
$STG_ROOT/t/t1800-import/gzip-gnu-diff &&
stg import $STG_ROOT/t/t1800-import/gzip-gnu-diff &&
[ $(git cat-file -p $(stg id) \
| grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") = 1 ] &&
rm $STG_ROOT/t/t1800-import/gzip-gnu-diff &&
stg delete ..
'
test_expect_success \
'Apply a gzip patch with a .gz suffix' \
'
gzip -c $STG_ROOT/t/t1800-import/gnu-diff > \
$STG_ROOT/t/t1800-import/gnu-diff.gz &&
stg import $STG_ROOT/t/t1800-import/gnu-diff.gz &&
[ $(git cat-file -p $(stg id) \
| grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") = 1 ] &&
rm $STG_ROOT/t/t1800-import/gnu-diff.gz &&
stg delete ..
'
test_expect_success \
'apply a series from a tarball' \
'
rm -f jabberwocky.txt && touch jabberwocky.txt &&
stg add jabberwocky.txt && git commit -m "empty file" jabberwocky.txt &&
(cd $STG_ROOT/t/t1800-import; tar -cjf jabberwocky.tar.bz2 patches) &&
stg import --series $STG_ROOT/t/t1800-import/jabberwocky.tar.bz2
[ $(git cat-file -p $(stg id) \
| grep -c "tree 2c33937252a21f1550c0bf21f1de534b68f69635") = 1 ] &&
rm $STG_ROOT/t/t1800-import/jabberwocky.tar.bz2
'
test_expect_success \
'Import from git format-patch output' '
(
test_create_repo upstream &&
cd upstream &&
echo "something" > some.txt &&
git add some.txt &&
git commit -m "Add something"
stg init
) &&
(
git clone upstream downstream
cd downstream &&
echo "else µ" >> some.txt &&
git commit -a --author "Éd <ed@example.com>" -m "something else" &&
git format-patch --stdout HEAD~1 > ../downstream.mbox
) &&
(
cd upstream &&
stg import --mbox ../downstream.mbox &&
stg top | grep "something-else" &&
grep "else µ" some.txt
)
'
test_expect_success \
'Import with author options' \
'
stg show | grep -e "Author: Clark Williams <williams@redhat.com>" &&
stg delete --top --spill &&
stg diff > some.patch &&
git reset jabberwocky.txt &&
git checkout jabberwocky.txt &&
stg import --authname "Some Author" \
--authemail "some@example.com" \
--authdate 2005-04-07T22:13:13 \
--stripname \
some.patch &&
stg show | grep -e "Author: Some Author <some@example.com>" &&
stg show | grep -E "Date: +Thu Apr 7 22:13:13 2005 \+0000" &&
stg delete --top
'
test_expect_success \
'Import with bad author_date option' \
'
stg delete --top &&
command_error stg import --authdate "a long time ago" some.patch 2>&1 |
grep -e "\"a long time ago\" is not a valid date"
'
test_expect_success \
'Import from stdin' \
'
cat some.patch |
stg import --name xxx \
--authname "Some Author" \
--authemail "some@example.com" &&
test "$(echo $(stg top))" = "xxx" &&
stg show | grep -e "Author: Some Author <some@example.com>"
'
test_expect_success \
'Replace existing patch' \
'
stg pop xxx &&
stg import --replace \
--name xxx \
--author "Different Author <diff@example.com>" \
some.patch &&
test "$(echo $(stg top))" = "xxx" &&
stg show | grep -e "Author: Different Author <diff@example.com>"
'
test_expect_success \
'Ignore patch reapplication' \
'
stg top | grep -e "xxx" &&
stg import --ignore --name xxx some.patch &&
test "$(echo $(stg top))" = "xxx" &&
stg show | grep -e "Author: Different Author <diff@example.com>" &&
stg delete --top
'
test_expect_success \
'Import from stdin no name' \
'
cat some.patch |
stg import --ignore --author "Some Author <some@example.com>" &&
stg top | grep -e "unknown" &&
stg show | grep -e "Author: Some Author <some@example.com>" &&
stg delete --top
'
test_expect_success \
'Import empty patch with sign-off' \
'
echo "" |
stg import -n empty --sign 2>&1 |
grep -e "No diff found, creating empty patch" &&
stg show | grep -e "Signed-off-by: C Ó Mitter <committer@example.com>" &&
stg top | grep -e "empty" &&
stg clean &&
stg top | grep -v -e "empty"
'
test_expect_success \
'Import series from stdin' \
'
echo "some.patch" |
stg import --series &&
stg top | grep -e "some.patch" &&
stg delete --top
'
test_expect_success \
'Attempt url' \
'
command_error stg import --url 2>&1 |
grep -e "URL argument required"
'
test_expect_success \
'Too many arguments' \
'
command_error stg import some.patch some.patch 2>&1 |
grep -e "incorrect number of arguments"
'
test_done
|
