{"thread":{"id":"9048","subject":"[PATCH 0/4] Move git-p4import into contrib directory.","startedAt":"2007-07-15T19:48:04Z","lastAt":"2007-07-15T22:37:09Z","messageCount":7,"participants":["Sean","Scott Lamb","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"47452","messageId":"20070715154804.2877361d.seanlkml@sympatico.ca","threadId":"9048","inReplyTo":null,"subject":"[PATCH 0/4] Move git-p4import into contrib directory.","fromName":"Sean","fromEmail":"seanlkml@sympatico.ca","sentAt":"2007-07-15T19:48:04Z","receivedAt":"2007-07-15T19:48:04Z","isPatch":true,"sender":{"key":"seanlkml@sympatico.ca","avatar":"https://gravatar.com/avatar/f92923f54fc08c401fc59b71829d4b89e9b8087fbba45ff87c82e6a83aee02ae?d=mp&s=160"},"body":"\nHi Junio,\n\nHaving caught up on some list emails, it appears that Git now has a\nmuch better option for importing from Perforce in the git-p4 front\nend to fast-import.\n\nIs there anyone out there actually even using git-p4import? It was\nwritten for a very specific case, by a git wannabe hacker who had\nnever used Perforce before, and not intended for inclusion in Git\nproper...\n\nMy guess is that it could be removed outright without pain to anyone,\nbut as a first step, it could be moved into contrib for 1.5.3.\n\nSean\n"},{"id":"47453","messageId":"20070715154933.6b24ef74.seanlkml@sympatico.ca","threadId":"9048","inReplyTo":"20070715154804.2877361d.seanlkml@sympatico.ca","subject":"[PATCH 1/4] Remove \"WITH_P4IMPORT\" knob from the Makefile","fromName":"Sean","fromEmail":"seanlkml@sympatico.ca","sentAt":"2007-07-15T19:49:33Z","receivedAt":"2007-07-15T19:49:33Z","isPatch":true,"sender":{"key":"seanlkml@sympatico.ca","avatar":"https://gravatar.com/avatar/f92923f54fc08c401fc59b71829d4b89e9b8087fbba45ff87c82e6a83aee02ae?d=mp&s=160"},"body":"\nSigned-off-by: Sean Estabrooks \n---\n Makefile | 26 --------------------------\n 1 files changed, 0 insertions(+), 26 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 5b30e5c..cc18bf4 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -112,8 +112,6 @@ all::\n # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's\n # MakeMaker (e.g. using ActiveState under Cygwin).\n #\n-# Define WITH_P4IMPORT to build and install Python git-p4import script.\n-#\n # Define NO_TCLTK if you do not want Tcl/Tk GUI.\n #\n # The TCL_PATH variable governs the location of the Tcl interpreter\n@@ -222,20 +220,9 @@ SCRIPT_PERL = \\\n \tgit-svnimport.perl git-cvsexportcommit.perl \\\n \tgit-send-email.perl git-svn.perl\n \n-SCRIPT_PYTHON = \\\n-\tgit-p4import.py\n-\n-ifdef WITH_P4IMPORT\n SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \\\n \t $(patsubst %.perl,%,$(SCRIPT_PERL)) \\\n-\t $(patsubst %.py,%,$(SCRIPT_PYTHON)) \\\n \t git-status git-instaweb\n-else\n-SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \\\n-\t $(patsubst %.perl,%,$(SCRIPT_PERL)) \\\n-\t git-status git-instaweb\n-endif\n-\n \n # ... and all the rest that could be moved out of bindir to gitexecdir\n PROGRAMS = \\\n@@ -285,9 +272,6 @@ endif\n ifndef PERL_PATH\n \tPERL_PATH = /usr/bin/perl\n endif\n-ifndef PYTHON_PATH\n-\tPYTHON_PATH = /usr/local/bin/python\n-endif\n \n export PERL_PATH\n \n@@ -710,7 +694,6 @@ prefix_SQ = $(subst ','\\'',$(prefix))\n \n SHELL_PATH_SQ = $(subst ','\\'',$(SHELL_PATH))\n PERL_PATH_SQ = $(subst ','\\'',$(PERL_PATH))\n-PYTHON_PATH_SQ = $(subst ','\\'',$(PYTHON_PATH))\n TCLTK_PATH_SQ = $(subst ','\\'',$(TCLTK_PATH))\n \n LIBS = $(GITLIBS) $(EXTLIBS)\n@@ -782,15 +765,6 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh\n \n $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak\n \n-$(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py\n-\trm -f $@ $@+\n-\tsed -e '1s|#!.*/python|#!$(PYTHON_PATH_SQ)|' \\\n-\t -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \\\n-\t -e 's/@@NO_CURL@@/$(NO_CURL)/g' \\\n-\t $@.py >$@+\n-\tchmod +x $@+\n-\tmv $@+ $@\n-\n perl/perl.mak: GIT-CFLAGS\n \t$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)\n \n-- \n1.5.3.rc0.826.gc301a3\n"},{"id":"47454","messageId":"20070715155101.af14204c.seanlkml@sympatico.ca","threadId":"9048","inReplyTo":"20070715154804.2877361d.seanlkml@sympatico.ca","subject":"[PATCH 2/4] Remove p4 rpm from git.spec.in.","fromName":"Sean","fromEmail":"seanlkml@sympatico.ca","sentAt":"2007-07-15T19:51:01Z","receivedAt":"2007-07-15T19:51:01Z","isPatch":true,"sender":{"key":"seanlkml@sympatico.ca","avatar":"https://gravatar.com/avatar/f92923f54fc08c401fc59b71829d4b89e9b8087fbba45ff87c82e6a83aee02ae?d=mp&s=160"},"body":"\nSigned-off-by: Sean Estabrooks \n---\n git.spec.in | 29 +++++++++--------------------\n 1 files changed, 9 insertions(+), 20 deletions(-)\n\n\nNOTE: Unfortunately i have no way to test this here, anyone?\n\n\ndiff --git a/git.spec.in b/git.spec.in\nindex 27182ba..fe7b3d8 100644\n--- a/git.spec.in\n+++ b/git.spec.in\n@@ -12,7 +12,7 @@ URL: \t\thttp://kernel.org/pub/software/scm/git/\n Source: \thttp://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz\n BuildRequires:\tzlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3}\n BuildRoot:\t%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)\n-Requires:\tgit-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, git-p4, perl-Git\n+Requires:\tgit-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git\n \n %description\n Git is a fast, scalable, distributed revision control system with an\n@@ -53,13 +53,6 @@ Requires: git-core = %{version}-%{release}, tla\n %description arch\n Git tools for importing Arch repositories.\n \n-%package p4\n-Summary: Git tools for importing Perforce repositories\n-Group: Development/Tools\n-Requires: git-core = %{version}-%{release}, python\n-%description p4\n-Git tools for importing Perforce repositories.\n-\n %package email\n Summary: Git tools for sending email\n Group: Development/Tools\n@@ -95,14 +88,14 @@ Perl interface to Git\n %setup -q\n \n %build\n-make %{_smp_mflags} CFLAGS=\"$RPM_OPT_FLAGS\" WITH_P4IMPORT=YesPlease \\\n+make %{_smp_mflags} CFLAGS=\"$RPM_OPT_FLAGS\" \\\n ETC_GITCONFIG=/etc/gitconfig \\\n- prefix=%{_prefix} PYTHON_PATH=%{python_path} all %{!?_without_docs: doc}\n+ prefix=%{_prefix} all %{!?_without_docs: doc}\n \n %install\n rm -rf $RPM_BUILD_ROOT\n make %{_smp_mflags} CFLAGS=\"$RPM_OPT_FLAGS\" DESTDIR=$RPM_BUILD_ROOT \\\n- WITH_P4IMPORT=YesPlease prefix=%{_prefix} mandir=%{_mandir} \\\n+ prefix=%{_prefix} mandir=%{_mandir} \\\n ETC_GITCONFIG=/etc/gitconfig \\\n PYTHON_PATH=%{python_path} \\\n INSTALLDIRS=vendor install %{!?_without_docs: install-doc}\n@@ -110,10 +103,10 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'\n find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'\n find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'\n \n-(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE \"p4import|archimport|svn|cvs|email|gitk|git-gui|git-citool\" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files\n+(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE \"archimport|svn|cvs|email|gitk|git-gui|git-citool\" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files\n (find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files\n %if %{!?_without_docs:1}0\n-(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE \"p4import|archimport|svn|git-cvs|email|gitk|git-gui|git-citool\" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files\n+(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE \"archimport|svn|git-cvs|email|gitk|git-gui|git-citool\" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files\n %else\n rm -rf $RPM_BUILD_ROOT%{_mandir}\n %endif\n@@ -145,13 +138,6 @@ rm -rf $RPM_BUILD_ROOT\n %{!?_without_docs: %{_mandir}/man1/git-archimport.1*}\n %{!?_without_docs: %doc Documentation/git-archimport.html }\n \n-%files p4\n-%defattr(-,root,root)\n-%doc Documentation/git-p4import.txt\n-%{_bindir}/git-p4import\n-%{!?_without_docs: %{_mandir}/man1/git-p4import.1*}\n-%{!?_without_docs: %doc Documentation/git-p4import.html }\n-\n %files email\n %defattr(-,root,root)\n %doc Documentation/*email*.txt\n@@ -187,6 +173,9 @@ rm -rf $RPM_BUILD_ROOT\n %{!?_without_docs: %doc Documentation/technical}\n \n %changelog\n+* Sun Jul 15 2007 Sean Estabrooks \n+- Removed p4import.\n+\n * Tue Jun 26 2007 Quy Tonthat \n - Fixed problems looking for wrong manpages.\n \n-- \n1.5.3.rc0.826.gc301a3\n\nOn Sun, 15 Jul 2007 15:48:04 -0400\nSean wrote:\n\n> Hi Junio,\n> \n> Having caught up on some list emails, it appears that Git now has a\n> much better option for importing from Perforce in the git-p4 front\n> end to fast-import.\n> \n> Is there anyone out there actually even using git-p4import? It was\n> written for a very specific case, by a git wannabe hacker who had\n> never used Perforce before, and not intended for inclusion in Git\n> proper...\n> \n> My guess is that it could be removed outright without pain to anyone,\n> but as a first step, it could be moved into contrib for 1.5.3.\n> \n> Sean\n> \n"},{"id":"47455","messageId":"20070715155232.fb6ff093.seanlkml@sympatico.ca","threadId":"9048","inReplyTo":"20070715154804.2877361d.seanlkml@sympatico.ca","subject":"[PATCH 3/4] Demote git-p4import to contrib status.","fromName":"Sean","fromEmail":"seanlkml@sympatico.ca","sentAt":"2007-07-15T19:52:32Z","receivedAt":"2007-07-15T19:52:32Z","isPatch":true,"sender":{"key":"seanlkml@sympatico.ca","avatar":"https://gravatar.com/avatar/f92923f54fc08c401fc59b71829d4b89e9b8087fbba45ff87c82e6a83aee02ae?d=mp&s=160"},"body":"\nMove git-p4import.py and Documentation/git-p4import.txt into\na contrib/p4import directory. Add a README there directing\npeople to contrib/fast-import/git-p4 as a better alternative.\n\nSigned-off-by: Sean Estabrooks \n---\n contrib/p4import/README | 1 +\n .../p4import/git-p4import.py | 0 \n .../p4import}/git-p4import.txt | 0 \n 3 files changed, 1 insertions(+), 0 deletions(-)\n create mode 100644 contrib/p4import/README\n rename git-p4import.py => contrib/p4import/git-p4import.py (100%)\n rename {Documentation => contrib/p4import}/git-p4import.txt (100%)\n\ndiff --git a/contrib/p4import/README b/contrib/p4import/README\nnew file mode 100644\nindex 0000000..b9892b6\n--- /dev/null\n+++ b/contrib/p4import/README\n@@ -0,0 +1 @@\n+Please see contrib/fast-import/git-p4 for a better Perforce importer.\ndiff --git a/git-p4import.py b/contrib/p4import/git-p4import.py\nsimilarity index 100%\nrename from git-p4import.py\nrename to contrib/p4import/git-p4import.py\ndiff --git a/Documentation/git-p4import.txt b/contrib/p4import/git-p4import.txt\nsimilarity index 100%\nrename from Documentation/git-p4import.txt\nrename to contrib/p4import/git-p4import.txt\n-- \n1.5.3.rc0.826.gc301a3\n"},{"id":"47456","messageId":"20070715155335.2784dd0f.seanlkml@sympatico.ca","threadId":"9048","inReplyTo":"20070715154804.2877361d.seanlkml@sympatico.ca","subject":"[PATCH 4/4] Update 1.5.3 release notes: git-p4import has been deprecated","fromName":"Sean","fromEmail":"seanlkml@sympatico.ca","sentAt":"2007-07-15T19:53:35Z","receivedAt":"2007-07-15T19:53:35Z","isPatch":true,"sender":{"key":"seanlkml@sympatico.ca","avatar":"https://gravatar.com/avatar/f92923f54fc08c401fc59b71829d4b89e9b8087fbba45ff87c82e6a83aee02ae?d=mp&s=160"},"body":"\nSigned-off-by: Sean Estabrooks \n---\n Documentation/RelNotes-1.5.3.txt | 5 +++++\n 1 files changed, 5 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/RelNotes-1.5.3.txt b/Documentation/RelNotes-1.5.3.txt\nindex e2e809e..00b2b93 100644\n--- a/Documentation/RelNotes-1.5.3.txt\n+++ b/Documentation/RelNotes-1.5.3.txt\n@@ -172,6 +172,11 @@ Updates since v1.5.2\n concatenate them into a single line and treat the result as\n \"oneline\".\n \n+ - \"git p4import\" has been demoted to contrib status. For\n+ a superior option, checkout the git-p4 front end to\n+ git-fast-import (also in contrib). The man page and p4\n+ rpm have been removed as well.\n+\n * Builds\n \n - old-style function definitions (most notably, a function\n-- \n1.5.3.rc0.826.gc301a3\n"},{"id":"47462","messageId":"469A9771.1000805@slamb.org","threadId":"9048","inReplyTo":"20070715154804.2877361d.seanlkml@sympatico.ca","subject":"Re: [PATCH 0/4] Move git-p4import into contrib directory.","fromName":"Scott Lamb","fromEmail":"slamb@slamb.org","sentAt":"2007-07-15T21:53:53Z","receivedAt":"2007-07-15T21:53:53Z","isPatch":true,"sender":{"key":"slamb@slamb.org","avatar":null},"body":"Sean wrote:\n> Hi Junio,\n> \n> Having caught up on some list emails, it appears that Git now has a\n> much better option for importing from Perforce in the git-p4 front\n> end to fast-import.\n> \n> Is there anyone out there actually even using git-p4import? It was\n> written for a very specific case, by a git wannabe hacker who had\n> never used Perforce before, and not intended for inclusion in Git\n> proper...\n> \n> My guess is that it could be removed outright without pain to anyone,\n> but as a first step, it could be moved into contrib for 1.5.3.\n\nI vote for removing it immediately. It has serious bugs - e.g.,\nincremental mode is totally broken. I sent in a patch a month ago to fix\nthis particular bug, which remains unapplied. Now that git-p4 has made\nit into git.git, I don't think anyone - myself included - is interested\nin creating or merging git-p4import.py fixes. Keeping git-p4import.py in\nthis broken state just wastes the time of anyone unlucky enough to see\nit first.\n\nBest regards,\nScott\n\n-- \nScott Lamb \n"},{"id":"47467","messageId":"7vr6n9cmzu.fsf@assigned-by-dhcp.cox.net","threadId":"9048","inReplyTo":"20070715154804.2877361d.seanlkml@sympatico.ca","subject":"Re: [PATCH 0/4] Move git-p4import into contrib directory.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-07-15T22:37:09Z","receivedAt":"2007-07-15T22:37:09Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Sean writes:\n\n> Having caught up on some list emails, it appears that Git now has a\n> much better option for importing from Perforce in the git-p4 front\n> end to fast-import.\n>\n> Is there anyone out there actually even using git-p4import? It was\n> written for a very specific case, by a git wannabe hacker who had\n> never used Perforce before, and not intended for inclusion in Git\n> proper...\n>\n> My guess is that it could be removed outright without pain to anyone,\n> but as a first step, it could be moved into contrib for 1.5.3.\n\nWell, I am all for reducing the code base all the time ;-).\n"}]}