mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-28 04:36:10 +02:00
Code

git-cvsserver: no longer use deprecated 'git-subcommand' commands 

git-cvsserver still references git commands like 'git-config', which
is depcrecated.  This commit changes git-cvsserver to use the
'git subcommand' form.

Sylvain Beucler reported the problem through
 http://bugs.debian.org/536067

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Gerrit Pape 2009-09-02 09:23:10 +00:00 committed by Junio C Hamano
parent 5e64650d93
commit d2feb01aa5
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
git-cvsserver.perl
View File

@ -285,7 +285,7 @@ sub req_Root
return 0; return 0;
} }
my @gitvars = `git-config -l`; my @gitvars = `git config -l`;
if ($?) { if ($?) {
print "E problems executing git-config on the server -- this is not a git repository or the PATH is not set correctly.\n"; print "E problems executing git-config on the server -- this is not a git repository or the PATH is not set correctly.\n";
print "E \n"; print "E \n";
@ -702,7 +702,7 @@ sub req_Modified
# Save the file data in $state # Save the file data in $state
$state->{entries}{$state->{directory}.$data}{modified_filename} = $filename; $state->{entries}{$state->{directory}.$data}{modified_filename} = $filename;
$state->{entries}{$state->{directory}.$data}{modified_mode} = $mode; $state->{entries}{$state->{directory}.$data}{modified_mode} = $mode;
$state->{entries}{$state->{directory}.$data}{modified_hash} = `git-hash-object $filename`; $state->{entries}{$state->{directory}.$data}{modified_hash} = `git hash-object $filename`;
$state->{entries}{$state->{directory}.$data}{modified_hash} =~ s/\s.*$//s; $state->{entries}{$state->{directory}.$data}{modified_hash} =~ s/\s.*$//s;
#$log->debug("req_Modified : file=$data mode=$mode size=$size"); #$log->debug("req_Modified : file=$data mode=$mode size=$size");
@ -1289,7 +1289,7 @@ sub req_ci
# do a checkout of the file if it is part of this tree # do a checkout of the file if it is part of this tree
if ($wrev) { if ($wrev) {
system('git-checkout-index', '-f', '-u', $filename); system('git', 'checkout-index', '-f', '-u', $filename);
unless ($? == 0) { unless ($? == 0) {
die "Error running git-checkout-index -f -u $filename : $!"; die "Error running git-checkout-index -f -u $filename : $!";
} }
@ -1331,15 +1331,15 @@ sub req_ci
{ {
$log->info("Removing file '$filename'"); $log->info("Removing file '$filename'");
unlink($filename); unlink($filename);
system("git-update-index", "--remove", $filename); system("git", "update-index", "--remove", $filename);
} }
elsif ( $addflag ) elsif ( $addflag )
{ {
$log->info("Adding file '$filename'"); $log->info("Adding file '$filename'");
system("git-update-index", "--add", $filename); system("git", "update-index", "--add", $filename);
} else { } else {
$log->info("Updating file '$filename'"); $log->info("Updating file '$filename'");
system("git-update-index", $filename); system("git", "update-index", $filename);
} }
} }
@ -1351,7 +1351,7 @@ sub req_ci
return; return;
} }
my $treehash = `git-write-tree`; my $treehash = `git write-tree`;
chomp $treehash; chomp $treehash;
$log->debug("Treehash : $treehash, Parenthash : $parenthash"); $log->debug("Treehash : $treehash, Parenthash : $parenthash");
@ -1368,7 +1368,7 @@ sub req_ci
} }
close $msg_fh; close $msg_fh;
my $commithash = `git-commit-tree $treehash -p $parenthash < $msg_filename`; my $commithash = `git commit-tree $treehash -p $parenthash < $msg_filename`;
chomp($commithash); chomp($commithash);
$log->info("Commit hash : $commithash"); $log->info("Commit hash : $commithash");
@ -1821,7 +1821,7 @@ sub req_annotate
# TODO: if we got a revision from the client, use that instead # TODO: if we got a revision from the client, use that instead
# to look up the commithash in sqlite (still good to default to # to look up the commithash in sqlite (still good to default to
# the current head as we do now) # the current head as we do now)
system("git-read-tree", $lastseenin); system("git", "read-tree", $lastseenin);
unless ($? == 0) unless ($? == 0)
{ {
print "E error running git-read-tree $lastseenin $ENV{GIT_INDEX_FILE} $!\n"; print "E error running git-read-tree $lastseenin $ENV{GIT_INDEX_FILE} $!\n";
@ -1830,7 +1830,7 @@ sub req_annotate
$log->info("Created index '$ENV{GIT_INDEX_FILE}' with commit $lastseenin - exit status $?"); $log->info("Created index '$ENV{GIT_INDEX_FILE}' with commit $lastseenin - exit status $?");
# do a checkout of the file # do a checkout of the file
system('git-checkout-index', '-f', '-u', $filename); system('git', 'checkout-index', '-f', '-u', $filename);
unless ($? == 0) { unless ($? == 0) {
print "E error running git-checkout-index -f -u $filename : $!\n"; print "E error running git-checkout-index -f -u $filename : $!\n";
return; return;
@ -1861,7 +1861,7 @@ sub req_annotate
close ANNOTATEHINTS close ANNOTATEHINTS
or (print "E failed to write $a_hints: $!\n"), return; or (print "E failed to write $a_hints: $!\n"), return;
my @cmd = (qw(git-annotate -l -S), $a_hints, $filename); my @cmd = (qw(git annotate -l -S), $a_hints, $filename);
if (!open(ANNOTATE, "-|", @cmd)) { if (!open(ANNOTATE, "-|", @cmd)) {
print "E error invoking ". join(' ',@cmd) .": $!\n"; print "E error invoking ". join(' ',@cmd) .": $!\n";
return; return;
@ -2078,17 +2078,17 @@ sub transmitfile
die "Need filehash" unless ( defined ( $filehash ) and $filehash =~ /^[a-zA-Z0-9]{40}$/ ); die "Need filehash" unless ( defined ( $filehash ) and $filehash =~ /^[a-zA-Z0-9]{40}$/ );
my $type = `git-cat-file -t $filehash`; my $type = `git cat-file -t $filehash`;
chomp $type; chomp $type;
die ( "Invalid type '$type' (expected 'blob')" ) unless ( defined ( $type ) and $type eq "blob" ); die ( "Invalid type '$type' (expected 'blob')" ) unless ( defined ( $type ) and $type eq "blob" );
my $size = `git-cat-file -s $filehash`; my $size = `git cat-file -s $filehash`;
chomp $size; chomp $size;
$log->debug("transmitfile($filehash) size=$size, type=$type"); $log->debug("transmitfile($filehash) size=$size, type=$type");
if ( open my $fh, '-|', "git-cat-file", "blob", $filehash ) if ( open my $fh, '-|', "git", "cat-file", "blob", $filehash )
{ {
if ( defined ( $options->{targetfile} ) ) if ( defined ( $options->{targetfile} ) )
{ {
@ -2935,7 +2935,7 @@ sub update
push @git_log_params, $self->{module}; push @git_log_params, $self->{module};
} }
# git-rev-list is the backend / plumbing version of git-log # git-rev-list is the backend / plumbing version of git-log
open(GITLOG, '-|', 'git-rev-list', @git_log_params) or die "Cannot call git-rev-list: $!"; open(GITLOG, '-|', 'git', 'rev-list', @git_log_params) or die "Cannot call git-rev-list: $!";
my @commits; my @commits;
@ -3021,7 +3021,7 @@ sub update
next; next;
} }
my $base = eval { my $base = eval {
safe_pipe_capture('git-merge-base', safe_pipe_capture('git', 'merge-base',
$lastpicked, $parent); $lastpicked, $parent);
}; };
# The two branches may not be related at all, # The two branches may not be related at all,
@ -3033,7 +3033,7 @@ sub update
if ($base) { if ($base) {
my @merged; my @merged;
# print "want to log between $base $parent \n"; # print "want to log between $base $parent \n";
open(GITLOG, '-|', 'git-log', '--pretty=medium', "$base..$parent") open(GITLOG, '-|', 'git', 'log', '--pretty=medium', "$base..$parent")
or die "Cannot call git-log: $!"; or die "Cannot call git-log: $!";
my $mergedhash; my $mergedhash;
while (<GITLOG>) { while (<GITLOG>) {
@ -3075,7 +3075,7 @@ sub update
if ( defined ( $lastpicked ) ) if ( defined ( $lastpicked ) )
{ {
my $filepipe = open(FILELIST, '-|', 'git-diff-tree', '-z', '-r', $lastpicked, $commit->{hash}) or die("Cannot call git-diff-tree : $!"); my $filepipe = open(FILELIST, '-|', 'git', 'diff-tree', '-z', '-r', $lastpicked, $commit->{hash}) or die("Cannot call git-diff-tree : $!");
local ($/) = "\0"; local ($/) = "\0";
while ( <FILELIST> ) while ( <FILELIST> )
{ {
@ -3149,7 +3149,7 @@ sub update
# this is used to detect files removed from the repo # this is used to detect files removed from the repo
my $seen_files = {}; my $seen_files = {};
my $filepipe = open(FILELIST, '-|', 'git-ls-tree', '-z', '-r', $commit->{hash}) or die("Cannot call git-ls-tree : $!"); my $filepipe = open(FILELIST, '-|', 'git', 'ls-tree', '-z', '-r', $commit->{hash}) or die("Cannot call git-ls-tree : $!");
local $/ = "\0"; local $/ = "\0";
while ( <FILELIST> ) while ( <FILELIST> )
{ {
@ -3451,7 +3451,7 @@ sub commitmessage
return $message; return $message;
} }
my @lines = safe_pipe_capture("git-cat-file", "commit", $commithash); my @lines = safe_pipe_capture("git", "cat-file", "commit", $commithash);
shift @lines while ( $lines[0] =~ /\S/ ); shift @lines while ( $lines[0] =~ /\S/ );
$message = join("",@lines); $message = join("",@lines);
$message .= " " if ( $message =~ /\n$/ ); $message .= " " if ( $message =~ /\n$/ );