summaryrefslogtreecommitdiff
path: root/contrib/remote-helpers/test-hg-hg-git.sh
blob: b23909ae6ccc9cc5b2169c2898ea8de292bd0d22 (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
#!/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 output compared to hg-git'
 
test -n "$TEST_DIRECTORY" || TEST_DIRECTORY=${0%/*}/../../t
. "$TEST_DIRECTORY"/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
 
if ! python -c 'import hggit'
then
	skip_all='skipping remote-hg tests; hg-git not available'
	test_done
fi
 
# clone to a git repo with git
git_clone_git () {
	git clone -q "hg::$1" $2 &&
	(cd $2 && git checkout master && git branch -D default)
}
 
# clone to an hg repo with git
hg_clone_git () {
	(
	hg init $2 &&
	hg -R $2 bookmark -i master &&
	cd $1 &&
	git push -q "hg::../$2" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*'
	) &&
 
	(cd $2 && hg -q update)
}
 
# clone to a git repo with hg
git_clone_hg () {
	(
	git init -q $2 &&
	cd $1 &&
	hg bookmark -i -f -r tip master &&
	hg -q push -r master ../$2 || true
	)
}
 
# clone to an hg repo with hg
hg_clone_hg () {
	hg -q clone $1 $2
}
 
# push an hg repo with git
hg_push_git () {
	(
	cd $2
	git checkout -q -b tmp &&
	git fetch -q "hg::../$1" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' &&
	git branch -D default &&
	git checkout -q @{-1} &&
	git branch -q -D tmp 2>/dev/null || true
	)
}
 
# push an hg git repo with hg
hg_push_hg () {
	(
	cd $1 &&
	hg -q push ../$2 || true
	)
}
 
hg_log () {
	hg -R $1 log --graph --debug >log &&
	grep -v 'tag: *default/' log
}
 
git_log () {
	git --git-dir=$1/.git fast-export --branches
}
 
setup () {
	(
	echo "[ui]"
	echo "username = A U Thor <author@example.com>"
	echo "[defaults]"
	echo "backout = -d \"0 0\""
	echo "commit = -d \"0 0\""
	echo "debugrawcommit = -d \"0 0\""
	echo "tag = -d \"0 0\""
	echo "[extensions]"
	echo "hgext.bookmarks ="
	echo "hggit ="
	echo "graphlog ="
	) >>"$HOME"/.hgrc &&
	git config --global receive.denycurrentbranch warn
	git config --global remote-hg.hg-git-compat true
	git config --global remote-hg.track-branches false
 
	HGEDITOR=true
	HGMERGE=true
 
	GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230"
	GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
	export HGEDITOR HGMERGE GIT_AUTHOR_DATE GIT_COMMITTER_DATE
}
 
setup
 
test_expect_success 'executable bit' '
	test_when_finished "rm -rf gitrepo* hgrepo*" &&
 
	(
	git init -q gitrepo &&
	cd gitrepo &&
	echo alpha >alpha &&
	chmod 0644 alpha &&
	git add alpha &&
	git commit -m "add alpha" &&
	chmod 0755 alpha &&
	git add alpha &&
	git commit -m "set executable bit" &&
	chmod 0644 alpha &&
	git add alpha &&
	git commit -m "clear executable bit"
	) &&
 
	for x in hg git
	do
		(
		hg_clone_$x gitrepo hgrepo-$x &&
		cd hgrepo-$x &&
		hg_log . &&
		hg manifest -r 1 -v &&
		hg manifest -v
		) >"output-$x" &&
 
		git_clone_$x hgrepo-$x gitrepo2-$x &&
		git_log gitrepo2-$x >"log-$x"
	done &&
 
	test_cmp output-hg output-git &&
	test_cmp log-hg log-git
'
 
test_expect_success 'symlink' '
	test_when_finished "rm -rf gitrepo* hgrepo*" &&
 
	(
	git init -q gitrepo &&
	cd gitrepo &&
	echo alpha >alpha &&
	git add alpha &&
	git commit -m "add alpha" &&
	ln -s alpha beta &&
	git add beta &&
	git commit -m "add beta"
	) &&
 
	for x in hg git
	do
		(
		hg_clone_$x gitrepo hgrepo-$x &&
		cd hgrepo-$x &&
		hg_log . &&
		hg manifest -v
		) >"output-$x" &&
 
		git_clone_$x hgrepo-$x gitrepo2-$x &&
		git_log gitrepo2-$x >"log-$x"
	done &&
 
	test_cmp output-hg output-git &&
	test_cmp log-hg log-git
'
 
test_expect_success 'merge conflict 1' '
	test_when_finished "rm -rf gitrepo* hgrepo*" &&
 
	(
	hg init hgrepo1 &&
	cd hgrepo1 &&
	echo A >afile &&
	hg add afile &&
	hg ci -m "origin" &&
 
	echo B >afile &&
	hg ci -m "A->B" &&
 
	hg up -r0 &&
	echo C >afile &&
	hg ci -m "A->C" &&
 
	hg merge -r1 &&
	echo C >afile &&
	hg resolve -m afile &&
	hg ci -m "merge to C"
	) &&
 
	for x in hg git
	do
		git_clone_$x hgrepo1 gitrepo-$x &&
		hg_clone_$x gitrepo-$x hgrepo2-$x &&
		hg_log hgrepo2-$x >"hg-log-$x" &&
		git_log gitrepo-$x >"git-log-$x"
	done &&
 
	test_cmp hg-log-hg hg-log-git &&
	test_cmp git-log-hg git-log-git
'
 
test_expect_success 'merge conflict 2' '
	test_when_finished "rm -rf gitrepo* hgrepo*" &&
 
	(
	hg init hgrepo1 &&
	cd hgrepo1 &&
	echo A >afile &&
	hg add afile &&
	hg ci -m "origin" &&
 
	echo B >afile &&
	hg ci -m "A->B" &&
 
	hg up -r0 &&
	echo C >afile &&
	hg ci -m "A->C" &&
 
	hg merge -r1 || true &&
	echo B >afile &&
	hg resolve -m afile &&
	hg ci -m "merge to B"
	) &&
 
	for x in hg git
	do
		git_clone_$x hgrepo1 gitrepo-$x &&
		hg_clone_$x gitrepo-$x hgrepo2-$x &&
		hg_log hgrepo2-$x >"hg-log-$x" &&
		git_log gitrepo-$x >"git-log-$x"
	done &&
 
	test_cmp hg-log-hg hg-log-git &&
	test_cmp git-log-hg git-log-git
'
 
test_expect_success 'converged merge' '
	test_when_finished "rm -rf gitrepo* hgrepo*" &&
 
	(
	hg init hgrepo1 &&
	cd hgrepo1 &&
	echo A >afile &&
	hg add afile &&
	hg ci -m "origin" &&
 
	echo B >afile &&
	hg ci -m "A->B" &&
 
	echo C >afile &&
	hg ci -m "B->C" &&
 
	hg up -r0 &&
	echo C >afile &&
	hg ci -m "A->C" &&
 
	hg merge -r2 || true &&
	hg ci -m "merge"
	) &&
 
	for x in hg git
	do
		git_clone_$x hgrepo1 gitrepo-$x &&
		hg_clone_$x gitrepo-$x hgrepo2-$x &&
		hg_log hgrepo2-$x >"hg-log-$x" &&
		git_log gitrepo-$x >"git-log-$x"
	done &&
 
	test_cmp hg-log-hg hg-log-git &&
	test_cmp git-log-hg git-log-git
'
 
test_expect_success 'encoding' '
	test_when_finished "rm -rf gitrepo* hgrepo*" &&
 
	(
	git init -q gitrepo &&
	cd gitrepo &&
 
	echo alpha >alpha &&
	git add alpha &&
	git commit -m "add älphà" &&
 
	GIT_AUTHOR_NAME="tést èncödîng" &&
	export GIT_AUTHOR_NAME &&
	echo beta >beta &&
	git add beta &&
	git commit -m "add beta" &&
 
	echo gamma >gamma &&
	git add gamma &&
	git commit -m "add gämmâ" &&
 
	: TODO git config i18n.commitencoding latin-1 &&
	echo delta >delta &&
	git add delta &&
	git commit -m "add déltà"
	) &&
 
	for x in hg git
	do
		hg_clone_$x gitrepo hgrepo-$x &&
		git_clone_$x hgrepo-$x gitrepo2-$x &&
 
		HGENCODING=utf-8 hg_log hgrepo-$x >"hg-log-$x" &&
		git_log gitrepo2-$x >"git-log-$x"
	done &&
 
	test_cmp hg-log-hg hg-log-git &&
	test_cmp git-log-hg git-log-git
'
 
test_expect_success 'file removal' '
	test_when_finished "rm -rf gitrepo* hgrepo*" &&
 
	(
	git init -q gitrepo &&
	cd gitrepo &&
	echo alpha >alpha &&
	git add alpha &&
	git commit -m "add alpha" &&
	echo beta >beta &&
	git add beta &&
	git commit -m "add beta"
	mkdir foo &&
	echo blah >foo/bar &&
	git add foo &&
	git commit -m "add foo" &&
	git rm alpha &&
	git commit -m "remove alpha" &&
	git rm foo/bar &&
	git commit -m "remove foo/bar"
	) &&
 
	for x in hg git
	do
		(
		hg_clone_$x gitrepo hgrepo-$x &&
		cd hgrepo-$x &&
		hg_log . &&
		hg manifest -r 3 &&
		hg manifest
		) >"output-$x" &&
 
		git_clone_$x hgrepo-$x gitrepo2-$x &&
		git_log gitrepo2-$x >"log-$x"
	done &&
 
	test_cmp output-hg output-git &&
	test_cmp log-hg log-git
'
 
test_expect_success 'git tags' '
	test_when_finished "rm -rf gitrepo* hgrepo*" &&
 
	(
	git init -q gitrepo &&
	cd gitrepo &&
	git config receive.denyCurrentBranch ignore &&
	echo alpha >alpha &&
	git add alpha &&
	git commit -m "add alpha" &&
	git tag alpha &&
 
	echo beta >beta &&
	git add beta &&
	git commit -m "add beta" &&
	git tag -a -m "added tag beta" beta
	) &&
 
	for x in hg git
	do
		hg_clone_$x gitrepo hgrepo-$x &&
		hg_log hgrepo-$x >"log-$x"
	done &&
 
	test_cmp log-hg log-git
'
 
test_expect_success 'hg author' '
	test_when_finished "rm -rf gitrepo* hgrepo*" &&
 
	for x in hg git
	do
		(
		git init -q gitrepo-$x &&
		cd gitrepo-$x &&
 
		echo alpha >alpha &&
		git add alpha &&
		git commit -m "add alpha" &&
		git checkout -q -b not-master
		) &&
 
		(
		hg_clone_$x gitrepo-$x hgrepo-$x &&
		cd hgrepo-$x &&
 
		hg co master &&
		echo beta >beta &&
		hg add beta &&
		hg commit -u "test" -m "add beta" &&
 
		echo gamma >>beta &&
		hg commit -u "test <test@example.com> (comment)" -m "modify beta" &&
 
		echo gamma >gamma &&
		hg add gamma &&
		hg commit -u "<test@example.com>" -m "add gamma" &&
 
		echo delta >delta &&
		hg add delta &&
		hg commit -u "name<test@example.com>" -m "add delta" &&
 
		echo epsilon >epsilon &&
		hg add epsilon &&
		hg commit -u "name <test@example.com" -m "add epsilon" &&
 
		echo zeta >zeta &&
		hg add zeta &&
		hg commit -u " test " -m "add zeta" &&
 
		echo eta >eta &&
		hg add eta &&
		hg commit -u "test < test@example.com >" -m "add eta" &&
 
		echo theta >theta &&
		hg add theta &&
		hg commit -u "test >test@example.com>" -m "add theta" &&
 
		echo iota >iota &&
		hg add iota &&
		hg commit -u "test <test <at> example <dot> com>" -m "add iota"
		) &&
 
		hg_push_$x hgrepo-$x gitrepo-$x &&
		hg_clone_$x gitrepo-$x hgrepo2-$x &&
 
		hg_log hgrepo2-$x >"hg-log-$x" &&
		git_log gitrepo-$x >"git-log-$x"
	done &&
 
	test_cmp hg-log-hg hg-log-git &&
	test_cmp git-log-hg git-log-git
'
 
test_expect_success 'hg branch' '
	test_when_finished "rm -rf gitrepo* hgrepo*" &&
 
	for x in hg git
	do
		(
		git init -q gitrepo-$x &&
		cd gitrepo-$x &&
 
		echo alpha >alpha &&
		git add alpha &&
		git commit -q -m "add alpha" &&
		git checkout -q -b not-master
		) &&
 
		(
		hg_clone_$x gitrepo-$x hgrepo-$x &&
 
		cd hgrepo-$x &&
		hg -q co master &&
		hg mv alpha beta &&
		hg -q commit -m "rename alpha to beta" &&
		hg branch gamma | grep -v "permanent and global" &&
		hg -q commit -m "started branch gamma"
		) &&
 
		hg_push_$x hgrepo-$x gitrepo-$x &&
		hg_clone_$x gitrepo-$x hgrepo2-$x &&
 
		hg_log hgrepo2-$x >"hg-log-$x" &&
		git_log gitrepo-$x >"git-log-$x"
	done &&
 
	test_cmp hg-log-hg hg-log-git &&
	test_cmp git-log-hg git-log-git
'
 
test_expect_success 'hg tags' '
	test_when_finished "rm -rf gitrepo* hgrepo*" &&
 
	for x in hg git
	do
		(
		git init -q gitrepo-$x &&
		cd gitrepo-$x &&
 
		echo alpha >alpha &&
		git add alpha &&
		git commit -m "add alpha" &&
		git checkout -q -b not-master
		) &&
 
		(
		hg_clone_$x gitrepo-$x hgrepo-$x &&
 
		cd hgrepo-$x &&
		hg co master &&
		hg tag alpha
		) &&
 
		hg_push_$x hgrepo-$x gitrepo-$x &&
		hg_clone_$x gitrepo-$x hgrepo2-$x &&
 
		(
		git --git-dir=gitrepo-$x/.git tag -l &&
		hg_log hgrepo2-$x &&
		cat hgrepo2-$x/.hgtags
		) >"output-$x"
	done &&
 
	test_cmp output-hg output-git
'
 
test_done