summaryrefslogtreecommitdiff
path: root/contrib/remote-helpers/test-hg.sh
blob: 51f3c03875c5872dddacc86f39a7441f741209e4 (plain)
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
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
#!/bin/sh
#
# Copyright (c) 2012 Felipe Contreras
#
# Base commands from hg-git tests:
# https://bitbucket.org/durin42/hg-git/src
#
 
test_description='Test remote-hg'
 
. ./test-lib.sh
 
if ! test_have_prereq PYTHON; then
	skip_all='skipping remote-hg tests; python not available'
	test_done
fi
 
if ! python -c 'import mercurial'; then
	skip_all='skipping remote-hg tests; mercurial not available'
	test_done
fi
 
check () {
	echo $3 > expected &&
	git --git-dir=$1/.git log --format='%s' -1 $2 > actual
	test_cmp expected actual
}
 
check_branch () {
	if [ -n "$3" ]; then
		echo $3 > expected &&
		hg -R $1 log -r $2 --template '{desc}\n' > actual &&
		test_cmp expected actual
	else
		hg -R $1 branches > out &&
		! grep $2 out
	fi
}
 
check_bookmark () {
	if [ -n "$3" ]; then
		echo $3 > expected &&
		hg -R $1 log -r "bookmark('$2')" --template '{desc}\n' > actual &&
		test_cmp expected actual
	else
		hg -R $1 bookmarks > out &&
		! grep $2 out
	fi
}
 
check_push () {
	local expected_ret=$1 ret=0 ref_ret=0 IFS=':'
 
	shift
	git push origin "$@" 2> error
	ret=$?
	cat error
 
	while read branch kind
	do
		case "$kind" in
		'new')
			grep "^ \* \[new branch\] *${branch} -> ${branch}$" error || ref_ret=1
			;;
		'non-fast-forward')
			grep "^ ! \[rejected\] *${branch} -> ${branch} (non-fast-forward)$" error || ref_ret=1
			;;
		'fetch-first')
			grep "^ ! \[rejected\] *${branch} -> ${branch} (fetch first)$" error || ref_ret=1
			;;
		'')
			grep "^   [a-f0-9]*\.\.[a-f0-9]* *${branch} -> ${branch}$" error || ref_ret=1
			;;
		esac
		let 'ref_ret' && echo "match for '$branch' failed" && break
	done
 
	if let 'expected_ret != ret || ref_ret'
	then
		return 1
	fi
 
	return 0
}
 
setup () {
	(
	echo "[ui]"
	echo "username = H G Wells <wells@example.com>"
	echo "[extensions]"
	echo "mq ="
	) >> "$HOME"/.hgrc &&
 
	GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230" &&
	GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" &&
	export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
}
 
setup
 
test_expect_success 'cloning' '
	test_when_finished "rm -rf gitrepo*" &&
 
	(
	hg init hgrepo &&
	cd hgrepo &&
	echo zero > content &&
	hg add content &&
	hg commit -m zero
	) &&
 
	git clone "hg::hgrepo" gitrepo &&
	check gitrepo HEAD zero
'
 
test_expect_success 'cloning with branches' '
	test_when_finished "rm -rf gitrepo*" &&
 
	(
	cd hgrepo &&
	hg branch next &&
	echo next > content &&
	hg commit -m next
	) &&
 
	git clone "hg::hgrepo" gitrepo &&
	check gitrepo origin/branches/next next
'
 
test_expect_success 'cloning with bookmarks' '
	test_when_finished "rm -rf gitrepo*" &&
 
	(
	cd hgrepo &&
	hg checkout default &&
	hg bookmark feature-a &&
	echo feature-a > content &&
	hg commit -m feature-a
	) &&
 
	git clone "hg::hgrepo" gitrepo &&
	check gitrepo origin/feature-a feature-a
'
 
test_expect_success 'update bookmark' '
	test_when_finished "rm -rf gitrepo*" &&
 
	(
	cd hgrepo &&
	hg bookmark devel
	) &&
 
	(
	git clone "hg::hgrepo" gitrepo &&
	cd gitrepo &&
	git checkout --quiet devel &&
	echo devel > content &&
	git commit -a -m devel &&
	git push --quiet
	) &&
 
	check_bookmark hgrepo devel devel
'
 
test_expect_success 'new bookmark' '
	test_when_finished "rm -rf gitrepo*" &&
 
	(
	git clone "hg::hgrepo" gitrepo &&
	cd gitrepo &&
	git checkout --quiet -b feature-b &&
	echo feature-b > content &&
	git commit -a -m feature-b &&
	git push --quiet origin feature-b
	) &&
 
	check_bookmark hgrepo feature-b feature-b
'
 
# cleanup previous stuff
rm -rf hgrepo
 
author_test () {
	echo $1 >> content &&
	hg commit -u "$2" -m "add $1" &&
	echo "$3" >> ../expected
}
 
test_expect_success 'authors' '
	test_when_finished "rm -rf hgrepo gitrepo" &&
 
	(
	hg init hgrepo &&
	cd hgrepo &&
 
	touch content &&
	hg add content &&
 
	> ../expected &&
	author_test alpha "" "H G Wells <wells@example.com>" &&
	author_test beta "test" "test <unknown>" &&
	author_test beta "test <test@example.com> (comment)" "test <test@example.com>" &&
	author_test gamma "<test@example.com>" "Unknown <test@example.com>" &&
	author_test delta "name<test@example.com>" "name <test@example.com>" &&
	author_test epsilon "name <test@example.com" "name <test@example.com>" &&
	author_test zeta " test " "test <unknown>" &&
	author_test eta "test < test@example.com >" "test <test@example.com>" &&
	author_test theta "test >test@example.com>" "test <test@example.com>" &&
	author_test iota "test < test <at> example <dot> com>" "test <unknown>" &&
	author_test kappa "test@example.com" "Unknown <test@example.com>"
	) &&
 
	git clone "hg::hgrepo" gitrepo &&
	git --git-dir=gitrepo/.git log --reverse --format="%an <%ae>" > actual &&
 
	test_cmp expected actual
'
 
test_expect_success 'strip' '
	test_when_finished "rm -rf hgrepo gitrepo" &&
 
	(
	hg init hgrepo &&
	cd hgrepo &&
 
	echo one >> content &&
	hg add content &&
	hg commit -m one &&
 
	echo two >> content &&
	hg commit -m two
	) &&
 
	git clone "hg::hgrepo" gitrepo &&
 
	(
	cd hgrepo &&
	hg strip 1 &&
 
	echo three >> content &&
	hg commit -m three &&
 
	echo four >> content &&
	hg commit -m four
	) &&
 
	(
	cd gitrepo &&
	git fetch &&
	git log --format="%s" origin/master > ../actual
	) &&
 
	hg -R hgrepo log --template "{desc}\n" > expected &&
	test_cmp actual expected
'
 
test_expect_success 'remote push with master bookmark' '
	test_when_finished "rm -rf hgrepo gitrepo*" &&
 
	(
	hg init hgrepo &&
	cd hgrepo &&
	echo zero > content &&
	hg add content &&
	hg commit -m zero &&
	hg bookmark master &&
	echo one > content &&
	hg commit -m one
	) &&
 
	(
	git clone "hg::hgrepo" gitrepo &&
	cd gitrepo &&
	echo two > content &&
	git commit -a -m two &&
	git push
	) &&
 
	check_branch hgrepo default two
'
 
cat > expected <<EOF
changeset:   0:6e2126489d3d
tag:         tip
user:        A U Thor <author@example.com>
date:        Mon Jan 01 00:00:00 2007 +0230
summary:     one
 
EOF
 
test_expect_success 'remote push from master branch' '
	test_when_finished "rm -rf hgrepo gitrepo*" &&
 
	hg init hgrepo &&
 
	(
	git init gitrepo &&
	cd gitrepo &&
	git remote add origin "hg::../hgrepo" &&
	echo one > content &&
	git add content &&
	git commit -a -m one &&
	git push origin master
	) &&
 
	hg -R hgrepo log > actual &&
	cat actual &&
	test_cmp expected actual &&
 
	check_branch hgrepo default one
'
 
GIT_REMOTE_HG_TEST_REMOTE=1
export GIT_REMOTE_HG_TEST_REMOTE
 
test_expect_success 'remote cloning' '
	test_when_finished "rm -rf gitrepo*" &&
 
	(
	hg init hgrepo &&
	cd hgrepo &&
	echo zero > content &&
	hg add content &&
	hg commit -m zero
	) &&
 
	git clone "hg::hgrepo" gitrepo &&
	check gitrepo HEAD zero
'
 
test_expect_success 'remote update bookmark' '
	test_when_finished "rm -rf gitrepo*" &&
 
	(
	cd hgrepo &&
	hg bookmark devel
	) &&
 
	(
	git clone "hg::hgrepo" gitrepo &&
	cd gitrepo &&
	git checkout --quiet devel &&
	echo devel > content &&
	git commit -a -m devel &&
	git push --quiet
	) &&
 
	check_bookmark hgrepo devel devel
'
 
test_expect_success 'remote new bookmark' '
	test_when_finished "rm -rf gitrepo*" &&
 
	(
	git clone "hg::hgrepo" gitrepo &&
	cd gitrepo &&
	git checkout --quiet -b feature-b &&
	echo feature-b > content &&
	git commit -a -m feature-b &&
	git push --quiet origin feature-b
	) &&
 
	check_bookmark hgrepo feature-b feature-b
'
 
test_expect_success 'remote push diverged' '
	test_when_finished "rm -rf gitrepo*" &&
 
	git clone "hg::hgrepo" gitrepo &&
 
	(
	cd hgrepo &&
	hg checkout default &&
	echo bump > content &&
	hg commit -m bump
	) &&
 
	(
	cd gitrepo &&
	echo diverge > content &&
	git commit -a -m diverged &&
	check_push 1 <<-EOF
	master:non-fast-forward
	EOF
	) &&
 
	check_branch hgrepo default bump
'
 
test_expect_success 'remote update bookmark diverge' '
	test_when_finished "rm -rf gitrepo*" &&
 
	(
	cd hgrepo &&
	hg checkout tip^ &&
	hg bookmark diverge
	) &&
 
	git clone "hg::hgrepo" gitrepo &&
 
	(
	cd hgrepo &&
	echo "bump bookmark" > content &&
	hg commit -m "bump bookmark"
	) &&
 
	(
	cd gitrepo &&
	git checkout --quiet diverge &&
	echo diverge > content &&
	git commit -a -m diverge &&
	check_push 1 <<-EOF
	diverge:fetch-first
	EOF
	) &&
 
	check_bookmark hgrepo diverge "bump bookmark"
'
 
test_expect_success 'remote new bookmark multiple branch head' '
	test_when_finished "rm -rf gitrepo*" &&
 
	(
	git clone "hg::hgrepo" gitrepo &&
	cd gitrepo &&
	git checkout --quiet -b feature-c HEAD^ &&
	echo feature-c > content &&
	git commit -a -m feature-c &&
	git push --quiet origin feature-c
	) &&
 
	check_bookmark hgrepo feature-c feature-c
'
 
# cleanup previous stuff
rm -rf hgrepo
 
setup_big_push () {
	(
	hg init hgrepo &&
	cd hgrepo &&
	echo zero > content &&
	hg add content &&
	hg commit -m zero &&
	hg bookmark bad_bmark1 &&
	echo one > content &&
	hg commit -m one &&
	hg bookmark bad_bmark2 &&
	hg bookmark good_bmark &&
	hg bookmark -i good_bmark &&
	hg -q branch good_branch &&
	echo "good branch" > content &&
	hg commit -m "good branch" &&
	hg -q branch bad_branch &&
	echo "bad branch" > content &&
	hg commit -m "bad branch"
	) &&
 
	git clone "hg::hgrepo" gitrepo &&
 
	(
	cd gitrepo &&
	echo two > content &&
	git commit -q -a -m two &&
 
	git checkout -q good_bmark &&
	echo three > content &&
	git commit -q -a -m three &&
 
	git checkout -q bad_bmark1 &&
	git reset --hard HEAD^ &&
	echo four > content &&
	git commit -q -a -m four &&
 
	git checkout -q bad_bmark2 &&
	git reset --hard HEAD^ &&
	echo five > content &&
	git commit -q -a -m five &&
 
	git checkout -q -b new_bmark master &&
	echo six > content &&
	git commit -q -a -m six &&
 
	git checkout -q branches/good_branch &&
	echo seven > content &&
	git commit -q -a -m seven &&
	echo eight > content &&
	git commit -q -a -m eight &&
 
	git checkout -q branches/bad_branch &&
	git reset --hard HEAD^ &&
	echo nine > content &&
	git commit -q -a -m nine &&
 
	git checkout -q -b branches/new_branch master &&
	echo ten > content &&
	git commit -q -a -m ten
	)
}
 
test_expect_success 'remote big push' '
	test_when_finished "rm -rf hgrepo gitrepo*" &&
 
	setup_big_push
 
	(
	cd gitrepo &&
 
	check_push 1 --all <<-EOF
	master
	good_bmark
	branches/good_branch
	new_bmark:new
	branches/new_branch:new
	bad_bmark1:non-fast-forward
	bad_bmark2:non-fast-forward
	branches/bad_branch:non-fast-forward
	EOF
	) &&
 
	check_branch hgrepo default one &&
	check_branch hgrepo good_branch "good branch" &&
	check_branch hgrepo bad_branch "bad branch" &&
	check_branch hgrepo new_branch '' &&
	check_bookmark hgrepo good_bmark one &&
	check_bookmark hgrepo bad_bmark1 one &&
	check_bookmark hgrepo bad_bmark2 one &&
	check_bookmark hgrepo new_bmark ''
'
 
test_expect_success 'remote big push fetch first' '
	test_when_finished "rm -rf hgrepo gitrepo*" &&
 
	(
	hg init hgrepo &&
	cd hgrepo &&
	echo zero > content &&
	hg add content &&
	hg commit -m zero &&
	hg bookmark bad_bmark &&
	hg bookmark good_bmark &&
	hg bookmark -i good_bmark &&
	hg -q branch good_branch &&
	echo "good branch" > content &&
	hg commit -m "good branch" &&
	hg -q branch bad_branch &&
	echo "bad branch" > content &&
	hg commit -m "bad branch"
	) &&
 
	git clone "hg::hgrepo" gitrepo &&
 
	(
	cd hgrepo &&
	hg bookmark -f bad_bmark &&
	echo update_bmark > content &&
	hg commit -m "update bmark"
	) &&
 
	(
	cd gitrepo &&
	echo two > content &&
	git commit -q -a -m two &&
 
	git checkout -q good_bmark &&
	echo three > content &&
	git commit -q -a -m three &&
 
	git checkout -q bad_bmark &&
	echo four > content &&
	git commit -q -a -m four &&
 
	git checkout -q branches/bad_branch &&
	echo five > content &&
	git commit -q -a -m five &&
 
	check_push 1 --all <<-EOF
	master
	good_bmark
	new_bmark:new
	new_branch:new
	bad_bmark:fetch-first
	branches/bad_branch:festch-first
	EOF
 
	git fetch &&
 
	check_push 1 --all <<-EOF
	master
	good_bmark
	bad_bmark:non-fast-forward
	branches/bad_branch:non-fast-forward
	EOF
	)
'
 
test_expect_failure 'remote big push dry-run' '
	test_when_finished "rm -rf hgrepo gitrepo*" &&
 
	setup_big_push
 
	(
	cd gitrepo &&
 
	check_push 0 --dry-run --all <<-EOF
	master
	good_bmark
	branches/good_branch
	new_bmark:new
	branches/new_branch:new
	bad_bmark1:non-fast-forward
	bad_bmark2:non-fast-forward
	branches/bad_branch:non-fast-forward
	EOF
 
	check_push 0 --dry-run master good_bmark new_bmark branches/good_branch branches/new_branch <<-EOF
	master
	good_bmark
	branches/good_branch
	new_bmark:new
	branches/new_branch:new
	EOF
	) &&
 
	check_branch hgrepo default one &&
	check_branch hgrepo good_branch "good branch" &&
	check_branch hgrepo bad_branch "bad branch" &&
	check_branch hgrepo new_branch '' &&
	check_bookmark hgrepo good_bmark one &&
	check_bookmark hgrepo bad_bmark1 one &&
	check_bookmark hgrepo bad_bmark2 one &&
	check_bookmark hgrepo new_bmark ''
'
 
test_expect_success 'remote double failed push' '
	test_when_finished "rm -rf hgrepo gitrepo*" &&
 
	(
	hg init hgrepo &&
	cd hgrepo &&
	echo zero > content &&
	hg add content &&
	hg commit -m zero &&
	echo one > content &&
	hg commit -m one
	) &&
 
	(
	git clone "hg::hgrepo" gitrepo &&
	cd gitrepo &&
	git reset --hard HEAD^ &&
	echo two > content &&
	git commit -a -m two &&
	test_expect_code 1 git push &&
	test_expect_code 1 git push
	)
'
 
test_done