2 # Copyright (C) 2006, Eric Wong <normalperson@yhbt.net>
3 # License: GPL v2 or later
6 use vars qw
/ $AUTHOR $VERSION
7 $SVN_URL $SVN_INFO $SVN_WC $SVN_UUID
8 $GIT_SVN_INDEX $GIT_SVN
9 $GIT_DIR $GIT_SVN_DIR $REVDB/;
10 $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
11 $VERSION = '@@GIT_VERSION@@';
14 $GIT_DIR = abs_path
($ENV{GIT_DIR
} || '.git');
15 $ENV{GIT_DIR
} = $GIT_DIR;
17 my $LC_ALL = $ENV{LC_ALL
};
19 # make sure the svn binary gives consistent output between locales and TZs:
22 $| = 1; # unbuffer STDOUT
24 # properties that we do not log:
25 my %SKIP = ( 'svn:wc:ra_dav:version-url' => 1,
27 'svn:executable' => 1,
28 'svn:entry:committed-rev' => 1,
29 'svn:entry:last-author' => 1,
30 'svn:entry:uuid' => 1,
31 'svn:entry:committed-date' => 1,
34 sub fatal
(@
) { print STDERR
@_; exit 1 }
35 require SVN
::Core
; # use()-ing this causes segfaults for me... *shrug*
38 if ($SVN::Core
::VERSION
lt '1.1.0') {
39 fatal
"Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)\n";
41 push @SVN::Git
::Editor
::ISA
, 'SVN::Delta::Editor';
42 push @SVN::Git
::Fetcher
::ISA
, 'SVN::Delta::Editor';
43 *SVN
::Git
::Fetcher
::process_rm
= *process_rm
;
46 use File
::Basename qw
/dirname basename/;
47 use File
::Path qw
/mkpath/;
48 use Getopt
::Long qw
/:config gnu_getopt no_ignore_case auto_abbrev pass_through/;
49 use POSIX qw
/strftime/;
52 use Git qw
/command command_oneline command_noisy
53 command_output_pipe command_input_pipe command_close_pipe
/;
54 memoize
('revisions_eq');
55 memoize
('cmt_metadata');
56 memoize
('get_commit_time');
60 my $_optimize_commits = 1 unless $ENV{GIT_SVN_NO_OPTIMIZE_COMMITS
};
61 my $sha1 = qr/[a-f\d]{40}/;
62 my $sha1_short = qr/[a-f\d]{4,40}/;
63 my $_esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
64 my ($_revision,$_stdin,$_no_ignore_ext,$_no_stop_copy,$_help,$_rmdir,$_edit,
65 $_find_copies_harder, $_l, $_cp_similarity, $_cp_remote,
66 $_repack, $_repack_nr, $_repack_flags, $_q,
67 $_message, $_file, $_follow_parent, $_no_metadata,
68 $_template, $_shared, $_no_default_regex, $_no_graft_copy,
69 $_limit, $_verbose, $_incremental, $_oneline, $_l_fmt, $_show_commit,
70 $_version, $_upgrade, $_authors, $_branch_all_refs, @_opt_m,
71 $_merge, $_strategy, $_dry_run, $_ignore_nodate, $_non_recursive,
72 $_username, $_config_dir, $_no_auth_cache,
74 my (@_branch_from, %tree_map, %users, %rusers, %equiv);
75 my ($_svn_can_do_switch);
76 my @repo_path_split_cache;
78 my %fc_opts = ( 'no-ignore-externals' => \
$_no_ignore_ext,
79 'branch|b=s' => \
@_branch_from,
80 'follow-parent|follow' => \
$_follow_parent,
81 'branch-all-refs|B' => \
$_branch_all_refs,
82 'authors-file|A=s' => \
$_authors,
83 'repack:i' => \
$_repack,
84 'no-metadata' => \
$_no_metadata,
86 'username=s' => \
$_username,
87 'config-dir=s' => \
$_config_dir,
88 'no-auth-cache' => \
$_no_auth_cache,
89 'ignore-nodate' => \
$_ignore_nodate,
90 'repack-flags|repack-args|repack-opts=s' => \
$_repack_flags);
92 my ($_trunk, $_tags, $_branches);
93 my %multi_opts = ( 'trunk|T=s' => \
$_trunk,
94 'tags|t=s' => \
$_tags,
95 'branches|b=s' => \
$_branches );
96 my %init_opts = ( 'template=s' => \
$_template, 'shared' => \
$_shared );
97 my %cmt_opts = ( 'edit|e' => \
$_edit,
99 'find-copies-harder' => \
$_find_copies_harder,
101 'copy-similarity|C=i'=> \
$_cp_similarity
105 fetch
=> [ \
&fetch
, "Download new revisions from SVN",
106 { 'revision|r=s' => \
$_revision, %fc_opts } ],
107 init
=> [ \
&init
, "Initialize a repo for tracking" .
108 " (requires URL argument)",
110 dcommit
=> [ \
&dcommit
, 'Commit several diffs to merge with upstream',
111 { 'merge|m|M' => \
$_merge,
112 'strategy|s=s' => \
$_strategy,
113 'dry-run|n' => \
$_dry_run,
114 %cmt_opts, %fc_opts } ],
115 'set-tree' => [ \
&commit
, "Set an SVN repository to a git tree-ish",
116 { 'stdin|' => \
$_stdin, %cmt_opts, %fc_opts, } ],
117 'show-ignore' => [ \
&show_ignore
, "Show svn:ignore listings",
118 { 'revision|r=i' => \
$_revision } ],
119 rebuild
=> [ \
&rebuild
, "Rebuild git-svn metadata (after git clone)",
120 { 'no-ignore-externals' => \
$_no_ignore_ext,
121 'copy-remote|remote=s' => \
$_cp_remote,
122 'upgrade' => \
$_upgrade } ],
123 'graft-branches' => [ \
&graft_branches
,
124 'Detect merges/branches from already imported history',
125 { 'merge-rx|m' => \
@_opt_m,
126 'branch|b=s' => \
@_branch_from,
127 'branch-all-refs|B' => \
$_branch_all_refs,
128 'no-default-regex' => \
$_no_default_regex,
129 'no-graft-copy' => \
$_no_graft_copy } ],
130 'multi-init' => [ \
&multi_init
,
131 'Initialize multiple trees (like git-svnimport)',
132 { %multi_opts, %init_opts,
133 'revision|r=i' => \
$_revision,
134 'username=s' => \
$_username,
135 'config-dir=s' => \
$_config_dir,
136 'no-auth-cache' => \
$_no_auth_cache,
138 'multi-fetch' => [ \
&multi_fetch
,
139 'Fetch multiple trees (like git-svnimport)',
141 'log' => [ \
&show_log
, 'Show commit logs',
142 { 'limit=i' => \
$_limit,
143 'revision|r=s' => \
$_revision,
144 'verbose|v' => \
$_verbose,
145 'incremental' => \
$_incremental,
146 'oneline' => \
$_oneline,
147 'show-commit' => \
$_show_commit,
148 'non-recursive' => \
$_non_recursive,
149 'authors-file|A=s' => \
$_authors,
151 'pager=s' => \
$_pager,
153 'commit-diff' => [ \
&commit_diff
, 'Commit a diff between two trees',
154 { 'message|m=s' => \
$_message,
155 'file|F=s' => \
$_file,
156 'revision|r=s' => \
$_revision,
161 for (my $i = 0; $i < @ARGV; $i++) {
162 if (defined $cmd{$ARGV[$i]}) {
169 my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
171 read_repo_config
(\
%opts);
172 my $rv = GetOptions
(%opts, 'help|H|h' => \
$_help,
173 'version|V' => \
$_version,
174 'id|i=s' => \
$GIT_SVN);
175 exit 1 if (!$rv && $cmd ne 'log');
179 version
() if $_version;
180 usage
(1) unless defined $cmd;
182 load_authors
() if $_authors;
183 load_all_refs
() if $_branch_all_refs;
184 migration_check
() unless $cmd =~ /^(?:init|rebuild|multi-init|commit-diff)$/;
185 $cmd{$cmd}->[0]->(@ARGV);
188 ####################### primary functions ######################
190 my $exit = shift || 0;
191 my $fd = $exit ? \
*STDERR
: \
*STDOUT
;
193 git
-svn
- bidirectional operations between a single Subversion tree
and git
194 Usage
: $0 <command
> [options
] [arguments
]\n
196 print $fd "Available commands:\n" unless $cmd;
198 foreach (sort keys %cmd) {
199 next if $cmd && $cmd ne $_;
200 print $fd ' ',pack('A17',$_),$cmd{$_}->[1],"\n";
201 foreach (keys %{$cmd{$_}->[2]}) {
202 # prints out arguments as they should be passed:
203 my $x = s
#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
204 print $fd ' ' x
21, join(', ', map { length $_ > 1 ?
206 split /\|/,$_)," $x\n";
210 \nGIT_SVN_ID may be set
in the environment
or via the
--id
/-i switch to an
211 arbitrary identifier
if you
're tracking multiple SVN branches/repositories in
212 one git repository and want to keep them separate. See git-svn(1) for more
219 print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
224 if (!verify_ref("refs/remotes/$GIT_SVN^0")) {
227 $SVN_URL = shift or undef;
230 command_noisy('update
-ref',"refs/remotes/$GIT_SVN","
233 check_upgrade_needed();
236 my ($rev_list, $ctx) = command_output_pipe("rev-list",
237 "refs/remotes/$GIT_SVN");
239 while (<$rev_list>) {
242 croak "Non-SHA1: $c\n" unless $c =~ /^$sha1$/o;
243 my @commit = grep(/^git-svn-id: /,
244 command(qw/cat-file commit/, $c));
245 next if (!@commit); # skip merges
246 my ($url, $rev, $uuid) = extract_metadata($commit[$#commit]);
247 if (!defined $rev || !$uuid) {
248 croak "Unable to extract revision or UUID from ",
249 "$c, $commit[$#commit]\n";
252 # if we merged or otherwise started elsewhere, this is
253 # how we break out of it
254 next if (defined $SVN_UUID && ($uuid ne $SVN_UUID));
255 next if (defined $SVN_URL && defined $url && ($url ne $SVN_URL));
257 unless (defined $latest) {
258 if (!$SVN_URL && !$url) {
259 croak "SVN repository location required: $url\n";
266 revdb_set($REVDB, $rev, $c);
267 print "r$rev = $c\n";
268 $newest_rev = $rev if ($rev > $newest_rev);
270 command_close_pipe($rev_list, $ctx);
274 my $url = shift or die "SVN repository location required " .
275 "as a command-line argument\n";
276 $url =~ s!/+$!!; # strip trailing slash
278 if (my $repo_path = shift) {
279 unless (-d $repo_path) {
280 mkpath([$repo_path]);
282 $GIT_DIR = $ENV{GIT_DIR} = $repo_path . "/.git";
287 unless (-d $GIT_DIR) {
288 my @init_db = ('init
-db
');
289 push @init_db, "--template=$_template" if defined $_template;
290 push @init_db, "--shared" if defined $_shared;
291 command_noisy(@init_db);
297 check_upgrade_needed();
298 $SVN_URL ||= file_to_s("$GIT_SVN_DIR/info/url");
299 my $ret = fetch_lib(@_);
300 if ($ret->{commit} && !verify_ref('refs
/heads/master
^0')) {
301 command_noisy(qw(update-ref refs/heads/master),$ret->{commit
});
308 $SVN_URL ||= file_to_s
("$GIT_SVN_DIR/info/url");
309 $SVN ||= libsvn_connect
($SVN_URL);
310 my ($last_rev, $last_commit) = svn_grab_base_rev
();
311 my ($base, $head) = libsvn_parse_revision
($last_rev);
313 return { revision
=> $last_rev, commit
=> $last_commit }
315 my $index = set_index
($GIT_SVN_INDEX);
317 # limit ourselves and also fork() since get_log won't release memory
318 # after processing a revision and SVN stuff seems to leak
320 my ($min, $max) = ($base, $head < $base+$inc ?
$head : $base+$inc);
322 if (defined $last_commit) {
323 unless (-e
$GIT_SVN_INDEX) {
324 command_noisy
('read-tree', $last_commit);
326 my $x = command_oneline
('write-tree');
327 my ($y) = (command
(qw
/cat-file commit/, $last_commit)
328 =~ /^tree ($sha1)/m);
330 unlink $GIT_SVN_INDEX or croak
$!;
331 command_noisy
('read-tree', $last_commit);
333 $x = command_oneline
('write-tree');
335 print STDERR
"trees ($last_commit) $y != $x\n",
336 "Something is seriously wrong...\n";
340 # fork, because using SVN::Pool with get_log() still doesn't
341 # seem to help enough to keep memory usage down.
342 defined(my $pid = fork) or croak
$!;
344 $SVN::Error
::handler
= \
&libsvn_skip_unknown_revs
;
346 # Yes I'm perfectly aware that the fourth argument
347 # below is the limit revisions number. Unfortunately
348 # performance sucks with it enabled, so it's much
349 # faster to fetch revision ranges instead of relying
351 libsvn_get_log
(libsvn_dup_ra
($SVN), [''],
356 $log_msg = libsvn_fetch
(
358 $last_commit = git_commit
(
363 $log_msg = libsvn_new_tree
(@_);
364 $last_commit = git_commit
(
372 ($last_rev, $last_commit) = svn_grab_base_rev
();
373 last if ($max >= $head);
376 $max = $head if ($max > $head);
377 $SVN = libsvn_connect
($SVN_URL);
379 restore_index
($index);
380 return { revision
=> $last_rev, commit
=> $last_commit };
385 check_upgrade_needed
();
386 if ($_stdin || !@commits) {
387 print "Reading from stdin...\n";
390 if (/\b($sha1_short)\b/o) {
391 unshift @commits, $1;
396 foreach my $c (@commits) {
397 my @tmp = command
('rev-parse',$c);
398 if (scalar @tmp == 1) {
400 } elsif (scalar @tmp > 1) {
401 push @revs, reverse(command
('rev-list',@tmp));
403 die "Failed to rev-parse $c\n";
407 print "Done committing ",scalar @revs," revisions to SVN\n";
412 my ($r_last, $cmt_last) = svn_grab_base_rev
();
413 defined $r_last or die "Must have an existing revision to commit\n";
414 my $fetched = fetch
();
415 if ($r_last != $fetched->{revision
}) {
416 print STDERR
"There are new revisions that were fetched ",
417 "and need to be merged (or acknowledged) ",
418 "before committing.\n",
419 "last rev: $r_last\n",
420 " current: $fetched->{revision}\n";
424 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef, 0) : ();
425 my $commit_msg = "$GIT_SVN_DIR/.svn-commit.tmp.$$";
428 set_svn_commit_env
();
429 foreach my $c (@revs) {
430 my $log_msg = get_commit_message
($c, $commit_msg);
432 # fork for each commit because there's a memory leak I
433 # can't track down... (it's probably in the SVN code)
434 defined(my $pid = open my $fh, '-|') or croak
$!;
436 my $ed = SVN
::Git
::Editor
->new(
438 ra
=> libsvn_dup_ra
($SVN),
440 svn_path
=> $SVN->{svn_path
},
442 $SVN->get_commit_editor(
453 my $mods = libsvn_checkout_tree
($cmt_last, $c, $ed);
455 print "No changes\nr$r_last = $cmt_last\n";
462 my ($r_new, $cmt_new, $no);
466 if (/^r(\d+) = ($sha1)$/o) {
467 ($r_new, $cmt_new) = ($1, $2);
468 } elsif ($_ eq 'No changes') {
473 if (! defined $r_new && ! defined $cmt_new) {
475 die "Failed to parse revision information\n";
478 ($r_last, $cmt_last) = ($r_new, $cmt_new);
486 my $head = shift || 'HEAD';
487 my $gs = "refs/remotes/$GIT_SVN";
488 my @refs = command
(qw
/rev-list --no-merges/, "$gs..$head");
490 foreach my $d (reverse @refs) {
491 if (!verify_ref
("$d~1")) {
493 "has no parent commit, and therefore ",
494 "nothing to diff against.\n",
495 "You should be working from a repository ",
496 "originally created by git-svn\n";
498 unless (defined $last_rev) {
499 (undef, $last_rev, undef) = cmt_metadata
("$d~1");
500 unless (defined $last_rev) {
501 die "Unable to extract revision information ",
502 "from commit $d~1\n";
506 print "diff-tree $d~1 $d\n";
508 if (my $r = commit_diff
("$d~1", $d, undef, $last_rev)) {
510 } # else: no changes, same $last_rev
515 my @diff = command
('diff-tree', 'HEAD', $gs, '--');
518 @finish = qw
/rebase/;
519 push @finish, qw
/--merge/ if $_merge;
520 push @finish, "--strategy=$_strategy" if $_strategy;
521 print STDERR
"W: HEAD and $gs differ, using @finish:\n", @diff;
523 print "No changes between current HEAD and $gs\n",
524 "Resetting to the latest $gs\n";
525 @finish = qw
/reset --mixed/;
527 command_noisy
(@finish, $gs);
531 $SVN_URL ||= file_to_s
("$GIT_SVN_DIR/info/url");
533 $SVN ||= libsvn_connect
($SVN_URL);
534 my $r = defined $_revision ?
$_revision : $SVN->get_latest_revnum;
535 libsvn_traverse_ignore
(\
*STDOUT
, $SVN->{svn_path
}, $r);
539 my $gr_file = "$GIT_DIR/info/grafts";
540 my ($grafts, $comments) = read_grafts
($gr_file);
544 # temporarily disable our grafts file to make this idempotent
545 chomp($gr_sha1 = command
(qw
/hash-object -w/,$gr_file));
546 rename $gr_file, "$gr_file~$gr_sha1" or croak
$!;
549 my $l_map = read_url_paths
();
550 my @re = map { qr/$_/is } @_opt_m if @_opt_m;
551 unless ($_no_default_regex) {
552 push @re, (qr/\b(?:merge|merging|merged)\s+with\s+([\w\.\-]+)/i,
553 qr/\b(?:merge|merging|merged)\s+([\w\.\-]+)/i,
554 qr/\b(?:from|of)\s+([\w\.\-]+)/i );
556 foreach my $u (keys %$l_map) {
558 foreach my $p (keys %{$l_map->{$u}}) {
559 graft_merge_msg
($grafts,$l_map,$u,$p,@re);
562 unless ($_no_graft_copy) {
563 graft_file_copy_lib
($grafts,$l_map,$u);
566 graft_tree_joins
($grafts);
568 write_grafts
($grafts, $comments, $gr_file);
569 unlink "$gr_file~$gr_sha1" if $gr_sha1;
574 unless (defined $_trunk || defined $_branches || defined $_tags) {
577 if (defined $_trunk) {
578 my $trunk_url = complete_svn_url
($url, $_trunk);
580 if ($GIT_SVN eq 'git-svn') {
582 $GIT_SVN = $ENV{GIT_SVN_ID
} = 'trunk';
585 unless (-d
$GIT_SVN_DIR) {
587 print "GIT_SVN_ID set to 'trunk' for ",
588 "$trunk_url ($_trunk)\n";
591 command_noisy
('repo-config', 'svn.trunk', $trunk_url);
594 complete_url_ls_init
($url, $_branches, '--branches/-b', '');
595 complete_url_ls_init
($url, $_tags, '--tags/-t', 'tags/');
599 # try to do trunk first, since branches/tags
600 # may be descended from it.
601 if (-e
"$GIT_DIR/svn/trunk/info/url") {
602 fetch_child_id
('trunk', @_);
604 rec_fetch
('', "$GIT_DIR/svn", @_);
610 my $r_last = -1; # prevent dupes
611 rload_authors
() if $_authors;
617 if (defined $_revision) {
618 if ($_revision =~ /^(\d+):(\d+)$/) {
619 ($r_min, $r_max) = ($1, $2);
620 } elsif ($_revision =~ /^\d+$/) {
621 $r_min = $r_max = $_revision;
623 print STDERR
"-r$_revision is not supported, use ",
624 "standard \'git log\' arguments instead\n";
630 @args = (git_svn_log_cmd
($r_min, $r_max), @args);
631 my $log = command_output_pipe
(@args);
636 if (/^${_esc_color}commit ($sha1_short)/o) {
638 if ($c && cmt_showable
($c) && $c->{r
} != $r_last) {
640 process_commit
($c, $r_min, $r_max, \
@k) or
645 } elsif (/^${_esc_color}author (.+) (\d+) ([\-\+]?\d+)$/) {
646 get_author_info
($c, $1, $2, $3);
647 } elsif (/^${_esc_color}(?:tree|parent|committer) /) {
649 } elsif (/^${_esc_color}:\d{6} \d{6} $sha1_short/o) {
650 push @
{$c->{raw
}}, $_;
651 } elsif (/^${_esc_color}[ACRMDT]\t/) {
652 # we could add $SVN->{svn_path} here, but that requires
653 # remote access at the moment (repo_path_split)...
654 s
#^(${_esc_color})([ACRMDT])\t#$1 $2 #;
655 push @
{$c->{changed
}}, $_;
656 } elsif (/^${_esc_color}diff /) {
658 push @
{$c->{diff
}}, $_;
660 push @
{$c->{diff
}}, $_;
661 } elsif (/^${_esc_color} (git-svn-id:.+)$/) {
662 ($c->{url
}, $c->{r
}, undef) = extract_metadata
($1);
663 } elsif (s/^${_esc_color} //) {
667 if ($c && defined $c->{r
} && $c->{r
} != $r_last) {
669 process_commit
($c, $r_min, $r_max, \
@k);
675 process_commit
($_, $r_min, $r_max) foreach reverse @k;
678 eval { command_close_pipe
($log) };
679 print '-' x72
,"\n" unless $_incremental || $_oneline;
682 sub commit_diff_usage
{
683 print STDERR
"Usage: $0 commit-diff <tree-ish> <tree-ish> [<URL>]\n";
688 my $ta = shift or commit_diff_usage
();
689 my $tb = shift or commit_diff_usage
();
690 if (!eval { $SVN_URL = shift || file_to_s
("$GIT_SVN_DIR/info/url") }) {
691 print STDERR
"Needed URL or usable git-svn id command-line\n";
695 unless (defined $r) {
696 if (defined $_revision) {
699 die "-r|--revision is a required argument\n";
702 if (defined $_message && defined $_file) {
703 print STDERR
"Both --message/-m and --file/-F specified ",
704 "for the commit message.\n",
705 "I have no idea what you mean\n";
708 if (defined $_file) {
709 $_message = file_to_s
($_file);
711 $_message ||= get_commit_message
($tb,
712 "$GIT_DIR/.svn-commit.tmp.$$")->{msg
};
714 $SVN ||= libsvn_connect
($SVN_URL);
716 $r = $SVN->get_latest_revnum;
717 } elsif ($r !~ /^\d+$/) {
718 die "revision argument: $r not understood by git-svn\n";
720 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef, 0) : ();
722 my $ed = SVN
::Git
::Editor
->new({ r
=> $r,
723 ra
=> libsvn_dup_ra
($SVN),
725 svn_path
=> $SVN->{svn_path
}
727 $SVN->get_commit_editor($_message,
729 $rev_committed = $_[0];
730 print "Committed $_[0]\n";
734 my $mods = libsvn_checkout_tree
($ta, $tb, $ed);
736 print "No changes\n$ta == $tb\n";
743 $_message = $_file = undef;
744 return $rev_committed;
747 ########################### utility functions #########################
751 return 1 if defined $c->{r
};
752 if ($c->{l
} && $c->{l
}->[-1] eq "...\n" &&
753 $c->{a_raw
} =~ /\@([a-f\d\-]+)>$/) {
754 my @msg = command
(qw
/cat-file commit/, $c->{c
});
755 shift @msg while ($msg[0] ne "\n");
757 @
{$c->{l
}} = grep !/^git-svn-id: /, @msg;
759 (undef, $c->{r
}, undef) = extract_metadata
(
760 (grep(/^git-svn-id: /, @msg))[-1]);
762 return defined $c->{r
};
768 $dcvar = 'color.diff';
769 $dc = `git-repo-config --get $dcvar`;
771 # nothing at all; fallback to "diff.color"
772 $dcvar = 'diff.color';
773 $dc = `git-repo-config --get $dcvar`;
778 $pc = `git-repo-config --get color.pager`;
780 # does not have it -- fallback to pager.color
781 $pc = `git-repo-config --bool --get pager.color`;
784 $pc = `git-repo-config --bool --get color.pager`;
790 if (-t
*STDOUT
|| (defined $_pager && $pc eq 'true')) {
791 return ($ENV{TERM
} && $ENV{TERM
} ne 'dumb');
795 return 0 if $dc eq 'never';
796 return 1 if $dc eq 'always';
797 chomp($dc = `git-repo-config --bool --get $dcvar`);
798 return ($dc eq 'true');
801 sub git_svn_log_cmd
{
802 my ($r_min, $r_max) = @_;
803 my @cmd = (qw
/log --abbrev
-commit
--pretty
=raw
804 --default/, "refs/remotes
/$GIT_SVN");
805 push @cmd, '-r' unless $_non_recursive;
806 push @cmd, qw/--raw --name-status/ if $_verbose;
807 push @cmd, '--color' if log_use_color();
808 return @cmd unless defined $r_max;
809 if ($r_max == $r_min) {
810 push @cmd, '--max-count=1';
811 if (my $c = revdb_get($REVDB, $r_max)) {
816 $c_max = revdb_get($REVDB, $r_max);
817 $c_min = revdb_get($REVDB, $r_min);
818 if (defined $c_min && defined $c_max) {
819 if ($r_max > $r_max) {
820 push @cmd, "$c_min..$c_max";
822 push @cmd, "$c_max..$c_min";
824 } elsif ($r_max > $r_min) {
835 print "Fetching
$id\n";
836 my $ref = "$GIT_DIR/refs/remotes
/$id";
837 defined(my $pid = open my $fh, '-|') or croak $!;
840 $GIT_SVN = $ENV{GIT_SVN_ID} = $id;
847 check_repack() if (/^r\d+ = $sha1/);
849 close $fh or croak $?;
853 my ($pfx, $p, @args) = @_;
855 foreach (sort <$p/*>) {
856 if (-r "$_/info/url
") {
857 $pfx .= '/' if $pfx && $pfx !~ m!/$!;
858 my $id = $pfx . basename $_;
859 next if $id eq 'trunk';
860 fetch_child_id($id, @args);
867 $x =~ s!^\Q$GIT_DIR\E/svn/!!;
872 sub complete_svn_url {
873 my ($url, $path) = @_;
875 $url =~ s#/+$## if $url;
876 if ($path !~ m#^[a-z\+]+://#) {
877 $path = '/' . $path if ($path !~ m#^/#);
878 if (!defined $url || $url !~ m#^[a-z\+]+://#) {
879 fatal("E
: '$path' is
not a complete URL
",
880 "and a separate URL is
not specified
\n");
882 $path = $url . $path;
887 sub complete_url_ls_init {
888 my ($url, $path, $switch, $pfx) = @_;
890 print STDERR "W
: $switch not specified
\n";
893 my $full_url = complete_svn_url($url, $path);
894 my @ls = libsvn_ls_fullurl($full_url);
895 defined(my $pid = fork) or croak $!;
897 foreach my $u (map { "$full_url/$_" } (grep m!/$!, @ls)) {
899 if ($u !~ m!\Q$full_url\E/(.+)$!) {
900 print STDERR
"W: Unrecognized URL: $u\n";
901 die "This should never happen\n";
903 # don't try to init already existing refs
905 $GIT_SVN = $ENV{GIT_SVN_ID
} = $id;
907 unless (-d
$GIT_SVN_DIR) {
908 print "init $u => $id\n";
916 my ($n) = ($switch =~ /^--(\w+)/);
917 command_noisy
('repo-config', "svn.$n", $full_url);
924 my @tmp = split m
#/#, $_;
926 while (my $x = shift @tmp) {
932 foreach (sort {length $b <=> length $a} keys %common) {
933 if ($common{$_} == @
$paths) {
940 # grafts set here are 'stronger' in that they're based on actual tree
941 # matches, and won't be deleted from merge-base checking in write_grafts()
942 sub graft_tree_joins
{
944 map_tree_joins
() if (@_branch_from && !%tree_map);
945 return unless %tree_map;
949 my @args = (qw
/rev-list --pretty=raw/, "refs/remotes/$i");
950 my ($fh, $ctx) = command_output_pipe
(@args);
952 next unless /^commit ($sha1)$/o;
954 my ($t) = (<$fh> =~ /^tree ($sha1)$/o);
955 next unless $tree_map{$t};
960 } until ($l =~ /^committer (?:.+) (\d+) ([\-\+]?\d+)$/);
962 my ($s, $tz) = ($1, $2);
963 if ($tz =~ s/^\+//) {
964 $s += tz_to_s_offset
($tz);
965 } elsif ($tz =~ s/^\-//) {
966 $s -= tz_to_s_offset
($tz);
969 my ($url_a, $r_a, $uuid_a) = cmt_metadata
($c);
971 foreach my $p (@
{$tree_map{$t}}) {
973 my $mb = eval { command
('merge-base', $c, $p) };
974 next unless ($@
|| $?
);
976 # see if SVN says it's a relative
977 my ($url_b, $r_b, $uuid_b) =
979 next if (defined $url_b &&
981 ($url_a eq $url_b) &&
982 ($uuid_a eq $uuid_b));
983 if ($uuid_a eq $uuid_b) {
985 $grafts->{$c}->{$p} = 2;
987 } elsif ($r_b > $r_a) {
988 $grafts->{$p}->{$c} = 2;
993 my $ct = get_commit_time
($p);
995 $grafts->{$c}->{$p} = 2;
997 $grafts->{$p}->{$c} = 2;
999 # what should we do when $ct == $s ?
1002 command_close_pipe
($fh, $ctx);
1006 sub graft_file_copy_lib
{
1007 my ($grafts, $l_map, $u) = @_;
1008 my $tree_paths = $l_map->{$u};
1009 my $pfx = common_prefix
([keys %$tree_paths]);
1010 my ($repo, $path) = repo_path_split
($u.$pfx);
1011 $SVN = libsvn_connect
($repo);
1013 my ($base, $head) = libsvn_parse_revision
();
1015 my ($min, $max) = ($base, $head < $base+$inc ?
$head : $base+$inc);
1016 my $eh = $SVN::Error
::handler
;
1017 $SVN::Error
::handler
= \
&libsvn_skip_unknown_revs
;
1019 my $pool = SVN
::Pool
->new;
1020 libsvn_get_log
(libsvn_dup_ra
($SVN), [$path],
1021 $min, $max, 0, 2, 1,
1023 libsvn_graft_file_copies
($grafts, $tree_paths,
1027 last if ($max >= $head);
1030 $max = $head if ($max > $head);
1032 $SVN::Error
::handler
= $eh;
1035 sub process_merge_msg_matches
{
1036 my ($grafts, $l_map, $u, $p, $c, @matches) = @_;
1037 my (@strong, @weak);
1038 foreach (@matches) {
1039 # merging with ourselves is not interesting
1041 if ($l_map->{$u}->{$_}) {
1047 foreach my $w (@weak) {
1049 # no exact match, use branch name as regexp.
1050 my $re = qr/\Q$w\E/i;
1051 foreach (keys %{$l_map->{$u}}) {
1053 push @strong, $l_map->{$u}->{$_};
1060 foreach (keys %{$l_map->{$u}}) {
1062 push @strong, $l_map->{$u}->{$_};
1067 my ($rev) = ($c->{m
} =~ /^git
-svn
-id
:\s
(?
:\S
+?
)\@
(\d
+)
1068 \s
(?
:[a
-f\d\
-]+)$/xsm
);
1069 unless (defined $rev) {
1070 ($rev) = ($c->{m
} =~/^git
-svn
-id
:\s
(\d
+)
1071 \@
(?
:[a
-f\d\
-]+)/xsm
);
1072 return unless defined $rev;
1074 foreach my $m (@strong) {
1075 my ($r0, $s0) = find_rev_before
($rev, $m, 1);
1076 $grafts->{$c->{c
}}->{$s0} = 1 if defined $s0;
1080 sub graft_merge_msg
{
1081 my ($grafts, $l_map, $u, $p, @re) = @_;
1083 my $x = $l_map->{$u}->{$p};
1084 my $rl = rev_list_raw
($x);
1085 while (my $c = next_rev_list_entry
($rl)) {
1086 foreach my $re (@re) {
1087 my (@br) = ($c->{m
} =~ /$re/g);
1089 process_merge_msg_matches
($grafts,$l_map,$u,$p,$c,@br);
1095 return if $SVN_UUID;
1096 my $pool = SVN
::Pool
->new;
1097 $SVN_UUID = $SVN->get_uuid($pool);
1103 eval { command_oneline
([ 'rev-parse', '--verify', $ref ],
1104 { STDERR
=> 0 }); };
1107 sub repo_path_split
{
1108 my $full_url = shift;
1109 $full_url =~ s
#/+$##;
1111 foreach (@repo_path_split_cache) {
1112 if ($full_url =~ s
#$_##) {
1114 $full_url =~ s
#^/+##;
1115 return ($u, $full_url);
1118 my $tmp = libsvn_connect
($full_url);
1119 return ($tmp->{repos_root
}, $tmp->{svn_path
});
1123 defined $SVN_URL or croak
"SVN repository location required\n";
1124 unless (-d
$GIT_DIR) {
1125 croak
"GIT_DIR=$GIT_DIR does not exist!\n";
1127 mkpath
([$GIT_SVN_DIR]);
1128 mkpath
(["$GIT_SVN_DIR/info"]);
1129 open my $fh, '>>',$REVDB or croak
$!;
1131 s_to_file
($SVN_URL,"$GIT_SVN_DIR/info/url");
1135 sub get_tree_from_treeish
{
1137 croak
"Not a sha1: $treeish\n" unless $treeish =~ /^$sha1$/o;
1138 my $type = command_oneline
(qw
/cat-file -t/, $treeish);
1140 while ($type eq 'tag') {
1141 ($treeish, $type) = command
(qw
/cat-file tag/, $treeish);
1143 if ($type eq 'commit') {
1144 $expected = (grep /^tree /, command
(qw
/cat-file commit/,
1146 ($expected) = ($expected =~ /^tree ($sha1)$/);
1147 die "Unable to get tree from $treeish\n" unless $expected;
1148 } elsif ($type eq 'tree') {
1149 $expected = $treeish;
1151 die "$treeish is a $type, expected tree, tag or commit\n";
1157 my ($from, $treeish) = @_;
1158 print "diff-tree $from $treeish\n";
1159 my @diff_tree = qw(diff-tree -z -r);
1160 if ($_cp_similarity) {
1161 push @diff_tree, "-C$_cp_similarity";
1163 push @diff_tree, '-C';
1165 push @diff_tree, '--find-copies-harder' if $_find_copies_harder;
1166 push @diff_tree, "-l$_l" if defined $_l;
1167 push @diff_tree, $from, $treeish;
1168 my ($diff_fh, $ctx) = command_output_pipe
(@diff_tree);
1172 while (<$diff_fh>) {
1173 chomp $_; # this gets rid of the trailing "\0"
1174 if ($state eq 'meta' && /^:(\d
{6})\s
(\d
{6})\s
1175 $sha1\s
($sha1)\s
([MTCRAD
])\d
*$/xo
) {
1176 push @mods, { mode_a
=> $1, mode_b
=> $2,
1177 sha1_b
=> $3, chg
=> $4 };
1178 if ($4 =~ /^(?:C|R)$/) {
1183 } elsif ($state eq 'file_a') {
1184 my $x = $mods[$#mods] or croak
"Empty array\n";
1185 if ($x->{chg
} !~ /^(?:C|R)$/) {
1186 croak
"Error parsing $_, $x->{chg}\n";
1190 } elsif ($state eq 'file_b') {
1191 my $x = $mods[$#mods] or croak
"Empty array\n";
1192 if (exists $x->{file_a
} && $x->{chg
} !~ /^(?:C|R)$/) {
1193 croak
"Error parsing $_, $x->{chg}\n";
1195 if (!exists $x->{file_a
} && $x->{chg
} =~ /^(?:C|R)$/) {
1196 croak
"Error parsing $_, $x->{chg}\n";
1201 croak
"Error parsing $_\n";
1204 command_close_pipe
($diff_fh, $ctx);
1208 sub libsvn_checkout_tree
{
1209 my ($from, $treeish, $ed) = @_;
1210 my $mods = get_diff
($from, $treeish);
1211 return $mods unless (scalar @
$mods);
1212 my %o = ( D
=> 1, R
=> 0, C
=> -1, A
=> 3, M
=> 3, T
=> 3 );
1213 foreach my $m (sort { $o{$a->{chg
}} <=> $o{$b->{chg
}} } @
$mods) {
1215 if (defined $o{$f}) {
1218 croak
"Invalid change type: $f\n";
1221 $ed->rmdirs($_q) if $_rmdir;
1225 sub get_commit_message
{
1226 my ($commit, $commit_msg) = (@_);
1227 my %log_msg = ( msg
=> '' );
1228 open my $msg, '>', $commit_msg or croak
$!;
1230 my $type = command_oneline
(qw
/cat-file -t/, $commit);
1231 if ($type eq 'commit' || $type eq 'tag') {
1232 my ($msg_fh, $ctx) = command_output_pipe
('cat-file',
1237 $in_msg = 1 if (/^\s*$/);
1238 } elsif (/^git-svn-id: /) {
1239 # skip this, we regenerate the correct one
1240 # on re-fetch anyways
1242 print $msg $_ or croak
$!;
1245 command_close_pipe
($msg_fh, $ctx);
1247 close $msg or croak
$!;
1249 if ($_edit || ($type eq 'tree')) {
1250 my $editor = $ENV{VISUAL
} || $ENV{EDITOR
} || 'vi';
1251 system($editor, $commit_msg);
1254 # file_to_s removes all trailing newlines, so just use chomp() here:
1255 open $msg, '<', $commit_msg or croak
$!;
1256 { local $/; chomp($log_msg{msg
} = <$msg>); }
1257 close $msg or croak
$!;
1262 sub set_svn_commit_env
{
1263 if (defined $LC_ALL) {
1264 $ENV{LC_ALL
} = $LC_ALL;
1266 delete $ENV{LC_ALL
};
1271 my ($fh, $c) = command_output_pipe
(qw
/rev-list --pretty=raw/, @_);
1272 return { fh
=> $fh, ctx
=> $c, t
=> { } };
1275 sub next_rev_list_entry
{
1280 if (/^commit ($sha1)$/o) {
1282 $rl->{t
} = { c
=> $1 };
1287 } elsif (/^parent ($sha1)$/o) {
1294 command_close_pipe
($fh, $rl->{ctx
});
1295 return ($x != $rl->{t
}) ?
$x : undef;
1299 my ($str, $file, $mode) = @_;
1300 open my $fd,'>',$file or croak
$!;
1301 print $fd $str,"\n" or croak
$!;
1302 close $fd or croak
$!;
1303 chmod ($mode &~ umask, $file) if (defined $mode);
1308 open my $fd,'<',$file or croak
"$!: file: $file\n";
1311 close $fd or croak
$!;
1316 sub assert_revision_unknown
{
1318 if (my $c = revdb_get
($REVDB, $r)) {
1319 croak
"$r = $c already exists! Why are we refetching it?";
1324 my ($log_msg, @parents) = @_;
1325 assert_revision_unknown
($log_msg->{revision
});
1326 map_tree_joins
() if (@_branch_from && !%tree_map);
1328 my (@tmp_parents, @exec_parents, %seen_parent);
1329 if (my $lparents = $log_msg->{parents
}) {
1330 @tmp_parents = @
$lparents
1332 # commit parents can be conditionally bound to a particular
1333 # svn revision via: "svn_revno=commit_sha1", filter them out here:
1334 foreach my $p (@parents) {
1335 next unless defined $p;
1336 if ($p =~ /^(\d+)=($sha1_short)$/o) {
1337 if ($1 == $log_msg->{revision
}) {
1338 push @tmp_parents, $2;
1341 push @tmp_parents, $p if $p =~ /$sha1_short/o;
1344 my $tree = $log_msg->{tree
};
1345 if (!defined $tree) {
1346 my $index = set_index
($GIT_SVN_INDEX);
1347 $tree = command_oneline
('write-tree');
1349 restore_index
($index);
1351 # just in case we clobber the existing ref, we still want that ref
1353 if (my $cur = verify_ref
("refs/remotes/$GIT_SVN^0")) {
1355 push @tmp_parents, $cur;
1358 if (exists $tree_map{$tree}) {
1359 foreach my $p (@
{$tree_map{$tree}}) {
1361 foreach (@tmp_parents) {
1362 # see if a common parent is found
1363 my $mb = eval { command
('merge-base', $_, $p) };
1369 my ($url_p, $r_p, $uuid_p) = cmt_metadata
($p);
1370 next if (($SVN_UUID eq $uuid_p) &&
1371 ($log_msg->{revision
} > $r_p));
1372 next if (defined $url_p && defined $SVN_URL &&
1373 ($SVN_UUID eq $uuid_p) &&
1374 ($url_p eq $SVN_URL));
1375 push @tmp_parents, $p;
1378 foreach (@tmp_parents) {
1379 next if $seen_parent{$_};
1380 $seen_parent{$_} = 1;
1381 push @exec_parents, $_;
1382 # MAXPARENT is defined to 16 in commit-tree.c:
1383 last if @exec_parents > 16;
1386 set_commit_env
($log_msg);
1387 my @exec = ('git-commit-tree', $tree);
1388 push @exec, '-p', $_ foreach @exec_parents;
1389 defined(my $pid = open3
(my $msg_fh, my $out_fh, '>&STDERR', @exec))
1391 print $msg_fh $log_msg->{msg
} or croak
$!;
1392 unless ($_no_metadata) {
1393 print $msg_fh "\ngit-svn-id: $SVN_URL\@$log_msg->{revision}",
1394 " $SVN_UUID\n" or croak
$!;
1396 $msg_fh->flush == 0 or croak
$!;
1397 close $msg_fh or croak
$!;
1398 chomp(my $commit = do { local $/; <$out_fh> });
1399 close $out_fh or croak
$!;
1402 if ($commit !~ /^$sha1$/o) {
1403 die "Failed to commit, invalid sha1: $commit\n";
1405 command_noisy
('update-ref',"refs/remotes/$GIT_SVN",$commit);
1406 revdb_set
($REVDB, $log_msg->{revision
}, $commit);
1408 # this output is read via pipe, do not change:
1409 print "r$log_msg->{revision} = $commit\n";
1415 if ($_repack && (--$_repack_nr == 0)) {
1416 $_repack_nr = $_repack;
1417 # repack doesn't use any arguments with spaces in them, does it?
1418 command_noisy
('repack', split(/\s+/, $_repack_flags));
1422 sub set_commit_env
{
1424 my $author = $log_msg->{author
};
1425 if (!defined $author || length $author == 0) {
1426 $author = '(no author)';
1428 my ($name,$email) = defined $users{$author} ? @
{$users{$author}}
1429 : ($author,"$author\@$SVN_UUID");
1430 $ENV{GIT_AUTHOR_NAME
} = $ENV{GIT_COMMITTER_NAME
} = $name;
1431 $ENV{GIT_AUTHOR_EMAIL
} = $ENV{GIT_COMMITTER_EMAIL
} = $email;
1432 $ENV{GIT_AUTHOR_DATE
} = $ENV{GIT_COMMITTER_DATE
} = $log_msg->{date
};
1435 sub check_upgrade_needed
{
1437 -d
$GIT_SVN_DIR or mkpath
([$GIT_SVN_DIR]);
1438 open my $fh, '>>',$REVDB or croak
$!;
1441 return unless eval {
1442 command
([qw
/rev-parse --verify/,"$GIT_SVN-HEAD^0"],
1445 my $head = eval { command
('rev-parse',"refs/remotes/$GIT_SVN") };
1447 print STDERR
"Please run: $0 rebuild --upgrade\n";
1452 # fills %tree_map with a reverse mapping of trees to commits. Useful
1453 # for finding parents to commit on.
1454 sub map_tree_joins
{
1456 foreach my $br (@_branch_from) {
1457 my $pipe = command_output_pipe
(qw
/rev
-list
1458 --topo
-order
--pretty
=raw
/, $br);
1460 if (/^commit ($sha1)$/o) {
1463 # if we've seen a commit,
1464 # we've seen its parents
1465 last if $seen{$commit};
1466 my ($tree) = (<$pipe> =~ /^tree ($sha1)$/o);
1467 unless (defined $tree) {
1468 die "Failed to parse commit $commit\n";
1470 push @
{$tree_map{$tree}}, $commit;
1474 eval { command_close_pipe
($pipe) };
1479 if (@_branch_from) {
1480 print STDERR
'--branch|-b parameters are ignored when ',
1481 "--branch-all-refs|-B is passed\n";
1484 # don't worry about rev-list on non-commit objects/tags,
1485 # it shouldn't blow up if a ref is a blob or tree...
1486 @_branch_from = command
(qw
/rev-parse --symbolic --all/);
1489 # '<svn username> = real-name <email address>' mapping based on git-svnimport:
1491 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
1492 while (<$authors>) {
1494 next unless /^(\S+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
1495 my ($user, $name, $email) = ($1, $2, $3);
1496 $users{$user} = [$name, $email];
1498 close $authors or croak
$!;
1502 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
1503 while (<$authors>) {
1505 next unless /^(\S+?)\s*=\s*(.+?)\s*<(.+)>\s*$/;
1506 my ($user, $name, $email) = ($1, $2, $3);
1507 $rusers{"$name <$email>"} = $user;
1509 close $authors or croak
$!;
1514 foreach (command
(qw
/rev-parse --symbolic --all/)) {
1515 next unless s
#^refs/remotes/##;
1517 next unless -f
"$GIT_DIR/svn/$_/info/url";
1525 defined(my $pid = fork) or croak
$!;
1527 $GIT_SVN = $ENV{GIT_SVN_ID
} = $id;
1529 exit 0 if -r
$REVDB;
1530 print "Upgrading svn => git mapping...\n";
1531 -d
$GIT_SVN_DIR or mkpath
([$GIT_SVN_DIR]);
1532 open my $fh, '>>',$REVDB or croak
$!;
1535 print "Done upgrading. You may now delete the ",
1536 "deprecated $GIT_SVN_DIR/revs directory\n";
1544 sub migration_check
{
1545 migrate_revdb
() unless (-e
$REVDB);
1546 return if (-d
"$GIT_DIR/svn" || !-d
$GIT_DIR);
1547 print "Upgrading repository...\n";
1548 unless (-d
"$GIT_DIR/svn") {
1549 mkdir "$GIT_DIR/svn" or croak
$!;
1551 print "Data from a previous version of git-svn exists, but\n\t",
1552 "$GIT_SVN_DIR\n\t(required for this version ",
1553 "($VERSION) of git-svn) does not.\n";
1555 foreach my $x (command
(qw
/rev-parse --symbolic --all/)) {
1556 next unless $x =~ s
#^refs/remotes/##;
1558 next unless -f
"$GIT_DIR/$x/info/url";
1559 my $u = eval { file_to_s
("$GIT_DIR/$x/info/url") };
1561 my $dn = dirname
("$GIT_DIR/svn/$x");
1562 mkpath
([$dn]) unless -d
$dn;
1563 rename "$GIT_DIR/$x", "$GIT_DIR/svn/$x" or croak
"$!: $x";
1565 migrate_revdb
() if (-d
$GIT_SVN_DIR && !-w
$REVDB);
1566 print "Done upgrading.\n";
1569 sub find_rev_before
{
1570 my ($r, $id, $eq_ok) = @_;
1571 my $f = "$GIT_DIR/svn/$id/.rev_db";
1572 return (undef,undef) unless -r
$f;
1575 if (my $c = revdb_get
($f, $r)) {
1580 return (undef, undef);
1584 $GIT_SVN ||= $ENV{GIT_SVN_ID
} || 'git-svn';
1585 $GIT_SVN_DIR = "$GIT_DIR/svn/$GIT_SVN";
1586 $REVDB = "$GIT_SVN_DIR/.rev_db";
1587 $GIT_SVN_INDEX = "$GIT_SVN_DIR/index";
1589 $SVN_WC = "$GIT_SVN_DIR/tree";
1593 # convert GetOpt::Long specs for use by git-repo-config
1594 sub read_repo_config
{
1595 return unless -d
$GIT_DIR;
1597 foreach my $o (keys %$opts) {
1598 my $v = $opts->{$o};
1599 my ($key) = ($o =~ /^([a-z\-]+)/);
1601 my $arg = 'git-repo-config';
1602 $arg .= ' --int' if ($o =~ /[:=]i$/);
1603 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
1604 if (ref $v eq 'ARRAY') {
1605 chomp(my @tmp = `$arg --get-all svn.$key`);
1608 chomp(my $tmp = `$arg --get svn.$key`);
1609 if ($tmp && !($arg =~ / --bool / && $tmp eq 'false')) {
1616 sub set_default_vals
{
1617 if (defined $_repack) {
1618 $_repack = 1000 if ($_repack <= 0);
1619 $_repack_nr = $_repack;
1620 $_repack_flags ||= '-d';
1625 my $gr_file = shift;
1626 my ($grafts, $comments) = ({}, {});
1627 if (open my $fh, '<', $gr_file) {
1630 if (/^($sha1)\s+/) {
1633 @
{$comments->{$c}} = @tmp;
1636 foreach my $p (split /\s+/, $_) {
1637 $grafts->{$c}->{$p} = 1;
1643 close $fh or croak
$!;
1644 @
{$comments->{'END'}} = @tmp if @tmp;
1646 return ($grafts, $comments);
1650 my ($grafts, $comments, $gr_file) = @_;
1652 open my $fh, '>', $gr_file or croak
$!;
1653 foreach my $c (sort keys %$grafts) {
1654 if ($comments->{$c}) {
1655 print $fh $_ foreach @
{$comments->{$c}};
1657 my $p = $grafts->{$c};
1658 my %x; # real parents
1659 delete $p->{$c}; # commits are not self-reproducing...
1660 my $ch = command_output_pipe
(qw
/cat-file commit/, $c);
1662 if (/^parent ($sha1)/) {
1663 $x{$1} = $p->{$1} = 1;
1668 eval { command_close_pipe
($ch) }; # breaking the pipe
1670 # if real parents are the only ones in the grafts, drop it
1671 next if join(' ',sort keys %$p) eq join(' ',sort keys %x);
1675 @ip = @jp = keys %$p;
1676 foreach my $i (@ip) {
1677 next if $del{$i} || $p->{$i} == 2;
1678 foreach my $j (@jp) {
1679 next if $i eq $j || $del{$j} || $p->{$j} == 2;
1680 $mb = eval { command
('merge-base', $i, $j) };
1687 } elsif ($mb eq $i) {
1694 # if real parents are the only ones in the grafts, drop it
1695 next if join(' ',sort keys %$p) eq join(' ',sort keys %x);
1697 print $fh $c, ' ', join(' ', sort keys %$p),"\n";
1699 if ($comments->{'END'}) {
1700 print $fh $_ foreach @
{$comments->{'END'}};
1702 close $fh or croak
$!;
1705 sub read_url_paths_all
{
1706 my ($l_map, $pfx, $p) = @_;
1709 if (-r
"$_/info/url") {
1710 $pfx .= '/' if $pfx && $pfx !~ m
!/$!;
1711 my $id = $pfx . basename
$_;
1712 my $url = file_to_s
("$_/info/url");
1713 my ($u, $p) = repo_path_split
($url);
1714 $l_map->{$u}->{$p} = $id;
1721 $x =~ s!^\Q$GIT_DIR\E/svn/!!o;
1722 read_url_paths_all
($l_map, $x, $_);
1726 # this one only gets ids that have been imported, not new ones
1727 sub read_url_paths
{
1729 git_svn_each
(sub { my $x = shift;
1730 my $url = file_to_s
("$GIT_DIR/svn/$x/info/url");
1731 my ($u, $p) = repo_path_split
($url);
1732 $l_map->{$u}->{$p} = $x;
1737 sub extract_metadata
{
1738 my $id = shift or return (undef, undef, undef);
1739 my ($url, $rev, $uuid) = ($id =~ /^git
-svn
-id
:\s
(\S
+?
)\@
(\d
+)
1741 if (!defined $rev || !$uuid || !$url) {
1742 # some of the original repositories I made had
1743 # identifiers like this:
1744 ($rev, $uuid) = ($id =~/^git-svn-id:\s(\d+)\@([a-f\d\-]+)/);
1746 return ($url, $rev, $uuid);
1750 return extract_metadata
((grep(/^git-svn-id: /,
1751 command
(qw
/cat-file commit/, shift)))[-1]);
1754 sub get_commit_time
{
1756 my $fh = command_output_pipe
(qw
/rev-list --pretty=raw -n1/, $cmt);
1758 /^committer\s(?:.+) (\d+) ([\-\+]?\d+)$/ or next;
1759 my ($s, $tz) = ($1, $2);
1760 if ($tz =~ s/^\+//) {
1761 $s += tz_to_s_offset
($tz);
1762 } elsif ($tz =~ s/^\-//) {
1763 $s -= tz_to_s_offset
($tz);
1765 eval { command_close_pipe
($fh) };
1768 die "Can't get commit time for commit: $cmt\n";
1771 sub tz_to_s_offset
{
1774 return ($1 * 60) + ($tz * 3600);
1777 # adapted from pager.c
1779 $_pager ||= $ENV{GIT_PAGER
} || $ENV{PAGER
};
1780 if (!defined $_pager) {
1782 } elsif (length $_pager == 0 || $_pager eq 'cat') {
1788 return unless -t
*STDOUT
;
1789 pipe my $rfd, my $wfd or return;
1790 defined(my $pid = fork) or croak
$!;
1792 open STDOUT
, '>&', $wfd or croak
$!;
1795 open STDIN
, '<&', $rfd or croak
$!;
1796 $ENV{LESS
} ||= 'FRSX';
1797 exec $_pager or croak
"Can't run pager: $! ($_pager)\n";
1800 sub get_author_info
{
1801 my ($dest, $author, $t, $tz) = @_;
1802 $author =~ s/(?:^\s*|\s*$)//g;
1803 $dest->{a_raw
} = $author;
1806 $_a = $rusers{$author} || undef;
1809 ($_a) = ($author =~ /<([^>]+)\@[^>]+>$/);
1814 # Date::Parse isn't in the standard Perl distro :(
1815 if ($tz =~ s/^\+//) {
1816 $t += tz_to_s_offset
($tz);
1817 } elsif ($tz =~ s/^\-//) {
1818 $t -= tz_to_s_offset
($tz);
1820 $dest->{t_utc
} = $t;
1823 sub process_commit
{
1824 my ($c, $r_min, $r_max, $defer) = @_;
1825 if (defined $r_min && defined $r_max) {
1826 if ($r_min == $c->{r
} && $r_min == $r_max) {
1830 return 1 if $r_min == $r_max;
1831 if ($r_min < $r_max) {
1832 # we need to reverse the print order
1833 return 0 if (defined $_limit && --$_limit < 0);
1837 if ($r_min != $r_max) {
1838 return 1 if ($r_min < $c->{r
});
1839 return 1 if ($r_max > $c->{r
});
1842 return 0 if (defined $_limit && --$_limit < 0);
1851 if (my $l = $c->{l
}) {
1852 while ($l->[0] =~ /^\s*$/) { shift @
$l }
1855 $_l_fmt ||= 'A' . length($c->{r
});
1856 print 'r',pack($_l_fmt, $c->{r
}),' | ';
1857 print "$c->{c} | " if $_show_commit;
1860 show_commit_normal
($c);
1864 sub show_commit_changed_paths
{
1866 return unless $c->{changed
};
1867 print "Changed paths:\n", @
{$c->{changed
}};
1870 sub show_commit_normal
{
1872 print '-' x72
, "\nr$c->{r} | ";
1873 print "$c->{c} | " if $_show_commit;
1874 print "$c->{a} | ", strftime
("%Y-%m-%d %H:%M:%S %z (%a, %d %b %Y)",
1875 localtime($c->{t_utc
})), ' | ';
1878 if (my $l = $c->{l
}) {
1879 while ($l->[$#$l] eq "\n" && $#$l > 0
1880 && $l->[($#$l - 1)] eq "\n") {
1883 $nr_line = scalar @
$l;
1885 print "1 line\n\n\n";
1887 if ($nr_line == 1) {
1888 $nr_line = '1 line';
1890 $nr_line .= ' lines';
1892 print $nr_line, "\n";
1893 show_commit_changed_paths
($c);
1895 print $_ foreach @
$l;
1899 show_commit_changed_paths
($c);
1903 foreach my $x (qw
/raw diff/) {
1906 print $_ foreach @
{$c->{$x}}
1911 sub _simple_prompt
{
1912 my ($cred, $realm, $default_username, $may_save, $pool) = @_;
1913 $may_save = undef if $_no_auth_cache;
1914 $default_username = $_username if defined $_username;
1915 if (defined $default_username && length $default_username) {
1916 if (defined $realm && length $realm) {
1917 print "Authentication realm: $realm\n";
1919 $cred->username($default_username);
1921 _username_prompt
($cred, $realm, $may_save, $pool);
1923 $cred->password(_read_password
("Password for '" .
1924 $cred->username . "': ", $realm));
1925 $cred->may_save($may_save);
1926 $SVN::_Core
::SVN_NO_ERROR
;
1929 sub _ssl_server_trust_prompt
{
1930 my ($cred, $realm, $failures, $cert_info, $may_save, $pool) = @_;
1931 $may_save = undef if $_no_auth_cache;
1932 print "Error validating server certificate for '$realm':\n";
1933 if ($failures & $SVN::Auth
::SSL
::UNKNOWNCA
) {
1934 print " - The certificate is not issued by a trusted ",
1935 "authority. Use the\n",
1936 " fingerprint to validate the certificate manually!\n";
1938 if ($failures & $SVN::Auth
::SSL
::CNMISMATCH
) {
1939 print " - The certificate hostname does not match.\n";
1941 if ($failures & $SVN::Auth
::SSL
::NOTYETVALID
) {
1942 print " - The certificate is not yet valid.\n";
1944 if ($failures & $SVN::Auth
::SSL
::EXPIRED
) {
1945 print " - The certificate has expired.\n";
1947 if ($failures & $SVN::Auth
::SSL
::OTHER
) {
1948 print " - The certificate has an unknown error.\n";
1950 printf( "Certificate information:\n".
1951 " - Hostname: %s\n".
1952 " - Valid: from %s until %s\n".
1954 " - Fingerprint: %s\n",
1955 map $cert_info->$_, qw(hostname valid_from valid_until
1956 issuer_dname fingerprint) );
1960 "(R)eject, accept (t)emporarily or accept (p)ermanently? " :
1961 "(R)eject or accept (t)emporarily? ";
1962 $choice = lc(substr(<STDIN
> || 'R', 0, 1));
1963 if ($choice =~ /^t$/i) {
1964 $cred->may_save(undef);
1965 } elsif ($choice =~ /^r$/i) {
1967 } elsif ($may_save && $choice =~ /^p$/i) {
1968 $cred->may_save($may_save);
1972 $cred->accepted_failures($failures);
1973 $SVN::_Core
::SVN_NO_ERROR
;
1976 sub _ssl_client_cert_prompt
{
1977 my ($cred, $realm, $may_save, $pool) = @_;
1978 $may_save = undef if $_no_auth_cache;
1979 print "Client certificate filename: ";
1980 chomp(my $filename = <STDIN
>);
1981 $cred->cert_file($filename);
1982 $cred->may_save($may_save);
1983 $SVN::_Core
::SVN_NO_ERROR
;
1986 sub _ssl_client_cert_pw_prompt
{
1987 my ($cred, $realm, $may_save, $pool) = @_;
1988 $may_save = undef if $_no_auth_cache;
1989 $cred->password(_read_password
("Password: ", $realm));
1990 $cred->may_save($may_save);
1991 $SVN::_Core
::SVN_NO_ERROR
;
1994 sub _username_prompt
{
1995 my ($cred, $realm, $may_save, $pool) = @_;
1996 $may_save = undef if $_no_auth_cache;
1997 if (defined $realm && length $realm) {
1998 print "Authentication realm: $realm\n";
2001 if (defined $_username) {
2002 $username = $_username;
2005 chomp($username = <STDIN
>);
2007 $cred->username($username);
2008 $cred->may_save($may_save);
2009 $SVN::_Core
::SVN_NO_ERROR
;
2012 sub _read_password
{
2013 my ($prompt, $realm) = @_;
2015 require Term
::ReadKey
;
2016 Term
::ReadKey
::ReadMode
('noecho');
2018 while (defined(my $key = Term
::ReadKey
::ReadKey
(0))) {
2019 last if $key =~ /[\012\015]/; # \n\r
2022 Term
::ReadKey
::ReadMode
('restore');
2027 sub libsvn_connect
{
2029 SVN
::_Core
::svn_config_ensure
($_config_dir, undef);
2030 my ($baton, $callbacks) = SVN
::Core
::auth_open_helper
([
2031 SVN
::Client
::get_simple_provider
(),
2032 SVN
::Client
::get_ssl_server_trust_file_provider
(),
2033 SVN
::Client
::get_simple_prompt_provider
(
2034 \
&_simple_prompt
, 2),
2035 SVN
::Client
::get_ssl_client_cert_prompt_provider
(
2036 \
&_ssl_client_cert_prompt
, 2),
2037 SVN
::Client
::get_ssl_client_cert_pw_prompt_provider
(
2038 \
&_ssl_client_cert_pw_prompt
, 2),
2039 SVN
::Client
::get_username_provider
(),
2040 SVN
::Client
::get_ssl_server_trust_prompt_provider
(
2041 \
&_ssl_server_trust_prompt
),
2042 SVN
::Client
::get_username_prompt_provider
(
2043 \
&_username_prompt
, 2),
2045 my $config = SVN
::Core
::config_get_config
($_config_dir);
2046 my $ra = SVN
::Ra
->new(url
=> $url, auth
=> $baton,
2048 pool
=> SVN
::Pool
->new,
2049 auth_provider_callbacks
=> $callbacks);
2050 $ra->{svn_path
} = $url;
2051 $ra->{repos_root
} = $ra->get_repos_root;
2052 $ra->{svn_path
} =~ s
#^\Q$ra->{repos_root}\E/*##;
2053 push @repo_path_split_cache, qr/^(\Q$ra->{repos_root}\E)/;
2057 sub libsvn_can_do_switch
{
2058 unless (defined $_svn_can_do_switch) {
2059 my $pool = SVN
::Pool
->new;
2061 $SVN->do_switch(1, '', 0, $SVN->{url
},
2062 SVN
::Delta
::Editor
->new, $pool);
2065 $_svn_can_do_switch = 0;
2067 $rep->abort_report($pool);
2068 $_svn_can_do_switch = 1;
2072 $_svn_can_do_switch;
2077 SVN
::Ra
->new(map { $_ => $ra->{$_} } qw
/config url
2078 auth auth_provider_callbacks repos_root svn_path
/);
2083 $f =~ s
#([^a-zA-Z0-9\*!\:_\./\-])#uc sprintf("%%%02x",ord($1))#eg;
2090 $f =~ s/%([A-F0-9]{2})/chr hex($1)/ge;
2094 sub libsvn_log_entry
{
2095 my ($rev, $author, $date, $msg, $parents, $untracked) = @_;
2096 my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d
{4})\
-(\d\d
)\
-(\d\d
)T
2097 (\d\d
)\
:(\d\d
)\
:(\d\d
).\d
+Z
$/x
)
2098 or die "Unable to parse date: $date\n";
2099 if (defined $author && length $author > 0 &&
2100 defined $_authors && ! defined $users{$author}) {
2101 die "Author: $author not defined in $_authors file\n";
2103 $msg = '' if ($rev == 0 && !defined $msg);
2105 open my $un, '>>', "$GIT_SVN_DIR/unhandled.log" or croak
$!;
2107 print $un "r$rev\n" or croak
$!;
2108 $h = $untracked->{empty
};
2109 foreach (sort keys %$h) {
2110 my $act = $h->{$_} ?
'+empty_dir' : '-empty_dir';
2111 print $un " $act: ", uri_encode
($_), "\n" or croak
$!;
2112 warn "W: $act: $_\n";
2114 foreach my $t (qw
/dir_prop file_prop/) {
2115 $h = $untracked->{$t} or next;
2116 foreach my $path (sort keys %$h) {
2117 my $ppath = $path eq '' ?
'.' : $path;
2118 foreach my $prop (sort keys %{$h->{$path}}) {
2119 next if $SKIP{$prop};
2120 my $v = $h->{$path}->{$prop};
2123 uri_encode
($ppath), ' ',
2124 uri_encode
($prop), ' ',
2125 uri_encode
($v), "\n"
2129 uri_encode
($ppath), ' ',
2130 uri_encode
($prop), "\n"
2136 foreach my $t (qw
/absent_file absent_directory/) {
2137 $h = $untracked->{$t} or next;
2138 foreach my $parent (sort keys %$h) {
2139 foreach my $path (sort @
{$h->{$parent}}) {
2141 uri_encode
("$parent/$path"), "\n"
2143 warn "W: $t: $parent/$path ",
2144 "Insufficient permissions?\n";
2149 # revprops (make this optional? it's an extra network trip...)
2150 my $pool = SVN
::Pool
->new;
2151 my $rp = $SVN->rev_proplist($rev, $pool);
2152 foreach (sort keys %$rp) {
2153 next if /^svn:(?:author|date|log)$/;
2154 print $un " rev_prop: ", uri_encode
($_), ' ',
2155 uri_encode
($rp->{$_}), "\n";
2158 close $un or croak
$!;
2160 { revision
=> $rev, date
=> "+0000 $Y-$m-$d $H:$M:$S",
2161 author
=> $author, msg
=> $msg."\n", parents
=> $parents || [],
2166 my ($gui, $last_commit, $f, $q) = @_;
2167 # remove entire directories.
2168 if (command
('ls-tree',$last_commit,'--',$f) =~ /^040000 tree/) {
2169 my ($ls, $ctx) = command_output_pipe
(qw
/ls
-tree
2171 $last_commit,'--',$f);
2174 print $gui '0 ',0 x
40,"\t",$_ or croak
$!;
2175 print "\tD\t$_\n" unless $q;
2177 print "\tD\t$f/\n" unless $q;
2178 command_close_pipe
($ls, $ctx);
2179 return $SVN::Node
::dir
;
2181 print $gui '0 ',0 x
40,"\t",$f,"\0" or croak
$!;
2182 print "\tD\t$f\n" unless $q;
2183 return $SVN::Node
::file
;
2188 my ($last_commit, $paths, $rev, $author, $date, $msg) = @_;
2189 my $pool = SVN
::Pool
->new;
2190 my $ed = SVN
::Git
::Fetcher
->new({ c
=> $last_commit, q
=> $_q });
2191 my $reporter = $SVN->do_update($rev, '', 1, $ed, $pool);
2192 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef) : ();
2193 my (undef, $last_rev, undef) = cmt_metadata
($last_commit);
2194 $reporter->set_path('', $last_rev, 0, @lock, $pool);
2195 $reporter->finish_report($pool);
2197 unless ($ed->{git_commit_ok
}) {
2198 die "SVN connection failed somewhere...\n";
2200 libsvn_log_entry
($rev, $author, $date, $msg, [$last_commit], $ed);
2203 sub svn_grab_base_rev
{
2204 my $c = eval { command_oneline
([qw
/rev-parse --verify/,
2205 "refs/remotes/$GIT_SVN^0"],
2207 if (defined $c && length $c) {
2208 my ($url, $rev, $uuid) = cmt_metadata
($c);
2209 return ($rev, $c) if defined $rev;
2211 if ($_no_metadata) {
2212 my $offset = -41; # from tail
2214 open my $fh, '<', $REVDB or
2215 die "--no-metadata specified and $REVDB not readable\n";
2216 seek $fh, $offset, 2;
2218 defined $rl or return (undef, undef);
2220 while ($c ne $rl && tell $fh != 0) {
2222 seek $fh, $offset, 2;
2224 defined $rl or return (undef, undef);
2228 croak
$! if ($rev < -1);
2229 $rev = ($rev - 41) / 41;
2230 close $fh or croak
$!;
2233 return (undef, undef);
2236 sub libsvn_parse_revision
{
2238 my $head = $SVN->get_latest_revnum();
2239 if (!defined $_revision || $_revision eq 'BASE:HEAD') {
2240 return ($base + 1, $head) if (defined $base);
2243 return ($1, $2) if ($_revision =~ /^(\d+):(\d+)$/);
2244 return ($_revision, $_revision) if ($_revision =~ /^\d+$/);
2245 if ($_revision =~ /^BASE:(\d+)$/) {
2246 return ($base + 1, $1) if (defined $base);
2249 return ($1, $head) if ($_revision =~ /^(\d+):HEAD$/);
2250 die "revision argument: $_revision not understood by git-svn\n",
2251 "Try using the command-line svn client instead\n";
2254 sub libsvn_traverse_ignore
{
2255 my ($fh, $path, $r) = @_;
2257 my $pool = SVN
::Pool
->new;
2258 my ($dirent, undef, $props) = $SVN->get_dir($path, $r, $pool);
2260 $p =~ s
#^\Q$SVN->{svn_path}\E/##;
2261 print $fh length $p ?
"\n# $p\n" : "\n# /\n";
2262 if (my $s = $props->{'svn:ignore'}) {
2263 $s =~ s/[\r\n]+/\n/g;
2265 if (length $p == 0) {
2269 $s =~ s
#\n#\n/$p/#g;
2270 print $fh "/$p/$s\n";
2273 foreach (sort keys %$dirent) {
2274 next if $dirent->{$_}->kind != $SVN::Node
::dir
;
2275 libsvn_traverse_ignore
($fh, "$path/$_", $r);
2281 my ($path, $r0, $r1) = @_;
2282 return 1 if $r0 == $r1;
2284 # should be OK to use Pool here (r1 - r0) should be small
2285 my $pool = SVN
::Pool
->new;
2286 libsvn_get_log
($SVN, [$path], $r0, $r1,
2287 0, 0, 1, sub {$nr++}, $pool);
2289 return 0 if ($nr > 1);
2293 sub libsvn_find_parent_branch
{
2294 my ($paths, $rev, $author, $date, $msg) = @_;
2295 my $svn_path = '/'.$SVN->{svn_path
};
2297 # look for a parent from another branch:
2298 my $i = $paths->{$svn_path} or return;
2299 my $branch_from = $i->copyfrom_path or return;
2300 my $r = $i->copyfrom_rev;
2301 print STDERR
"Found possible branch point: ",
2302 "$branch_from => $svn_path, $r\n";
2303 $branch_from =~ s
#^/##;
2305 read_url_paths_all
($l_map, '', "$GIT_DIR/svn");
2306 my $url = $SVN->{repos_root
};
2307 defined $l_map->{$url} or return;
2308 my $id = $l_map->{$url}->{$branch_from};
2309 if (!defined $id && $_follow_parent) {
2310 print STDERR
"Following parent: $branch_from\@$r\n";
2311 # auto create a new branch and follow it
2312 $id = basename
($branch_from);
2313 $id .= '@'.$r if -r
"$GIT_DIR/svn/$id";
2314 while (-r
"$GIT_DIR/svn/$id") {
2315 # just grow a tail if we're not unique enough :x
2319 return unless defined $id;
2321 my ($r0, $parent) = find_rev_before
($r,$id,1);
2322 if ($_follow_parent && (!defined $r0 || !defined $parent)) {
2323 defined(my $pid = fork) or croak
$!;
2325 $GIT_SVN = $ENV{GIT_SVN_ID
} = $id;
2327 $SVN_URL = "$url/$branch_from";
2330 # we can't assume SVN_URL exists at r+1:
2331 $_revision = "0:$r";
2337 ($r0, $parent) = find_rev_before
($r,$id,1);
2339 return unless (defined $r0 && defined $parent);
2340 if (revisions_eq
($branch_from, $r0, $r)) {
2341 unlink $GIT_SVN_INDEX;
2342 print STDERR
"Found branch parent: ($GIT_SVN) $parent\n";
2343 command_noisy
('read-tree', $parent);
2344 unless (libsvn_can_do_switch
()) {
2345 return _libsvn_new_tree
($paths, $rev, $author, $date,
2348 # do_switch works with svn/trunk >= r22312, but that is not
2349 # included with SVN 1.4.2 (the latest version at the moment),
2350 # so we can't rely on it.
2351 my $ra = libsvn_connect
("$url/$branch_from");
2352 my $ed = SVN
::Git
::Fetcher
->new({c
=> $parent, q
=> $_q });
2353 my $pool = SVN
::Pool
->new;
2354 my $reporter = $ra->do_switch($rev, '', 1, $SVN->{url
},
2356 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef) : ();
2357 $reporter->set_path('', $r0, 0, @lock, $pool);
2358 $reporter->finish_report($pool);
2360 unless ($ed->{git_commit_ok
}) {
2361 die "SVN connection failed somewhere...\n";
2363 return libsvn_log_entry
($rev, $author, $date, $msg, [$parent]);
2365 print STDERR
"Nope, branch point not imported or unknown\n";
2369 sub libsvn_get_log
{
2370 my ($ra, @args) = @_;
2371 $args[4]-- if $args[4] && ! $_follow_parent;
2372 if ($SVN::Core
::VERSION
le '1.2.0') {
2373 splice(@args, 3, 1);
2375 $ra->get_log(@args);
2378 sub libsvn_new_tree
{
2379 if (my $log_entry = libsvn_find_parent_branch
(@_)) {
2382 my ($paths, $rev, $author, $date, $msg) = @_; # $pool is last
2383 _libsvn_new_tree
($paths, $rev, $author, $date, $msg, []);
2386 sub _libsvn_new_tree
{
2387 my ($paths, $rev, $author, $date, $msg, $parents) = @_;
2388 my $pool = SVN
::Pool
->new;
2389 my $ed = SVN
::Git
::Fetcher
->new({q
=> $_q});
2390 my $reporter = $SVN->do_update($rev, '', 1, $ed, $pool);
2391 my @lock = $SVN::Core
::VERSION
ge '1.2.0' ?
(undef) : ();
2392 $reporter->set_path('', $rev, 1, @lock, $pool);
2393 $reporter->finish_report($pool);
2395 unless ($ed->{git_commit_ok
}) {
2396 die "SVN connection failed somewhere...\n";
2398 libsvn_log_entry
($rev, $author, $date, $msg, $parents, $ed);
2401 sub find_graft_path_commit
{
2402 my ($tree_paths, $p1, $r1) = @_;
2403 foreach my $x (keys %$tree_paths) {
2404 next unless ($p1 =~ /^\Q$x\E/);
2405 my $i = $tree_paths->{$x};
2406 my ($r0, $parent) = find_rev_before
($r1,$i,1);
2407 return $parent if (defined $r0 && $r0 == $r1);
2408 print STDERR
"r$r1 of $i not imported\n";
2414 sub find_graft_path_parents
{
2415 my ($grafts, $tree_paths, $c, $p0, $r0) = @_;
2416 foreach my $x (keys %$tree_paths) {
2417 next unless ($p0 =~ /^\Q$x\E/);
2418 my $i = $tree_paths->{$x};
2419 my ($r, $parent) = find_rev_before
($r0, $i, 1);
2420 if (defined $r && defined $parent && revisions_eq
($x,$r,$r0)) {
2421 my ($url_b, undef, $uuid_b) = cmt_metadata
($c);
2422 my ($url_a, undef, $uuid_a) = cmt_metadata
($parent);
2423 next if ($url_a && $url_b && $url_a eq $url_b &&
2424 $uuid_b eq $uuid_a);
2425 $grafts->{$c}->{$parent} = 1;
2430 sub libsvn_graft_file_copies
{
2431 my ($grafts, $tree_paths, $path, $paths, $rev) = @_;
2432 foreach (keys %$paths) {
2433 my $i = $paths->{$_};
2434 my ($m, $p0, $r0) = ($i->action, $i->copyfrom_path,
2436 next unless (defined $p0 && defined $r0);
2441 my $c = find_graft_path_commit
($tree_paths, $p1, $rev);
2443 find_graft_path_parents
($grafts, $tree_paths, $c, $p0, $r0);
2448 my $old = $ENV{GIT_INDEX_FILE
};
2449 $ENV{GIT_INDEX_FILE
} = shift;
2456 $ENV{GIT_INDEX_FILE
} = $old;
2458 delete $ENV{GIT_INDEX_FILE
};
2462 sub libsvn_commit_cb
{
2463 my ($rev, $date, $committer, $c, $msg, $r_last, $cmt_last) = @_;
2464 if ($_optimize_commits && $rev == ($r_last + 1)) {
2465 my $log = libsvn_log_entry
($rev,$committer,$date,$msg);
2466 $log->{tree
} = get_tree_from_treeish
($c);
2467 my $cmt = git_commit
($log, $cmt_last, $c);
2468 my @diff = command
('diff-tree', $cmt, $c);
2470 print STDERR
"Trees differ: $cmt $c\n",
2471 join('',@diff),"\n";
2479 sub libsvn_ls_fullurl
{
2480 my $fullurl = shift;
2481 my $ra = libsvn_connect
($fullurl);
2483 my $pool = SVN
::Pool
->new;
2484 my $r = defined $_revision ?
$_revision : $ra->get_latest_revnum;
2485 my ($dirent, undef, undef) = $ra->get_dir('', $r, $pool);
2486 foreach my $d (sort keys %$dirent) {
2487 if ($dirent->{$d}->kind == $SVN::Node
::dir
) {
2488 push @ret, "$d/"; # add '/' for compat with cli svn
2496 sub libsvn_skip_unknown_revs
{
2498 my $errno = $err->apr_err();
2499 # Maybe the branch we're tracking didn't
2500 # exist when the repo started, so it's
2501 # not an error if it doesn't, just continue
2503 # Wonderfully consistent library, eh?
2504 # 160013 - svn:// and file://
2505 # 175002 - http(s)://
2506 # 175007 - http(s):// (this repo required authorization, too...)
2507 # More codes may be discovered later...
2508 if ($errno == 175007 || $errno == 175002 || $errno == 160013) {
2511 croak
"Error from SVN, ($errno): ", $err->expanded_message,"\n";
2514 # Tie::File seems to be prone to offset errors if revisions get sparse,
2515 # it's not that fast, either. Tie::File is also not in Perl 5.6. So
2516 # one of my favorite modules is out :< Next up would be one of the DBM
2517 # modules, but I'm not sure which is most portable... So I'll just
2518 # go with something that's plain-text, but still capable of
2519 # being randomly accessed. So here's my ultra-simple fixed-width
2520 # database. All records are 40 characters + "\n", so it's easy to seek
2521 # to a revision: (41 * rev) is the byte offset.
2522 # A record of 40 0s denotes an empty revision.
2523 # And yes, it's still pretty fast (faster than Tie::File).
2525 my ($file, $rev, $commit) = @_;
2526 length $commit == 40 or croak
"arg3 must be a full SHA1 hexsum\n";
2527 open my $fh, '+<', $file or croak
$!;
2528 my $offset = $rev * 41;
2529 # assume that append is the common case:
2530 seek $fh, 0, 2 or croak
$!;
2532 if ($pos < $offset) {
2533 print $fh (('0' x
40),"\n") x
(($offset - $pos) / 41);
2535 seek $fh, $offset, 0 or croak
$!;
2536 print $fh $commit,"\n";
2537 close $fh or croak
$!;
2541 my ($file, $rev) = @_;
2543 my $offset = $rev * 41;
2544 open my $fh, '<', $file or croak
$!;
2545 seek $fh, $offset, 0;
2546 if (tell $fh == $offset) {
2547 $ret = readline $fh;
2550 $ret = undef if ($ret =~ /^0{40}$/);
2553 close $fh or croak
$!;
2557 sub copy_remote_ref
{
2558 my $origin = $_cp_remote ?
$_cp_remote : 'origin';
2559 my $ref = "refs/remotes/$GIT_SVN";
2560 if (command
('ls-remote', $origin, $ref)) {
2561 command_noisy
('fetch', $origin, "$ref:$ref");
2562 } elsif ($_cp_remote && !$_upgrade) {
2563 die "Unable to find remote reference: ",
2564 "refs/remotes/$GIT_SVN on $origin\n";
2569 my $kill_stupid_warnings = $SVN::Node
::none
.$SVN::Node
::file
.
2570 $SVN::Node
::dir
.$SVN::Node
::unknown
.
2571 $SVN::Node
::none
.$SVN::Node
::file
.
2572 $SVN::Node
::dir
.$SVN::Node
::unknown
.
2573 $SVN::Auth
::SSL
::CNMISMATCH
.
2574 $SVN::Auth
::SSL
::NOTYETVALID
.
2575 $SVN::Auth
::SSL
::EXPIRED
.
2576 $SVN::Auth
::SSL
::UNKNOWNCA
.
2577 $SVN::Auth
::SSL
::OTHER
;
2580 package SVN
::Git
::Fetcher
;
2586 use Git qw
/command command_oneline command_noisy
2587 command_output_pipe command_input_pipe command_close_pipe
/;
2589 # file baton members: path, mode_a, mode_b, pool, fh, blob, base
2591 my ($class, $git_svn) = @_;
2592 my $self = SVN
::Delta
::Editor
->new;
2593 bless $self, $class;
2594 $self->{c
} = $git_svn->{c
} if exists $git_svn->{c
};
2595 $self->{q
} = $git_svn->{q
};
2596 $self->{empty
} = {};
2597 $self->{dir_prop
} = {};
2598 $self->{file_prop
} = {};
2599 $self->{absent_dir
} = {};
2600 $self->{absent_file
} = {};
2601 ($self->{gui
}, $self->{ctx
}) = command_input_pipe
(
2602 qw
/update-index -z --index-info/);
2603 require Digest
::MD5
;
2611 sub open_directory
{
2612 my ($self, $path, $pb, $rev) = @_;
2617 my ($self, $path, $rev, $pb) = @_;
2618 my $t = process_rm
($self->{gui
}, $self->{c
}, $path, $self->{q
});
2619 $self->{empty
}->{$path} = 0 if $t == $SVN::Node
::dir
;
2624 my ($self, $path, $pb, $rev) = @_;
2625 my ($mode, $blob) = (command
('ls-tree', $self->{c
}, '--',$path)
2626 =~ /^(\d{6}) blob ([a-f\d]{40})\t/);
2627 unless (defined $mode && defined $blob) {
2628 die "$path was not found in commit $self->{c} (r$rev)\n";
2630 { path
=> $path, mode_a
=> $mode, mode_b
=> $mode, blob
=> $blob,
2631 pool
=> SVN
::Pool
->new, action
=> 'M' };
2635 my ($self, $path, $pb, $cp_path, $cp_rev) = @_;
2636 my ($dir, $file) = ($path =~ m
#^(.*?)/?([^/]+)$#);
2637 delete $self->{empty
}->{$dir};
2638 { path
=> $path, mode_a
=> 100644, mode_b
=> 100644,
2639 pool
=> SVN
::Pool
->new, action
=> 'A' };
2643 my ($self, $path, $cp_path, $cp_rev) = @_;
2644 my ($dir, $file) = ($path =~ m
#^(.*?)/?([^/]+)$#);
2645 delete $self->{empty
}->{$dir};
2646 $self->{empty
}->{$path} = 1;
2650 sub change_dir_prop
{
2651 my ($self, $db, $prop, $value) = @_;
2652 $self->{dir_prop
}->{$db->{path
}} ||= {};
2653 $self->{dir_prop
}->{$db->{path
}}->{$prop} = $value;
2657 sub absent_directory
{
2658 my ($self, $path, $pb) = @_;
2659 $self->{absent_dir
}->{$pb->{path
}} ||= [];
2660 push @
{$self->{absent_dir
}->{$pb->{path
}}}, $path;
2665 my ($self, $path, $pb) = @_;
2666 $self->{absent_file
}->{$pb->{path
}} ||= [];
2667 push @
{$self->{absent_file
}->{$pb->{path
}}}, $path;
2671 sub change_file_prop
{
2672 my ($self, $fb, $prop, $value) = @_;
2673 if ($prop eq 'svn:executable') {
2674 if ($fb->{mode_b
} != 120000) {
2675 $fb->{mode_b
} = defined $value ?
100755 : 100644;
2677 } elsif ($prop eq 'svn:special') {
2678 $fb->{mode_b
} = defined $value ?
120000 : 100644;
2680 $self->{file_prop
}->{$fb->{path
}} ||= {};
2681 $self->{file_prop
}->{$fb->{path
}}->{$prop} = $value;
2686 sub apply_textdelta
{
2687 my ($self, $fb, $exp) = @_;
2688 my $fh = IO
::File
->new_tmpfile;
2690 # $fh gets auto-closed() by SVN::TxDelta::apply(),
2691 # (but $base does not,) so dup() it for reading in close_file
2692 open my $dup, '<&', $fh or croak
$!;
2693 my $base = IO
::File
->new_tmpfile;
2694 $base->autoflush(1);
2696 defined (my $pid = fork) or croak
$!;
2698 open STDOUT
, '>&', $base or croak
$!;
2699 print STDOUT
'link ' if ($fb->{mode_a
} == 120000);
2700 exec qw
/git-cat-file blob/, $fb->{blob
} or croak
$!;
2706 seek $base, 0, 0 or croak
$!;
2707 my $md5 = Digest
::MD5
->new;
2708 $md5->addfile($base);
2709 my $got = $md5->hexdigest;
2710 die "Checksum mismatch: $fb->{path} $fb->{blob}\n",
2712 " got: $got\n" if ($got ne $exp);
2715 seek $base, 0, 0 or croak
$!;
2717 $fb->{base
} = $base;
2718 [ SVN
::TxDelta
::apply
($base, $fh, undef, $fb->{path
}, $fb->{pool
}) ];
2722 my ($self, $fb, $exp) = @_;
2724 my $path = $fb->{path
};
2725 if (my $fh = $fb->{fh
}) {
2726 seek($fh, 0, 0) or croak
$!;
2727 my $md5 = Digest
::MD5
->new;
2729 my $got = $md5->hexdigest;
2730 die "Checksum mismatch: $path\n",
2731 "expected: $exp\n got: $got\n" if ($got ne $exp);
2732 seek($fh, 0, 0) or croak
$!;
2733 if ($fb->{mode_b
} == 120000) {
2734 read($fh, my $buf, 5) == 5 or croak
$!;
2735 $buf eq 'link ' or die "$path has mode 120000",
2736 "but is not a link\n";
2738 defined(my $pid = open my $out,'-|') or die "Can't fork: $!\n";
2740 open STDIN
, '<&', $fh or croak
$!;
2741 exec qw
/git-hash-object -w --stdin/ or croak
$!;
2743 chomp($hash = do { local $/; <$out> });
2744 close $out or croak
$!;
2745 close $fh or croak
$!;
2746 $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n";
2747 close $fb->{base
} or croak
$!;
2749 $hash = $fb->{blob
} or die "no blob information\n";
2752 my $gui = $self->{gui
};
2753 print $gui "$fb->{mode_b} $hash\t$path\0" or croak
$!;
2754 print "\t$fb->{action}\t$path\n" if $fb->{action
} && ! $self->{q
};
2760 eval { command_close_pipe
($self->{gui
}, $self->{ctx
}) };
2761 $self->SUPER::abort_edit
(@_);
2766 command_close_pipe
($self->{gui
}, $self->{ctx
});
2767 $self->{git_commit_ok
} = 1;
2768 $self->SUPER::close_edit
(@_);
2771 package SVN
::Git
::Editor
;
2777 use Git qw
/command command_oneline command_noisy
2778 command_output_pipe command_input_pipe command_close_pipe
/;
2782 my $git_svn = shift;
2783 my $self = SVN
::Delta
::Editor
->new(@_);
2784 bless $self, $class;
2785 foreach (qw
/svn_path c r ra /) {
2786 die "$_ required!\n" unless (defined $git_svn->{$_});
2787 $self->{$_} = $git_svn->{$_};
2789 $self->{pool
} = SVN
::Pool
->new;
2790 $self->{bat
} = { '' => $self->open_root($self->{r
}, $self->{pool
}) };
2792 require Digest
::MD5
;
2797 return ($_[0] =~ m
#^(.*?)/?([^/]+)$#);
2801 (defined $_[1] && length $_[1]) ?
$_[1] : ''
2805 my ($self, $path) = @_;
2806 $self->{ra
}->{url
} . '/' . $self->repo_path($path);
2810 my ($self, $q) = @_;
2811 my $rm = $self->{rm
};
2812 delete $rm->{''}; # we never delete the url we're tracking
2815 foreach (keys %$rm) {
2816 my @d = split m
#/#, $_;
2820 $c .= '/' . shift @d;
2824 delete $rm->{$self->{svn_path
}};
2825 delete $rm->{''}; # we never delete the url we're tracking
2828 my ($fh, $ctx) = command_output_pipe
(
2829 qw
/ls-tree --name-only -r -z/, $self->{c
});
2833 my @dn = split m
#/#, $_;
2835 delete $rm->{join '/', @dn};
2838 eval { command_close_pipe
($fh) };
2842 command_close_pipe
($fh, $ctx);
2844 my ($r, $p, $bat) = ($self->{r
}, $self->{pool
}, $self->{bat
});
2845 foreach my $d (sort { $b =~ tr
#/#/# <=> $a =~ tr#/#/# } keys %$rm) {
2846 $self->close_directory($bat->{$d}, $p);
2847 my ($dn) = ($d =~ m
#^(.*?)/?(?:[^/]+)$#);
2848 print "\tD+\t/$d/\n" unless $q;
2849 $self->SUPER::delete_entry
($d, $r, $bat->{$dn}, $p);
2854 sub open_or_add_dir
{
2855 my ($self, $full_path, $baton) = @_;
2856 my $p = SVN
::Pool
->new;
2857 my $t = $self->{ra
}->check_path($full_path, $self->{r
}, $p);
2859 if ($t == $SVN::Node
::none
) {
2860 return $self->add_directory($full_path, $baton,
2861 undef, -1, $self->{pool
});
2862 } elsif ($t == $SVN::Node
::dir
) {
2863 return $self->open_directory($full_path, $baton,
2864 $self->{r
}, $self->{pool
});
2866 print STDERR
"$full_path already exists in repository at ",
2867 "r$self->{r} and it is not a directory (",
2868 ($t == $SVN::Node
::file ?
'file' : 'unknown'),"/$t)\n";
2873 my ($self, $path) = @_;
2874 my $bat = $self->{bat
};
2875 $path = $self->repo_path($path);
2876 return $bat->{''} unless (length $path);
2877 my @p = split m
#/+#, $path;
2879 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{''});
2882 $c .= '/' . shift @p;
2883 $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{$c0});
2889 my ($self, $m, $q) = @_;
2890 my ($dir, $file) = split_path
($m->{file_b
});
2891 my $pbat = $self->ensure_path($dir);
2892 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
2894 print "\tA\t$m->{file_b}\n" unless $q;
2895 $self->chg_file($fbat, $m);
2896 $self->close_file($fbat,undef,$self->{pool
});
2900 my ($self, $m, $q) = @_;
2901 my ($dir, $file) = split_path
($m->{file_b
});
2902 my $pbat = $self->ensure_path($dir);
2903 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
2904 $self->url_path($m->{file_a
}), $self->{r
});
2905 print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $q;
2906 $self->chg_file($fbat, $m);
2907 $self->close_file($fbat,undef,$self->{pool
});
2911 my ($self, $path, $pbat) = @_;
2912 my $rpath = $self->repo_path($path);
2913 my ($dir, $file) = split_path
($rpath);
2914 $self->{rm
}->{$dir} = 1;
2915 $self->SUPER::delete_entry
($rpath, $self->{r
}, $pbat, $self->{pool
});
2919 my ($self, $m, $q) = @_;
2920 my ($dir, $file) = split_path
($m->{file_b
});
2921 my $pbat = $self->ensure_path($dir);
2922 my $fbat = $self->add_file($self->repo_path($m->{file_b
}), $pbat,
2923 $self->url_path($m->{file_a
}), $self->{r
});
2924 print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $q;
2925 $self->chg_file($fbat, $m);
2926 $self->close_file($fbat,undef,$self->{pool
});
2928 ($dir, $file) = split_path
($m->{file_a
});
2929 $pbat = $self->ensure_path($dir);
2930 $self->delete_entry($m->{file_a
}, $pbat);
2934 my ($self, $m, $q) = @_;
2935 my ($dir, $file) = split_path
($m->{file_b
});
2936 my $pbat = $self->ensure_path($dir);
2937 my $fbat = $self->open_file($self->repo_path($m->{file_b
}),
2938 $pbat,$self->{r
},$self->{pool
});
2939 print "\t$m->{chg}\t$m->{file_b}\n" unless $q;
2940 $self->chg_file($fbat, $m);
2941 $self->close_file($fbat,undef,$self->{pool
});
2944 sub T
{ shift->M(@_) }
2946 sub change_file_prop
{
2947 my ($self, $fbat, $pname, $pval) = @_;
2948 $self->SUPER::change_file_prop
($fbat, $pname, $pval, $self->{pool
});
2952 my ($self, $fbat, $m) = @_;
2953 if ($m->{mode_b
} =~ /755$/ && $m->{mode_a
} !~ /755$/) {
2954 $self->change_file_prop($fbat,'svn:executable','*');
2955 } elsif ($m->{mode_b
} !~ /755$/ && $m->{mode_a
} =~ /755$/) {
2956 $self->change_file_prop($fbat,'svn:executable',undef);
2958 my $fh = IO
::File
->new_tmpfile or croak
$!;
2959 if ($m->{mode_b
} =~ /^120/) {
2960 print $fh 'link ' or croak
$!;
2961 $self->change_file_prop($fbat,'svn:special','*');
2962 } elsif ($m->{mode_a
} =~ /^120/ && $m->{mode_b
} !~ /^120/) {
2963 $self->change_file_prop($fbat,'svn:special',undef);
2965 defined(my $pid = fork) or croak
$!;
2967 open STDOUT
, '>&', $fh or croak
$!;
2968 exec qw
/git-cat-file blob/, $m->{sha1_b
} or croak
$!;
2972 $fh->flush == 0 or croak
$!;
2973 seek $fh, 0, 0 or croak
$!;
2975 my $md5 = Digest
::MD5
->new;
2976 $md5->addfile($fh) or croak
$!;
2977 seek $fh, 0, 0 or croak
$!;
2979 my $exp = $md5->hexdigest;
2980 my $pool = SVN
::Pool
->new;
2981 my $atd = $self->apply_textdelta($fbat, undef, $pool);
2982 my $got = SVN
::TxDelta
::send_stream
($fh, @
$atd, $pool);
2983 die "Checksum mismatch\nexpected: $exp\ngot: $got\n" if ($got ne $exp);
2986 close $fh or croak
$!;
2990 my ($self, $m, $q) = @_;
2991 my ($dir, $file) = split_path
($m->{file_b
});
2992 my $pbat = $self->ensure_path($dir);
2993 print "\tD\t$m->{file_b}\n" unless $q;
2994 $self->delete_entry($m->{file_b
}, $pbat);
2999 my ($p,$bat) = ($self->{pool
}, $self->{bat
});
3000 foreach (sort { $b =~ tr
#/#/# <=> $a =~ tr#/#/# } keys %$bat) {
3001 $self->close_directory($bat->{$_}, $p);
3003 $self->SUPER::close_edit
($p);
3009 $self->SUPER::abort_edit
($self->{pool
});
3010 $self->{pool
}->clear;
3017 $log_msg hashref as returned by libsvn_log_entry
()
3019 msg
=> 'whitespace-formatted log entry
3020 ', # trailing newline is preserved
3021 revision
=> '8', # integer
3022 date
=> '2004-02-24T17:01:44.108345Z', # commit date
3023 author
=> 'committer name'
3026 @mods = array of diff
-index line hashes
, each element represents one line
3027 of diff
-index output
3029 diff
-index line
($m hash
)
3031 mode_a
=> first column of diff
-index output
, no leading
':',
3032 mode_b
=> second column of diff
-index output
,
3033 sha1_b
=> sha1sum of the final blob
,
3034 chg
=> change type
[MCRADT
],
3035 file_a
=> original file name of a file
(iff chg is
'C' or 'R')
3036 file_b
=> new
/current file name of a file
(any chg
)
3040 # retval of read_url_paths{,_all}();
3042 # repository root url
3043 'https://svn.musicpd.org' => {
3044 # repository path # GIT_SVN_ID
3045 'mpd/trunk' => 'trunk',
3046 'mpd/tags/0.11.5' => 'tags/0.11.5',
3051 I don
't trust the each() function on unless I created %hash myself
3052 because the internal iterator may not have started at base.