From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael G. Schwern" Subject: [PATCH 2/4] Prepare Git::SVN for extraction into its own file. Date: Thu, 26 Jul 2012 16:22:23 -0700 Message-ID: <1343344945-3717-3-git-send-email-schwern@pobox.com> References: <1343344945-3717-1-git-send-email-schwern@pobox.com> Cc: robbat2@gentoo.org, bwalton@artsci.utoronto.ca, normalperson@yhbt.net, jrnieder@gmail.com, "Michael G. Schwern" To: git@vger.kernel.org, gitster@pobox.com X-From: git-owner@vger.kernel.org Fri Jul 27 01:23:06 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SuXOa-0005Dz-Cy for gcvg-git-2@plane.gmane.org; Fri, 27 Jul 2012 01:23:04 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753210Ab2GZXW7 (ORCPT ); Thu, 26 Jul 2012 19:22:59 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:41890 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753202Ab2GZXW5 (ORCPT ); Thu, 26 Jul 2012 19:22:57 -0400 Received: by mail-pb0-f46.google.com with SMTP id rp8so3965600pbb.19 for ; Thu, 26 Jul 2012 16:22:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=DIuiM0ZSPJyRzRgGinPwPXPpqbYEFNVUemwXVLkuy4A=; b=ymi5G5Aw/KD8U6ffd4Z8fLAeRQk7aNACfT5knIwbiPsO3Q5W+XzzEbJx6kGtYnmRTv NwxuFU47HS4274NWF84Dk92Pg3AGb+kvCLgLlS38VH4uNWw9wAOJoq1112OxPNzfoRya WKflUDRZJOgYUdNYtsoM08Wg0ODwrmYooZ+yU7IZpUu1EGSDf5/Hpt/uJEtxFKKwH0ek IAdh1hqF+II6s5spIYva3JzfqFsolPoM0SeE/2WgzOCXyidCoL7BJIwvqWhqG47hKzsO nslhzsSwt2PZVLx2eUtjqAqYXTTqo2/mo3DZiZ2CuSqINESA+zgK8yE1Bcti5WWc5jqZ iP4w== Received: by 10.68.232.232 with SMTP id tr8mr8691663pbc.73.1343344977566; Thu, 26 Jul 2012 16:22:57 -0700 (PDT) Received: from localhost.localdomain (c-76-105-239-160.hsd1.or.comcast.net. [76.105.239.160]) by mx.google.com with ESMTPS id oo6sm596728pbc.22.2012.07.26.16.22.56 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 16:22:57 -0700 (PDT) X-Mailer: git-send-email 1.7.11.1 In-Reply-To: <1343344945-3717-1-git-send-email-schwern@pobox.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: "Michael G. Schwern" This means it should be able to load without git-svn being loaded. * Load Git.pm on its own and all the needed command functions. * It needs to grab at a git-svn lexical $_prefix representing the --prefix option. Provide opt_prefix() for that. This is a refactoring artifact. The prefix should really be passed into Git::SVN->new. * Unqualify unnecessarily fully qualified globals like $Git::SVN::default_repo_id. * Lexically isolate the class just to make sure nothing is leaking out. --- git-svn.perl | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index 79fe4a4..9cdf6fc 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -89,7 +89,7 @@ BEGIN { foreach (qw/command command_oneline command_noisy command_output_pipe command_input_pipe command_close_pipe command_bidi_pipe command_close_bidi_pipe/) { - for my $package ( qw(Git::SVN::Migration Git::SVN::Log Git::SVN), + for my $package ( qw(Git::SVN::Migration Git::SVN::Log), __PACKAGE__) { *{"${package}::$_"} = \&{"Git::$_"}; } @@ -109,6 +109,10 @@ my ($_stdin, $_help, $_edit, $_merge, $_strategy, $_preserve_merges, $_dry_run, $_local, $_prefix, $_no_checkout, $_url, $_verbose, $_git_format, $_commit_url, $_tag, $_merge_info, $_interactive); + +# This is a refactoring artifact so Git::SVN can get at this git-svn switch. +sub opt_prefix { return $_prefix || '' } + $Git::SVN::_follow_parent = 1; $Git::SVN::Fetcher::_placeholder_filename = ".gitignore"; $_q ||= 0; @@ -2038,6 +2042,7 @@ sub gc_directory { } } +{ package Git::SVN; use strict; use warnings; @@ -2056,6 +2061,13 @@ use Memoize; # core since 5.8.0, Jul 2002 use Memoize::Storable; use POSIX qw(:signal_h); +use Git qw( + command + command_oneline + command_noisy + command_output_pipe + command_close_pipe +); use Git::SVN::Utils qw(fatal can_compress); my $can_use_yaml; @@ -4280,12 +4292,13 @@ sub find_rev_after { sub _new { my ($class, $repo_id, $ref_id, $path) = @_; unless (defined $repo_id && length $repo_id) { - $repo_id = $Git::SVN::default_repo_id; + $repo_id = $default_repo_id; } unless (defined $ref_id && length $ref_id) { - $_prefix = '' unless defined($_prefix); + # Access the prefix option from the git-svn main program if it's loaded. + my $prefix = defined &::opt_prefix ? ::opt_prefix() : ""; $_[2] = $ref_id = - "refs/remotes/$_prefix$Git::SVN::default_ref_id"; + "refs/remotes/$prefix$default_ref_id"; } $_[1] = $repo_id; my $dir = "$ENV{GIT_DIR}/svn/$ref_id"; @@ -4347,6 +4360,7 @@ sub uri_decode { sub remove_username { $_[0] =~ s{^([^:]*://)[^@]+@}{$1}; } +} package Git::SVN::Log; use strict; -- 1.7.11.1