undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn: checkout files on new fetches

Browse Source 
On newly-created repositories, 'refs/heads/master' does not
point to anything.  This can be confusing to new users; so we
update 'master' to point to the last imported ref after fetching
is done.

Once 'master' is valid; we assume HEAD points to it; and if
the repository is not bare, then checkout the files if the
working tree is clean and unused.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
Eric Wong 2007-02-16 01:45:13 -08:00
parent 488a63ec23
commit 1e889ef36c
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
git-svn.perl
View File

@ -56,7 +56,7 @@ my ($_stdin, $_help, $_edit,
$_template, $_shared, $_template, $_shared,
$_version, $_fetch_all, $_version, $_fetch_all,
$_merge, $_strategy, $_dry_run, $_merge, $_strategy, $_dry_run,
$_prefix); $_prefix, $_no_checkout);
$Git::SVN::_follow_parent = 1; $Git::SVN::_follow_parent = 1;
my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username, my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
'config-dir=s' => \$Git::SVN::Ra::config_dir, 'config-dir=s' => \$Git::SVN::Ra::config_dir,
@ -67,6 +67,7 @@ my %fc_opts = ( 'follow-parent|follow!' => \$Git::SVN::_follow_parent,
'noMetadata' => \$Git::SVN::_no_metadata, 'noMetadata' => \$Git::SVN::_no_metadata,
'useSvmProps' => \$Git::SVN::_use_svm_props, 'useSvmProps' => \$Git::SVN::_use_svm_props,
'log-window-size=i' => \$Git::SVN::Ra::_log_window_size, 'log-window-size=i' => \$Git::SVN::Ra::_log_window_size,
'no-checkout' => \$_no_checkout,
'quiet|q' => \$_q, 'quiet|q' => \$_q,
'repack-flags|repack-args|repack-opts=s' => 'repack-flags|repack-args|repack-opts=s' =>
\$Git::SVN::_repack_flags, \$Git::SVN::_repack_flags,
@ -167,6 +168,7 @@ eval {
$cmd{$cmd}->[0]->(@ARGV); $cmd{$cmd}->[0]->(@ARGV);
}; };
fatal $@ if $@; fatal $@ if $@;
post_fetch_checkout();
exit 0; exit 0;
####################### primary functions ###################### ####################### primary functions ######################
@ -466,6 +468,27 @@ sub cmd_commit_diff {
########################### utility functions ######################### ########################### utility functions #########################
sub post_fetch_checkout {
return if $_no_checkout;
my $gs = $Git::SVN::_head or return;
return if verify_ref('refs/heads/master^0');
my $valid_head = verify_ref('HEAD^0');
command_noisy(qw(update-ref refs/heads/master), $gs->refname);
return if ($valid_head || !verify_ref('HEAD^0'));
return if $ENV{GIT_DIR} !~ m#^(?:.*/)?\.git$#;
my $index = $ENV{GIT_INDEX_FILE} || "$ENV{GIT_DIR}/index";
return if -f $index;
chomp(my $bare = `git config --bool --get core.bare`);
return if $bare eq 'true';
return if command_oneline(qw/rev-parse --is-inside-git-dir/) eq 'true';
command_noisy(qw/read-tree -m -u -v HEAD HEAD/);
print STDERR "Checked out HEAD:\n ",
$gs->full_url, " r", $gs->last_rev, "\n";
}
sub complete_svn_url { sub complete_svn_url {
my ($url, $path) = @_; my ($url, $path) = @_;
$path =~ s#/+$##; $path =~ s#/+$##;
@ -668,7 +691,7 @@ package Git::SVN;
use strict; use strict;
use warnings; use warnings;
use vars qw/$default_repo_id $default_ref_id $_no_metadata $_follow_parent use vars qw/$default_repo_id $default_ref_id $_no_metadata $_follow_parent
$_repack $_repack_flags $_use_svm_props/; $_repack $_repack_flags $_use_svm_props $_head/;
use Carp qw/croak/; use Carp qw/croak/;
use File::Path qw/mkpath/; use File::Path qw/mkpath/;
use File::Copy qw/copy/; use File::Copy qw/copy/;
@ -1781,6 +1804,7 @@ sub rev_db_set {
} }
close $fh or croak $!; close $fh or croak $!;
if ($update_ref) { if ($update_ref) {
$_head = $self;
command_noisy('update-ref', '-m', "r$rev", command_noisy('update-ref', '-m', "r$rev",
$self->refname, $commit); $self->refname, $commit);
} }