undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cvsimport: ignore CVSPS_NO_BRANCH and impossible branches

Browse Source 
cvsps output often contains references to CVSPS_NO_BRANCH, commits
that it could not trace to a branch. Ignore that branch.

Additionally, cvsps will sometimes draw circular relationships
between branches -- where two branches are recorded as opening
from the other.  In those cases, and where the ancestor branch
hasn't been seen, ignore it.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Martin Langhoff 2006-06-11 20:12:09 +12:00 committed by Junio C Hamano
parent b19ee24b22
commit 71b0814836
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
git-cvsimport.perl
View File

@ -595,7 +595,11 @@ sub write_tree () {
} }
my($patchset,$date,$author_name,$author_email,$branch,$ancestor,$tag,$logmsg); my($patchset,$date,$author_name,$author_email,$branch,$ancestor,$tag,$logmsg);
my(@old,@new,@skipped); my(@old,@new,@skipped,%ignorebranch);
# commits that cvsps cannot place anywhere...
$ignorebranch{'#CVSPS_NO_BRANCH'} = 1;
sub commit { sub commit {
update_index(@old, @new); update_index(@old, @new);
@old = @new = (); @old = @new = ();
@ -751,7 +755,16 @@ while(<CVS>) {
$state = 11; $state = 11;
next; next;
} }
if (exists $ignorebranch{$branch}) {
print STDERR "Skipping $branch\n";
$state = 11;
next;
}
if($ancestor) { if($ancestor) {
if($ancestor eq $branch) {
print STDERR "Branch $branch erroneously stems from itself -- changed ancestor to $opt_o\n";
$ancestor = $opt_o;
}
if(-f "$git_dir/refs/heads/$branch") { if(-f "$git_dir/refs/heads/$branch") {
print STDERR "Branch $branch already exists!\n"; print STDERR "Branch $branch already exists!\n";
$state=11; $state=11;
@ -759,6 +772,7 @@ while(<CVS>) {
} }
unless(open(H,"$git_dir/refs/heads/$ancestor")) { unless(open(H,"$git_dir/refs/heads/$ancestor")) {
print STDERR "Branch $ancestor does not exist!\n"; print STDERR "Branch $ancestor does not exist!\n";
$ignorebranch{$branch} = 1;
$state=11; $state=11;
next; next;
} }
@ -766,6 +780,7 @@ while(<CVS>) {
close(H); close(H);
unless(open(H,"> $git_dir/refs/heads/$branch")) { unless(open(H,"> $git_dir/refs/heads/$branch")) {
print STDERR "Could not create branch $branch: $!\n"; print STDERR "Could not create branch $branch: $!\n";
$ignorebranch{$branch} = 1;
$state=11; $state=11;
next; next;
} }