mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn: port the 'rebuild' command to use Git::SVN objects

Browse Source 
Also correctly shared some variables needed for Git::SVN::Log

Signed-off-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
Eric Wong
2007-01-12 02:49:01 -08:00
parent f8c9d1d27f
commit e7f023c81a
1 changed files with 28 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
git-svn.perl
View File

@ -7,7 +7,8 @@ use vars qw/ $AUTHOR $VERSION
$SVN_URL $SVN_URL
$GIT_SVN_INDEX $GIT_SVN $GIT_SVN_INDEX $GIT_SVN
$GIT_DIR $GIT_SVN_DIR $REVDB $GIT_DIR $GIT_SVN_DIR $REVDB
$_follow_parent $sha1 $sha1_short/; $_follow_parent $sha1 $sha1_short $_revision
$_cp_remote $_upgrade/;
$AUTHOR = 'Eric Wong <normalperson@yhbt.net>'; $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
$VERSION = '@@GIT_VERSION@@'; $VERSION = '@@GIT_VERSION@@';
@ -69,8 +70,8 @@ my ($SVN);
my $_optimize_commits = 1 unless $ENV{GIT_SVN_NO_OPTIMIZE_COMMITS}; my $_optimize_commits = 1 unless $ENV{GIT_SVN_NO_OPTIMIZE_COMMITS};
$sha1 = qr/[a-f\d]{40}/; $sha1 = qr/[a-f\d]{40}/;
$sha1_short = qr/[a-f\d]{4,40}/; $sha1_short = qr/[a-f\d]{4,40}/;
my ($_revision,$_stdin,$_help,$_rmdir,$_edit, my ($_stdin,$_help,$_rmdir,$_edit,
$_find_copies_harder, $_l, $_cp_similarity, $_cp_remote, $_find_copies_harder, $_l, $_cp_similarity,
$_repack, $_repack_nr, $_repack_flags, $_q, $_repack, $_repack_nr, $_repack_flags, $_q,
$_message, $_file, $_no_metadata, $_message, $_file, $_no_metadata,
$_template, $_shared, $_no_default_regex, $_no_graft_copy, $_template, $_shared, $_no_default_regex, $_no_graft_copy,
@ -119,7 +120,7 @@ my %cmd = (
{ 'stdin|' => \$_stdin, %cmt_opts, %fc_opts, } ], { 'stdin|' => \$_stdin, %cmt_opts, %fc_opts, } ],
'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings", 'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings",
{ 'revision|r=i' => \$_revision } ], { 'revision|r=i' => \$_revision } ],
rebuild => [ \&rebuild, "Rebuild git-svn metadata (after git clone)", rebuild => [ \&cmd_rebuild, "Rebuild git-svn metadata (after git clone)",
{ 'copy-remote|remote=s' => \$_cp_remote, { 'copy-remote|remote=s' => \$_cp_remote,
'upgrade' => \$_upgrade } ], 'upgrade' => \$_upgrade } ],
'graft-branches' => [ \&graft_branches, 'graft-branches' => [ \&graft_branches,
@ -223,53 +224,48 @@ sub version {
exit 0; exit 0;
} }
sub rebuild { sub cmd_rebuild {
if (!verify_ref("refs/remotes/$GIT_SVN^0")) { my $url = shift;
copy_remote_ref(); my $gs = $url ? Git::SVN->init(undef, $url)
: eval { Git::SVN->new };
$gs ||= Git::SVN->_new;
if (!verify_ref($gs->refname.'^0')) {
$gs->copy_remote_ref;
} }
$SVN_URL = shift or undef;
my $newest_rev = 0;
if ($_upgrade) { if ($_upgrade) {
command_noisy('update-ref',"refs/remotes/$GIT_SVN"," command_noisy('update-ref',$gs->refname, $gs->{id}.'-HEAD');
$GIT_SVN-HEAD");
} else { } else {
check_upgrade_needed(); $gs->check_upgrade_needed;
} }
my ($rev_list, $ctx) = command_output_pipe("rev-list", my ($rev_list, $ctx) = command_output_pipe("rev-list", $gs->refname);
"refs/remotes/$GIT_SVN");
my $latest; my $latest;
my $svn_uuid; my $svn_uuid;
while (<$rev_list>) { while (<$rev_list>) {
chomp; chomp;
my $c = $_; my $c = $_;
croak "Non-SHA1: $c\n" unless $c =~ /^$sha1$/o; fatal "Non-SHA1: $c\n" unless $c =~ /^$sha1$/o;
my @commit = grep(/^git-svn-id: /, my ($url, $rev, $uuid) = cmt_metadata($c);
command(qw/cat-file commit/, $c));
next if (!@commit); # skip merges # ignore merges (from set-tree)
my ($url, $rev, $uuid) = extract_metadata($commit[$#commit]); next if (!defined $rev || !$uuid);
if (!defined $rev || !$uuid) {
croak "Unable to extract revision or UUID from ",
"$c, $commit[$#commit]\n";
}
# if we merged or otherwise started elsewhere, this is # if we merged or otherwise started elsewhere, this is
# how we break out of it # how we break out of it
next if (defined $svn_uuid && ($uuid ne $svn_uuid)); if ((defined $svn_uuid && ($uuid ne $svn_uuid)) ||
next if (defined $SVN_URL && defined $url && ($url ne $SVN_URL)); ($gs->{url} && $url && ($url ne $gs->{url}))) {
next;
}
unless (defined $latest) { unless (defined $latest) {
if (!$SVN_URL && !$url) { if (!$gs->{url} && !$url) {
croak "SVN repository location required: $url\n"; fatal "SVN repository location required\n";
} }
$SVN_URL ||= $url; $gs = Git::SVN->init(undef, $url);
$svn_uuid ||= $uuid;
setup_git_svn();
$latest = $rev; $latest = $rev;
} }
revdb_set($REVDB, $rev, $c); $gs->rev_db_set($rev, $c);
print "r$rev = $c\n"; print "r$rev = $c\n";
$newest_rev = $rev if ($rev > $newest_rev);
} }
command_close_pipe($rev_list, $ctx); command_close_pipe($rev_list, $ctx);
} }
@ -2617,17 +2613,6 @@ sub revdb_get {
return $ret; return $ret;
} }
sub copy_remote_ref {
my $origin = $_cp_remote ? $_cp_remote : 'origin';
my $ref = "refs/remotes/$GIT_SVN";
if (command('ls-remote', $origin, $ref)) {
command_noisy('fetch', $origin, "$ref:$ref");
} elsif ($_cp_remote && !$_upgrade) {
die "Unable to find remote reference: ",
"refs/remotes/$GIT_SVN on $origin\n";
}
}
{ {
my $kill_stupid_warnings = $SVN::Node::none.$SVN::Node::file. my $kill_stupid_warnings = $SVN::Node::none.$SVN::Node::file.
$SVN::Node::dir.$SVN::Node::unknown. $SVN::Node::dir.$SVN::Node::unknown.