public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: "Tommy M. McGuire" <mcguire@crsr•net>
To: "Tommy M. McGuire" <mcguire@crsr•net>
Cc: Linus Torvalds <torvalds@osdl•org>,
	Git Mailing List <git@vger•kernel.org>
Subject: [PATCH] git cvsimport fuzz argument
Date: Fri, 10 Jun 2005 01:38:32 -0500	[thread overview]
Message-ID: <20050610063832.GC4763@immutable.crsr.net> (raw)
In-Reply-To: <20050610062206.GA3992@immutable.crsr.net>

Give the user the option of specifying the timestamp fuzz passed to
cvsps.  Looking at the other arguments to it, I can't see anything else
that would be sane to play with.  Also, use --cvs-direct, which speeds
up cvsps for remote repositories and doesn't seem to do anything bad to
local repositories.

Signed-off-by: Tommy McGuire <mcguire@crsr•net>

Add "-z fuzz" argument, passed to cvsps, and clean up argument processing.
Also, use "cvsps --cvs-direct", which is is somewhat faster.

---
commit 018aee88d1b71f96ce9ecdfba77608566f51c860
tree 623c7a40ea20ef8b68cf896605d55432cd0469ac
parent 9a861c244e79634abf3c8436d720e77140d0e0e3
author Tommy M. McGuire <mcguire@crsr•net> Fri, 10 Jun 2005 02:51:34 -0500
committer Tommy M. McGuire <mcguire@crsr•net> Fri, 10 Jun 2005 02:51:34 -0500

 git-cvsimport-script |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/git-cvsimport-script b/git-cvsimport-script
--- a/git-cvsimport-script
+++ b/git-cvsimport-script
@@ -1,15 +1,26 @@
 #!/bin/sh
-ARGS=""
-if [ "$1" == "-v" ]; then
-	ARGS=$1
+
+usage () {
+	echo "Usage: git cvsimport [-v] [-z fuzz] <cvsroot> <module>"
+	exit 1
+}
+
+CVS2GIT=""
+CVSPS="--cvs-direct -x -A"
+while true; do
+	case "$1" in
+	-v) CVS2GIT="$1" ;;
+	-z) shift; CVSPS="$CVSPS -z $1" ;;
+	-*) usage ;;
+	*)  break ;;
+	esac
 	shift
-fi
+done
 
 export CVSROOT="$1"
 export MODULE="$2"
 if [ ! "$CVSROOT" ] || [ ! "$MODULE" ] ; then
-	echo "Usage: git cvsimport <cvsroot> <module>"
-	exit 1
+	usage
 fi
 
 cvsps -h 2>&1 | grep -q "cvsps version 2.1" >& /dev/null || {
@@ -20,8 +31,8 @@ cvsps -h 2>&1 | grep -q "cvsps version 2
 mkdir "$MODULE" || exit 1
 cd "$MODULE"
 
-TZ=UTC cvsps -x -A $MODULE > .git-cvsps-result
+TZ=UTC cvsps $CVSPS $MODULE > .git-cvsps-result
 [ -s .git-cvsps-result ] || exit 1
-git-cvs2git $ARGS --cvsroot="$CVSROOT" --module="$MODULE" < .git-cvsps-result > .git-create-script || exit 1
+git-cvs2git $CVS2GIT --cvsroot="$CVSROOT" --module="$MODULE" < .git-cvsps-result > .git-create-script || exit 1
 sh .git-create-script
 


\f
!-------------------------------------------------------------flip-


-- 
Tommy McGuire

     prev parent reply	other threads:[~2005-06-10  6:34 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-06-07 23:03 "git cvsimport" Linus Torvalds
2005-06-08  5:32 ` Tommy M. McGuire
2005-06-10  6:22 ` [PATCH] " Tommy M. McGuire
2005-06-10  6:27   ` [PATCH] git cvsimport sanity checking Tommy M. McGuire
2005-06-10  6:33   ` [PATCH] cvs-migration.txt Tommy M. McGuire
2005-06-10  6:38   ` Tommy M. McGuire [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20050610063832.GC4763@immutable.crsr.net \
    --to=mcguire@crsr$(echo .)net \
    --cc=git@vger$(echo .)kernel.org \
    --cc=torvalds@osdl$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox