git-svn: reinstate --no-metadata, add --svn-remote=, variable cleanups
--svn-remote allows the default remote name to be overridden (useful for tracking multiple SVN repositories). Signed-off-by: Eric Wong <normalperson@yhbt.net>
Eric Wong committed
Jan 31, 2007 at 03:06 UTC
9760adccccc0cc4dccc2f28765611550db640ceb
2 files changed
+24
-24
Documentation/git-svn.txt
+6
@@ -301,6 +301,12 @@ section on
301
'<<tracking-multiple-repos,Tracking Multiple Repositories or Branches>>'
302
for more information on using GIT_SVN_ID.
303
304
+-R<remote name>::
305
+--svn-remote <remote name>::
306
+ Specify the [svn-remote "<remote name>"] section to use,
307
+ this allows multiple repositories to be tracked.
308
+ Default: git-svn
309
+
310
--follow-parent::
311
This is especially helpful when we're tracking a directory
312
that has been moved around within the repository, or if we
git-svn.perl
+18
-24
@@ -4,12 +4,8 @@
4
use warnings;
5
use strict;
6
use vars qw/ $AUTHOR $VERSION
7
- $SVN_URL
8
- $GIT_SVN_INDEX $GIT_SVN
9
- $GIT_DIR $GIT_SVN_DIR $REVDB
10
- $_follow_parent $sha1 $sha1_short $_revision
11
- $_cp_remote $_upgrade $_q
12
- $_authors %users/;
7
+ $sha1 $sha1_short $_revision
8
+ $_q $_authors %users/;
9
$AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
10
$VERSION = '@@GIT_VERSION@@';
11
@@ -17,11 +13,8 @@ $ENV{GIT_DIR} ||= '.git';
13
$Git::SVN::default_repo_id = 'git-svn';
14
$Git::SVN::default_ref_id = $ENV{GIT_SVN_ID} || 'git-svn';
15
20
-my $LC_ALL = $ENV{LC_ALL};
16
$Git::SVN::Log::TZ = $ENV{TZ};
22
-# make sure the svn binary gives consistent output between locales and TZs:
17
$ENV{TZ} = 'UTC';
24
-$ENV{LC_ALL} = 'C';
18
$| = 1; # unbuffer STDOUT
19
20
sub fatal (@) { print STDERR @_; exit 1 }
@@ -60,19 +53,19 @@ $sha1 = qr/[a-f\d]{40}/;
53
$sha1_short = qr/[a-f\d]{4,40}/;
54
my ($_stdin, $_help, $_edit,
55
$_repack, $_repack_nr, $_repack_flags,
63
- $_message, $_file, $_no_metadata,
56
+ $_message, $_file,
57
$_template, $_shared,
65
- $_version, $_upgrade,
58
+ $_version,
59
$_merge, $_strategy, $_dry_run,
60
$_prefix);
61
62
my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
63
'config-dir=s' => \$Git::SVN::Ra::config_dir,
64
'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache );
72
-my %fc_opts = ( 'follow-parent|follow' => \$_follow_parent,
65
+my %fc_opts = ( 'follow-parent|follow' => \$Git::SVN::_follow_parent,
66
'authors-file|A=s' => \$_authors,
67
'repack:i' => \$_repack,
75
- 'no-metadata' => \$_no_metadata,
68
+ 'no-metadata' => \$Git::SVN::_no_metadata,
69
'quiet|q' => \$_q,
70
'repack-flags|repack-args|repack-opts=s' => \$_repack_flags,
71
%remote_opts );
@@ -152,11 +145,10 @@ for (my $i = 0; $i < @ARGV; $i++) {
145
my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
146
147
read_repo_config(\%opts);
155
-my $rv = GetOptions(%opts, 'help|H|h' => \$_help,
156
- 'version|V' => \$_version,
157
- 'minimize-connections' =>
158
- \$Git::SVN::Migration::_minimize,
159
- 'id|i=s' => \$Git::SVN::default_ref_id);
148
+my $rv = GetOptions(%opts, 'help|H|h' => \$_help, 'version|V' => \$_version,
149
+ 'minimize-connections' => \$Git::SVN::Migration::_minimize,
150
+ 'id|i=s' => \$Git::SVN::default_ref_id,
151
+ 'svn-remote|remote|R=s' => \$Git::SVN::default_repo_id);
152
exit 1 if (!$rv && $cmd ne 'log');
153
154
usage(0) if $_help;
@@ -634,7 +626,7 @@ sub cmt_metadata {
626
package Git::SVN;
627
use strict;
628
use warnings;
637
-use vars qw/$default_repo_id $default_ref_id/;
629
+use vars qw/$default_repo_id $default_ref_id $_no_metadata $_follow_parent/;
630
use Carp qw/croak/;
631
use File::Path qw/mkpath/;
632
use IPC::Open3;
@@ -1012,9 +1004,11 @@ sub do_git_commit {
1004
defined(my $pid = open3(my $msg_fh, my $out_fh, '>&STDERR', @exec))
1005
or croak $!;
1006
print $msg_fh $log_entry->{log} or croak $!;
1015
- print $msg_fh "\ngit-svn-id: ", $self->full_url, '@',
1016
- $log_entry->{revision}, ' ',
1017
- $self->ra->uuid, "\n" or croak $!;
1007
+ unless ($_no_metadata) {
1008
+ print $msg_fh "\ngit-svn-id: ", $self->full_url, '@',
1009
+ $log_entry->{revision}, ' ',
1010
+ $self->ra->uuid, "\n" or croak $!;
1011
+ }
1012
$msg_fh->flush == 0 or croak $!;
1013
close $msg_fh or croak $!;
1014
chomp(my $commit = do { local $/; <$out_fh> });
@@ -1059,7 +1053,7 @@ sub match_paths {
1053
1054
sub find_parent_branch {
1055
my ($self, $paths, $rev) = @_;
1062
- return undef unless $::_follow_parent;
1056
+ return undef unless $_follow_parent;
1057
unless (defined $paths) {
1058
$self->ra->get_log([$self->{path}], $rev, $rev, 0, 1, 1,
1059
sub { $paths = dup_changed_paths($_[0]) });
@@ -1112,7 +1106,7 @@ sub find_parent_branch {
1106
$gs = Git::SVN->init($new_url, '', $ref_id, $ref_id);
1107
}
1108
my ($r0, $parent) = $gs->find_rev_before($r, 1);
1115
- if ($::_follow_parent && (!defined $r0 || !defined $parent)) {
1109
+ if ($_follow_parent && (!defined $r0 || !defined $parent)) {
1110
$gs->fetch(0, $r);
1111
($r0, $parent) = $gs->last_rev_commit;
1112
}