/[gentoo-x86]/dev-vcs/git/files/git-1.7.3.5-optional-cvs.patch
Gentoo

Contents of /dev-vcs/git/files/git-1.7.3.5-optional-cvs.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (hide annotations) (download)
Fri Jan 7 09:00:26 2011 UTC (4 years, 2 months ago) by robbat2
Branch: MAIN
Bug #350330: Avoid automagic CVS. Need to port to 1.7.4 still.

(Portage version: 2.2.0_alpha13/cvs/Linux x86_64)

1 robbat2 1.1 --- git-1.7.3.5.orig/Makefile 2011-01-06 20:32:54.512331834 +0000
2     +++ git-1.7.3.5/Makefile 2011-01-07 08:22:04.682967076 +0000
3     @@ -183,6 +183,8 @@ all::
4     #
5     # Define NO_TCLTK if you do not want Tcl/Tk GUI.
6     #
7     +# Define NO_CVS if you do not want any CVS interface utilities.
8     +#
9     # The TCL_PATH variable governs the location of the Tcl interpreter
10     # used to optimize git-gui for your system. Only used if NO_TCLTK
11     # is not set. Defaults to the bare 'tclsh'.
12     @@ -339,6 +341,7 @@ LIB_OBJS =
13     PROGRAM_OBJS =
14     PROGRAMS =
15     SCRIPT_PERL =
16     +SCRIPT_PERL_CVS =
17     SCRIPT_PYTHON =
18     SCRIPT_SH =
19     SCRIPT_LIB =
20     @@ -376,17 +379,18 @@ SCRIPT_LIB += git-sh-setup
21     SCRIPT_PERL += git-add--interactive.perl
22     SCRIPT_PERL += git-difftool.perl
23     SCRIPT_PERL += git-archimport.perl
24     -SCRIPT_PERL += git-cvsexportcommit.perl
25     -SCRIPT_PERL += git-cvsimport.perl
26     -SCRIPT_PERL += git-cvsserver.perl
27     SCRIPT_PERL += git-relink.perl
28     SCRIPT_PERL += git-send-email.perl
29     SCRIPT_PERL += git-svn.perl
30    
31     +SCRIPT_PERL_CVS += git-cvsexportcommit.perl
32     +SCRIPT_PERL_CVS += git-cvsimport.perl
33     +SCRIPT_PERL_CVS += git-cvsserver.perl
34     +
35     SCRIPT_PYTHON += git-remote-testgit.py
36    
37     SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
38     - $(patsubst %.perl,%,$(SCRIPT_PERL)) \
39     + $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) \
40     $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
41     git-instaweb
42    
43     @@ -1676,13 +1680,25 @@ $(SCRIPT_LIB) : % : %.sh
44     $(QUIET_GEN)$(cmd_munge_script) && \
45     mv $@+ $@
46    
47     +_SCRIPT_PERL_BUILD =
48     +_SCRIPT_PERL_NOBUILD =
49     +
50     ifndef NO_PERL
51     -$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
52     +
53     +_SCRIPT_PERL_BUILD += $(SCRIPT_PERL)
54     +
55     +ifndef NO_CVS
56     +_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS)
57     +else # NO_CVS
58     +_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS)
59     +endif # NO_CVS
60     +
61     +$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): perl/perl.mak
62    
63     perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL
64     $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
65    
66     -$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
67     +$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl
68     $(QUIET_GEN)$(RM) $@ $@+ && \
69     INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
70     sed -e '1{' \
71     @@ -1738,14 +1754,17 @@ git-instaweb: git-instaweb.sh gitweb/git
72     chmod +x $@+ && \
73     mv $@+ $@
74     else # NO_PERL
75     -$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh
76     +_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb
77     +endif # NO_PERL
78     +
79     +# This is any perl scripts that were disabled it might be empty...
80     +$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)): % : unimplemented.sh
81     $(QUIET_GEN)$(RM) $@ $@+ && \
82     sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
83     -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
84     unimplemented.sh >$@+ && \
85     chmod +x $@+ && \
86     mv $@+ $@
87     -endif # NO_PERL
88    
89     ifndef NO_PYTHON
90     $(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS
91     @@ -1780,7 +1799,7 @@ configure: configure.ac
92     # These can record GIT_VERSION
93     git.o git.spec \
94     $(patsubst %.sh,%,$(SCRIPT_SH)) \
95     - $(patsubst %.perl,%,$(SCRIPT_PERL)) \
96     + $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) \
97     : GIT-VERSION-FILE
98    
99     TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS))
100     diff -Nuarp git-1.7.3.5.orig/t/t9200-git-cvsexportcommit.sh git-1.7.3.5/t/t9200-git-cvsexportcommit.sh
101     --- git-1.7.3.5.orig/t/t9200-git-cvsexportcommit.sh 2011-01-06 00:08:33.000000000 +0000
102     +++ git-1.7.3.5/t/t9200-git-cvsexportcommit.sh 2011-01-07 08:41:46.478972459 +0000
103     @@ -12,6 +12,11 @@ if ! test_have_prereq PERL; then
104     test_done
105     fi
106    
107     +if ! test_have_prereq CVS; then
108     + skip_all='skipping git cvsexportcommit tests, cvs not available'
109     + test_done
110     +fi
111     +
112     cvs >/dev/null 2>&1
113     if test $? -ne 1
114     then
115     diff -Nuarp git-1.7.3.5.orig/t/t9400-git-cvsserver-server.sh git-1.7.3.5/t/t9400-git-cvsserver-server.sh
116     --- git-1.7.3.5.orig/t/t9400-git-cvsserver-server.sh 2011-01-06 00:08:33.000000000 +0000
117     +++ git-1.7.3.5/t/t9400-git-cvsserver-server.sh 2011-01-07 08:42:28.033449530 +0000
118     @@ -11,9 +11,15 @@ cvs CLI client via git-cvsserver server'
119     . ./test-lib.sh
120    
121     if ! test_have_prereq PERL; then
122     - skip_all='skipping git cvsserver tests, perl not available'
123     + skip_all='skipping git-cvsserver tests, perl not available'
124     test_done
125     fi
126     +
127     +if ! test_have_prereq CVS; then
128     + skip_all='skipping git-cvsserver tests, cvs not available'
129     + test_done
130     +fi
131     +
132     cvs >/dev/null 2>&1
133     if test $? -ne 1
134     then
135     diff -Nuarp git-1.7.3.5.orig/t/t9401-git-cvsserver-crlf.sh git-1.7.3.5/t/t9401-git-cvsserver-crlf.sh
136     --- git-1.7.3.5.orig/t/t9401-git-cvsserver-crlf.sh 2011-01-06 00:08:33.000000000 +0000
137     +++ git-1.7.3.5/t/t9401-git-cvsserver-crlf.sh 2011-01-07 08:42:59.907660136 +0000
138     @@ -38,15 +38,20 @@ not_present() {
139     fi
140     }
141    
142     -cvs >/dev/null 2>&1
143     -if test $? -ne 1
144     +if ! test_have_prereq PERL
145     then
146     - skip_all='skipping git-cvsserver tests, cvs not found'
147     + skip_all='skipping git-cvsserver tests, perl not available'
148     test_done
149     fi
150     -if ! test_have_prereq PERL
151     +if ! test_have_prereq CVS
152     then
153     - skip_all='skipping git-cvsserver tests, perl not available'
154     + skip_all='skipping git-cvsserver tests, cvs not available'
155     + test_done
156     +fi
157     +cvs >/dev/null 2>&1
158     +if test $? -ne 1
159     +then
160     + skip_all='skipping git-cvsserver tests, cvs not found'
161     test_done
162     fi
163     "$PERL_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
164     diff -Nuarp git-1.7.3.5.orig/t/t9600-cvsimport.sh git-1.7.3.5/t/t9600-cvsimport.sh
165     --- git-1.7.3.5.orig/t/t9600-cvsimport.sh 2011-01-06 00:08:33.000000000 +0000
166     +++ git-1.7.3.5/t/t9600-cvsimport.sh 2011-01-07 08:44:34.960276512 +0000
167     @@ -3,14 +3,25 @@
168     test_description='git cvsimport basic tests'
169     . ./lib-cvs.sh
170    
171     -test_expect_success PERL 'setup cvsroot environment' '
172     +if ! test_have_prereq PERL
173     +then
174     + skip_all='skipping git cvsimport tests, perl not available'
175     + test_done
176     +fi
177     +if ! test_have_prereq CVS
178     +then
179     + skip_all='skipping git cvsimport tests, cvs not available'
180     + test_done
181     +fi
182     +
183     +test_expect_success 'setup cvsroot environment' '
184     CVSROOT=$(pwd)/cvsroot &&
185     export CVSROOT
186     '
187    
188     -test_expect_success PERL 'setup cvsroot' '$CVS init'
189     +test_expect_success 'setup cvsroot' '$CVS init'
190    
191     -test_expect_success PERL 'setup a cvs module' '
192     +test_expect_success 'setup a cvs module' '
193    
194     mkdir "$CVSROOT/module" &&
195     $CVS co -d module-cvs module &&
196     @@ -42,23 +53,23 @@ EOF
197     )
198     '
199    
200     -test_expect_success PERL 'import a trivial module' '
201     +test_expect_success 'import a trivial module' '
202    
203     git cvsimport -a -R -z 0 -C module-git module &&
204     test_cmp module-cvs/o_fortuna module-git/o_fortuna
205    
206     '
207    
208     -test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
209     +test_expect_success 'pack refs' '(cd module-git && git gc)'
210    
211     -test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
212     +test_expect_success 'initial import has correct .git/cvs-revisions' '
213    
214     (cd module-git &&
215     git log --format="o_fortuna 1.1 %H" -1) > expected &&
216     test_cmp expected module-git/.git/cvs-revisions
217     '
218    
219     -test_expect_success PERL 'update cvs module' '
220     +test_expect_success 'update cvs module' '
221     (cd module-cvs &&
222     cat <<EOF >o_fortuna &&
223     O Fortune,
224     @@ -86,7 +97,7 @@ EOF
225     )
226     '
227    
228     -test_expect_success PERL 'update git module' '
229     +test_expect_success 'update git module' '
230    
231     (cd module-git &&
232     git cvsimport -a -R -z 0 module &&
233     @@ -96,7 +107,7 @@ test_expect_success PERL 'update git mod
234    
235     '
236    
237     -test_expect_success PERL 'update has correct .git/cvs-revisions' '
238     +test_expect_success 'update has correct .git/cvs-revisions' '
239    
240     (cd module-git &&
241     git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
242     @@ -104,7 +115,7 @@ test_expect_success PERL 'update has cor
243     test_cmp expected module-git/.git/cvs-revisions
244     '
245    
246     -test_expect_success PERL 'update cvs module' '
247     +test_expect_success 'update cvs module' '
248    
249     (cd module-cvs &&
250     echo 1 >tick &&
251     @@ -113,7 +124,7 @@ test_expect_success PERL 'update cvs mod
252     )
253     '
254    
255     -test_expect_success PERL 'cvsimport.module config works' '
256     +test_expect_success 'cvsimport.module config works' '
257    
258     (cd module-git &&
259     git config cvsimport.module module &&
260     @@ -124,7 +135,7 @@ test_expect_success PERL 'cvsimport.modu
261    
262     '
263    
264     -test_expect_success PERL 'second update has correct .git/cvs-revisions' '
265     +test_expect_success 'second update has correct .git/cvs-revisions' '
266    
267     (cd module-git &&
268     git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
269     @@ -133,7 +144,7 @@ test_expect_success PERL 'second update
270     test_cmp expected module-git/.git/cvs-revisions
271     '
272    
273     -test_expect_success PERL 'import from a CVS working tree' '
274     +test_expect_success 'import from a CVS working tree' '
275    
276     $CVS co -d import-from-wt module &&
277     (cd import-from-wt &&
278     @@ -145,12 +156,12 @@ test_expect_success PERL 'import from a
279    
280     '
281    
282     -test_expect_success PERL 'no .git/cvs-revisions created by default' '
283     +test_expect_success 'no .git/cvs-revisions created by default' '
284    
285     ! test -e import-from-wt/.git/cvs-revisions
286    
287     '
288    
289     -test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
290     +test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
291    
292     test_done
293     diff -Nuarp git-1.7.3.5.orig/t/t9601-cvsimport-vendor-branch.sh git-1.7.3.5/t/t9601-cvsimport-vendor-branch.sh
294     --- git-1.7.3.5.orig/t/t9601-cvsimport-vendor-branch.sh 2011-01-06 00:08:33.000000000 +0000
295     +++ git-1.7.3.5/t/t9601-cvsimport-vendor-branch.sh 2011-01-07 08:45:11.251279877 +0000
296     @@ -34,6 +34,17 @@
297     test_description='git cvsimport handling of vendor branches'
298     . ./lib-cvs.sh
299    
300     +if ! test_have_prereq PERL
301     +then
302     + skip_all='skipping git cvsimport tests, perl not available'
303     + test_done
304     +fi
305     +if ! test_have_prereq CVS
306     +then
307     + skip_all='skipping git cvsimport tests, cvs not available'
308     + test_done
309     +fi
310     +
311     setup_cvs_test_repository t9601
312    
313     test_expect_success PERL 'import a module with a vendor branch' '
314     diff -Nuarp git-1.7.3.5.orig/t/t9602-cvsimport-branches-tags.sh git-1.7.3.5/t/t9602-cvsimport-branches-tags.sh
315     --- git-1.7.3.5.orig/t/t9602-cvsimport-branches-tags.sh 2011-01-06 00:08:33.000000000 +0000
316     +++ git-1.7.3.5/t/t9602-cvsimport-branches-tags.sh 2011-01-07 08:45:17.234778646 +0000
317     @@ -6,6 +6,17 @@
318     test_description='git cvsimport handling of branches and tags'
319     . ./lib-cvs.sh
320    
321     +if ! test_have_prereq PERL
322     +then
323     + skip_all='skipping git cvsimport tests, perl not available'
324     + test_done
325     +fi
326     +if ! test_have_prereq CVS
327     +then
328     + skip_all='skipping git cvsimport tests, cvs not available'
329     + test_done
330     +fi
331     +
332     setup_cvs_test_repository t9602
333    
334     test_expect_success PERL 'import module' '
335     diff -Nuarp git-1.7.3.5.orig/t/t9603-cvsimport-patchsets.sh git-1.7.3.5/t/t9603-cvsimport-patchsets.sh
336     --- git-1.7.3.5.orig/t/t9603-cvsimport-patchsets.sh 2011-01-06 00:08:33.000000000 +0000
337     +++ git-1.7.3.5/t/t9603-cvsimport-patchsets.sh 2011-01-07 08:45:24.371642637 +0000
338     @@ -14,6 +14,17 @@
339     test_description='git cvsimport testing for correct patchset estimation'
340     . ./lib-cvs.sh
341    
342     +if ! test_have_prereq PERL
343     +then
344     + skip_all='skipping git cvsimport tests, perl not available'
345     + test_done
346     +fi
347     +if ! test_have_prereq CVS
348     +then
349     + skip_all='skipping git cvsimport tests, cvs not available'
350     + test_done
351     +fi
352     +
353     setup_cvs_test_repository t9603
354    
355     test_expect_failure 'import with criss cross times on revisions' '
356     diff -Nuarp git-1.7.3.5.orig/t/test-lib.sh git-1.7.3.5/t/test-lib.sh
357     --- git-1.7.3.5.orig/t/test-lib.sh 2011-01-06 00:08:33.000000000 +0000
358     +++ git-1.7.3.5/t/test-lib.sh 2011-01-07 08:40:05.006179654 +0000
359     @@ -1015,6 +1015,7 @@ case $(uname -s) in
360     ;;
361     esac
362    
363     +test -z "$NO_CVS" && test_set_prereq CVS
364     test -z "$NO_PERL" && test_set_prereq PERL
365     test -z "$NO_PYTHON" && test_set_prereq PYTHON
366    

  ViewVC Help
Powered by ViewVC 1.1.20