mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn: log command fixes

Browse Source 
Change the --verbose flag to more closely match svn.  I was
somehow under the impression that --summary included --raw diff
output, but I was wrong.  We now pass -r --raw --name-status as
arguments if passed -v/--verbose.

-r (recursive) is passed by default, since users usually want
it, and accepting it causes difficulty with the -r<revision>
option used by svn users.  A --non-recursive switch has been
added to disable this.

Of course, --summary, --raw, -p and any other git-log options
can still be passed directly (without --name-status).

Also, several warnings about referencing undefined variables
have been fixed.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Eric Wong
2006-10-11 11:53:22 -07:00
committed by Junio C Hamano
parent c35b96e785
commit 74a31a100a
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
git-svn.perl
View File

@ -52,7 +52,7 @@ my ($_revision,$_stdin,$_no_ignore_ext,$_no_stop_copy,$_help,$_rmdir,$_edit,
$_template, $_shared, $_no_default_regex, $_no_graft_copy, $_template, $_shared, $_no_default_regex, $_no_graft_copy,
$_limit, $_verbose, $_incremental, $_oneline, $_l_fmt, $_show_commit, $_limit, $_verbose, $_incremental, $_oneline, $_l_fmt, $_show_commit,
$_version, $_upgrade, $_authors, $_branch_all_refs, @_opt_m, $_version, $_upgrade, $_authors, $_branch_all_refs, @_opt_m,
$_merge, $_strategy, $_dry_run, $_ignore_nodate); $_merge, $_strategy, $_dry_run, $_ignore_nodate, $_non_recursive);
my (@_branch_from, %tree_map, %users, %rusers, %equiv); my (@_branch_from, %tree_map, %users, %rusers, %equiv);
my ($_svn_co_url_revs, $_svn_pg_peg_revs); my ($_svn_co_url_revs, $_svn_pg_peg_revs);
my @repo_path_split_cache; my @repo_path_split_cache;
@ -114,6 +114,7 @@ my %cmd = (
'incremental' => \$_incremental, 'incremental' => \$_incremental,
'oneline' => \$_oneline, 'oneline' => \$_oneline,
'show-commit' => \$_show_commit, 'show-commit' => \$_show_commit,
'non-recursive' => \$_non_recursive,
'authors-file|A=s' => \$_authors, 'authors-file|A=s' => \$_authors,
} ], } ],
'commit-diff' => [ \&commit_diff, 'Commit a diff between two trees', 'commit-diff' => [ \&commit_diff, 'Commit a diff between two trees',
@ -752,13 +753,18 @@ sub show_log {
# ignore # ignore
} elsif (/^:\d{6} \d{6} $sha1_short/o) { } elsif (/^:\d{6} \d{6} $sha1_short/o) {
push @{$c->{raw}}, $_; push @{$c->{raw}}, $_;
} elsif (/^[ACRMDT]\t/) {
# we could add $SVN_PATH here, but that requires
# remote access at the moment (repo_path_split)...
s#^([ACRMDT])\t# $1 #;
push @{$c->{changed}}, $_;
} elsif (/^diff /) { } elsif (/^diff /) {
$d = 1; $d = 1;
push @{$c->{diff}}, $_; push @{$c->{diff}}, $_;
} elsif ($d) { } elsif ($d) {
push @{$c->{diff}}, $_; push @{$c->{diff}}, $_;
} elsif (/^ (git-svn-id:.+)$/) { } elsif (/^ (git-svn-id:.+)$/) {
(undef, $c->{r}, undef) = extract_metadata($1); ($c->{url}, $c->{r}, undef) = extract_metadata($1);
} elsif (s/^ //) { } elsif (s/^ //) {
push @{$c->{l}}, $_; push @{$c->{l}}, $_;
} }
@ -850,7 +856,8 @@ sub git_svn_log_cmd {
my ($r_min, $r_max) = @_; my ($r_min, $r_max) = @_;
my @cmd = (qw/git-log --abbrev-commit --pretty=raw my @cmd = (qw/git-log --abbrev-commit --pretty=raw
--default/, "refs/remotes/$GIT_SVN"); --default/, "refs/remotes/$GIT_SVN");
push @cmd, '--summary' if $_verbose; push @cmd, '-r' unless $_non_recursive;
push @cmd, qw/--raw --name-status/ if $_verbose;
return @cmd unless defined $r_max; return @cmd unless defined $r_max;
if ($r_max == $r_min) { if ($r_max == $r_min) {
push @cmd, '--max-count=1'; push @cmd, '--max-count=1';
@ -861,7 +868,7 @@ sub git_svn_log_cmd {
my ($c_min, $c_max); my ($c_min, $c_max);
$c_max = revdb_get($REVDB, $r_max); $c_max = revdb_get($REVDB, $r_max);
$c_min = revdb_get($REVDB, $r_min); $c_min = revdb_get($REVDB, $r_min);
if ($c_min && $c_max) { if (defined $c_min && defined $c_max) {
if ($r_max > $r_max) { if ($r_max > $r_max) {
push @cmd, "$c_min..$c_max"; push @cmd, "$c_min..$c_max";
} else { } else {
@ -2561,6 +2568,12 @@ sub show_commit {
} }
} }
sub show_commit_changed_paths {
my ($c) = @_;
return unless $c->{changed};
print "Changed paths:\n", @{$c->{changed}};
}
sub show_commit_normal { sub show_commit_normal {
my ($c) = @_; my ($c) = @_;
print '-' x72, "\nr$c->{r} | "; print '-' x72, "\nr$c->{r} | ";
@ -2570,7 +2583,8 @@ sub show_commit_normal {
my $nr_line = 0; my $nr_line = 0;
if (my $l = $c->{l}) { if (my $l = $c->{l}) {
while ($l->[$#$l] eq "\n" && $l->[($#$l - 1)] eq "\n") { while ($l->[$#$l] eq "\n" && $#$l > 0
&& $l->[($#$l - 1)] eq "\n") {
pop @$l; pop @$l;
} }
$nr_line = scalar @$l; $nr_line = scalar @$l;
@ -2582,11 +2596,15 @@ sub show_commit_normal {
} else { } else {
$nr_line .= ' lines'; $nr_line .= ' lines';
} }
print $nr_line, "\n\n"; print $nr_line, "\n";
show_commit_changed_paths($c);
print "\n";
print $_ foreach @$l; print $_ foreach @$l;
} }
} else { } else {
print "1 line\n\n"; print "1 line\n";
show_commit_changed_paths($c);
print "\n";
} }
foreach my $x (qw/raw diff/) { foreach my $x (qw/raw diff/) {