34
my $sha1 = qr/[a-f\d]{40}/;
35
my $sha1_short = qr/[a-f\d]{6,40}/;
36
my ($_revision,$_stdin,$_no_ignore_ext,$_no_stop_copy,$_help,$_rmdir,$_edit,
37
- $_find_copies_harder, $_l, $_version);
37
+ $_find_copies_harder, $_l, $_version, $_upgrade);
38
39
GetOptions( 'revision|r=s' => \$_revision,
40
'no-ignore-externals' => \$_no_ignore_ext,
41
'stdin|' => \$_stdin,
42
'edit|e' => \$_edit,
43
'rmdir' => \$_rmdir,
44
+ 'upgrade' => \$_upgrade,
45
'help|H|h' => \$_help,
46
'find-copies-harder' => \$_find_copies_harder,
47
'l=i' => \$_l,
107
$SVN_URL = shift or undef;
108
my $repo_uuid;
109
my $newest_rev = 0;
110
+ if ($_upgrade) {
111
+ sys('git-update-ref',"refs/remotes/$GIT_SVN","$GIT_SVN-HEAD");
112
+ } else {
113
+ check_upgrade_needed();
114
+ }
115
116
my $pid = open(my $rev_list,'-|');
117
defined $pid or croak $!;
118
if ($pid == 0) {
113
- exec("git-rev-list","$GIT_SVN-HEAD") or croak $!;
119
+ exec("git-rev-list","refs/remotes/$GIT_SVN") or croak $!;
120
}
115
- my $first;
121
+ my $latest;
122
while (<$rev_list>) {
123
chomp;
124
my $c = $_;
138
"$c, $id\n";
139
}
140
}
141
+
142
+ # if we merged or otherwise started elsewhere, this is
143
+ # how we break out of it
144
+ next if (defined $repo_uuid && ($uuid ne $repo_uuid));
145
+ next if (defined $SVN_URL && ($url ne $SVN_URL));
146
+
147
print "r$rev = $c\n";
136
- unless (defined $first) {
148
+ unless (defined $latest) {
149
if (!$SVN_URL && !$url) {
150
croak "SVN repository location required: $url\n";
151
}
152
$SVN_URL ||= $url;
141
- $repo_uuid = setup_git_svn();
142
- $first = $rev;
143
- }
144
- if ($uuid ne $repo_uuid) {
145
- croak "Repository UUIDs do not match!\ngot: $uuid\n",
146
- "expected: $repo_uuid\n";
153
+ $repo_uuid ||= setup_git_svn();
154
+ $latest = $rev;
155
}
156
assert_revision_eq_or_unknown($rev, $c);
157
sys('git-update-ref',"$GIT_SVN/revs/$rev",$c);
159
}
160
close $rev_list or croak $?;
161
if (!chdir $SVN_WC) {
154
- my @svn_co = ('svn','co',"-r$first");
162
+ my @svn_co = ('svn','co',"-r$latest");
163
push @svn_co, '--ignore-externals' unless $_no_ignore_ext;
164
sys(@svn_co, $SVN_URL, $SVN_WC);
165
chdir $SVN_WC or croak $!;
176
exec('git-write-tree');
177
}
178
waitpid $pid, 0;
179
+
180
+ if ($_upgrade) {
181
+ print STDERR <<"";
182
+Keeping deprecated refs/head/$GIT_SVN-HEAD for now. Please remove it
183
+when you have upgraded your tools and habits to use refs/remotes/$GIT_SVN
184
+
185
+ }
186
}
187
188
sub init {
195
196
sub fetch {
197
my (@parents) = @_;
198
+ check_upgrade_needed();
199
$SVN_URL ||= file_to_s("$GIT_DIR/$GIT_SVN/info/url");
200
my @log_args = -d $SVN_WC ? ($SVN_WC) : ($SVN_URL);
201
unless ($_revision) {
238
239
sub commit {
240
my (@commits) = @_;
241
+ check_upgrade_needed();
242
if ($_stdin || !@commits) {
243
print "Reading from stdin...\n";
244
@commits = ();
880
if ($commit !~ /^$sha1$/o) {
881
croak "Failed to commit, invalid sha1: $commit\n";
882
}
866
- my @update_ref = ('git-update-ref',"refs/heads/$GIT_SVN-HEAD",$commit);
883
+ my @update_ref = ('git-update-ref',"refs/remotes/$GIT_SVN",$commit);
884
if (my $primary_parent = shift @exec_parents) {
885
push @update_ref, $primary_parent;
886
}
953
$_no_ignore_ext = 1;
954
}
955
}
956
+
957
+sub check_upgrade_needed {
958
+ my $old = eval {
959
+ my $pid = open my $child, '-|';
960
+ defined $pid or croak $!;
961
+ if ($pid == 0) {
962
+ close STDERR;
963
+ exec('git-rev-parse',"$GIT_SVN-HEAD") or croak $?;
964
+ }
965
+ my @ret = (<$child>);
966
+ close $child or croak $?;
967
+ die $? if $?; # just in case close didn't error out
968
+ return wantarray ? @ret : join('',@ret);
969
+ };
970
+ return unless $old;
971
+ my $head = eval { safe_qx('git-rev-parse',"refs/remotes/$GIT_SVN") };
972
+ if ($@ || !$head) {
973
+ print STDERR "Please run: $0 rebuild --upgrade\n";
974
+ exit 1;
975
+ }
976
+}
977
+
978
__END__
979
980
Data structures: