Browse Source
* ra/anno: Add git-annotate, a tool for assigning blame. git-svn: 0.9.1: add --version and copyright/license (GPL v2+) information contrib/git-svn: add Makefile, test, and associated ignores git-svn: fix several corner-case and rare bugs with 'commit' contrib/git-svn.txt: add a note about renamed/copied directory support git-svn: change ; to && in addremove() git-svn: remove any need for the XML::Simple dependency git-svn: Allow for more argument types for commit (from..to) git-svn: allow --find-copies-harder and -l<num> to be passed on commit git-svn: fix a typo in defining the --no-stop-on-copy optionmaint
Junio C Hamano
19 years ago
7 changed files with 854 additions and 118 deletions
@ -0,0 +1,4 @@
@@ -0,0 +1,4 @@
|
||||
git-svn |
||||
git-svn.xml |
||||
git-svn.html |
||||
git-svn.1 |
||||
@ -0,0 +1,32 @@
@@ -0,0 +1,32 @@
|
||||
all: git-svn |
||||
|
||||
prefix?=$(HOME) |
||||
bindir=$(prefix)/bin |
||||
mandir=$(prefix)/man |
||||
man1=$(mandir)/man1 |
||||
INSTALL?=install |
||||
doc_conf=../../Documentation/asciidoc.conf |
||||
-include ../../config.mak |
||||
|
||||
git-svn: git-svn.perl |
||||
cp $< $@ |
||||
chmod +x $@ |
||||
|
||||
install: all |
||||
$(INSTALL) -d -m755 $(DESTDIR)$(bindir) |
||||
$(INSTALL) git-svn $(DESTDIR)$(bindir) |
||||
|
||||
install-doc: doc |
||||
$(INSTALL) git-svn.1 $(DESTDIR)$(man1) |
||||
|
||||
doc: git-svn.1 |
||||
git-svn.1 : git-svn.xml |
||||
xmlto man git-svn.xml |
||||
git-svn.xml : git-svn.txt |
||||
asciidoc -b docbook -d manpage \ |
||||
-f ../../Documentation/asciidoc.conf $< |
||||
test: |
||||
cd t && $(SHELL) ./t0000-contrib-git-svn.sh |
||||
|
||||
clean: |
||||
rm -f git-svn *.xml *.html *.1 |
||||
@ -0,0 +1,216 @@
@@ -0,0 +1,216 @@
|
||||
#!/bin/sh |
||||
# |
||||
# Copyright (c) 2006 Eric Wong |
||||
# |
||||
|
||||
|
||||
PATH=$PWD/../:$PATH |
||||
test_description='git-svn tests' |
||||
if test -d ../../../t |
||||
then |
||||
cd ../../../t |
||||
else |
||||
echo "Must be run in contrib/git-svn/t" >&2 |
||||
exit 1 |
||||
fi |
||||
|
||||
. ./test-lib.sh |
||||
|
||||
GIT_DIR=$PWD/.git |
||||
GIT_SVN_DIR=$GIT_DIR/git-svn |
||||
SVN_TREE=$GIT_SVN_DIR/tree |
||||
|
||||
svnadmin >/dev/null 2>&1 |
||||
if test $? != 1 |
||||
then |
||||
test_expect_success 'skipping contrib/git-svn test' : |
||||
test_done |
||||
exit |
||||
fi |
||||
|
||||
svn >/dev/null 2>&1 |
||||
if test $? != 1 |
||||
then |
||||
test_expect_success 'skipping contrib/git-svn test' : |
||||
test_done |
||||
exit |
||||
fi |
||||
|
||||
svnrepo=$PWD/svnrepo |
||||
|
||||
set -e |
||||
|
||||
svnadmin create $svnrepo |
||||
svnrepo="file://$svnrepo/test-git-svn" |
||||
|
||||
mkdir import |
||||
|
||||
cd import |
||||
|
||||
echo foo > foo |
||||
ln -s foo foo.link |
||||
mkdir -p dir/a/b/c/d/e |
||||
echo 'deep dir' > dir/a/b/c/d/e/file |
||||
mkdir -p bar |
||||
echo 'zzz' > bar/zzz |
||||
echo '#!/bin/sh' > exec.sh |
||||
chmod +x exec.sh |
||||
svn import -m 'import for git-svn' . $svnrepo >/dev/null |
||||
|
||||
cd .. |
||||
|
||||
rm -rf import |
||||
|
||||
test_expect_success \ |
||||
'initialize git-svn' \ |
||||
"git-svn init $svnrepo" |
||||
|
||||
test_expect_success \ |
||||
'import an SVN revision into git' \ |
||||
'git-svn fetch' |
||||
|
||||
|
||||
name='try a deep --rmdir with a commit' |
||||
git checkout -b mybranch git-svn-HEAD |
||||
mv dir/a/b/c/d/e/file dir/file |
||||
cp dir/file file |
||||
git update-index --add --remove dir/a/b/c/d/e/file dir/file file |
||||
git commit -m "$name" |
||||
|
||||
test_expect_success "$name" \ |
||||
"git-svn commit --find-copies-harder --rmdir git-svn-HEAD..mybranch && |
||||
test -d $SVN_TREE/dir && test ! -d $SVN_TREE/dir/a" |
||||
|
||||
|
||||
name='detect node change from file to directory #1' |
||||
mkdir dir/new_file |
||||
mv dir/file dir/new_file/file |
||||
mv dir/new_file dir/file |
||||
git update-index --remove dir/file |
||||
git update-index --add dir/file/file |
||||
git commit -m "$name" |
||||
|
||||
test_expect_code 1 "$name" \ |
||||
'git-svn commit --find-copies-harder --rmdir git-svn-HEAD..mybranch' \ |
||||
|| true |
||||
|
||||
|
||||
name='detect node change from directory to file #1' |
||||
rm -rf dir $GIT_DIR/index |
||||
git checkout -b mybranch2 git-svn-HEAD |
||||
mv bar/zzz zzz |
||||
rm -rf bar |
||||
mv zzz bar |
||||
git update-index --remove -- bar/zzz |
||||
git update-index --add -- bar |
||||
git commit -m "$name" |
||||
|
||||
test_expect_code 1 "$name" \ |
||||
'git-svn commit --find-copies-harder --rmdir git-svn-HEAD..mybranch2' \ |
||||
|| true |
||||
|
||||
|
||||
name='detect node change from file to directory #2' |
||||
rm -f $GIT_DIR/index |
||||
git checkout -b mybranch3 git-svn-HEAD |
||||
rm bar/zzz |
||||
git-update-index --remove bar/zzz |
||||
mkdir bar/zzz |
||||
echo yyy > bar/zzz/yyy |
||||
git-update-index --add bar/zzz/yyy |
||||
git commit -m "$name" |
||||
|
||||
test_expect_code 1 "$name" \ |
||||
'git-svn commit --find-copies-harder --rmdir git-svn-HEAD..mybranch3' \ |
||||
|| true |
||||
|
||||
|
||||
name='detect node change from directory to file #2' |
||||
rm -f $GIT_DIR/index |
||||
git checkout -b mybranch4 git-svn-HEAD |
||||
rm -rf dir |
||||
git update-index --remove -- dir/file |
||||
touch dir |
||||
echo asdf > dir |
||||
git update-index --add -- dir |
||||
git commit -m "$name" |
||||
|
||||
test_expect_code 1 "$name" \ |
||||
'git-svn commit --find-copies-harder --rmdir git-svn-HEAD..mybranch4' \ |
||||
|| true |
||||
|
||||
|
||||
name='remove executable bit from a file' |
||||
rm -f $GIT_DIR/index |
||||
git checkout -b mybranch5 git-svn-HEAD |
||||
chmod -x exec.sh |
||||
git update-index exec.sh |
||||
git commit -m "$name" |
||||
|
||||
test_expect_success "$name" \ |
||||
"git-svn commit --find-copies-harder --rmdir git-svn-HEAD..mybranch5 && |
||||
test ! -x $SVN_TREE/exec.sh" |
||||
|
||||
|
||||
name='add executable bit back file' |
||||
chmod +x exec.sh |
||||
git update-index exec.sh |
||||
git commit -m "$name" |
||||
|
||||
test_expect_success "$name" \ |
||||
"git-svn commit --find-copies-harder --rmdir git-svn-HEAD..mybranch5 && |
||||
test -x $SVN_TREE/exec.sh" |
||||
|
||||
|
||||
|
||||
name='executable file becomes a symlink to bar/zzz (file)' |
||||
rm exec.sh |
||||
ln -s bar/zzz exec.sh |
||||
git update-index exec.sh |
||||
git commit -m "$name" |
||||
|
||||
test_expect_success "$name" \ |
||||
"git-svn commit --find-copies-harder --rmdir git-svn-HEAD..mybranch5 && |
||||
test -L $SVN_TREE/exec.sh" |
||||
|
||||
|
||||
|
||||
name='new symlink is added to a file that was also just made executable' |
||||
chmod +x bar/zzz |
||||
ln -s bar/zzz exec-2.sh |
||||
git update-index --add bar/zzz exec-2.sh |
||||
git commit -m "$name" |
||||
|
||||
test_expect_success "$name" \ |
||||
"git-svn commit --find-copies-harder --rmdir git-svn-HEAD..mybranch5 && |
||||
test -x $SVN_TREE/bar/zzz && |
||||
test -L $SVN_TREE/exec-2.sh" |
||||
|
||||
|
||||
|
||||
name='modify a symlink to become a file' |
||||
git help > help || true |
||||
rm exec-2.sh |
||||
cp help exec-2.sh |
||||
git update-index exec-2.sh |
||||
git commit -m "$name" |
||||
|
||||
test_expect_success "$name" \ |
||||
"git-svn commit --find-copies-harder --rmdir git-svn-HEAD..mybranch5 && |
||||
test -f $SVN_TREE/exec-2.sh && |
||||
test ! -L $SVN_TREE/exec-2.sh && |
||||
diff -u help $SVN_TREE/exec-2.sh" |
||||
|
||||
|
||||
|
||||
name='test fetch functionality (svn => git) with alternate GIT_SVN_ID' |
||||
GIT_SVN_ID=alt |
||||
export GIT_SVN_ID |
||||
test_expect_success "$name" \ |
||||
"git-svn init $svnrepo && git-svn fetch -v && |
||||
git-rev-list --pretty=raw git-svn-HEAD | grep ^tree | uniq > a && |
||||
git-rev-list --pretty=raw alt-HEAD | grep ^tree | uniq > b && |
||||
diff -u a b" |
||||
|
||||
test_done |
||||
|
||||
@ -0,0 +1,321 @@
@@ -0,0 +1,321 @@
|
||||
#!/usr/bin/perl |
||||
# Copyright 2006, Ryan Anderson <ryan@michonline.com> |
||||
# |
||||
# GPL v2 (See COPYING) |
||||
# |
||||
# This file is licensed under the GPL v2, or a later version |
||||
# at the discretion of Linus Torvalds. |
||||
|
||||
use warnings; |
||||
use strict; |
||||
|
||||
my $filename = shift @ARGV; |
||||
|
||||
|
||||
my @stack = ( |
||||
{ |
||||
'rev' => "HEAD", |
||||
'filename' => $filename, |
||||
}, |
||||
); |
||||
|
||||
our (@lineoffsets, @pendinglineoffsets); |
||||
our @filelines = (); |
||||
open(F,"<",$filename) |
||||
or die "Failed to open filename: $!"; |
||||
|
||||
while(<F>) { |
||||
chomp; |
||||
push @filelines, $_; |
||||
} |
||||
close(F); |
||||
our $leftover_lines = @filelines; |
||||
our %revs; |
||||
our @revqueue; |
||||
our $head; |
||||
|
||||
my $revsprocessed = 0; |
||||
while (my $bound = pop @stack) { |
||||
my @revisions = git_rev_list($bound->{'rev'}, $bound->{'filename'}); |
||||
foreach my $revinst (@revisions) { |
||||
my ($rev, @parents) = @$revinst; |
||||
$head ||= $rev; |
||||
|
||||
$revs{$rev}{'filename'} = $bound->{'filename'}; |
||||
if (scalar @parents > 0) { |
||||
$revs{$rev}{'parents'} = \@parents; |
||||
next; |
||||
} |
||||
|
||||
my $newbound = find_parent_renames($rev, $bound->{'filename'}); |
||||
if ( exists $newbound->{'filename'} && $newbound->{'filename'} ne $bound->{'filename'}) { |
||||
push @stack, $newbound; |
||||
$revs{$rev}{'parents'} = [$newbound->{'rev'}]; |
||||
} |
||||
} |
||||
} |
||||
push @revqueue, $head; |
||||
init_claim($head); |
||||
$revs{$head}{'lineoffsets'} = {}; |
||||
handle_rev(); |
||||
|
||||
|
||||
my $i = 0; |
||||
foreach my $l (@filelines) { |
||||
my ($output, $rev, $committer, $date); |
||||
if (ref $l eq 'ARRAY') { |
||||
($output, $rev, $committer, $date) = @$l; |
||||
if (length($rev) > 8) { |
||||
$rev = substr($rev,0,8); |
||||
} |
||||
} else { |
||||
$output = $l; |
||||
($rev, $committer, $date) = ('unknown', 'unknown', 'unknown'); |
||||
} |
||||
|
||||
printf("(%8s %10s %10s %d)%s\n", $rev, $committer, $date, $i++, $output); |
||||
} |
||||
|
||||
sub init_claim { |
||||
my ($rev) = @_; |
||||
my %revinfo = git_commit_info($rev); |
||||
for (my $i = 0; $i < @filelines; $i++) { |
||||
$filelines[$i] = [ $filelines[$i], '', '', '', 1]; |
||||
# line, |
||||
# rev, |
||||
# author, |
||||
# date, |
||||
# 1 <-- belongs to the original file. |
||||
} |
||||
$revs{$rev}{'lines'} = \@filelines; |
||||
} |
||||
|
||||
|
||||
sub handle_rev { |
||||
my $i = 0; |
||||
while (my $rev = shift @revqueue) { |
||||
|
||||
my %revinfo = git_commit_info($rev); |
||||
|
||||
foreach my $p (@{$revs{$rev}{'parents'}}) { |
||||
|
||||
git_diff_parse($p, $rev, %revinfo); |
||||
push @revqueue, $p; |
||||
} |
||||
|
||||
|
||||
if (scalar @{$revs{$rev}{parents}} == 0) { |
||||
# We must be at the initial rev here, so claim everything that is left. |
||||
for (my $i = 0; $i < @{$revs{$rev}{lines}}; $i++) { |
||||
if (ref ${$revs{$rev}{lines}}[$i] eq '' || ${$revs{$rev}{lines}}[$i][1] eq '') { |
||||
claim_line($i, $rev, $revs{$rev}{lines}, %revinfo); |
||||
} |
||||
} |
||||
} |
||||
} |
||||
} |
||||
|
||||
|
||||
sub git_rev_list { |
||||
my ($rev, $file) = @_; |
||||
|
||||
open(P,"-|","git-rev-list","--parents","--remove-empty",$rev,"--",$file) |
||||
or die "Failed to exec git-rev-list: $!"; |
||||
|
||||
my @revs; |
||||
while(my $line = <P>) { |
||||
chomp $line; |
||||
my ($rev, @parents) = split /\s+/, $line; |
||||
push @revs, [ $rev, @parents ]; |
||||
} |
||||
close(P); |
||||
|
||||
printf("0 revs found for rev %s (%s)\n", $rev, $file) if (@revs == 0); |
||||
return @revs; |
||||
} |
||||
|
||||
sub find_parent_renames { |
||||
my ($rev, $file) = @_; |
||||
|
||||
open(P,"-|","git-diff-tree", "-M50", "-r","--name-status", "-z","$rev") |
||||
or die "Failed to exec git-diff: $!"; |
||||
|
||||
local $/ = "\0"; |
||||
my %bound; |
||||
my $junk = <P>; |
||||
while (my $change = <P>) { |
||||
chomp $change; |
||||
my $filename = <P>; |
||||
chomp $filename; |
||||
|
||||
if ($change =~ m/^[AMD]$/ ) { |
||||
next; |
||||
} elsif ($change =~ m/^R/ ) { |
||||
my $oldfilename = $filename; |
||||
$filename = <P>; |
||||
chomp $filename; |
||||
if ( $file eq $filename ) { |
||||
my $parent = git_find_parent($rev, $oldfilename); |
||||
@bound{'rev','filename'} = ($parent, $oldfilename); |
||||
last; |
||||
} |
||||
} |
||||
} |
||||
close(P); |
||||
|
||||
return \%bound; |
||||
} |
||||
|
||||
|
||||
sub git_find_parent { |
||||
my ($rev, $filename) = @_; |
||||
|
||||
open(REVPARENT,"-|","git-rev-list","--remove-empty", "--parents","--max-count=1","$rev","--",$filename) |
||||
or die "Failed to open git-rev-list to find a single parent: $!"; |
||||
|
||||
my $parentline = <REVPARENT>; |
||||
chomp $parentline; |
||||
my ($revfound,$parent) = split m/\s+/, $parentline; |
||||
|
||||
close(REVPARENT); |
||||
|
||||
return $parent; |
||||
} |
||||
|
||||
|
||||
# Get a diff between the current revision and a parent. |
||||
# Record the commit information that results. |
||||
sub git_diff_parse { |
||||
my ($parent, $rev, %revinfo) = @_; |
||||
|
||||
my ($ri, $pi) = (0,0); |
||||
open(DIFF,"-|","git-diff-tree","-M","-p",$rev,$parent,"--", |
||||
$revs{$rev}{'filename'}, $revs{$parent}{'filename'}) |
||||
or die "Failed to call git-diff for annotation: $!"; |
||||
|
||||
my $slines = $revs{$rev}{'lines'}; |
||||
my @plines; |
||||
|
||||
my $gotheader = 0; |
||||
my ($remstart, $remlength, $addstart, $addlength); |
||||
my ($hunk_start, $hunk_index, $hunk_adds); |
||||
while(<DIFF>) { |
||||
chomp; |
||||
if (m/^@@ -(\d+),(\d+) \+(\d+),(\d+)/) { |
||||
($remstart, $remlength, $addstart, $addlength) = ($1, $2, $3, $4); |
||||
# Adjust for 0-based arrays |
||||
$remstart--; |
||||
$addstart--; |
||||
# Reinit hunk tracking. |
||||
$hunk_start = $remstart; |
||||
$hunk_index = 0; |
||||
$gotheader = 1; |
||||
|
||||
for (my $i = $ri; $i < $remstart; $i++) { |
||||
$plines[$pi++] = $slines->[$i]; |
||||
$ri++; |
||||
} |
||||
next; |
||||
} elsif (!$gotheader) { |
||||
next; |
||||
} |
||||
|
||||
if (m/^\+(.*)$/) { |
||||
my $line = $1; |
||||
$plines[$pi++] = [ $line, '', '', '', 0 ]; |
||||
next; |
||||
|
||||
} elsif (m/^-(.*)$/) { |
||||
my $line = $1; |
||||
if (get_line($slines, $ri) eq $line) { |
||||
# Found a match, claim |
||||
claim_line($ri, $rev, $slines, %revinfo); |
||||
} else { |
||||
die sprintf("Sync error: %d/%d\n|%s\n|%s\n%s => %s\n", |
||||
$ri, $hunk_start + $hunk_index, |
||||
$line, |
||||
get_line($slines, $ri), |
||||
$rev, $parent); |
||||
} |
||||
$ri++; |
||||
|
||||
} else { |
||||
if (substr($_,1) ne get_line($slines,$ri) ) { |
||||
die sprintf("Line %d (%d) does not match:\n|%s\n|%s\n%s => %s\n", |
||||
$hunk_start + $hunk_index, $ri, |
||||
substr($_,1), |
||||
get_line($slines,$ri), |
||||
$rev, $parent); |
||||
} |
||||
$plines[$pi++] = $slines->[$ri++]; |
||||
} |
||||
$hunk_index++; |
||||
} |
||||
close(DIFF); |
||||
for (my $i = $ri; $i < @{$slines} ; $i++) { |
||||
push @plines, $slines->[$ri++]; |
||||
} |
||||
|
||||
$revs{$parent}{lines} = \@plines; |
||||
return; |
||||
} |
||||
|
||||
sub get_line { |
||||
my ($lines, $index) = @_; |
||||
|
||||
return ref $lines->[$index] ne '' ? $lines->[$index][0] : $lines->[$index]; |
||||
} |
||||
|
||||
sub git_cat_file { |
||||
my ($parent, $filename) = @_; |
||||
return () unless defined $parent && defined $filename; |
||||
my $blobline = `git-ls-tree $parent $filename`; |
||||
my ($mode, $type, $blob, $tfilename) = split(/\s+/, $blobline, 4); |
||||
|
||||
open(C,"-|","git-cat-file", "blob", $blob) |
||||
or die "Failed to git-cat-file blob $blob (rev $parent, file $filename): " . $!; |
||||
|
||||
my @lines; |
||||
while(<C>) { |
||||
chomp; |
||||
push @lines, $_; |
||||
} |
||||
close(C); |
||||
|
||||
return @lines; |
||||
} |
||||
|
||||
|
||||
sub claim_line { |
||||
my ($floffset, $rev, $lines, %revinfo) = @_; |
||||
my $oline = get_line($lines, $floffset); |
||||
@{$lines->[$floffset]} = ( $oline, $rev, |
||||
$revinfo{'author'}, $revinfo{'author_date'} ); |
||||
#printf("Claiming line %d with rev %s: '%s'\n", |
||||
# $floffset, $rev, $oline) if 1; |
||||
} |
||||
|
||||
sub git_commit_info { |
||||
my ($rev) = @_; |
||||
open(COMMIT, "-|","git-cat-file", "commit", $rev) |
||||
or die "Failed to call git-cat-file: $!"; |
||||
|
||||
my %info; |
||||
while(<COMMIT>) { |
||||
chomp; |
||||
last if (length $_ == 0); |
||||
|
||||
if (m/^author (.*) <(.*)> (.*)$/) { |
||||
$info{'author'} = $1; |
||||
$info{'author_email'} = $2; |
||||
$info{'author_date'} = $3; |
||||
} elsif (m/^committer (.*) <(.*)> (.*)$/) { |
||||
$info{'committer'} = $1; |
||||
$info{'committer_email'} = $2; |
||||
$info{'committer_date'} = $3; |
||||
} |
||||
} |
||||
close(COMMIT); |
||||
|
||||
return %info; |
||||
} |
||||
Loading…
Reference in new issue