summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d542aed)
raw | patch | inline | side by side (parent: d542aed)
author | Eric Wong <normalperson@yhbt.net> | |
Fri, 9 Feb 2007 10:32:48 +0000 (02:32 -0800) | ||
committer | Eric Wong <normalperson@yhbt.net> | |
Fri, 23 Feb 2007 08:57:11 +0000 (00:57 -0800) |
We don't need them anymore, all the rough points of
the --follow-parent implementation have been worked out.
The only improvement in the future will probably be
--follow-parent-harder, which will track subdirectories and
follow individual file history (so annotate/blame can be
complete); but that is still a ways off.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
the --follow-parent implementation have been worked out.
The only improvement in the future will probably be
--follow-parent-harder, which will track subdirectories and
follow individual file history (so annotate/blame can be
complete); but that is still a ways off.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
git-svn.perl | patch | blob | history |
diff --git a/git-svn.perl b/git-svn.perl
index 819d25e28937488e4e7432c5b262474eaa821580..c8a1df3651c7f9ebd02c2c850cb817a4cca1b1cd 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
next;
}
} else {
- warn "Globbed ($path->{glob}:$ref->{glob}): ",
- "$pathname == $refname\n";
$fetch->{$pathname} = $refname;
}
}
last if $i;
unshift(@a_path_components, pop(@b_path_components));
}
- goto not_found unless defined $i;
- my $branch_from = $i->{copyfrom_path} or goto not_found;
+ return undef unless defined $i;
+ my $branch_from = $i->{copyfrom_path} or return undef;
if (@a_path_components) {
print STDERR "branch_from: $branch_from => ";
$branch_from .= '/'.join('/', @a_path_components);
print STDERR "Successfully followed parent\n";
return $self->make_log_entry($rev, [$parent], $ed);
}
-not_found:
- print STDERR "Branch parent for path: '/",
- $self->rel_path, "' @ r$rev not found:\n";
- return undef unless $paths;
- print STDERR "Changed paths:\n";
- foreach my $x (sort keys %$paths) {
- my $p = $paths->{$x};
- print STDERR "\t$p->{action}\t$x";
- if ($p->{copyfrom_path}) {
- print STDERR "(from $p->{copyfrom_path}: ",
- "$p->{copyfrom_rev})";
- }
- print STDERR "\n";
- }
- print STDERR '-'x72, "\n";
return undef;
}