# [PATCH 6/9] contrib/git-svn: create a more recent master if one does not exist 2 messages from 2006-03-03 to 2006-03-03. Participants: Eric Wong. Thread: https://gitlist.dev/t/3537 ## Eric Wong, 2006-03-03 09:20 Subject: [PATCH 5/9] contrib/git-svn: cleanup option parsing Message-ID: <11413776081545-git-send-email-normalperson@yhbt.net> URL: https://gitlist.dev/e/11413776081545-git-send-email-normalperson%40yhbt.net In-Reply-To: <11413776082506-git-send-email-normalperson@yhbt.net> ``` Signed-off-by: Eric Wong --- contrib/git-svn/git-svn.perl | 65 +++++++++++++++++++++++------------------- 1 files changed, 35 insertions(+), 30 deletions(-) a080e189728de9a7aa834b61205df9d8de1025ba diff --git a/contrib/git-svn/git-svn.perl b/contrib/git-svn/git-svn.perl index c2b4ee9..5d547e8 100755 --- a/contrib/git-svn/git-svn.perl +++ b/contrib/git-svn/git-svn.perl @@ -24,6 +24,7 @@ $ENV{LC_ALL} = 'C'; # If SVN:: library support is added, please make the dependencies # optional and preserve the capability to use the command-line client. # use eval { require SVN::... } to make it lazy load +# We don't use any modules not in the standard Perl distribution: use Carp qw/croak/; use IO::File qw//; use File::Basename qw/dirname basename/; @@ -37,26 +38,25 @@ my ($_revision,$_stdin,$_no_ignore_ext,$ $_find_copies_harder, $_l, $_version, $_upgrade, $_authors); my (@_branch_from, %tree_map, %users); -GetOptions( 'revision|r=s' => \$_revision, - 'no-ignore-externals' => \$_no_ignore_ext, - 'stdin|' => \$_stdin, - 'edit|e' => \$_edit, - 'rmdir' => \$_rmdir, - 'upgrade' => \$_upgrade, - 'help|H|h' => \$_help, +my %fc_opts = ( 'no-ignore-externals' => \$_no_ignore_ext, 'branch|b=s' => \@_branch_from, - 'find-copies-harder' => \$_find_copies_harder, - 'authors-file|authors|A=s' => \$_authors, - 'l=i' => \$_l, - 'version|V' => \$_version, - 'no-stop-on-copy' => \$_no_stop_copy ); + 'authors-file|A=s' => \$_authors ); my %cmd = ( - fetch => [ \&fetch, "Download new revisions from SVN" ], - init => [ \&init, "Initialize and fetch (import)"], - commit => [ \&commit, "Commit git revisions to SVN" ], - 'show-ignore' => [ \&show_ignore, "Show svn:ignore listings" ], - rebuild => [ \&rebuild, "Rebuild git-svn metadata (after git clone)" ], - help => [ \&usage, "Show help" ], + fetch => [ \&fetch, "Download new revisions from SVN", + { 'revision|r=s' => \$_revision, %fc_opts } ], + init => [ \&init, "Initialize and fetch (import)", { } ], + commit => [ \&commit, "Commit git revisions to SVN", + { 'stdin|' => \$_stdin, + 'edit|e' => \$_edit, + 'rmdir' => \$_rmdir, + 'find-copies-harder' => \$_find_copies_harder, + 'l=i' => \$_l, + %fc_opts, + } ], + 'show-ignore' => [ \&show_ignore, "Show svn:ignore listings", { } ], + rebuild => [ \&rebuild, "Rebuild git-svn metadata (after git clone)", + { 'no-ignore-externals' => \$_no_ignore_ext, + 'upgrade' => \$_upgrade } ], ); my $cmd; for (my $i = 0; $i < @ARGV; $i++) { @@ -75,21 +75,14 @@ foreach (keys %cmd) { } } -# ' = real-name ' mapping based on git-svnimport: -if ($_authors) { - open my $authors, '<', $_authors or die "Can't open $_authors $!\n"; - while (<$authors>) { - chomp; - next unless /^(\S+?)\s*=\s*(.+?)\s*<(.+)>\s*$/; - my ($user, $name, $email) = ($1, $2, $3); - $users{$user} = [$name, $email]; - } - close $authors or croak $!; -} +my %opts; +%opts = %{$cmd{$cmd}->[2]} if (defined $cmd); +GetOptions(%opts, 'help|H|h' => \$_help, 'version|V' => \$_version ) or exit 1; usage(0) if $_help; version() if $_version; -usage(1) unless (defined $cmd); +usage(1) unless defined $cmd; +load_authors() if $_authors; svn_check_ignore_externals(); $cmd{$cmd}->[0]->(@ARGV); exit 0; @@ -1047,6 +1040,18 @@ sub map_tree_joins { } } +# ' = real-name ' mapping based on git-svnimport: +sub load_authors { + open my $authors, '<', $_authors or die "Can't open $_authors $!\n"; + while (<$authors>) { + chomp; + next unless /^(\S+?)\s*=\s*(.+?)\s*<(.+)>\s*$/; + my ($user, $name, $email) = ($1, $2, $3); + $users{$user} = [$name, $email]; + } + close $authors or croak $!; +} + __END__ Data structures: -- 1.2.3.g4676 ``` ## Eric Wong, 2006-03-03 09:20 Subject: [PATCH 6/9] contrib/git-svn: create a more recent master if one does not exist Message-ID: <11413776092820-git-send-email-normalperson@yhbt.net> URL: https://gitlist.dev/e/11413776092820-git-send-email-normalperson%40yhbt.net In-Reply-To: <11413776081545-git-send-email-normalperson@yhbt.net> ``` In a new repository, the initial fetch creates a master branch if one does not exist so HEAD has something to point to. It now creates a master at the end of the initial fetch run, pointing to the latest revision. Previously it pointed to the first revision imported, which is generally less useful. Signed-off-by: Eric Wong --- contrib/git-svn/git-svn.perl | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) 7d3cf853ffbe0d1ce8a15fa5ac3dad793ddb5021 diff --git a/contrib/git-svn/git-svn.perl b/contrib/git-svn/git-svn.perl index 5d547e8..69b6be3 100755 --- a/contrib/git-svn/git-svn.perl +++ b/contrib/git-svn/git-svn.perl @@ -224,9 +224,6 @@ sub fetch { sys(@svn_co, $SVN_URL, $SVN_WC); chdir $SVN_WC or croak $!; $last_commit = git_commit($base, @parents); - unless (-f "$GIT_DIR/refs/heads/master") { - sys(qw(git-update-ref refs/heads/master),$last_commit); - } assert_svn_wc_clean($base->{revision}, $last_commit); } else { chdir $SVN_WC or croak $!; @@ -242,6 +239,9 @@ sub fetch { $last_commit = git_commit($log_msg, $last_commit, @parents); } assert_svn_wc_clean($last_rev, $last_commit); + unless (-e "$GIT_DIR/refs/heads/master") { + sys(qw(git-update-ref refs/heads/master),$last_commit); + } return pop @$svn_log; } -- 1.2.3.g4676 ```