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

git-svn: track writes writes to the index in fetch

Browse Source 
Introducing Git::IndexInfo.  This module will probably be useful
outside of git-svn, so I'm not putting it in the Git::SVN
namespace.

This will allow me to more easily avoid the use of get_log() in
the future and simply run do_update in incrementing ranges.
get_log() should be avoided because there are cases where
moved/deleted directories do not track correctly (until
--follow-parent is run on a new branch).

Signed-off-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
Eric Wong
2007-01-24 03:30:57 -08:00
parent 7f578c55af
commit ef3cfaad19
1 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
git-svn.perl
View File

@ -1643,8 +1643,7 @@ sub new {
$self->{file_prop} = {}; $self->{file_prop} = {};
$self->{absent_dir} = {}; $self->{absent_dir} = {};
$self->{absent_file} = {}; $self->{absent_file} = {};
($self->{gui}, $self->{ctx}) = $git_svn->tmp_index_do( $self->{gii} = $git_svn->tmp_index_do(sub { Git::IndexInfo->new });
sub { command_input_pipe(qw/update-index -z --index-info/) } );
require Digest::MD5; require Digest::MD5;
$self; $self;
} }
@ -1671,7 +1670,6 @@ sub git_path {
sub delete_entry { sub delete_entry {
my ($self, $path, $rev, $pb) = @_; my ($self, $path, $rev, $pb) = @_;
my $gui = $self->{gui};
my $gpath = $self->git_path($path); my $gpath = $self->git_path($path);
# remove entire directories. # remove entire directories.
@ -1681,14 +1679,15 @@ sub delete_entry {
$self->{c}, '--', $gpath); $self->{c}, '--', $gpath);
local $/ = "\0"; local $/ = "\0";
while (<$ls>) { while (<$ls>) {
print $gui '0 ',0 x 40,"\t",$_ or croak $!; chomp;
$self->{gii}->remove($_);
print "\tD\t$_\n" unless $self->{q}; print "\tD\t$_\n" unless $self->{q};
} }
print "\tD\t$gpath/\n" unless $self->{q}; print "\tD\t$gpath/\n" unless $self->{q};
command_close_pipe($ls, $ctx); command_close_pipe($ls, $ctx);
$self->{empty}->{$path} = 0 $self->{empty}->{$path} = 0
} else { } else {
print $gui '0 ',0 x 40,"\t",$gpath,"\0" or croak $!; $self->{gii}->remove($gpath);
print "\tD\t$gpath\n" unless $self->{q}; print "\tD\t$gpath\n" unless $self->{q};
} }
undef; undef;
@ -1824,22 +1823,23 @@ sub close_file {
$hash = $fb->{blob} or die "no blob information\n"; $hash = $fb->{blob} or die "no blob information\n";
} }
$fb->{pool}->clear; $fb->{pool}->clear;
my $gui = $self->{gui}; $self->{gii}->update($fb->{mode_b}, $hash, $path) or croak $!;
print $gui "$fb->{mode_b} $hash\t$path\0" or croak $!;
print "\t$fb->{action}\t$path\n" if $fb->{action} && ! $self->{q}; print "\t$fb->{action}\t$path\n" if $fb->{action} && ! $self->{q};
undef; undef;
} }
sub abort_edit { sub abort_edit {
my $self = shift; my $self = shift;
eval { command_close_pipe($self->{gui}, $self->{ctx}) }; $self->{nr} = $self->{gii}->{nr};
delete $self->{gii};
$self->SUPER::abort_edit(@_); $self->SUPER::abort_edit(@_);
} }
sub close_edit { sub close_edit {
my $self = shift; my $self = shift;
command_close_pipe($self->{gui}, $self->{ctx});
$self->{git_commit_ok} = 1; $self->{git_commit_ok} = 1;
$self->{nr} = $self->{gii}->{nr};
delete $self->{gii};
$self->SUPER::close_edit(@_); $self->SUPER::close_edit(@_);
} }
@ -2832,6 +2832,38 @@ sub migration_check {
minimize_connections() if $_minimize; minimize_connections() if $_minimize;
} }
package Git::IndexInfo;
use strict;
use warnings;
use Git qw/command_input_pipe command_close_pipe/;
sub new {
my ($class) = @_;
my ($gui, $ctx) = command_input_pipe(qw/update-index -z --index-info/);
bless { gui => $gui, ctx => $ctx, nr => 0}, $class;
}
sub remove {
my ($self, $path) = @_;
if (print { $self->{gui} } '0 ', 0 x 40, "\t", $path, "\0") {
return ++$self->{nr};
}
undef;
}
sub update {
my ($self, $mode, $hash, $path) = @_;
if (print { $self->{gui} } $mode, ' ', $hash, "\t", $path, "\0") {
return ++$self->{nr};
}
undef;
}
sub DESTROY {
my ($self) = @_;
command_close_pipe($self->{gui}, $self->{ctx});
}
__END__ __END__
Data structures: Data structures: