Attachment #360798 for bug #487902

Lines 263-268 Link Here

(-)/root/git-9999/Makefile (-8 / +25 lines)
263	#	263	#
264	# Define NO_TCLTK if you do not want Tcl/Tk GUI.	264	# Define NO_TCLTK if you do not want Tcl/Tk GUI.
265	#	265	#
		266	# Define NO_CVS if you do not want any CVS interface utilities.
		267	#
266	# The TCL_PATH variable governs the location of the Tcl interpreter	268	# The TCL_PATH variable governs the location of the Tcl interpreter
267	# used to optimize git-gui for your system. Only used if NO_TCLTK	269	# used to optimize git-gui for your system. Only used if NO_TCLTK
268	# is not set. Defaults to the bare 'tclsh'.	270	# is not set. Defaults to the bare 'tclsh'.
Lines 437-442 Link Here
437	PROGRAM_OBJS =	439	PROGRAM_OBJS =
438	PROGRAMS =	440	PROGRAMS =
439	SCRIPT_PERL =	441	SCRIPT_PERL =
		442	SCRIPT_PERL_CVS =
440	SCRIPT_PYTHON =	443	SCRIPT_PYTHON =
441	SCRIPT_SH =	444	SCRIPT_SH =
442	SCRIPT_LIB =	445	SCRIPT_LIB =
Lines 478-497 Link Here
478	SCRIPT_PERL += git-add--interactive.perl	481	SCRIPT_PERL += git-add--interactive.perl
479	SCRIPT_PERL += git-difftool.perl	482	SCRIPT_PERL += git-difftool.perl
480	SCRIPT_PERL += git-archimport.perl	483	SCRIPT_PERL += git-archimport.perl
481	SCRIPT_PERL += git-cvsexportcommit.perl
482	SCRIPT_PERL += git-cvsimport.perl
483	SCRIPT_PERL += git-cvsserver.perl
484	SCRIPT_PERL += git-relink.perl	484	SCRIPT_PERL += git-relink.perl
485	SCRIPT_PERL += git-send-email.perl	485	SCRIPT_PERL += git-send-email.perl
486	SCRIPT_PERL += git-svn.perl	486	SCRIPT_PERL += git-svn.perl
487		487
		488	SCRIPT_PERL_CVS += git-cvsexportcommit.perl
		489	SCRIPT_PERL_CVS += git-cvsimport.perl
		490	SCRIPT_PERL_CVS += git-cvsserver.perl
		491
488	SCRIPT_PYTHON += git-p4.py	492	SCRIPT_PYTHON += git-p4.py
489		493
490	NO_INSTALL += git-remote-testgit	494	NO_INSTALL += git-remote-testgit
491		495
492	# Generated files for scripts	496	# Generated files for scripts
493	SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))	497	SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
494	SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL))	498	SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS))
495	SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON))	499	SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON))
496		500
497	SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN))	501	SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN))
Lines 1779-1786 Link Here
1779	$(join -DMAJOR= -DMINOR= -DPATCH=, $(wordlist 1,3,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \	1783	$(join -DMAJOR= -DMINOR= -DPATCH=, $(wordlist 1,3,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \
1780	-DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@	1784	-DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@
1781		1785
		1786	_SCRIPT_PERL_BUILD =
		1787	_SCRIPT_PERL_NOBUILD =
		1788
1782	ifndef NO_PERL	1789	ifndef NO_PERL
1783	$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak	1790
		1791	_SCRIPT_PERL_BUILD += $(SCRIPT_PERL)
		1792
		1793	ifndef NO_CVS
		1794	_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS)
		1795	else # NO_CVS
		1796	_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS)
		1797	endif # NO_CVS
1784		1798
1785	perl/perl.mak: perl/PM.stamp	1799	perl/perl.mak: perl/PM.stamp
1786		1800
Lines 1792-1798 Link Here
1792	perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL	1806	perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
1793	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)	1807	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
1794		1808
1795	$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE	1809	$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl GIT-VERSION-FILE
1796	$(QUIET_GEN)$(RM) $@ $@+ && \	1810	$(QUIET_GEN)$(RM) $@ $@+ && \
1797	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \	1811	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
1798	sed -e '1{' \	1812	sed -e '1{' \
Lines 1817-1830 Link Here
1817	chmod +x $@+ && \	1831	chmod +x $@+ && \
1818	mv $@+ $@	1832	mv $@+ $@
1819	else # NO_PERL	1833	else # NO_PERL
1820	$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh	1834	_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb
		1835	endif # NO_PERL
		1836
		1837	# This is any perl scripts that were disabled it might be empty...
		1838	$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)): % : unimplemented.sh
1821	$(QUIET_GEN)$(RM) $@ $@+ && \	1839	$(QUIET_GEN)$(RM) $@ $@+ && \
1822	sed -e '1s\|#!.*/sh\|#!$(SHELL_PATH_SQ)\|' \	1840	sed -e '1s\|#!.*/sh\|#!$(SHELL_PATH_SQ)\|' \
1823	-e 's\|@@REASON@@\|NO_PERL=$(NO_PERL)\|g' \	1841	-e 's\|@@REASON@@\|NO_PERL=$(NO_PERL)\|g' \
1824	unimplemented.sh >$@+ && \	1842	unimplemented.sh >$@+ && \
1825	chmod +x $@+ && \	1843	chmod +x $@+ && \
1826	mv $@+ $@	1844	mv $@+ $@
1827	endif # NO_PERL
1828		1845
1829	ifndef NO_PYTHON	1846	ifndef NO_PYTHON
1830	$(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS	1847	$(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS

Lines 12-17 Link Here

(-)/root/git-9999/t/t9200-git-cvsexportcommit.sh (+5 lines)
12	test_done	12	test_done
13	fi	13	fi
14		14
		15	if ! test_have_prereq CVS; then
		16	skip_all='skipping git cvsexportcommit tests, cvs not available'
		17	test_done
		18	fi
		19
15	cvs >/dev/null 2>&1	20	cvs >/dev/null 2>&1
16	if test $? -ne 1	21	if test $? -ne 1
17	then	22	then

Lines 11-19 Link Here

(-)/root/git-9999/t/t9400-git-cvsserver-server.sh (-1 / +7 lines)
11	. ./test-lib.sh	11	. ./test-lib.sh
12		12
13	if ! test_have_prereq PERL; then	13	if ! test_have_prereq PERL; then
14	skip_all='skipping git cvsserver tests, perl not available'	14	skip_all='skipping git-cvsserver tests, perl not available'
15	test_done	15	test_done
16	fi	16	fi
		17
		18	if ! test_have_prereq CVS; then
		19	skip_all='skipping git-cvsserver tests, cvs not available'
		20	test_done
		21	fi
		22
17	cvs >/dev/null 2>&1	23	cvs >/dev/null 2>&1
18	if test $? -ne 1	24	if test $? -ne 1
19	then	25	then




    return $stat
}

if ! test_have_prereq PERL
if test $? -ne 1
then
    skip_all='skipping git-cvsserver tests, perl not available'
    test_done
fi
if ! test_have_prereq CVS
then
    skip_all='skipping git-cvsserver tests, cvs not available'
    test_done
fi
cvs >/dev/null 2>&1
if test $? -ne 1
then
    skip_all='skipping git-cvsserver tests, cvs not found'
    test_done
fi
"$PERL_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {




test_description='git cvsimport basic tests'
. ./lib-cvs.sh

if ! test_have_prereq PERL
then
    skip_all='skipping git cvsimport tests, perl not available'
    test_done
fi
if ! test_have_prereq CVS
then
    skip_all='skipping git cvsimport tests, cvs not available'
    test_done
fi

test_expect_success 'setup cvsroot environment' '
	CVSROOT=$(pwd)/cvsroot &&
	export CVSROOT
'

test_expect_success 'setup cvsroot' '$CVS init'

test_expect_success 'setup a cvs module' '

	mkdir "$CVSROOT/module" &&
	$CVS co -d module-cvs module &&

	)
'

test_expect_success 'import a trivial module' '

	git cvsimport -a -R -z 0 -C module-git module &&
	test_cmp module-cvs/o_fortuna module-git/o_fortuna

'

test_expect_success 'pack refs' '(cd module-git && git gc)'

test_expect_success 'initial import has correct .git/cvs-revisions' '

	(cd module-git &&
	 git log --format="o_fortuna 1.1 %H" -1) > expected &&
	test_cmp expected module-git/.git/cvs-revisions
'

test_expect_success 'update cvs module' '
	(cd module-cvs &&
	cat <<EOF >o_fortuna &&
O Fortune,

	)
'

test_expect_success 'update git module' '

	(cd module-git &&
	git config cvsimport.trackRevisions true &&


'

test_expect_success 'update has correct .git/cvs-revisions' '

	(cd module-git &&
	 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&

	test_cmp expected module-git/.git/cvs-revisions
'

test_expect_success 'update cvs module' '

	(cd module-cvs &&
		echo 1 >tick &&

	)
'

test_expect_success 'cvsimport.module config works' '

	(cd module-git &&
		git config cvsimport.module module &&


'

test_expect_success 'second update has correct .git/cvs-revisions' '

	(cd module-git &&
	 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&

	test_cmp expected module-git/.git/cvs-revisions
'

test_expect_success 'import from a CVS working tree' '

	$CVS co -d import-from-wt module &&
	(cd import-from-wt &&


'

test_expect_success 'no .git/cvs-revisions created by default' '

	! test -e import-from-wt/.git/cvs-revisions

'

test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'

test_done




test_description='git cvsimport handling of vendor branches'
. ./lib-cvs.sh

if ! test_have_prereq PERL
then
    skip_all='skipping git cvsimport tests, perl not available'
    test_done
fi
if ! test_have_prereq CVS
then
    skip_all='skipping git cvsimport tests, cvs not available'
    test_done
fi

setup_cvs_test_repository t9601

test_expect_success PERL 'import a module with a vendor branch' '




test_description='git cvsimport handling of branches and tags'
. ./lib-cvs.sh

if ! test_have_prereq PERL
then
    skip_all='skipping git cvsimport tests, perl not available'
    test_done
fi
if ! test_have_prereq CVS
then
    skip_all='skipping git cvsimport tests, cvs not available'
    test_done
fi

setup_cvs_test_repository t9602

test_expect_success PERL 'import module' '




test_description='git cvsimport testing for correct patchset estimation'
. ./lib-cvs.sh

if ! test_have_prereq PERL
then
    skip_all='skipping git cvsimport tests, perl not available'
    test_done
fi
if ! test_have_prereq CVS
then
    skip_all='skipping git cvsimport tests, cvs not available'
    test_done
fi

setup_cvs_test_repository t9603

test_expect_failure 'import with criss cross times on revisions' '

Lines 836-841 Link Here

(-)/root/git-9999/t/test-lib.sh (+1 lines)
836	esac	836	esac
837		837
838	( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1	838	( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
		839	test -z "$NO_CVS" && test_set_prereq CVS
839	test -z "$NO_PERL" && test_set_prereq PERL	840	test -z "$NO_PERL" && test_set_prereq PERL
840	test -z "$NO_PYTHON" && test_set_prereq PYTHON	841	test -z "$NO_PYTHON" && test_set_prereq PYTHON
841	test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE	842	test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE

Return to bug 487902

Lines 3-16 Link Here

(-)/root/git-9999/t/t9600-cvsimport.sh (-15 / +26 lines)
3	test_description='git cvsimport basic tests'	3	test_description='git cvsimport basic tests'
4	. ./lib-cvs.sh	4	. ./lib-cvs.sh
5		5
6	test_expect_success PERL 'setup cvsroot environment' '	6	if ! test_have_prereq PERL
		7	then
		8	skip_all='skipping git cvsimport tests, perl not available'
		9	test_done
		10	fi
		11	if ! test_have_prereq CVS
		12	then
		13	skip_all='skipping git cvsimport tests, cvs not available'
		14	test_done
		15	fi
		16
		17	test_expect_success 'setup cvsroot environment' '
7	CVSROOT=$(pwd)/cvsroot &&	18	CVSROOT=$(pwd)/cvsroot &&
8	export CVSROOT	19	export CVSROOT
9	'	20	'
10		21
11	test_expect_success PERL 'setup cvsroot' '$CVS init'	22	test_expect_success 'setup cvsroot' '$CVS init'
12		23
13	test_expect_success PERL 'setup a cvs module' '	24	test_expect_success 'setup a cvs module' '
14		25
15	mkdir "$CVSROOT/module" &&	26	mkdir "$CVSROOT/module" &&
16	$CVS co -d module-cvs module &&	27	$CVS co -d module-cvs module &&
Lines 42-64 Link Here
42	)	53	)
43	'	54	'
44		55
45	test_expect_success PERL 'import a trivial module' '	56	test_expect_success 'import a trivial module' '
46		57
47	git cvsimport -a -R -z 0 -C module-git module &&	58	git cvsimport -a -R -z 0 -C module-git module &&
48	test_cmp module-cvs/o_fortuna module-git/o_fortuna	59	test_cmp module-cvs/o_fortuna module-git/o_fortuna
49		60
50	'	61	'
51		62
52	test_expect_success PERL 'pack refs' '(cd module-git && git gc)'	63	test_expect_success 'pack refs' '(cd module-git && git gc)'
53		64
54	test_expect_success PERL 'initial import has correct .git/cvs-revisions' '	65	test_expect_success 'initial import has correct .git/cvs-revisions' '
55		66
56	(cd module-git &&	67	(cd module-git &&
57	git log --format="o_fortuna 1.1 %H" -1) > expected &&	68	git log --format="o_fortuna 1.1 %H" -1) > expected &&
58	test_cmp expected module-git/.git/cvs-revisions	69	test_cmp expected module-git/.git/cvs-revisions
59	'	70	'
60		71
61	test_expect_success PERL 'update cvs module' '	72	test_expect_success 'update cvs module' '
62	(cd module-cvs &&	73	(cd module-cvs &&
63	cat <<EOF >o_fortuna &&	74	cat <<EOF >o_fortuna &&
64	O Fortune,	75	O Fortune,
Lines 86-92 Link Here
86	)	97	)
87	'	98	'
88		99
89	test_expect_success PERL 'update git module' '	100	test_expect_success 'update git module' '
90		101
91	(cd module-git &&	102	(cd module-git &&
92	git config cvsimport.trackRevisions true &&	103	git config cvsimport.trackRevisions true &&
Lines 97-103 Link Here
97		108
98	'	109	'
99		110
100	test_expect_success PERL 'update has correct .git/cvs-revisions' '	111	test_expect_success 'update has correct .git/cvs-revisions' '
101		112
102	(cd module-git &&	113	(cd module-git &&
103	git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&	114	git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
Lines 105-111 Link Here
105	test_cmp expected module-git/.git/cvs-revisions	116	test_cmp expected module-git/.git/cvs-revisions
106	'	117	'
107		118
108	test_expect_success PERL 'update cvs module' '	119	test_expect_success 'update cvs module' '
109		120
110	(cd module-cvs &&	121	(cd module-cvs &&
111	echo 1 >tick &&	122	echo 1 >tick &&
Lines 114-120 Link Here
114	)	125	)
115	'	126	'
116		127
117	test_expect_success PERL 'cvsimport.module config works' '	128	test_expect_success 'cvsimport.module config works' '
118		129
119	(cd module-git &&	130	(cd module-git &&
120	git config cvsimport.module module &&	131	git config cvsimport.module module &&
Lines 126-132 Link Here
126		137
127	'	138	'
128		139
129	test_expect_success PERL 'second update has correct .git/cvs-revisions' '	140	test_expect_success 'second update has correct .git/cvs-revisions' '
130		141
131	(cd module-git &&	142	(cd module-git &&
132	git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&	143	git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
Lines 135-141 Link Here
135	test_cmp expected module-git/.git/cvs-revisions	146	test_cmp expected module-git/.git/cvs-revisions
136	'	147	'
137		148
138	test_expect_success PERL 'import from a CVS working tree' '	149	test_expect_success 'import from a CVS working tree' '
139		150
140	$CVS co -d import-from-wt module &&	151	$CVS co -d import-from-wt module &&
141	(cd import-from-wt &&	152	(cd import-from-wt &&
Lines 148-159 Link Here
148		159
149	'	160	'
150		161
151	test_expect_success PERL 'no .git/cvs-revisions created by default' '	162	test_expect_success 'no .git/cvs-revisions created by default' '
152		163
153	! test -e import-from-wt/.git/cvs-revisions	164	! test -e import-from-wt/.git/cvs-revisions
154		165
155	'	166	'
156		167
157	test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'	168	test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
158		169
159	test_done	170	test_done

Lines 57-71 Link Here

(-)/root/git-9999/t/t9401-git-cvsserver-crlf.sh (-5 / +10 lines)
57	return $stat	57	return $stat
58	}	58	}
59		59
60	cvs >/dev/null 2>&1	60	if ! test_have_prereq PERL
61	if test $? -ne 1
62	then	61	then
63	skip_all='skipping git-cvsserver tests, cvs not found'	62	skip_all='skipping git-cvsserver tests, perl not available'
64	test_done	63	test_done
65	fi	64	fi
66	if ! test_have_prereq PERL	65	if ! test_have_prereq CVS
67	then	66	then
68	skip_all='skipping git-cvsserver tests, perl not available'	67	skip_all='skipping git-cvsserver tests, cvs not available'
		68	test_done
		69	fi
		70	cvs >/dev/null 2>&1
		71	if test $? -ne 1
		72	then
		73	skip_all='skipping git-cvsserver tests, cvs not found'
69	test_done	74	test_done
70	fi	75	fi
71	"$PERL_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 \|\| {	76	"$PERL_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 \|\| {

Lines 34-39 Link Here

(-)/root/git-9999/t/t9601-cvsimport-vendor-branch.sh (+11 lines)
34	test_description='git cvsimport handling of vendor branches'	34	test_description='git cvsimport handling of vendor branches'
35	. ./lib-cvs.sh	35	. ./lib-cvs.sh
36		36
		37	if ! test_have_prereq PERL
		38	then
		39	skip_all='skipping git cvsimport tests, perl not available'
		40	test_done
		41	fi
		42	if ! test_have_prereq CVS
		43	then
		44	skip_all='skipping git cvsimport tests, cvs not available'
		45	test_done
		46	fi
		47
37	setup_cvs_test_repository t9601	48	setup_cvs_test_repository t9601
38		49
39	test_expect_success PERL 'import a module with a vendor branch' '	50	test_expect_success PERL 'import a module with a vendor branch' '

Lines 6-11 Link Here

(-)/root/git-9999/t/t9602-cvsimport-branches-tags.sh (+11 lines)
6	test_description='git cvsimport handling of branches and tags'	6	test_description='git cvsimport handling of branches and tags'
7	. ./lib-cvs.sh	7	. ./lib-cvs.sh
8		8
		9	if ! test_have_prereq PERL
		10	then
		11	skip_all='skipping git cvsimport tests, perl not available'
		12	test_done
		13	fi
		14	if ! test_have_prereq CVS
		15	then
		16	skip_all='skipping git cvsimport tests, cvs not available'
		17	test_done
		18	fi
		19
9	setup_cvs_test_repository t9602	20	setup_cvs_test_repository t9602
10		21
11	test_expect_success PERL 'import module' '	22	test_expect_success PERL 'import module' '

Lines 14-19 Link Here

(-)/root/git-9999/t/t9603-cvsimport-patchsets.sh (+11 lines)
14	test_description='git cvsimport testing for correct patchset estimation'	14	test_description='git cvsimport testing for correct patchset estimation'
15	. ./lib-cvs.sh	15	. ./lib-cvs.sh
16		16
		17	if ! test_have_prereq PERL
		18	then
		19	skip_all='skipping git cvsimport tests, perl not available'
		20	test_done
		21	fi
		22	if ! test_have_prereq CVS
		23	then
		24	skip_all='skipping git cvsimport tests, cvs not available'
		25	test_done
		26	fi
		27
17	setup_cvs_test_repository t9603	28	setup_cvs_test_repository t9603
18		29
19	test_expect_failure 'import with criss cross times on revisions' '	30	test_expect_failure 'import with criss cross times on revisions' '