2 # Copyright (C) 2006, Eric Wong <normalperson@yhbt.net>
3 # License: GPL v2 or later
6 use vars qw
/ $AUTHOR $VERSION
8 $GIT_SVN_INDEX $GIT_SVN
9 $GIT_DIR $GIT_SVN_DIR $REVDB
10 $_follow_parent $sha1 $sha1_short $_revision
11 $_cp_remote $_upgrade $_rmdir $_q $_cp_similarity
12 $_find_copies_harder $_l $_authors %users/;
13 $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
14 $VERSION = '@@GIT_VERSION@@';
16 $ENV{GIT_DIR
} ||= '.git';
17 $Git::SVN
::default_repo_id
= 'git-svn';
18 $Git::SVN
::default_ref_id
= $ENV{GIT_SVN_ID
} || 'git-svn';
20 my $LC_ALL = $ENV{LC_ALL
};
21 $Git::SVN
::Log
::TZ
= $ENV{TZ
};
22 # make sure the svn binary gives consistent output between locales and TZs:
25 $| = 1; # unbuffer STDOUT
27 sub fatal
(@
) { print STDERR
@_; exit 1 }
28 require SVN
::Core
; # use()-ing this causes segfaults for me... *shrug*
31 if ($SVN::Core
::VERSION
lt '1.1.0') {
32 fatal
"Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)\n";
34 push @Git::SVN
::Ra
::ISA
, 'SVN::Ra';
35 push @SVN::Git
::Editor
::ISA
, 'SVN::Delta::Editor';
36 push @SVN::Git
::Fetcher
::ISA
, 'SVN::Delta::Editor';
39 use File
::Basename qw
/dirname basename/;
40 use File
::Path qw
/mkpath/;
41 use Getopt
::Long qw
/:config gnu_getopt no_ignore_case auto_abbrev pass_through/;
47 foreach (qw
/command command_oneline command_noisy command_output_pipe
48 command_input_pipe command_close_pipe
/) {
49 $s .= "*SVN::Git::Editor::$_ = *SVN::Git::Fetcher::$_ = ".
50 "*Git::SVN::Migration::$_ = ".
51 "*Git::SVN::Log::$_ = *Git::SVN::$_ = *$_ = *Git::$_; ";
58 my $_optimize_commits = 1 unless $ENV{GIT_SVN_NO_OPTIMIZE_COMMITS
};
59 $sha1 = qr/[a-f\d]{40}/;
60 $sha1_short = qr/[a-f\d]{4,40}/;
61 my ($_stdin, $_help, $_edit,
62 $_repack, $_repack_nr, $_repack_flags,
63 $_message, $_file, $_no_metadata,
66 $_merge, $_strategy, $_dry_run,
69 my %remote_opts = ( 'username=s' => \
$Git::SVN
::Prompt
::_username
,
70 'config-dir=s' => \
$Git::SVN
::Ra
::config_dir
,
71 'no-auth-cache' => \
$Git::SVN
::Prompt
::_no_auth_cache
);
72 my %fc_opts = ( 'follow-parent|follow' => \
$_follow_parent,
73 'authors-file|A=s' => \
$_authors,
74 'repack:i' => \
$_repack,
75 'no-metadata' => \
$_no_metadata,
77 'repack-flags|repack-args|repack-opts=s' => \
$_repack_flags,
80 my ($_trunk, $_tags, $_branches);
81 my %multi_opts = ( 'trunk|T=s' => \
$_trunk,
82 'tags|t=s' => \
$_tags,
83 'branches|b=s' => \
$_branches );
84 my %init_opts = ( 'template=s' => \
$_template, 'shared' => \
$_shared );
85 my %cmt_opts = ( 'edit|e' => \
$_edit,
87 'find-copies-harder' => \
$_find_copies_harder,
89 'copy-similarity|C=i'=> \
$_cp_similarity
93 fetch
=> [ \
&cmd_fetch
, "Download new revisions from SVN",
94 { 'revision|r=s' => \
$_revision, %fc_opts } ],
95 init
=> [ \
&cmd_init
, "Initialize a repo for tracking" .
96 " (requires URL argument)",
98 dcommit
=> [ \
&cmd_dcommit
,
99 'Commit several diffs to merge with upstream',
100 { 'merge|m|M' => \
$_merge,
101 'strategy|s=s' => \
$_strategy,
102 'dry-run|n' => \
$_dry_run,
103 %cmt_opts, %fc_opts } ],
104 'set-tree' => [ \
&cmd_set_tree
,
105 "Set an SVN repository to a git tree-ish",
106 { 'stdin|' => \
$_stdin, %cmt_opts, %fc_opts, } ],
107 'show-ignore' => [ \
&cmd_show_ignore
, "Show svn:ignore listings",
108 { 'revision|r=i' => \
$_revision } ],
109 rebuild
=> [ \
&cmd_rebuild
, "Rebuild git-svn metadata (after git clone)",
110 { 'copy-remote|remote=s' => \
$_cp_remote,
111 'upgrade' => \
$_upgrade } ],
112 'multi-init' => [ \
&cmd_multi_init
,
113 'Initialize multiple trees (like git-svnimport)',
114 { %multi_opts, %init_opts, %remote_opts,
115 'revision|r=i' => \
$_revision,
116 'prefix=s' => \
$_prefix,
118 'multi-fetch' => [ \
&cmd_multi_fetch
,
119 'Fetch multiple trees (like git-svnimport)',
121 'migrate' => [ sub { },
122 # no-op, we automatically run this anyways,
123 'Migrate configuration/metadata/layout from
124 previous versions of git-svn',
126 'log' => [ \
&Git
::SVN
::Log
::cmd_show_log
, 'Show commit logs',
127 { 'limit=i' => \
$Git::SVN
::Log
::limit
,
128 'revision|r=s' => \
$_revision,
129 'verbose|v' => \
$Git::SVN
::Log
::verbose
,
130 'incremental' => \
$Git::SVN
::Log
::incremental
,
131 'oneline' => \
$Git::SVN
::Log
::oneline
,
132 'show-commit' => \
$Git::SVN
::Log
::show_commit
,
133 'non-recursive' => \
$Git::SVN
::Log
::non_recursive
,
134 'authors-file|A=s' => \
$_authors,
135 'color' => \
$Git::SVN
::Log
::color
,
136 'pager=s' => \
$Git::SVN
::Log
::pager
,
138 'commit-diff' => [ \
&cmd_commit_diff
,
139 'Commit a diff between two trees',
140 { 'message|m=s' => \
$_message,
141 'file|F=s' => \
$_file,
142 'revision|r=s' => \
$_revision,
147 for (my $i = 0; $i < @ARGV; $i++) {
148 if (defined $cmd{$ARGV[$i]}) {
155 my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
157 read_repo_config
(\
%opts);
158 my $rv = GetOptions
(%opts, 'help|H|h' => \
$_help,
159 'version|V' => \
$_version,
160 'minimize-connections' =>
161 \
$Git::SVN
::Migration
::_minimize
,
162 'id|i=s' => \
$Git::SVN
::default_ref_id
);
163 exit 1 if (!$rv && $cmd ne 'log');
166 version
() if $_version;
167 usage
(1) unless defined $cmd;
168 load_authors
() if $_authors;
169 unless ($cmd =~ /^(?:init|rebuild|multi-init|commit-diff)$/) {
170 Git
::SVN
::Migration
::migration_check
();
173 Git
::SVN
::verify_remotes_sanity
();
174 $cmd{$cmd}->[0]->(@ARGV);
179 ####################### primary functions ######################
181 my $exit = shift || 0;
182 my $fd = $exit ? \
*STDERR
: \
*STDOUT
;
184 git
-svn
- bidirectional operations between a single Subversion tree
and git
185 Usage
: $0 <command
> [options
] [arguments
]\n
187 print $fd "Available commands:\n" unless $cmd;
189 foreach (sort keys %cmd) {
190 next if $cmd && $cmd ne $_;
191 print $fd ' ',pack('A17',$_),$cmd{$_}->[1],"\n";
192 foreach (keys %{$cmd{$_}->[2]}) {
193 # prints out arguments as they should be passed:
194 my $x = s
#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
195 print $fd ' ' x
21, join(', ', map { length $_ > 1 ?
197 split /\|/,$_)," $x\n";
201 \nGIT_SVN_ID may be set
in the environment
or via the
--id
/-i switch to an
202 arbitrary identifier
if you
're tracking multiple SVN branches/repositories in
203 one git repository and want to keep them separate. See git-svn(1) for more
210 print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
216 my $gs = $url ? Git::SVN->init($url)
217 : eval { Git::SVN->new };
218 $gs ||= Git::SVN->_new;
219 if (!verify_ref($gs->refname.'^0')) {
220 $gs->copy_remote_ref;
223 my ($rev_list, $ctx) = command_output_pipe("rev-list", $gs->refname);
226 while (<$rev_list>) {
229 fatal "Non-SHA1: $c\n" unless $c =~ /^$sha1$/o;
230 my ($url, $rev, $uuid) = cmt_metadata($c);
232 # ignore merges (from set-tree)
233 next if (!defined $rev || !$uuid);
235 # if we merged or otherwise started elsewhere, this is
236 # how we break out of it
237 if ((defined $svn_uuid && ($uuid ne $svn_uuid)) ||
238 ($gs->{url} && $url && ($url ne $gs->{url}))) {
242 unless (defined $latest) {
243 if (!$gs->{url} && !$url) {
244 fatal "SVN repository location required\n";
246 $gs = Git::SVN->init($url);
249 $gs->rev_db_set($rev, $c);
250 print "r$rev = $c\n";
252 command_close_pipe($rev_list, $ctx);
256 unless (-d $ENV{GIT_DIR}) {
257 my @init_db = ('init
');
258 push @init_db, "--template=$_template" if defined $_template;
259 push @init_db, "--shared" if defined $_shared;
260 command_noisy(@init_db);
265 my $url = shift or die "SVN repository location required " .
266 "as a command-line argument\n";
267 if (my $repo_path = shift) {
268 unless (-d $repo_path) {
269 mkpath([$repo_path]);
271 chdir $repo_path or croak $!;
272 $ENV{GIT_DIR} = $repo_path . "/.git";
276 Git::SVN->init($url);
281 die "Additional fetch arguments are no longer supported.\n",
282 "Use --follow-parent if you have moved/copied directories
285 my $gs = Git::SVN->new;
287 if ($gs->{last_commit} && !verify_ref('refs
/heads/master
^0')) {
288 command_noisy(qw(update-ref refs/heads/master),
295 if ($_stdin || !@commits) {
296 print "Reading from stdin...\n";
299 if (/\b($sha1_short)\b/o) {
300 unshift @commits, $1;
305 foreach my $c (@commits) {
306 my @tmp = command
('rev-parse',$c);
307 if (scalar @tmp == 1) {
309 } elsif (scalar @tmp > 1) {
310 push @revs, reverse(command
('rev-list',@tmp));
312 fatal
"Failed to rev-parse $c\n";
315 my $gs = Git
::SVN
->new;
316 my ($r_last, $cmt_last) = $gs->last_rev_commit;
318 if ($r_last != $gs->{last_rev
}) {
319 fatal
"There are new revisions that were fetched ",
320 "and need to be merged (or acknowledged) ",
321 "before committing.\nlast rev: $r_last\n",
322 " current: $gs->{last_rev}\n";
324 $gs->set_tree($_) foreach @revs;
325 print "Done committing ",scalar @revs," revisions to SVN\n";
330 my $gs = Git
::SVN
->new;
332 my @refs = command
(qw
/rev-list --no-merges/, $gs->refname."..$head");
334 foreach my $d (reverse @refs) {
335 if (!verify_ref
("$d~1")) {
337 "has no parent commit, and therefore ",
338 "nothing to diff against.\n",
339 "You should be working from a repository ",
340 "originally created by git-svn\n";
342 unless (defined $last_rev) {
343 (undef, $last_rev, undef) = cmt_metadata
("$d~1");
344 unless (defined $last_rev) {
345 fatal
"Unable to extract revision information ",
346 "from commit $d~1\n";
350 print "diff-tree $d~1 $d\n";
352 my $log = get_commit_entry
($d)->{log};
354 my $pool = SVN
::Pool
->new;
355 my %ed_opts = ( r
=> $last_rev,
357 svn_path
=> $ra->{svn_path
} );
358 my $ed = SVN
::Git
::Editor
->new(\
%ed_opts,
359 $ra->get_commit_editor($log,
360 sub { print "Committed r$_[0]\n";
361 $last_rev = $_[0]; }),
363 my $mods = $ed->apply_diff("$d~1", $d);
365 print "No changes\n$d~1 == $d\n";
371 # we always want to rebase against the current HEAD, not any
372 # head that was passed to us
373 my @diff = command
('diff-tree', 'HEAD', $gs->refname, '--');
376 @finish = qw
/rebase/;
377 push @finish, qw
/--merge/ if $_merge;
378 push @finish, "--strategy=$_strategy" if $_strategy;
379 print STDERR
"W: HEAD and ", $gs->refname, " differ, ",
380 "using @finish:\n", "@diff";
382 print "No changes between current HEAD and ",
383 $gs->refname, "\nResetting to the latest ",
385 @finish = qw
/reset --mixed/;
387 command_noisy
(@finish, $gs->refname);
390 sub cmd_show_ignore
{
391 my $gs = Git
::SVN
->new;
392 my $r = (defined $_revision ?
$_revision : $gs->ra->get_latest_revnum);
393 $gs->traverse_ignore(\
*STDOUT
, '', $r);
398 unless (defined $_trunk || defined $_branches || defined $_tags) {
402 $_prefix = '' unless defined $_prefix;
403 $url =~ s
#/+$## if defined $url;
404 if (defined $_trunk) {
405 my $trunk_ref = $_prefix . 'trunk';
406 # try both old-style and new-style lookups:
407 my $gs_trunk = eval { Git
::SVN
->new($trunk_ref) };
409 my ($trunk_url, $trunk_path) =
410 complete_svn_url
($url, $_trunk);
411 $gs_trunk = Git
::SVN
->init($trunk_url, $trunk_path,
415 return unless defined $_branches || defined $_tags;
416 my $ra = $url ? Git
::SVN
::Ra
->new($url) : undef;
417 complete_url_ls_init
($ra, $_branches, '--branches/-b', $_prefix);
418 complete_url_ls_init
($ra, $_tags, '--tags/-t', $_prefix . 'tags/');
421 sub cmd_multi_fetch
{
423 foreach (command
(qw
/config -l/)) {
424 next unless m
!^svn
-remote\
.(.+)\
.fetch
=
425 \s
*(.*)\s
*:\s
*refs
/remotes/(.+)\s
*$!x
;
426 my ($repo_id, $path, $ref_id) = ($1, $2, $3);
427 push @gs, Git
::SVN
->new($ref_id, $repo_id, $path);
434 # this command is special because it requires no metadata
435 sub cmd_commit_diff
{
436 my ($ta, $tb, $url) = @_;
437 my $usage = "Usage: $0 commit-diff -r<revision> ".
438 "<tree-ish> <tree-ish> [<URL>]\n";
439 fatal
($usage) if (!defined $ta || !defined $tb);
441 my $gs = eval { Git
::SVN
->new };
443 fatal
("Needed URL or usable git-svn --id in ",
444 "the command-line\n", $usage);
448 unless (defined $_revision) {
449 fatal
("-r|--revision is a required argument\n", $usage);
451 if (defined $_message && defined $_file) {
452 fatal
("Both --message/-m and --file/-F specified ",
453 "for the commit message.\n",
454 "I have no idea what you mean\n");
456 if (defined $_file) {
457 $_message = file_to_s
($_file);
459 $_message ||= get_commit_entry
($tb)->{log};
461 my $ra ||= Git
::SVN
::Ra
->new($url);
464 $r = $ra->get_latest_revnum;
465 } elsif ($r !~ /^\d+$/) {
466 die "revision argument: $r not understood by git-svn\n";
468 my $pool = SVN
::Pool
->new;
469 my %ed_opts = ( r
=> $r,
471 svn_path
=> $ra->{svn_path
} );
472 my $ed = SVN
::Git
::Editor
->new(\
%ed_opts,
473 $ra->get_commit_editor($_message,
474 sub { print "Committed r$_[0]\n" }),
476 my $mods = $ed->apply_diff($ta, $tb);
478 print "No changes\n$ta == $tb\n";
483 ########################### utility functions #########################
485 sub complete_svn_url
{
486 my ($url, $path) = @_;
488 if ($path !~ m
#^[a-z\+]+://#) {
489 if (!defined $url || $url !~ m
#^[a-z\+]+://#) {
490 fatal
("E: '$path' is not a complete URL ",
491 "and a separate URL is not specified\n");
493 return ($url, $path);
498 sub complete_url_ls_init
{
499 my ($ra, $repo_path, $switch, $pfx) = @_;
500 unless ($repo_path) {
501 print STDERR
"W: $switch not specified\n";
504 $repo_path =~ s
#/+$##;
505 if ($repo_path =~ m
#^[a-z\+]+://#) {
506 $ra = Git
::SVN
::Ra
->new($repo_path);
509 $repo_path =~ s
#^/+##;
511 fatal
("E: '$repo_path' is not a complete URL ",
512 "and a separate URL is not specified\n");
515 my $r = defined $_revision ?
$_revision : $ra->get_latest_revnum;
516 my ($dirent, undef, undef) = $ra->get_dir($repo_path, $r);
517 my $url = $ra->{url
};
518 foreach my $d (sort keys %$dirent) {
519 next if ($dirent->{$d}->kind != $SVN::Node
::dir
);
520 my $path = "$repo_path/$d";
522 my $gs = eval { Git
::SVN
->new($ref) };
523 # don't try to init already existing refs
525 print "init $url/$path => $ref\n";
526 Git
::SVN
->init($url, $path, undef, $ref);
533 eval { command_oneline
([ 'rev-parse', '--verify', $ref ],
537 sub get_tree_from_treeish
{
539 # $treeish can be a symbolic ref, too:
540 my $type = command_oneline
(qw
/cat-file -t/, $treeish);
542 while ($type eq 'tag') {
543 ($treeish, $type) = command
(qw
/cat-file tag/, $treeish);
545 if ($type eq 'commit') {
546 $expected = (grep /^tree /, command
(qw
/cat-file commit/,
548 ($expected) = ($expected =~ /^tree ($sha1)$/o);
549 die "Unable to get tree from $treeish\n" unless $expected;
550 } elsif ($type eq 'tree') {
551 $expected = $treeish;
553 die "$treeish is a $type, expected tree, tag or commit\n";
558 sub get_commit_entry
{
559 my ($treeish) = shift;
560 my %log_entry = ( log => '', tree
=> get_tree_from_treeish
($treeish) );
561 my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
562 my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
563 open my $log_fh, '>', $commit_editmsg or croak
$!;
565 my $type = command_oneline
(qw
/cat-file -t/, $treeish);
566 if ($type eq 'commit' || $type eq 'tag') {
567 my ($msg_fh, $ctx) = command_output_pipe
('cat-file',
572 $in_msg = 1 if (/^\s*$/);
573 } elsif (/^git-svn-id: /) {
574 # skip this for now, we regenerate the
575 # correct one on re-fetch anyways
576 # TODO: set *:merge properties or like...
578 print $log_fh $_ or croak
$!;
581 command_close_pipe
($msg_fh, $ctx);
583 close $log_fh or croak
$!;
585 if ($_edit || ($type eq 'tree')) {
586 my $editor = $ENV{VISUAL
} || $ENV{EDITOR
} || 'vi';
587 # TODO: strip out spaces, comments, like git-commit.sh
588 system($editor, $commit_editmsg);
590 rename $commit_editmsg, $commit_msg or croak
$!;
591 open $log_fh, '<', $commit_msg or croak
$!;
592 { local $/; chomp($log_entry{log} = <$log_fh>); }
593 close $log_fh or croak
$!;
599 my ($str, $file, $mode) = @_;
600 open my $fd,'>',$file or croak
$!;
601 print $fd $str,"\n" or croak
$!;
602 close $fd or croak
$!;
603 chmod ($mode &~ umask, $file) if (defined $mode);
608 open my $fd,'<',$file or croak
"$!: file: $file\n";
611 close $fd or croak
$!;
616 # '<svn username> = real-name <email address>' mapping based on git-svnimport:
618 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
619 my $log = $cmd eq 'log';
622 next unless /^(\S+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
623 my ($user, $name, $email) = ($1, $2, $3);
625 $Git::SVN
::Log
::rusers
{"$name <$email>"} = $user;
627 $users{$user} = [$name, $email];
630 close $authors or croak
$!;
633 # convert GetOpt::Long specs for use by git-config
634 sub read_repo_config
{
635 return unless -d
$ENV{GIT_DIR
};
637 foreach my $o (keys %$opts) {
639 my ($key) = ($o =~ /^([a-z\-]+)/);
641 my $arg = 'git-config';
642 $arg .= ' --int' if ($o =~ /[:=]i$/);
643 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
644 if (ref $v eq 'ARRAY') {
645 chomp(my @tmp = `$arg --get-all svn.$key`);
648 chomp(my $tmp = `$arg --get svn.$key`);
649 if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) {
656 sub extract_metadata
{
657 my $id = shift or return (undef, undef, undef);
658 my ($url, $rev, $uuid) = ($id =~ /^git
-svn
-id
:\s
(\S
+?
)\@
(\d
+)
660 if (!defined $rev || !$uuid || !$url) {
661 # some of the original repositories I made had
662 # identifiers like this:
663 ($rev, $uuid) = ($id =~/^git-svn-id:\s(\d+)\@([a-f\d\-]+)/);
665 return ($url, $rev, $uuid);
669 return extract_metadata
((grep(/^git-svn-id: /,
670 command
(qw
/cat-file commit/, shift)))[-1]);
673 sub get_commit_time
{
675 my $fh = command_output_pipe
(qw
/rev-list --pretty=raw -n1/, $cmt);
677 /^committer\s(?:.+) (\d+) ([\-\+]?\d+)$/ or next;
678 my ($s, $tz) = ($1, $2);
679 if ($tz =~ s/^\+//) {
680 $s += tz_to_s_offset
($tz);
681 } elsif ($tz =~ s/^\-//) {
682 $s -= tz_to_s_offset
($tz);
687 die "Can't get commit time for commit: $cmt\n";
693 return ($1 * 60) + ($tz * 3600);
699 use vars qw
/$default_repo_id $default_ref_id/;
701 use File
::Path qw
/mkpath/;
704 # properties that we do not log:
707 %SKIP_PROP = map { $_ => 1 } qw
/svn
:wc
:ra_dav
:version
-url
708 svn
:special svn
:executable
709 svn
:entry
:committed
-rev
710 svn
:entry
:last-author
712 svn
:entry
:committed
-date
/;
715 sub read_all_remotes
{
717 foreach (grep { s/^svn-remote\.// } command
(qw
/config -l/)) {
718 if (m!^(.+)\.fetch=\s*(.*)\s*:\s*refs/remotes/(.+)\s*$!) {
719 $r->{$1}->{fetch
}->{$2} = $3;
720 } elsif (m!^(.+)\.url=\s*(.*)\s*$!) {
721 $r->{$1}->{url
} = $2;
727 sub verify_remotes_sanity
{
728 return unless -d
$ENV{GIT_DIR
};
730 foreach (command
(qw
/config -l/)) {
731 if (m!^svn-remote\.(?:.+)\.fetch=.*:refs/remotes/(\S+)\s*$!) {
733 die "Remote ref refs/remote/$1 is tracked by",
734 "\n \"$_\"\nand\n \"$seen{$1}\"\n",
735 "Please resolve this ambiguity in ",
736 "your git configuration file before ",
744 # we allow more chars than remotes2config.sh...
745 sub sanitize_remote_name
{
747 $name =~ tr{A-Za-z0-9:,/+-}{.}c;
752 my ($class, $url, $path, $repo_id, $ref_id) = @_;
753 my $self = _new
($class, $repo_id, $ref_id, $path);
755 $url =~ s!/+$!!; # strip trailing slash
757 # verify that we aren't overwriting anything:
758 my $orig_url = eval {
759 command_oneline
('config', '--get',
760 "svn-remote.$repo_id.url")
762 if ($orig_url && ($orig_url ne $url)) {
763 die "svn-remote.$repo_id.url already set: ",
764 "$orig_url\nwanted to set to: $url\n";
766 my ($xrepo_id, $xpath) = find_ref
($self->refname);
767 if (defined $xpath) {
768 die "svn-remote.$xrepo_id.fetch already set to track ",
769 "$xpath:refs/remotes/", $self->refname, "\n";
772 command_noisy
('config',
773 "svn-remote.$repo_id.url", $url);
775 command_noisy
('config', '--add',
776 "svn-remote.$repo_id.fetch",
777 "$path:".$self->refname);
785 foreach (command
(qw
/config -l/)) {
786 next unless m
!^svn
-remote\
.(.+)\
.fetch
=
787 \s
*(.*)\s
*:\s
*refs
/remotes/(.+)\s
*$!x
;
788 my ($repo_id, $path, $ref) = ($1, $2, $3);
789 if ($ref eq $ref_id) {
790 $path = '' if ($path =~ m
#^\./?#);
791 return ($repo_id, $path);
794 (undef, undef, undef);
798 my ($class, $ref_id, $repo_id, $path) = @_;
799 if (defined $ref_id && !defined $repo_id && !defined $path) {
800 ($repo_id, $path) = find_ref
($ref_id);
801 if (!defined $repo_id) {
802 die "Could not find a \"svn-remote.*.fetch\" key ",
803 "in the repository configuration matching: ",
804 "refs/remotes/$ref_id\n";
807 my $self = _new
($class, $repo_id, $ref_id, $path);
808 if (!defined $self->{path
} || !length $self->{path
}) {
809 my $fetch = command_oneline
('config', '--get',
810 "svn-remote.$repo_id.fetch",
811 ":refs/remotes/$ref_id\$") or
812 die "Failed to read \"svn-remote.$repo_id.fetch\" ",
813 "\":refs/remotes/$ref_id\$\" in config\n";
814 ($self->{path
}, undef) = split(/\s*:\s*/, $fetch);
816 $self->{url
} = command_oneline
('config', '--get',
817 "svn-remote.$repo_id.url") or
818 die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
822 sub refname
{ "refs/remotes/$_[0]->{ref_id}" }
826 $self->{ra
} ||= Git
::SVN
::Ra
->new($self->{url
});
831 my $repos_root = $self->ra->{repos_root
};
832 return $self->{path
} if ($self->{url
} eq $repos_root);
833 my $url = $self->{url
} .
834 (length $self->{path
} ?
"/$self->{path}" : $self->{path
});
835 $url =~ s!^\Q$repos_root\E/*!!g;
839 sub copy_remote_ref
{
841 my $origin = $::_cp_remote ?
$::_cp_remote
: 'origin';
842 my $ref = $self->refname;
843 if (command
('ls-remote', $origin, $ref)) {
844 command_noisy
('fetch', $origin, "$ref:$ref");
845 } elsif ($::_cp_remote
&& !$::_upgrade
) {
846 die "Unable to find remote reference: $ref on $origin\n";
850 sub traverse_ignore
{
851 my ($self, $fh, $path, $r) = @_;
853 my ($dirent, undef, $props) = $self->ra->get_dir($path, $r);
855 $p =~ s
#^\Q$self->{ra}->{svn_path}\E/##;
856 print $fh length $p ?
"\n# $p\n" : "\n# /\n";
857 if (my $s = $props->{'svn:ignore'}) {
858 $s =~ s/[\r\n]+/\n/g;
860 if (length $p == 0) {
865 print $fh "/$p/$s\n";
868 foreach (sort keys %$dirent) {
869 next if $dirent->{$_}->kind != $SVN::Node
::dir
;
870 $self->traverse_ignore($fh, "$path/$_", $r);
874 # returns the newest SVN revision number and newest commit SHA1
875 sub last_rev_commit
{
877 if (defined $self->{last_rev
} && defined $self->{last_commit
}) {
878 return ($self->{last_rev
}, $self->{last_commit
});
880 my $c = ::verify_ref
($self->refname.'^0');
882 my $rev = (::cmt_metadata
($c))[1];
884 ($self->{last_rev
}, $self->{last_commit
}) = ($rev, $c);
888 my $offset = -41; # from tail
890 open my $fh, '<', $self->{db_path
} or
891 croak
"$self->{db_path} not readable: $!\n";
892 seek $fh, $offset, 2;
894 defined $rl or return (undef, undef);
896 while ($c ne $rl && tell $fh != 0) {
898 seek $fh, $offset, 2;
900 defined $rl or return (undef, undef);
904 croak
$! if ($rev < 0);
905 $rev = ($rev - 41) / 41;
906 close $fh or croak
$!;
907 ($self->{last_rev
}, $self->{last_commit
}) = ($rev, $c);
912 my ($self, $base) = @_;
913 my $head = $self->ra->get_latest_revnum;
914 if (!defined $::_revision
|| $::_revision
eq 'BASE:HEAD') {
915 return ($base + 1, $head) if (defined $base);
918 return ($1, $2) if ($::_revision
=~ /^(\d+):(\d+)$/);
919 return ($::_revision
, $::_revision
) if ($::_revision
=~ /^\d+$/);
920 if ($::_revision
=~ /^BASE:(\d+)$/) {
921 return ($base + 1, $1) if (defined $base);
924 return ($1, $head) if ($::_revision
=~ /^(\d+):HEAD$/);
925 die "revision argument: $::_revision not understood by git-svn\n",
926 "Try using the command-line svn client instead\n";
930 my ($self, $sub) = @_;
931 my $old_index = $ENV{GIT_INDEX_FILE
};
932 $ENV{GIT_INDEX_FILE
} = $self->{index};
935 $ENV{GIT_INDEX_FILE
} = $old_index;
937 delete $ENV{GIT_INDEX_FILE
};
939 wantarray ?
@ret : $ret[0];
942 sub assert_index_clean
{
943 my ($self, $treeish) = @_;
945 $self->tmp_index_do(sub {
946 command_noisy
('read-tree', $treeish) unless -e
$self->{index};
947 my $x = command_oneline
('write-tree');
948 my ($y) = (command
(qw
/cat-file commit/, $treeish) =~
949 /^tree ($::sha1)/mo);
951 unlink $self->{index} or croak
$!;
952 command_noisy
('read-tree', $treeish);
954 $x = command_oneline
('write-tree');
956 ::fatal
"trees ($treeish) $y != $x\n",
957 "Something is seriously wrong...\n";
962 sub get_commit_parents
{
963 my ($self, $log_entry, @parents) = @_;
964 my (%seen, @ret, @tmp);
965 # commit parents can be conditionally bound to a particular
966 # svn revision via: "svn_revno=commit_sha1", filter them out here:
967 foreach my $p (@parents) {
968 next unless defined $p;
969 if ($p =~ /^(\d+)=($::sha1_short)$/o) {
970 push @tmp, $2 if $1 == $log_entry->{revision
};
972 push @tmp, $p if $p =~ /^$::sha1_short$/o;
975 if (my $cur = ::verify_ref
($self->refname.'^0')) {
978 push @tmp, $_ foreach (@
{$log_entry->{parents
}}, @tmp);
979 while (my $p = shift @tmp) {
983 # MAXPARENT is defined to 16 in commit-tree.c:
987 die "r$log_entry->{revision}: No room for parents:\n\t",
988 join("\n\t", @tmp), "\n";
995 $self->ra->{url
} . (length $self->{path
} ?
'/' . $self->{path
} : '');
999 my ($self, $log_entry, @parents) = @_;
1000 if (my $c = $self->rev_db_get($log_entry->{revision
})) {
1001 croak
"$log_entry->{revision} = $c already exists! ",
1002 "Why are we refetching it?\n";
1004 my $author = $log_entry->{author
};
1005 my ($name, $email) = (defined $::users
{$author} ? @
{$::users
{$author}}
1006 : ($author, "$author\@".$self->ra->uuid));
1007 $ENV{GIT_AUTHOR_NAME
} = $ENV{GIT_COMMITTER_NAME
} = $name;
1008 $ENV{GIT_AUTHOR_EMAIL
} = $ENV{GIT_COMMITTER_EMAIL
} = $email;
1009 $ENV{GIT_AUTHOR_DATE
} = $ENV{GIT_COMMITTER_DATE
} = $log_entry->{date
};
1011 my $tree = $log_entry->{tree
};
1012 if (!defined $tree) {
1013 $tree = $self->tmp_index_do(sub {
1014 command_oneline
('write-tree') });
1016 die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o;
1018 my @exec = ('git-commit-tree', $tree);
1019 foreach ($self->get_commit_parents($log_entry, @parents)) {
1020 push @exec, '-p', $_;
1022 defined(my $pid = open3
(my $msg_fh, my $out_fh, '>&STDERR', @exec))
1024 print $msg_fh $log_entry->{log} or croak
$!;
1025 print $msg_fh "\ngit-svn-id: ", $self->full_url, '@',
1026 $log_entry->{revision
}, ' ',
1027 $self->ra->uuid, "\n" or croak
$!;
1028 $msg_fh->flush == 0 or croak
$!;
1029 close $msg_fh or croak
$!;
1030 chomp(my $commit = do { local $/; <$out_fh> });
1031 close $out_fh or croak
$!;
1034 if ($commit !~ /^$::sha1$/o) {
1035 die "Failed to commit, invalid sha1: $commit\n";
1038 command_noisy
('update-ref',$self->refname, $commit);
1039 $self->rev_db_set($log_entry->{revision
}, $commit);
1041 $self->{last_rev
} = $log_entry->{revision
};
1042 $self->{last_commit
} = $commit;
1043 print "r$log_entry->{revision} = $commit\n";
1048 my ($self, $r0, $r1) = @_;
1049 return 1 if $r0 == $r1;
1051 $self->ra->get_log([$self->{path
}], $r0, $r1,
1052 0, 0, 1, sub { $nr++ });
1053 return 0 if ($nr > 1);
1057 sub find_parent_branch
{
1058 my ($self, $paths, $rev) = @_;
1059 return undef unless $::_follow_parent
;
1061 # look for a parent from another branch:
1062 my $abs_path = '/'.$self->rel_path;
1063 my $i = $paths->{$abs_path} or goto not_found
;
1064 my $branch_from = $i->copyfrom_path or goto not_found
;
1065 my $r = $i->copyfrom_rev;
1066 my $repos_root = $self->ra->{repos_root
};
1067 my $url = $self->ra->{url
};
1068 my $new_url = $repos_root . $branch_from;
1069 print STDERR
"Found possible branch point: ",
1070 "$new_url => ", $self->full_url, ", $r\n";
1071 $branch_from =~ s
#^/##;
1072 my $remotes = read_all_remotes
();
1074 foreach my $repo_id (keys %$remotes) {
1075 my $u = $remotes->{$repo_id}->{url
} or next;
1077 my $fetch = $remotes->{$repo_id}->{fetch
};
1078 foreach my $f (keys %$fetch) {
1079 next if $f ne $branch_from;
1080 $gs = Git
::SVN
->new($fetch->{$f}, $repo_id, $f);
1086 my $ref_id = $branch_from;
1087 $ref_id .= "\@$r" if find_ref
($ref_id);
1088 # just grow a tail if we're not unique enough :x
1089 $ref_id .= '-' while find_ref
($ref_id);
1090 $gs = Git
::SVN
->init($new_url, '', $ref_id, $ref_id);
1092 my ($r0, $parent) = $gs->find_rev_before($r, 1);
1093 if ($::_follow_parent
&& (!defined $r0 || !defined $parent)) {
1095 my $log_entry = eval { $gs->do_fetch(undef, $_) };
1096 $gs->do_git_commit($log_entry) if $log_entry;
1098 ($r0, $parent) = $gs->last_rev_commit;
1100 if (defined $r0 && defined $parent && $gs->revisions_eq($r0, $r)) {
1101 print STDERR
"Found branch parent: ($self->{ref_id}) $parent\n";
1102 $self->assert_index_clean($parent);
1104 if ($self->ra->can_do_switch) {
1105 print STDERR
"Following parent with do_switch\n";
1106 # do_switch works with svn/trunk >= r22312, but that
1107 # is not included with SVN 1.4.2 (the latest version
1108 # at the moment), so we can't rely on it
1109 $self->{last_commit
} = $parent;
1110 $ed = SVN
::Git
::Fetcher
->new($self);
1111 $gs->ra->gs_do_switch($r0, $rev, $gs->{path
}, 1,
1112 $self->full_url, $ed)
1113 or die "SVN connection failed somewhere...\n";
1115 print STDERR
"Following parent with do_update\n";
1116 $ed = SVN
::Git
::Fetcher
->new($self);
1117 $self->ra->gs_do_update($rev, $rev, $self->{path
},
1119 or die "SVN connection failed somewhere...\n";
1121 return $self->make_log_entry($rev, [$parent], $ed);
1124 print STDERR
"Branch parent for path: '$abs_path' not found\n";
1125 return undef unless $paths;
1126 foreach my $p (sort keys %$paths) {
1127 print STDERR
' ', $p->action, ' ', $p;
1128 if (my $cp_from = $p->copyfrom_path) {
1129 print STDERR
"(from $cp_from:", $p->copyfrom_rev, ')';
1137 my ($self, $paths, $rev) = @_;
1139 my ($last_rev, @parents);
1140 if ($self->{last_commit
}) {
1141 $ed = SVN
::Git
::Fetcher
->new($self);
1142 $last_rev = $self->{last_rev
};
1143 $ed->{c
} = $self->{last_commit
};
1144 @parents = ($self->{last_commit
});
1147 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
1150 $ed = SVN
::Git
::Fetcher
->new($self);
1152 unless ($self->ra->gs_do_update($last_rev, $rev,
1153 $self->{path
}, 1, $ed)) {
1154 die "SVN connection failed somewhere...\n";
1156 $self->make_log_entry($rev, \
@parents, $ed);
1159 sub write_untracked
{
1160 my ($self, $rev, $fh, $untracked) = @_;
1162 print $fh "r$rev\n" or croak
$!;
1163 $h = $untracked->{empty
};
1164 foreach (sort keys %$h) {
1165 my $act = $h->{$_} ?
'+empty_dir' : '-empty_dir';
1166 print $fh " $act: ", uri_encode
($_), "\n" or croak
$!;
1167 warn "W: $act: $_\n";
1169 foreach my $t (qw
/dir_prop file_prop/) {
1170 $h = $untracked->{$t} or next;
1171 foreach my $path (sort keys %$h) {
1172 my $ppath = $path eq '' ?
'.' : $path;
1173 foreach my $prop (sort keys %{$h->{$path}}) {
1174 next if $SKIP_PROP{$prop};
1175 my $v = $h->{$path}->{$prop};
1178 uri_encode
($ppath), ' ',
1179 uri_encode
($prop), ' ',
1180 uri_encode
($v), "\n"
1184 uri_encode
($ppath), ' ',
1185 uri_encode
($prop), "\n"
1191 foreach my $t (qw
/absent_file absent_directory/) {
1192 $h = $untracked->{$t} or next;
1193 foreach my $parent (sort keys %$h) {
1194 foreach my $path (sort @
{$h->{$parent}}) {
1196 uri_encode
("$parent/$path"), "\n"
1198 warn "W: $t: $parent/$path ",
1199 "Insufficient permissions?\n";
1205 sub parse_svn_date
{
1206 my $date = shift || return '+0000 1970-01-01 00:00:00';
1207 my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d
{4})\
-(\d\d
)\
-(\d\d
)T
1208 (\d\d
)\
:(\d\d
)\
:(\d\d
).\d
+Z
$/x
) or
1209 croak
"Unable to parse date: $date\n";
1210 "+0000 $Y-$m-$d $H:$M:$S";
1215 if (!defined $author || length $author == 0) {
1216 $author = '(no author)';
1218 if (defined $::_authors
&& ! defined $::users
{$author}) {
1219 die "Author: $author not defined in $::_authors file\n";
1224 sub make_log_entry
{
1225 my ($self, $rev, $parents, $untracked) = @_;
1226 my $rp = $self->ra->rev_proplist($rev);
1227 my %log_entry = ( parents
=> $parents || [], revision
=> $rev,
1228 revprops
=> $rp, log => '');
1229 open my $un, '>>', "$self->{dir}/unhandled.log" or croak
$!;
1230 $self->write_untracked($rev, $un, $untracked);
1231 foreach (sort keys %$rp) {
1233 if (/^svn:(author|date|log)$/) {
1234 $log_entry{$1} = $v;
1236 print $un " rev_prop: ", uri_encode
($_), ' ',
1237 uri_encode
($v), "\n";
1240 close $un or croak
$!;
1241 $log_entry{date
} = parse_svn_date
($log_entry{date
});
1242 $log_entry{author
} = check_author
($log_entry{author
});
1243 $log_entry{log} .= "\n";
1248 my ($self, @parents) = @_;
1249 my ($last_rev, $last_commit) = $self->last_rev_commit;
1250 my ($base, $head) = $self->parse_revision($last_rev);
1251 return if ($base > $head);
1252 if (defined $last_commit) {
1253 $self->assert_index_clean($last_commit);
1256 my ($min, $max) = ($base, $head < $base + $inc ?
$head : $base + $inc);
1257 my $err_handler = $SVN::Error
::handler
;
1258 $SVN::Error
::handler
= \
&skip_unknown_revs
;
1261 $self->ra->get_log([$self->{path
}], $min, $max, 0, 1, 1, sub {
1262 my ($paths, $rev, $author, $date, $log) = @_;
1263 push @revs, [ $paths, $rev ] });
1265 my $log_entry = $self->do_fetch(@
$_);
1266 $self->do_git_commit($log_entry, @parents);
1268 last if $max >= $head;
1271 $max = $head if ($max > $head);
1273 $SVN::Error
::handler
= $err_handler;
1277 my ($self, $log_entry, $tree, $rev, $date, $author) = @_;
1278 # TODO: enable and test optimized commits:
1279 if (0 && $rev == ($self->{last_rev
} + 1)) {
1280 $log_entry->{revision
} = $rev;
1281 $log_entry->{author
} = $author;
1282 $self->do_git_commit($log_entry, "$rev=$tree");
1284 $self->fetch("$rev=$tree");
1289 my ($self, $tree) = (shift, shift);
1290 my $log_entry = ::get_commit_entry
($tree);
1291 unless ($self->{last_rev
}) {
1292 fatal
("Must have an existing revision to commit\n");
1294 my $pool = SVN
::Pool
->new;
1295 my $ed = SVN
::Git
::Editor
->new({ r
=> $self->{last_rev
},
1296 ra
=> $self->ra->dup,
1297 svn_path
=> $self->ra->{svn_path
}
1299 $self->ra->get_commit_editor(
1300 $log_entry->{log}, sub {
1301 $self->set_tree_cb($log_entry,
1305 my $mods = $ed->apply_diff($self->{last_commit
}, $tree);
1307 print "No changes\nr$self->{last_rev} = $tree\n";
1312 sub skip_unknown_revs
{
1314 my $errno = $err->apr_err();
1315 # Maybe the branch we're tracking didn't
1316 # exist when the repo started, so it's
1317 # not an error if it doesn't, just continue
1319 # Wonderfully consistent library, eh?
1320 # 160013 - svn:// and file://
1321 # 175002 - http(s)://
1322 # 175007 - http(s):// (this repo required authorization, too...)
1323 # More codes may be discovered later...
1324 if ($errno == 175007 || $errno == 175002 || $errno == 160013) {
1327 croak
"Error from SVN, ($errno): ", $err->expanded_message,"\n";
1331 # Tie::File seems to be prone to offset errors if revisions get sparse,
1332 # it's not that fast, either. Tie::File is also not in Perl 5.6. So
1333 # one of my favorite modules is out :< Next up would be one of the DBM
1334 # modules, but I'm not sure which is most portable... So I'll just
1335 # go with something that's plain-text, but still capable of
1336 # being randomly accessed. So here's my ultra-simple fixed-width
1337 # database. All records are 40 characters + "\n", so it's easy to seek
1338 # to a revision: (41 * rev) is the byte offset.
1339 # A record of 40 0s denotes an empty revision.
1340 # And yes, it's still pretty fast (faster than Tie::File).
1343 my ($self, $rev, $commit) = @_;
1344 length $commit == 40 or croak
"arg3 must be a full SHA1 hexsum\n";
1345 open my $fh, '+<', $self->{db_path
} or croak
$!;
1346 my $offset = $rev * 41;
1347 # assume that append is the common case:
1348 seek $fh, 0, 2 or croak
$!;
1350 if ($pos < $offset) {
1351 print $fh (('0' x
40),"\n") x
(($offset - $pos) / 41)
1354 seek $fh, $offset, 0 or croak
$!;
1355 print $fh $commit,"\n" or croak
$!;
1356 close $fh or croak
$!;
1360 my ($self, $rev) = @_;
1362 my $offset = $rev * 41;
1363 open my $fh, '<', $self->{db_path
} or croak
$!;
1364 if (seek $fh, $offset, 0) {
1365 $ret = readline $fh;
1368 $ret = undef if ($ret =~ /^0{40}$/);
1371 close $fh or croak
$!;
1375 sub find_rev_before
{
1376 my ($self, $rev, $eq_ok) = @_;
1377 --$rev unless $eq_ok;
1379 if (my $c = $self->rev_db_get($rev)) {
1384 return (undef, undef);
1388 my ($class, $repo_id, $ref_id, $path) = @_;
1389 unless (defined $repo_id && length $repo_id) {
1390 $repo_id = $Git::SVN
::default_repo_id
;
1392 unless (defined $ref_id && length $ref_id) {
1393 $_[2] = $ref_id = $Git::SVN
::default_ref_id
;
1395 $_[1] = $repo_id = sanitize_remote_name
($repo_id);
1396 my $dir = "$ENV{GIT_DIR}/svn/$ref_id";
1397 $_[3] = $path = '' unless (defined $path);
1399 unless (-f
"$dir/.rev_db") {
1400 open my $fh, '>>', "$dir/.rev_db" or croak
$!;
1401 close $fh or croak
$!;
1403 bless { ref_id
=> $ref_id, dir
=> $dir, index => "$dir/index",
1405 db_path
=> "$dir/.rev_db", repo_id
=> $repo_id }, $class;
1410 $f =~ s
#([^a-zA-Z0-9\*!\:_\./\-])#uc sprintf("%%%02x",ord($1))#eg;
1414 package Git
::SVN
::Prompt
;
1418 use vars qw
/$_no_auth_cache $_username/;
1421 my ($cred, $realm, $default_username, $may_save, $pool) = @_;
1422 $may_save = undef if $_no_auth_cache;
1423 $default_username = $_username if defined $_username;
1424 if (defined $default_username && length $default_username) {
1425 if (defined $realm && length $realm) {
1426 print STDERR
"Authentication realm: $realm\n";
1429 $cred->username($default_username);
1431 username
($cred, $realm, $may_save, $pool);
1433 $cred->password(_read_password
("Password for '" .
1434 $cred->username . "': ", $realm));
1435 $cred->may_save($may_save);
1436 $SVN::_Core
::SVN_NO_ERROR
;
1439 sub ssl_server_trust
{
1440 my ($cred, $realm, $failures, $cert_info, $may_save, $pool) = @_;
1441 $may_save = undef if $_no_auth_cache;
1442 print STDERR
"Error validating server certificate for '$realm':\n";
1443 if ($failures & $SVN::Auth
::SSL
::UNKNOWNCA
) {
1444 print STDERR
" - The certificate is not issued by a trusted ",
1445 "authority. Use the\n",
1446 " fingerprint to validate the certificate manually!\n";
1448 if ($failures & $SVN::Auth
::SSL
::CNMISMATCH
) {
1449 print STDERR
" - The certificate hostname does not match.\n";
1451 if ($failures & $SVN::Auth
::SSL
::NOTYETVALID
) {
1452 print STDERR
" - The certificate is not yet valid.\n";
1454 if ($failures & $SVN::Auth
::SSL
::EXPIRED
) {
1455 print STDERR
" - The certificate has expired.\n";
1457 if ($failures & $SVN::Auth
::SSL
::OTHER
) {
1458 print STDERR
" - The certificate has an unknown error.\n";
1461 "Certificate information:\n".
1462 " - Hostname: %s\n".
1463 " - Valid: from %s until %s\n".
1465 " - Fingerprint: %s\n",
1466 map $cert_info->$_, qw(hostname valid_from valid_until
1467 issuer_dname fingerprint);
1470 print STDERR
$may_save ?
1471 "(R)eject, accept (t)emporarily or accept (p)ermanently? " :
1472 "(R)eject or accept (t)emporarily? ";
1474 $choice = lc(substr(<STDIN
> || 'R', 0, 1));
1475 if ($choice =~ /^t$/i) {
1476 $cred->may_save(undef);
1477 } elsif ($choice =~ /^r$/i) {
1479 } elsif ($may_save && $choice =~ /^p$/i) {
1480 $cred->may_save($may_save);
1484 $cred->accepted_failures($failures);
1485 $SVN::_Core
::SVN_NO_ERROR
;
1488 sub ssl_client_cert
{
1489 my ($cred, $realm, $may_save, $pool) = @_;
1490 $may_save = undef if $_no_auth_cache;
1491 print STDERR
"Client certificate filename: ";
1493 chomp(my $filename = <STDIN
>);
1494 $cred->cert_file($filename);
1495 $cred->may_save($may_save);
1496 $SVN::_Core
::SVN_NO_ERROR
;
1499 sub ssl_client_cert_pw
{
1500 my ($cred, $realm, $may_save, $pool) = @_;
1501 $may_save = undef if $_no_auth_cache;
1502 $cred->password(_read_password
("Password: ", $realm));
1503 $cred->may_save($may_save);
1504 $SVN::_Core
::SVN_NO_ERROR
;
1508 my ($cred, $realm, $may_save, $pool) = @_;
1509 $may_save = undef if $_no_auth_cache;
1510 if (defined $realm && length $realm) {
1511 print STDERR
"Authentication realm: $realm\n";
1514 if (defined $_username) {
1515 $username = $_username;
1517 print STDERR
"Username: ";
1519 chomp($username = <STDIN
>);
1521 $cred->username($username);
1522 $cred->may_save($may_save);
1523 $SVN::_Core
::SVN_NO_ERROR
;
1526 sub _read_password
{
1527 my ($prompt, $realm) = @_;
1528 print STDERR
$prompt;
1530 require Term
::ReadKey
;
1531 Term
::ReadKey
::ReadMode
('noecho');
1533 while (defined(my $key = Term
::ReadKey
::ReadKey
(0))) {
1534 last if $key =~ /[\012\015]/; # \n\r
1537 Term
::ReadKey
::ReadMode
('restore');
1547 $f =~ s
#([^a-zA-Z0-9\*!\:_\./\-])#uc sprintf("%%%02x",ord($1))#eg;
1554 $f =~ s/%([A-F0-9]{2})/chr hex($1)/ge;
1559 my $kill_stupid_warnings = $SVN::Node
::none
.$SVN::Node
::file
.
1560 $SVN::Node
::dir
.$SVN::Node
::unknown
.
1561 $SVN::Node
::none
.$SVN::Node
::file
.
1562 $SVN::Node
::dir
.$SVN::Node
::unknown
.
1563 $SVN::Auth
::SSL
::CNMISMATCH
.
1564 $SVN::Auth
::SSL
::NOTYETVALID
.
1565 $SVN::Auth
::SSL
::EXPIRED
.
1566 $SVN::Auth
::SSL
::UNKNOWNCA
.
1567 $SVN::Auth
::SSL
::OTHER
;
1570 package SVN
::Git
::Fetcher
;
1577 # file baton members: path, mode_a, mode_b, pool, fh, blob, base
1579 my ($class, $git_svn) = @_;
1580 my $self = SVN
::Delta
::Editor
->new;
1581 bless $self, $class;
1582 $self->{c
} = $git_svn->{last_commit
} if exists $git_svn->{last_commit
};
1583 $self->{empty
} = {};
1584 $self->{dir_prop
} = {};
1585 $self->{file_prop
} = {};
1586 $self->{absent_dir
} = {};
1587 $self->{absent_file
} = {};
1588 ($self->{gui
}, $self->{ctx
}) = $git_svn->tmp_index_do(
1589 sub { command_input_pipe
(qw
/update-index -z --index-info/) } );
1590 require Digest
::MD5
;
1594 sub set_path_strip
{
1595 my ($self, $path) = @_;
1596 $self->{path_strip
} = qr/^\Q$path\E\/?
/;
1603 sub open_directory
{
1604 my ($self, $path, $pb, $rev) = @_;
1609 my ($self, $path) = @_;
1610 $path =~ s!$self->{path_strip}!! if $self->{path_strip
};
1615 my ($self, $path, $rev, $pb) = @_;
1616 my $gui = $self->{gui
};
1618 my $gpath = $self->git_path($path);
1619 # remove entire directories.
1620 if (command
('ls-tree', $self->{c
}, '--', $gpath) =~ /^040000 tree/) {
1621 my ($ls, $ctx) = command_output_pipe
(qw
/ls
-tree
1623 $self->{c
}, '--', $gpath);
1626 print $gui '0 ',0 x
40,"\t",$_ or croak
$!;
1627 print "\tD\t$_\n" unless $self->{q
};
1629 print "\tD\t$gpath/\n" unless $self->{q
};
1630 command_close_pipe
($ls, $ctx);
1631 $self->{empty
}->{$path} = 0
1633 print $gui '0 ',0 x
40,"\t",$gpath,"\0" or croak
$!;
1634 print "\tD\t$gpath\n" unless $self->{q
};
1640 my ($self, $path, $pb, $rev) = @_;
1641 my $gpath = $self->git_path($path);
1642 my ($mode, $blob) = (command
('ls-tree', $self->{c
}, '--', $gpath)
1643 =~ /^(\d{6}) blob ([a-f\d]{40})\t/);
1644 unless (defined $mode && defined $blob) {
1645 die "$path was not found in commit $self->{c} (r$rev)\n";
1647 { path
=> $path, mode_a
=> $mode, mode_b
=> $mode, blob
=> $blob,
1648 pool
=> SVN
::Pool
->new, action
=> 'M' };
1652 my ($self, $path, $pb, $cp_path, $cp_rev) = @_;
1653 my ($dir, $file) = ($path =~ m
#^(.*?)/?([^/]+)$#);
1654 delete $self->{empty
}->{$dir};
1655 { path
=> $path, mode_a
=> 100644, mode_b
=> 100644,
1656 pool
=> SVN
::Pool
->new, action
=> 'A' };
1660 my ($self, $path, $cp_path, $cp_rev) = @_;
1661 my ($dir, $file) = ($path =~ m
#^(.*?)/?([^/]+)$#);
1662 delete $self->{empty
}->{$dir};
1663 $self->{empty
}->{$path} = 1;
1667 sub change_dir_prop
{
1668 my ($self, $db, $prop, $value) = @_;
1669 $self->{dir_prop
}->{$db->{path
}} ||= {};
1670 $self->{dir_prop
}->{$db->{path
}}->{$prop} = $value;
1674 sub absent_directory
{
1675 my ($self, $path, $pb) = @_;
1676 $self->{absent_dir
}->{$pb->{path
}} ||= [];
1677 push @
{$self->{absent_dir
}->{$pb->{path
}}}, $path;
1682 my ($self, $path, $pb) = @_;
1683 $self->{absent_file
}->{$pb->{path
}} ||= [];
1684 push @
{$self->{absent_file
}->{$pb->{path
}}}, $path;
1688 sub change_file_prop
{
1689 my ($self, $fb, $prop, $value) = @_;
1690 if ($prop eq 'svn:executable') {
1691 if ($fb->{mode_b
} != 120000) {
1692 $fb->{mode_b
} = defined $value ?
100755 : 100644;
1694 } elsif ($prop eq 'svn:special') {
1695 $fb->{mode_b
} = defined $value ?
120000 : 100644;
1697 $self->{file_prop
}->{$fb->{path
}} ||= {};
1698 $self->{file_prop
}->{$fb->{path
}}->{$prop} = $value;
1703 sub apply_textdelta
{
1704 my ($self, $fb, $exp) = @_;
1705 my $fh = IO
::File
->new_tmpfile;
1707 # $fh gets auto-closed() by SVN::TxDelta::apply(),
1708 # (but $base does not,) so dup() it for reading in close_file
1709 open my $dup, '<&', $fh or croak
$!;
1710 my $base = IO
::File
->new_tmpfile;
1711 $base->autoflush(1);
1713 defined (my $pid = fork) or croak
$!;
1715 open STDOUT
, '>&', $base or croak
$!;
1716 print STDOUT
'link ' if ($fb->{mode_a
} == 120000);
1717 exec qw
/git-cat-file blob/, $fb->{blob
} or croak
$!;
1723 seek $base, 0, 0 or croak
$!;
1724 my $md5 = Digest
::MD5
->new;
1725 $md5->addfile($base);
1726 my $got = $md5->hexdigest;
1727 die "Checksum mismatch: $fb->{path} $fb->{blob}\n",
1729 " got: $got\n" if ($got ne $exp);
1732 seek $base, 0, 0 or croak
$!;
1734 $fb->{base
} = $base;
1735 [ SVN
::TxDelta
::apply
($base, $fh, undef, $fb->{path
}, $fb->{pool
}) ];
1739 my ($self, $fb, $exp) = @_;
1741 my $path = $self->git_path($fb->{path
});
1742 if (my $fh = $fb->{fh
}) {
1743 seek($fh, 0, 0) or croak
$!;
1744 my $md5 = Digest
::MD5
->new;
1746 my $got = $md5->hexdigest;
1747 die "Checksum mismatch: $path\n",
1748 "expected: $exp\n got: $got\n" if ($got ne $exp);
1749 seek($fh, 0, 0) or croak
$!;
1750 if ($fb->{mode_b
} == 120000) {
1751 read($fh, my $buf, 5) == 5 or croak
$!;
1752 $buf eq 'link ' or die "$path has mode 120000",
1753 "but is not a link\n";
1755 defined(my $pid = open my $out,'-|') or die "Can't fork: $!\n";
1757 open STDIN
, '<&', $fh or croak
$!;
1758 exec qw
/git-hash-object -w --stdin/ or croak
$!;
1760 chomp($hash = do { local $/; <$out> });
1761 close $out or croak
$!;
1762 close $fh or croak
$!;
1763 $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n";
1764 close $fb->{base
} or croak
$!;
1766 $hash = $fb->{blob
} or die "no blob information\n";
1769 my $gui = $self->{gui
};
1770 print $gui "$fb->{mode_b} $hash\t$path\0" or croak
$!;
1771 print "\t$fb->{action}\t$path\n" if $fb->{action
} && ! $self->{q
};
1777 eval { command_close_pipe
($self->{gui
}, $self->{ctx
}) };
1778 $self->SUPER::abort_edit
(@_);
1783 command_close_pipe
($self->{gui
}, $self->{ctx
});
1784 $self->{git_commit_ok
} = 1;
1785 $self->SUPER::close_edit
(@_);
1788 package SVN
::Git
::Editor
;
1797 my $git_svn = shift;
1798 my $self = SVN
::Delta
::Editor
->new(@_);
1799 bless $self, $class;
1800 foreach (qw
/svn_path r ra/) {
1801 die "$_ required!\n" unless (defined $git_svn->{$_});
1802 $self->{$_} = $git_svn->{$_};
1804 $self->{pool
} = SVN
::Pool
->new;
1805 $self->{bat
} = { '' => $self->open_root($self->{r
}, $self->{pool
}) };
1807 require Digest
::MD5
;
1812 return ($_[0] =~ m
#^(.*?)/?([^/]+)$#);
1816 (defined $_[1] && length $_[1]) ?
$_[1] : ''
1820 my ($self, $path) = @_;
1821 $self->{ra
}->{url
} . '/' . $self->repo_path($path);
1825 my ($self, $tree_b) = @_;
1826 my $rm = $self->{rm
};
1827 delete $rm->{''}; # we never delete the url we're tracking
1830 foreach (keys %$rm) {
1831 my @d = split m
#/#, $_;
1835 $c .= '/' . shift @d;
1839 delete $rm->{$self->{svn_path
}};
1840 delete $rm->{''}; # we never delete the url we're tracking
1843 my ($fh, $ctx) = command_output_pipe
(
1844 qw
/ls-tree --name-only -r -z/, $tree_b);
1848 my @dn = split m
#/#, $_;
1850 delete $rm->{join '/', @dn};
1857 command_close_pipe
($fh, $ctx);
1859 my ($r, $p, $bat) = ($self->{r
}, $self->{pool
}, $self->{bat
});
1860 foreach my $d (sort { $b =~ tr
#/#/# <=> $a =~ tr#/#/# } keys %$rm) {
1861 $self->close_directory($bat->{$d}, $p);
1862 my ($dn) = ($d =~ m
#^(.*?)/?(?:[^/]+)$#);
1863 print "\tD+\t$d/\n" unless $::_q
;
1864 $self->SUPER::delete_entry
($d, $r, $bat->{$dn}, $p);
1869 sub open_or_add_dir
{
1870 my ($self, $full_path, $baton) = @_;
1871 my $t = $self->{ra
}->check_path($full_path, $self->{r
});
1872 if ($t == $SVN::Node
::none
) {
1873 return $self->add_directory($full_path, $baton,
1874 undef, -1, $self->{pool
});
1875 } elsif ($t == $SVN::Node
::dir
) {
1876 return $self->open_directory($full_path, $baton,
1877 $self->{r
}, $self->{pool
});
1879 print STDERR
"$full_path already exists in repository at ",
1880 "r$self->{r} and it is not a directory (",
1881 ($t == $SVN::Node
::file ?
'file' : 'unknown'),"/$t)\n";
1886 my ($self, $path) = @_;
1887 my $bat = $self->{bat
};
1888 $path = $self->repo_path($path);
1889 return $bat->{''} unless (length $path);
1890 my @p = split m
#/+#, $path;
1892 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{''});
1895 $c .= '/' . shift @p;
1896 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{$c0});
1902 my ($self, $m) = @_;
1903 my ($dir, $file) = split_path
($m->{file_b
});
1904 my $pbat = $self->ensure_path($dir);
1905 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
1907 print "\tA\t$m->{file_b}\n" unless $::_q
;
1908 $self->chg_file($fbat, $m);
1909 $self->close_file($fbat,undef,$self->{pool
});
1913 my ($self, $m) = @_;
1914 my ($dir, $file) = split_path
($m->{file_b
});
1915 my $pbat = $self->ensure_path($dir);
1916 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
1917 $self->url_path($m->{file_a
}), $self->{r
});
1918 print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $::_q
;
1919 $self->chg_file($fbat, $m);
1920 $self->close_file($fbat,undef,$self->{pool
});
1924 my ($self, $path, $pbat) = @_;
1925 my $rpath = $self->repo_path($path);
1926 my ($dir, $file) = split_path
($rpath);
1927 $self->{rm
}->{$dir} = 1;
1928 $self->SUPER::delete_entry
($rpath, $self->{r
}, $pbat, $self->{pool
});
1932 my ($self, $m) = @_;
1933 my ($dir, $file) = split_path
($m->{file_b
});
1934 my $pbat = $self->ensure_path($dir);
1935 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
1936 $self->url_path($m->{file_a
}), $self->{r
});
1937 print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q
;
1938 $self->chg_file($fbat, $m);
1939 $self->close_file($fbat,undef,$self->{pool
});
1941 ($dir, $file) = split_path
($m->{file_a
});
1942 $pbat = $self->ensure_path($dir);
1943 $self->delete_entry($m->{file_a
}, $pbat);
1947 my ($self, $m) = @_;
1948 my ($dir, $file) = split_path
($m->{file_b
});
1949 my $pbat = $self->ensure_path($dir);
1950 my $fbat = $self->open_file($self->repo_path($m->{file_b
}),
1951 $pbat,$self->{r
},$self->{pool
});
1952 print "\t$m->{chg}\t$m->{file_b}\n" unless $::_q
;
1953 $self->chg_file($fbat, $m);
1954 $self->close_file($fbat,undef,$self->{pool
});
1957 sub T
{ shift->M(@_) }
1959 sub change_file_prop
{
1960 my ($self, $fbat, $pname, $pval) = @_;
1961 $self->SUPER::change_file_prop
($fbat, $pname, $pval, $self->{pool
});
1965 my ($self, $fbat, $m) = @_;
1966 if ($m->{mode_b
} =~ /755$/ && $m->{mode_a
} !~ /755$/) {
1967 $self->change_file_prop($fbat,'svn:executable','*');
1968 } elsif ($m->{mode_b
} !~ /755$/ && $m->{mode_a
} =~ /755$/) {
1969 $self->change_file_prop($fbat,'svn:executable',undef);
1971 my $fh = IO
::File
->new_tmpfile or croak
$!;
1972 if ($m->{mode_b
} =~ /^120/) {
1973 print $fh 'link ' or croak
$!;
1974 $self->change_file_prop($fbat,'svn:special','*');
1975 } elsif ($m->{mode_a
} =~ /^120/ && $m->{mode_b
} !~ /^120/) {
1976 $self->change_file_prop($fbat,'svn:special',undef);
1978 defined(my $pid = fork) or croak
$!;
1980 open STDOUT
, '>&', $fh or croak
$!;
1981 exec qw
/git-cat-file blob/, $m->{sha1_b
} or croak
$!;
1985 $fh->flush == 0 or croak
$!;
1986 seek $fh, 0, 0 or croak
$!;
1988 my $md5 = Digest
::MD5
->new;
1989 $md5->addfile($fh) or croak
$!;
1990 seek $fh, 0, 0 or croak
$!;
1992 my $exp = $md5->hexdigest;
1993 my $pool = SVN
::Pool
->new;
1994 my $atd = $self->apply_textdelta($fbat, undef, $pool);
1995 my $got = SVN
::TxDelta
::send_stream
($fh, @
$atd, $pool);
1996 die "Checksum mismatch\nexpected: $exp\ngot: $got\n" if ($got ne $exp);
1999 close $fh or croak
$!;
2003 my ($self, $m) = @_;
2004 my ($dir, $file) = split_path
($m->{file_b
});
2005 my $pbat = $self->ensure_path($dir);
2006 print "\tD\t$m->{file_b}\n" unless $::_q
;
2007 $self->delete_entry($m->{file_b
}, $pbat);
2012 my ($p,$bat) = ($self->{pool
}, $self->{bat
});
2013 foreach (sort { $b =~ tr
#/#/# <=> $a =~ tr#/#/# } keys %$bat) {
2014 $self->close_directory($bat->{$_}, $p);
2016 $self->SUPER::close_edit
($p);
2022 $self->SUPER::abort_edit
($self->{pool
});
2023 $self->{pool
}->clear;
2026 # this drives the editor
2028 my ($self, $tree_a, $tree_b) = @_;
2029 my @diff_tree = qw(diff-tree -z -r);
2030 if ($::_cp_similarity
) {
2031 push @diff_tree, "-C$::_cp_similarity";
2033 push @diff_tree, '-C';
2035 push @diff_tree, '--find-copies-harder' if $::_find_copies_harder
;
2036 push @diff_tree, "-l$::_l" if defined $::_l
;
2037 push @diff_tree, $tree_a, $tree_b;
2038 my ($diff_fh, $ctx) = command_output_pipe
(@diff_tree);
2043 while (<$diff_fh>) {
2044 chomp $_; # this gets rid of the trailing "\0"
2045 if ($state eq 'meta' && /^:(\d
{6})\s
(\d
{6})\s
2046 $::sha1\s
($::sha1
)\s
2047 ([MTCRAD
])\d
*$/xo
) {
2048 push @mods, { mode_a
=> $1, mode_b
=> $2,
2049 sha1_b
=> $3, chg
=> $4 };
2050 if ($4 =~ /^(?:C|R)$/) {
2055 } elsif ($state eq 'file_a') {
2056 my $x = $mods[$#mods] or croak
"Empty array\n";
2057 if ($x->{chg
} !~ /^(?:C|R)$/) {
2058 croak
"Error parsing $_, $x->{chg}\n";
2062 } elsif ($state eq 'file_b') {
2063 my $x = $mods[$#mods] or croak
"Empty array\n";
2064 if (exists $x->{file_a
} && $x->{chg
} !~ /^(?:C|R)$/) {
2065 croak
"Error parsing $_, $x->{chg}\n";
2067 if (!exists $x->{file_a
} && $x->{chg
} =~ /^(?:C|R)$/) {
2068 croak
"Error parsing $_, $x->{chg}\n";
2073 croak
"Error parsing $_\n";
2076 command_close_pipe
($diff_fh, $ctx);
2079 my %o = ( D
=> 1, R
=> 0, C
=> -1, A
=> 3, M
=> 3, T
=> 3 );
2080 foreach my $m (sort { $o{$a->{chg
}} <=> $o{$b->{chg
}} } @mods) {
2082 if (defined $o{$f}) {
2085 fatal
("Invalid change type: $f\n");
2088 $self->rmdirs($tree_b) if $::_rmdir
;
2097 package Git
::SVN
::Ra
;
2098 use vars qw
/@ISA $config_dir/;
2101 my ($can_do_switch);
2105 # enforce temporary pool usage for some simple functions
2107 foreach (qw
/get_latest_revnum rev_proplist get_file
2108 check_path get_dir get_uuid get_repos_root
/) {
2111 my \$pool = SVN::Pool->new;
2112 my \@ret = \$self->SUPER::$_(\@_,\$pool);
2114 wantarray ? \@ret : \$ret[0]; }\n";
2120 my ($class, $url) = @_;
2122 return $RA{$url} if $RA{$url};
2124 SVN
::_Core
::svn_config_ensure
($config_dir, undef);
2125 my ($baton, $callbacks) = SVN
::Core
::auth_open_helper
([
2126 SVN
::Client
::get_simple_provider
(),
2127 SVN
::Client
::get_ssl_server_trust_file_provider
(),
2128 SVN
::Client
::get_simple_prompt_provider
(
2129 \
&Git
::SVN
::Prompt
::simple
, 2),
2130 SVN
::Client
::get_ssl_client_cert_prompt_provider
(
2131 \
&Git
::SVN
::Prompt
::ssl_client_cert
, 2),
2132 SVN
::Client
::get_ssl_client_cert_pw_prompt_provider
(
2133 \
&Git
::SVN
::Prompt
::ssl_client_cert_pw
, 2),
2134 SVN
::Client
::get_username_provider
(),
2135 SVN
::Client
::get_ssl_server_trust_prompt_provider
(
2136 \
&Git
::SVN
::Prompt
::ssl_server_trust
),
2137 SVN
::Client
::get_username_prompt_provider
(
2138 \
&Git
::SVN
::Prompt
::username
, 2),
2140 my $config = SVN
::Core
::config_get_config
($config_dir);
2141 my $self = SVN
::Ra
->new(url
=> $url, auth
=> $baton,
2143 pool
=> SVN
::Pool
->new,
2144 auth_provider_callbacks
=> $callbacks);
2145 $self->{svn_path
} = $url;
2146 $self->{repos_root
} = $self->get_repos_root;
2147 $self->{svn_path
} =~ s
#^\Q$self->{repos_root}\E/*##;
2148 $RA{$url} = bless $self, $class;
2152 # do not call the real DESTROY since we store ourselves in %RA
2157 my $dup = SVN
::Ra
->new(pool
=> SVN
::Pool
->new,
2158 map { $_ => $self->{$_} } qw
/config url
2159 auth auth_provider_callbacks repos_root svn_path
/);
2160 bless $dup, ref $self;
2164 my ($self, @args) = @_;
2165 my $pool = SVN
::Pool
->new;
2166 $args[4]-- if $args[4] && ! $::_follow_parent
;
2167 splice(@args, 3, 1) if ($SVN::Core
::VERSION
le '1.2.0');
2168 my $ret = $self->SUPER::get_log
(@args, $pool);
2173 sub get_commit_editor
{
2174 my ($self, $log, $cb, $pool) = @_;
2175 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef, 0) : ();
2176 $self->SUPER::get_commit_editor
($log, $cb, @lock, $pool);
2181 $self->{uuid
} ||= $self->get_uuid;
2185 my ($self, $rev_a, $rev_b, $path, $recurse, $editor) = @_;
2186 my $pool = SVN
::Pool
->new;
2187 $editor->set_path_strip($path);
2188 my $reporter = $self->do_update($rev_b, $path, $recurse,
2190 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef) : ();
2191 my $new = ($rev_a == $rev_b);
2192 $reporter->set_path('', $rev_a, $new, @lock, $pool);
2193 $reporter->finish_report($pool);
2195 $editor->{git_commit_ok
};
2199 my ($self, $rev_a, $rev_b, $path, $recurse, $url_b, $editor) = @_;
2200 my $pool = SVN
::Pool
->new;
2201 $editor->set_path_strip($path);
2202 my $reporter = $self->do_switch($rev_b, $path, $recurse,
2203 $url_b, $editor, $pool);
2204 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef) : ();
2205 $reporter->set_path('', $rev_a, 0, @lock, $pool);
2206 $reporter->finish_report($pool);
2208 $editor->{git_commit_ok
};
2213 unless (defined $can_do_switch) {
2214 my $pool = SVN
::Pool
->new;
2216 $self->do_switch(1, '', 0, $self->{url
},
2217 SVN
::Delta
::Editor
->new, $pool);
2222 $rep->abort_report($pool);
2230 package Git
::SVN
::Log
;
2233 use POSIX qw
/strftime/;
2234 use vars qw
/$TZ $limit $color $pager $non_recursive $verbose $oneline
2235 %rusers $show_commit $incremental/;
2240 return 1 if defined $c->{r
};
2241 if ($c->{l
} && $c->{l
}->[-1] eq "...\n" &&
2242 $c->{a_raw
} =~ /\@([a-f\d\-]+)>$/) {
2243 my @log = command
(qw
/cat-file commit/, $c->{c
});
2244 shift @log while ($log[0] ne "\n");
2246 @
{$c->{l
}} = grep !/^git-svn-id: /, @log;
2248 (undef, $c->{r
}, undef) = ::extract_metadata
(
2249 (grep(/^git-svn-id: /, @log))[-1]);
2251 return defined $c->{r
};
2257 $dcvar = 'color.diff';
2258 $dc = `git-config --get $dcvar`;
2260 # nothing at all; fallback to "diff.color"
2261 $dcvar = 'diff.color';
2262 $dc = `git-config --get $dcvar`;
2265 if ($dc eq 'auto') {
2267 $pc = `git-config --get color.pager`;
2269 # does not have it -- fallback to pager.color
2270 $pc = `git-config --bool --get pager.color`;
2273 $pc = `git-config --bool --get color.pager`;
2279 if (-t
*STDOUT
|| (defined $pager && $pc eq 'true')) {
2280 return ($ENV{TERM
} && $ENV{TERM
} ne 'dumb');
2284 return 0 if $dc eq 'never';
2285 return 1 if $dc eq 'always';
2286 chomp($dc = `git-config --bool --get $dcvar`);
2287 return ($dc eq 'true');
2290 sub git_svn_log_cmd
{
2291 my ($r_min, $r_max) = @_;
2292 my $gs = Git
::SVN
->_new;
2293 my @cmd = (qw
/log --abbrev-commit --pretty=raw --default/,
2295 push @cmd, '-r' unless $non_recursive;
2296 push @cmd, qw
/--raw --name-status/ if $verbose;
2297 push @cmd, '--color' if log_use_color
();
2298 return @cmd unless defined $r_max;
2299 if ($r_max == $r_min) {
2300 push @cmd, '--max-count=1';
2301 if (my $c = $gs->rev_db_get($r_max)) {
2305 my ($c_min, $c_max);
2306 $c_max = $gs->rev_db_get($r_max);
2307 $c_min = $gs->rev_db_get($r_min);
2308 if (defined $c_min && defined $c_max) {
2309 if ($r_max > $r_max) {
2310 push @cmd, "$c_min..$c_max";
2312 push @cmd, "$c_max..$c_min";
2314 } elsif ($r_max > $r_min) {
2323 # adapted from pager.c
2325 $pager ||= $ENV{GIT_PAGER
} || $ENV{PAGER
};
2326 if (!defined $pager) {
2328 } elsif (length $pager == 0 || $pager eq 'cat') {
2334 return unless -t
*STDOUT
;
2335 pipe my $rfd, my $wfd or return;
2336 defined(my $pid = fork) or ::fatal
"Can't fork: $!\n";
2338 open STDOUT
, '>&', $wfd or
2339 ::fatal
"Can't redirect to stdout: $!\n";
2342 open STDIN
, '<&', $rfd or ::fatal
"Can't redirect stdin: $!\n";
2343 $ENV{LESS
} ||= 'FRSX';
2344 exec $pager or ::fatal
"Can't run pager: $! ($pager)\n";
2347 sub get_author_info
{
2348 my ($dest, $author, $t, $tz) = @_;
2349 $author =~ s/(?:^\s*|\s*$)//g;
2350 $dest->{a_raw
} = $author;
2353 $au = $rusers{$author} || undef;
2356 ($au) = ($author =~ /<([^>]+)\@[^>]+>$/);
2361 # Date::Parse isn't in the standard Perl distro :(
2362 if ($tz =~ s/^\+//) {
2363 $t += ::tz_to_s_offset
($tz);
2364 } elsif ($tz =~ s/^\-//) {
2365 $t -= ::tz_to_s_offset
($tz);
2367 $dest->{t_utc
} = $t;
2370 sub process_commit
{
2371 my ($c, $r_min, $r_max, $defer) = @_;
2372 if (defined $r_min && defined $r_max) {
2373 if ($r_min == $c->{r
} && $r_min == $r_max) {
2377 return 1 if $r_min == $r_max;
2378 if ($r_min < $r_max) {
2379 # we need to reverse the print order
2380 return 0 if (defined $limit && --$limit < 0);
2384 if ($r_min != $r_max) {
2385 return 1 if ($r_min < $c->{r
});
2386 return 1 if ($r_max > $c->{r
});
2389 return 0 if (defined $limit && --$limit < 0);
2398 if (my $l = $c->{l
}) {
2399 while ($l->[0] =~ /^\s*$/) { shift @
$l }
2402 $l_fmt ||= 'A' . length($c->{r
});
2403 print 'r',pack($l_fmt, $c->{r
}),' | ';
2404 print "$c->{c} | " if $show_commit;
2407 show_commit_normal
($c);
2411 sub show_commit_changed_paths
{
2413 return unless $c->{changed
};
2414 print "Changed paths:\n", @
{$c->{changed
}};
2417 sub show_commit_normal
{
2419 print '-' x72
, "\nr$c->{r} | ";
2420 print "$c->{c} | " if $show_commit;
2421 print "$c->{a} | ", strftime
("%Y-%m-%d %H:%M:%S %z (%a, %d %b %Y)",
2422 localtime($c->{t_utc
})), ' | ';
2425 if (my $l = $c->{l
}) {
2426 while ($l->[$#$l] eq "\n" && $#$l > 0
2427 && $l->[($#$l - 1)] eq "\n") {
2430 $nr_line = scalar @
$l;
2432 print "1 line\n\n\n";
2434 if ($nr_line == 1) {
2435 $nr_line = '1 line';
2437 $nr_line .= ' lines';
2439 print $nr_line, "\n";
2440 show_commit_changed_paths
($c);
2442 print $_ foreach @
$l;
2446 show_commit_changed_paths
($c);
2450 foreach my $x (qw
/raw diff/) {
2453 print $_ foreach @
{$c->{$x}}
2460 my ($r_min, $r_max);
2461 my $r_last = -1; # prevent dupes
2467 if (defined $::_revision
) {
2468 if ($::_revision
=~ /^(\d+):(\d+)$/) {
2469 ($r_min, $r_max) = ($1, $2);
2470 } elsif ($::_revision
=~ /^\d+$/) {
2471 $r_min = $r_max = $::_revision
;
2473 ::fatal
"-r$::_revision is not supported, use ",
2474 "standard \'git log\' arguments instead\n";
2479 @args = (git_svn_log_cmd
($r_min, $r_max), @args);
2480 my $log = command_output_pipe
(@args);
2483 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
2485 if (/^${esc_color}commit ($::sha1_short)/o) {
2487 if ($c && cmt_showable
($c) && $c->{r
} != $r_last) {
2489 process_commit
($c, $r_min, $r_max, \
@k) or
2494 } elsif (/^${esc_color}author (.+) (\d+) ([\-\+]?\d+)$/o) {
2495 get_author_info
($c, $1, $2, $3);
2496 } elsif (/^${esc_color}(?:tree|parent|committer) /o) {
2498 } elsif (/^${esc_color}:\d{6} \d{6} $::sha1_short/o) {
2499 push @
{$c->{raw
}}, $_;
2500 } elsif (/^${esc_color}[ACRMDT]\t/) {
2501 # we could add $SVN->{svn_path} here, but that requires
2502 # remote access at the moment (repo_path_split)...
2503 s
#^(${esc_color})([ACRMDT])\t#$1 $2 #o;
2504 push @
{$c->{changed
}}, $_;
2505 } elsif (/^${esc_color}diff /o) {
2507 push @
{$c->{diff
}}, $_;
2509 push @
{$c->{diff
}}, $_;
2510 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
2511 ($c->{url
}, $c->{r
}, undef) = ::extract_metadata
($1);
2512 } elsif (s/^${esc_color} //o) {
2513 push @
{$c->{l
}}, $_;
2516 if ($c && defined $c->{r
} && $c->{r
} != $r_last) {
2518 process_commit
($c, $r_min, $r_max, \
@k);
2524 process_commit
($_, $r_min, $r_max) foreach reverse @k;
2528 print '-' x72
,"\n" unless $incremental || $oneline;
2531 package Git
::SVN
::Migration
;
2532 # these version numbers do NOT correspond to actual version numbers
2533 # of git nor git-svn. They are just relative.
2535 # v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
2537 # v1 layout: .git/$id/info/url, refs/remotes/$id
2539 # v2 layout: .git/svn/$id/info/url, refs/remotes/$id
2541 # v3 layout: .git/svn/$id, refs/remotes/$id
2542 # - info/url may remain for backwards compatibility
2543 # - this is what we migrate up to this layout automatically,
2544 # - this will be used by git svn init on single branches
2546 # v4 layout: .git/svn/$repo_id/$id, refs/remotes/$repo_id/$id
2547 # - this is only created for newly multi-init-ed
2548 # repositories. Similar in spirit to the
2549 # --use-separate-remotes option in git-clone (now default)
2550 # - we do not automatically migrate to this (following
2551 # the example set by core git)
2555 use File
::Path qw
/mkpath/;
2556 use File
::Basename qw
/dirname basename/;
2557 use vars qw
/$_minimize/;
2559 sub migrate_from_v0
{
2560 my $git_dir = $ENV{GIT_DIR
};
2561 return undef unless -d
$git_dir;
2562 my ($fh, $ctx) = command_output_pipe
(qw
/rev-parse --symbolic --all/);
2566 my ($id, $orig_ref) = ($_, $_);
2567 next unless $id =~ s
#^refs/heads/(.+)-HEAD$#$1#;
2568 next unless -f
"$git_dir/$id/info/url";
2569 my $new_ref = "refs/remotes/$id";
2570 if (::verify_ref
("$new_ref^0")) {
2571 print STDERR
"W: $orig_ref is probably an old ",
2572 "branch used by an ancient version of ",
2574 "However, $new_ref also exists.\n",
2575 "We will not be able ",
2576 "to use this branch until this ",
2577 "ambiguity is resolved.\n";
2580 print STDERR
"Migrating from v0 layout...\n" if !$migrated;
2581 print STDERR
"Renaming ref: $orig_ref => $new_ref\n";
2582 command_noisy
('update-ref', $new_ref, $orig_ref);
2583 command_noisy
('update-ref', '-d', $orig_ref, $orig_ref);
2586 command_close_pipe
($fh, $ctx);
2587 print STDERR
"Done migrating from v0 layout...\n" if $migrated;
2591 sub migrate_from_v1
{
2592 my $git_dir = $ENV{GIT_DIR
};
2594 return $migrated unless -d
$git_dir;
2595 my $svn_dir = "$git_dir/svn";
2597 # just in case somebody used 'svn' as their $id at some point...
2598 return $migrated if -d
$svn_dir && ! -f
"$svn_dir/info/url";
2600 print STDERR
"Migrating from a git-svn v1 layout...\n";
2602 print STDERR
"Data from a previous version of git-svn exists, but\n\t",
2603 "$svn_dir\n\t(required for this version ",
2604 "($::VERSION) of git-svn) does not. exist\n";
2605 my ($fh, $ctx) = command_output_pipe
(qw
/rev-parse --symbolic --all/);
2608 next unless $x =~ s
#^refs/remotes/##;
2610 next unless -f
"$git_dir/$x/info/url";
2611 my $u = eval { ::file_to_s
("$git_dir/$x/info/url") };
2613 my $dn = dirname
("$git_dir/svn/$x");
2614 mkpath
([$dn]) unless -d
$dn;
2615 if ($x eq 'svn') { # they used 'svn' as GIT_SVN_ID:
2616 mkpath
(["$git_dir/svn/svn"]);
2617 print STDERR
" - $git_dir/$x/info => ",
2618 "$git_dir/svn/$x/info\n";
2619 rename "$git_dir/$x/info", "$git_dir/svn/$x/info" or
2621 # don't worry too much about these, they probably
2622 # don't exist with repos this old (save for index,
2623 # and we can easily regenerate that)
2624 foreach my $f (qw
/unhandled.log index .rev_db/) {
2625 rename "$git_dir/$x/$f", "$git_dir/svn/$x/$f";
2628 print STDERR
" - $git_dir/$x => $git_dir/svn/$x\n";
2629 rename "$git_dir/$x", "$git_dir/svn/$x" or
2634 command_close_pipe
($fh, $ctx);
2635 print STDERR
"Done migrating from a git-svn v1 layout\n";
2640 my ($l_map, $pfx, $path) = @_;
2642 foreach (<$path/*>) {
2643 if (-r
"$_/info/url") {
2644 $pfx .= '/' if $pfx && $pfx !~ m
!/$!;
2645 my $ref_id = $pfx . basename
$_;
2646 my $url = ::file_to_s
("$_/info/url");
2647 $l_map->{$ref_id} = $url;
2654 $x =~ s!^\Q$ENV{GIT_DIR}\E/svn/!!o;
2655 read_old_urls
($l_map, $x, $_);
2659 sub migrate_from_v2
{
2660 my @cfg = command
(qw
/config -l/);
2661 return if grep /^svn-remote\..+\.url=/, @cfg;
2663 read_old_urls
(\
%l_map, '', "$ENV{GIT_DIR}/svn");
2666 foreach my $ref_id (sort keys %l_map) {
2667 Git
::SVN
->init($l_map{$ref_id}, '', $ref_id, $ref_id);
2673 sub minimize_connections
{
2674 my $r = Git
::SVN
::read_all_remotes
();
2676 my $root_repos = {};
2677 foreach my $repo_id (keys %$r) {
2678 my $url = $r->{$repo_id}->{url
} or next;
2679 my $fetch = $r->{$repo_id}->{fetch
} or next;
2680 my $ra = Git
::SVN
::Ra
->new($url);
2682 # skip existing cases where we already connect to the root
2683 if (($ra->{url
} eq $ra->{repos_root
}) ||
2684 (Git
::SVN
::sanitize_remote_name
($ra->{repos_root
}) eq
2686 $root_repos->{$ra->{url
}} = $repo_id;
2690 my $root_ra = Git
::SVN
::Ra
->new($ra->{repos_root
});
2691 my $root_path = $ra->{url
};
2692 $root_path =~ s
#^\Q$ra->{repos_root}\E/*##;
2693 foreach my $path (keys %$fetch) {
2694 my $ref_id = $fetch->{$path};
2695 my $gs = Git
::SVN
->new($ref_id, $repo_id, $path);
2697 # make sure we can read when connecting to
2698 # a higher level of a repository
2699 my ($last_rev, undef) = $gs->last_rev_commit;
2700 if (!defined $last_rev) {
2702 $root_ra->get_latest_revnum;
2706 my $new = $root_path;
2707 $new .= length $path ?
"/$path" : '';
2709 $root_ra->get_log([$new], $last_rev, $last_rev,
2713 $new_urls->{$ra->{repos_root
}}->{$new} =
2714 { ref_id
=> $ref_id,
2715 old_repo_id
=> $repo_id,
2716 old_path
=> $path };
2721 foreach my $url (keys %$new_urls) {
2722 # see if we can re-use an existing [svn-remote "repo_id"]
2723 # instead of creating a(n ugly) new section:
2724 my $repo_id = $root_repos->{$url} ||
2725 Git
::SVN
::sanitize_remote_name
($url);
2727 my $fetch = $new_urls->{$url};
2728 foreach my $path (keys %$fetch) {
2729 my $x = $fetch->{$path};
2730 Git
::SVN
->init($url, $path, $repo_id, $x->{ref_id
});
2731 my $pfx = "svn-remote.$x->{old_repo_id}";
2733 my $old_fetch = quotemeta("$x->{old_path}:".
2734 "refs/remotes/$x->{ref_id}");
2735 command_noisy
(qw
/config --unset/,
2736 "$pfx.fetch", '^'. $old_fetch . '$');
2737 delete $r->{$x->{old_repo_id
}}->
2738 {fetch
}->{$x->{old_path
}};
2739 if (!keys %{$r->{$x->{old_repo_id
}}->{fetch
}}) {
2740 command_noisy
(qw
/config --unset/,
2742 push @emptied, $x->{old_repo_id
}
2747 my $file = $ENV{GIT_CONFIG
} || $ENV{GIT_CONFIG_LOCAL
} ||
2748 "$ENV{GIT_DIR}/config";
2750 The following [svn-remote] sections in your config file ($file) are empty
2751 and can be safely removed:
2753 print STDERR
"[svn-remote \"$_\"]\n" foreach @emptied;
2757 sub migration_check
{
2761 minimize_connections
() if $_minimize;
2768 $log_entry hashref as returned by libsvn_log_entry
()
2770 log => 'whitespace-formatted log entry
2771 ', # trailing newline is preserved
2772 revision
=> '8', # integer
2773 date
=> '2004-02-24T17:01:44.108345Z', # commit date
2774 author
=> 'committer name'
2777 @mods = array of diff
-index line hashes
, each element represents one line
2778 of diff
-index output
2780 diff
-index line
($m hash
)
2782 mode_a
=> first column of diff
-index output
, no leading
':',
2783 mode_b
=> second column of diff
-index output
,
2784 sha1_b
=> sha1sum of the final blob
,
2785 chg
=> change type
[MCRADT
],
2786 file_a
=> original file name of a file
(iff chg is
'C' or 'R')
2787 file_b
=> new
/current file name of a file
(any chg
)
2791 # retval of read_url_paths{,_all}();
2793 # repository root url
2794 'https://svn.musicpd.org' => {
2795 # repository path # GIT_SVN_ID
2796 'mpd/trunk' => 'trunk',
2797 'mpd/tags/0.11.5' => 'tags/0.11.5',
2802 I don
't trust the each() function on unless I created %hash myself
2803 because the internal iterator may not have started at base.