Robin RosenbergFrom: Robin Rosenberg <robin.rosenberg@dewire.com>
Binary files are except to this so far. ---
git-cvsexportcommit.perl | 24 +++++++++++++++-- t/t9200-git-cvsexportcommit.sh | 55 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 3 deletions(-)
Show changes to 2 files +76 −3
git-cvsexportcommit.perl, t/t9200-git-cvsexportcommit.sh
diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl index 99b3dc3..d78100c 100755 --- a/git-cvsexportcommit.perl +++ b/git-cvsexportcommit.perl @@ -121,7 +121,14 @@ #print @files; $? && die "Error in git-diff-tree"; foreach my $f (@files) { chomp $f; - my @fields = split(m!\s+!, $f); + $f =~ m/^(\S+) (\S+) (\S+) (\S+) (\S+) (.*)/; + my @fields = (); + $fields[++$#fields] = $1; + $fields[++$#fields] = $2; + $fields[++$#fields] = $3; + $fields[++$#fields] = $4; + $fields[++$#fields] = $5; + $fields[++$#fields] = $6; if ($fields[4] eq 'A') { my $path = $fields[5]; push @afiles, $path; @@ -217,7 +224,7 @@ foreach my $f (@bfiles) { } # replace with the new file - `git-cat-file blob $blob > $f`; + `git-cat-file blob $blob > "$f"`; # TODO: something smart with file modes @@ -231,7 +238,18 @@ ## apply non-binary changes my $fuzz = $opt_p ? 0 : 2; print "Patching non-binary files\n"; -print `(git-diff-tree -p $parent -p $commit | patch -p1 -F $fuzz ) 2>&1`; + +my $saveslash = $/; +undef $/; + +open DIFF, "git-diff-tree -p $parent -p $commit|" || die "Cannot diff"; +open PATCH, "|patch -p1 -F $fuzz" || die "Cannot patch"; +my $delta = <DIFF>; +close DIFF || die "Could not diff"; +$delta =~ s/\n(index [^\n]*)\n(--- [^\n]*)\n(\+\+\+ [^\n]*)\n(@@[^\n]*@@)\n/$1\n$2\t\n$3\t\n$4\n/sg; +print PATCH $delta; +close PATCH || die "Could not patch"; +$/ = $saveslash; my $dirtypatch = 0; if (($? >> 8) == 2) { diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh new file mode 100755 index 0000000..1041bb6 --- /dev/null +++ b/t/t9200-git-cvsexportcommit.sh @@ -0,0 +1,55 @@ +#!/bin/bash + +test_description='CVS export comit. + +These tests are ad-hoc ones made to test +some changes, not a complete test.' + +. ./test-lib.sh + +export CVSROOT=$(dirname $(pwd))/cvsroot +export CVSWORK=$(dirname $(pwd))/cvswork +rm -rf $CVSROOT $CVSWORK +mkdir $CVSROOT +cvs init +cvs -Q co -d $CVSWORK . +export GIT_DIR=$(pwd)/.git + +echo >empty && +git add empty && +git commit -a -m "Initial" + +test_expect_success \ + 'New file' \ + 'echo hello >newfile.txt && + git add newfile.txt && + git commit -a -m "Hello" && + id=$(git rev-list --max-count=1 HEAD) && + (cd $CVSWORK && + git cvsexportcommit -c $id && + test $(cat CVS/Entries|wc -l) = 2 + )' + +test_expect_success \ + 'New file with spaces in file name' \ + 'echo ok then >"with spaces.txt" && + git add "with spaces.txt" && \ + git commit -a -m "With spaces" && + id=$(git rev-list --max-count=1 HEAD) && + (cd $CVSWORK && + git-cvsexportcommit.perl -c $id && + test $(cat CVS/Entries|wc -l) = 3 + )' + +test_expect_success \ + 'Update file with spaces in file name' \ + 'echo Ok then >>"with spaces.txt" && + git add "with spaces.txt" && + git commit -a -m "Update with spaces" && + id=$(git rev-list --max-count=1 HEAD) && + (cd $CVSWORK && + git-cvsexportcommit.perl -c $id && + test $(cat CVS/Entries|wc -l) = 3 + )' + +test_done
