git-migration: cvs2git.options, pld-git.sh, cvswrapper (NEW) - move work of...

[draenog]

Author: draenog                      Date: Fri May 13 15:00:39 2011 GMT
Module: git-migration                 Tag: HEAD
---- Log message:
- move work of git-filter-branch to cvswrapper; it should be faster

---- Files affected:
git-migration:
   cvs2git.options (1.3 -> 1.4) , pld-git.sh (1.39 -> 1.40) , cvswrapper (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: git-migration/cvs2git.options
diff -u git-migration/cvs2git.options:1.3 git-migration/cvs2git.options:1.4
--- git-migration/cvs2git.options:1.3	Mon Apr  4 15:11:34 2011
+++ git-migration/cvs2git.options	Fri May 13 17:00:34 2011
@@ -156,7 +156,7 @@
     #
     # Uncomment one of the two following lines:
     #RCSRevisionReader(co_executable=r'co'),
-    CVSRevisionReader(cvs_executable=r'cvs'),
+    CVSRevisionReader(cvs_executable=r'./cvswrapper'),
     )
 # This second alternative is vastly faster than the version above.  It
 # uses an external Python program to reconstruct the contents of CVS

================================================================
Index: git-migration/pld-git.sh
diff -u git-migration/pld-git.sh:1.39 git-migration/pld-git.sh:1.40
--- git-migration/pld-git.sh:1.39	Fri May 13 16:58:52 2011
+++ git-migration/pld-git.sh	Fri May 13 17:00:34 2011
@@ -133,9 +133,6 @@
 		git fast-import --import-marks=cvs2svn-tmp/cvs2git.marks < cvs2svn-tmp/git-dump.dat
 		./cvs2git_fixes.sh deadbranch
 
-		# make final changes to converted repos by git-filter-branch
-		git filter-branch --tree-filter ". $tree_filter" -- --all
-
 		# clear all refs
 		git for-each-ref --format="%(refname)" refs/original/ | xargs -r -n 1 git update-ref -d
 		git gc --prune=now

================================================================
Index: git-migration/cvswrapper
diff -u /dev/null git-migration/cvswrapper:1.1
--- /dev/null	Fri May 13 17:00:39 2011
+++ git-migration/cvswrapper	Fri May 13 17:00:34 2011
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+first_line='# \$Revision$, \$Date$'
+changelog_line='%changelog'
+define_date_line='%define[\t ]*date[\t ]*.*'
+
+x=$@
+if [ "${x%.spec}" = "$x" ]; then
+    cvs $@
+else
+    cvs $@ | \
+        sed -e "
+		/^${first_line}$/d
+		/^${define_date_line}$/,\$d
+	"  | \
+        sed -e "
+		# kill last empty line(s)
+		\${/^\$/d}
+        "
+fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/git-migration/cvs2git.options?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/git-migration/pld-git.sh?r1=1.39&r2=1.40&f=u