development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-19 08:21:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ew/svn-fixes'

Browse source 
* ew/svn-fixes:
  git-svn: lazy load some modules
This commit is contained in:
Junio C Hamano 2015-03-05 12:45:45 -08:00
parent a6f9decbe3 28ed7b02dd
commit fcf04eef75
5 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
git-svn.perl
View file

@ -11,14 +11,10 @@
$VERSION = '@@GIT_VERSION@@';
use Carp qw/croak/;
use Digest::MD5;
use IO::File qw//;
use File::Basename qw/dirname basename/;
use File::Path qw/mkpath/;
use File::Spec;
use File::Find;
use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
use IPC::Open3;
use Memoize;
use Git::SVN;
@ -298,7 +294,6 @@ sub _req_svn {
{} ],
);
use Term::ReadLine;
package FakeTerm;
sub new {
my ($class, $reason) = @_;
@ -313,6 +308,7 @@ package main;
my $term;
sub term_init {
$term = eval {
require Term::ReadLine;
$ENV{"GIT_SVN_NOTTY"}
? new Term::ReadLine 'git-svn', \*STDIN, \*STDOUT
: new Term::ReadLine 'git-svn';
@ -1173,6 +1169,7 @@ sub cmd_branch {
}
::_req_svn();
require SVN::Client;
my $ctx = SVN::Client->new(
config => SVN::Core::config_get_config(
@ -1693,11 +1690,13 @@ sub cmd_reset {
}
sub cmd_gc {
require File::Find;
if (!can_compress()) {
warn "Compress::Zlib could not be found; unhandled.log " .
"files will not be compressed.\n";
}
find({ wanted => \&gc_directory, no_chdir => 1}, "$ENV{GIT_DIR}/svn");
File::Find::find({ wanted => \&gc_directory, no_chdir => 1},
"$ENV{GIT_DIR}/svn");
}
########################### utility functions #########################
@ -2122,6 +2121,7 @@ sub find_file_type_and_diff_status {
sub md5sum {
my $arg = shift;
my $ref = ref $arg;
require Digest::MD5;
my $md5 = Digest::MD5->new();
if ($ref eq 'GLOB' || $ref eq 'IO::File' || $ref eq 'File::Temp') {
$md5->addfile($arg) or croak $!;
@ -2148,6 +2148,7 @@ sub gc_directory {
$gz->gzwrite($str) or
die "Unable to write: ".$gz->gzerror()."!\n";
}
no warnings 'once'; # $File::Find::name would warn
unlink $_ or die "unlink $File::Find::name: $!\n";
} elsif (-f $_ && basename($_) eq "index") {
unlink $_ or die "unlink $_: $!\n";

22
perl/Git/SVN.pm
View file

@ -9,10 +9,8 @@ package Git::SVN;
$_use_log_author $_add_author_from $_localtime/;
use Carp qw/croak/;
use File::Path qw/mkpath/;
use File::Copy qw/copy/;
use IPC::Open3;
use Memoize; # core since 5.8.0, Jul 2002
use Memoize::Storable;
use POSIX qw(:signal_h);
use Time::Local;
@ -33,11 +31,7 @@ package Git::SVN;
add_path_to_url
);
my $can_use_yaml;
BEGIN {
$can_use_yaml = eval { require Git::SVN::Memoize::YAML; 1};
}
my $memo_backend;
our $_follow_parent = 1;
our $_minimize_url = 'unset';
our $default_repo_id = 'svn';
@ -1579,7 +1573,16 @@ sub tie_for_persistent_memoization {
my $hash = shift;
my $path = shift;
if ($can_use_yaml) {
unless ($memo_backend) {
if (eval { require Git::SVN::Memoize::YAML; 1}) {
$memo_backend = 1;
} else {
require Memoize::Storable;
$memo_backend = -1;
}
}
if ($memo_backend > 0) {
tie %$hash => 'Git::SVN::Memoize::YAML', "$path.yaml";
} else {
tie %$hash => 'Memoize::Storable', "$path.db", 'nstore';
@ -2189,8 +2192,9 @@ sub rev_map_set {
# both of these options make our .rev_db file very, very important
# and we can't afford to lose it because rebuild() won't work
if ($self->use_svm_props || $self->no_metadata) {
require File::Copy;
$sync = 1;
copy($db, $db_lock) or die "rev_map_set(@_): ",
File::Copy::copy($db, $db_lock) or die "rev_map_set(@_): ",
"Failed to copy: ",
"$db => $db_lock ($!)\n";
} else {

3
perl/Git/SVN/Editor.pm
View file

@ -5,7 +5,6 @@ package Git::SVN::Editor;
use SVN::Core;
use SVN::Delta;
use Carp qw/croak/;
use IO::File;
use Git qw/command command_oneline command_noisy command_output_pipe
command_input_pipe command_close_pipe
command_bidi_pipe command_close_bidi_pipe/;
@ -586,7 +585,7 @@ =head1 DESCRIPTION
=head1 DEPENDENCIES
Subversion perl bindings,
the core L<Carp> and L<IO::File> modules,
the core L<Carp> module,
and git's L<Git> helper module.
C<Git::SVN::Editor> has not been tested using callers other than

3
perl/Git/SVN/Fetcher.pm
View file

@ -7,7 +7,6 @@ package Git::SVN::Fetcher;
use SVN::Delta;
use Carp qw/croak/;
use File::Basename qw/dirname/;
use IO::File qw//;
use Git qw/command command_oneline command_noisy command_output_pipe
command_input_pipe command_close_pipe
command_bidi_pipe command_close_bidi_pipe/;
@ -608,7 +607,7 @@ =head1 DESCRIPTION
=head1 DEPENDENCIES
L<SVN::Delta> from the Subversion perl bindings,
the core L<Carp>, L<File::Basename>, and L<IO::File> modules,
the core L<Carp> and L<File::Basename> modules,
and git's L<Git> helper module.
C<Git::SVN::Fetcher> has not been tested using callers other than

5
perl/Git/SVN/Ra.pm
View file

@ -3,7 +3,6 @@ package Git::SVN::Ra;
use strict;
use warnings;
use Memoize;
use SVN::Client;
use Git::SVN::Utils qw(
canonicalize_url
canonicalize_path
@ -42,6 +41,7 @@ END
}
sub _auth_providers () {
require SVN::Client;
my @rv = (
SVN::Client::get_simple_provider(),
SVN::Client::get_ssl_server_trust_file_provider(),
@ -247,7 +247,10 @@ sub get_log {
$ret;
}
# uncommon, only for ancient SVN (<= 1.4.2)
sub trees_match {
require IO::File;
require SVN::Client;
my ($self, $url1, $rev1, $url2, $rev2) = @_;
my $ctx = SVN::Client->new(auth => _auth_providers);
my $out = IO::File->new_tmpfile;