2 # Copyright (C) 2006, Eric Wong <normalperson@yhbt.net>
3 # License: GPL v2 or later
7 use vars qw
/ $AUTHOR $VERSION
8 $sha1 $sha1_short $_revision $_repository
9 $_q $_authors $_authors_prog %users/;
10 $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
11 $VERSION = '@@GIT_VERSION@@';
15 use Git
::SVN
::Migration
;
16 use Git
::SVN
::Utils
qw(fatal can_compress);
26 command_close_bidi_pipe
30 # From which subdir have we been invoked?
31 my $cmd_dir_prefix = eval {
32 command_oneline
([qw
/rev-parse --show-prefix/], STDERR
=> 0)
35 my $git_dir_user_set = 1 if defined $ENV{GIT_DIR
};
36 $ENV{GIT_DIR
} ||= '.git';
37 $Git::SVN
::Ra
::_log_window_size
= 100;
39 if (! exists $ENV{SVN_SSH
} && exists $ENV{GIT_SSH
}) {
40 $ENV{SVN_SSH
} = $ENV{GIT_SSH
};
43 if (exists $ENV{SVN_SSH
} && $^O
eq 'msys') {
44 $ENV{SVN_SSH
} =~ s/\\/\\\\/g;
45 $ENV{SVN_SSH
} =~ s/(.*)/"$1"/;
48 $Git::SVN
::Log
::TZ
= $ENV{TZ
};
50 $| = 1; # unbuffer STDOUT
52 # All SVN commands do it. Otherwise we may die on SIGPIPE when the remote
53 # repository decides to close the connection which we expect to be kept alive.
54 $SIG{PIPE
} = 'IGNORE';
56 # Given a dot separated version number, "subtract" it from
57 # the SVN::Core::VERSION; non-negaitive return means the SVN::Core
58 # is at least at the version the caller asked for.
59 sub compare_svn_version
{
60 my (@ours) = split(/\./, $SVN::Core
::VERSION
);
61 my (@theirs) = split(/\./, $_[0]);
64 for ($i = 0; $i < @ours && $i < @theirs; $i++) {
65 $diff = $ours[$i] - $theirs[$i];
66 return $diff if ($diff);
68 return 1 if ($i < @ours);
69 return -1 if ($i < @theirs);
74 require SVN
::Core
; # use()-ing this causes segfaults for me... *shrug*
77 if (::compare_svn_version
('1.1.0') < 0) {
78 fatal
"Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)";
85 use File
::Basename qw
/dirname basename/;
86 use File
::Path qw
/mkpath/;
89 use Getopt
::Long qw
/:config gnu_getopt no_ignore_case auto_abbrev/;
91 use Git
::SVN
::Editor qw
//;
92 use Git
::SVN
::Fetcher qw
//;
93 use Git
::SVN
::Ra qw
//;
94 use Git
::SVN
::Prompt qw
//;
95 use Memoize
; # core since 5.8.0, Jul 2002
98 Memoize
::memoize
'Git::config';
99 Memoize
::memoize
'Git::config_bool';
104 $sha1 = qr/[a-f\d]{40}/;
105 $sha1_short = qr/[a-f\d]{4,40}/;
106 my ($_stdin, $_help, $_edit,
107 $_message, $_file, $_branch_dest,
108 $_template, $_shared,
109 $_version, $_fetch_all, $_no_rebase, $_fetch_parent,
110 $_merge, $_strategy, $_preserve_merges, $_dry_run, $_local,
111 $_prefix, $_no_checkout, $_url, $_verbose,
112 $_commit_url, $_tag, $_merge_info, $_interactive);
114 # This is a refactoring artifact so Git::SVN can get at this git-svn switch.
115 sub opt_prefix
{ return $_prefix || '' }
117 $Git::SVN
::Fetcher
::_placeholder_filename
= ".gitignore";
119 my %remote_opts = ( 'username=s' => \
$Git::SVN
::Prompt
::_username
,
120 'config-dir=s' => \
$Git::SVN
::Ra
::config_dir
,
121 'no-auth-cache' => \
$Git::SVN
::Prompt
::_no_auth_cache
,
122 'ignore-paths=s' => \
$Git::SVN
::Fetcher
::_ignore_regex
,
123 'ignore-refs=s' => \
$Git::SVN
::Ra
::_ignore_refs_regex
);
124 my %fc_opts = ( 'follow-parent|follow!' => \
$Git::SVN
::_follow_parent
,
125 'authors-file|A=s' => \
$_authors,
126 'authors-prog=s' => \
$_authors_prog,
127 'repack:i' => \
$Git::SVN
::_repack
,
128 'noMetadata' => \
$Git::SVN
::_no_metadata
,
129 'useSvmProps' => \
$Git::SVN
::_use_svm_props
,
130 'useSvnsyncProps' => \
$Git::SVN
::_use_svnsync_props
,
131 'log-window-size=i' => \
$Git::SVN
::Ra
::_log_window_size
,
132 'no-checkout' => \
$_no_checkout,
134 'repack-flags|repack-args|repack-opts=s' =>
135 \
$Git::SVN
::_repack_flags
,
136 'use-log-author' => \
$Git::SVN
::_use_log_author
,
137 'add-author-from' => \
$Git::SVN
::_add_author_from
,
138 'localtime' => \
$Git::SVN
::_localtime
,
141 my ($_trunk, @_tags, @_branches, $_stdlayout);
143 my %init_opts = ( 'template=s' => \
$_template, 'shared:s' => \
$_shared,
144 'trunk|T=s' => \
$_trunk, 'tags|t=s@' => \
@_tags,
145 'branches|b=s@' => \
@_branches, 'prefix=s' => \
$_prefix,
146 'stdlayout|s' => \
$_stdlayout,
147 'minimize-url|m!' => \
$Git::SVN
::_minimize_url
,
148 'no-metadata' => sub { $icv{noMetadata
} = 1 },
149 'use-svm-props' => sub { $icv{useSvmProps
} = 1 },
150 'use-svnsync-props' => sub { $icv{useSvnsyncProps
} = 1 },
151 'rewrite-root=s' => sub { $icv{rewriteRoot
} = $_[1] },
152 'rewrite-uuid=s' => sub { $icv{rewriteUUID
} = $_[1] },
154 my %cmt_opts = ( 'edit|e' => \
$_edit,
155 'rmdir' => \
$Git::SVN
::Editor
::_rmdir
,
156 'find-copies-harder' => \
$Git::SVN
::Editor
::_find_copies_harder
,
157 'l=i' => \
$Git::SVN
::Editor
::_rename_limit
,
158 'copy-similarity|C=i'=> \
$Git::SVN
::Editor
::_cp_similarity
162 fetch
=> [ \
&cmd_fetch
, "Download new revisions from SVN",
163 { 'revision|r=s' => \
$_revision,
164 'fetch-all|all' => \
$_fetch_all,
165 'parent|p' => \
$_fetch_parent,
167 clone
=> [ \
&cmd_clone
, "Initialize and fetch revisions",
168 { 'revision|r=s' => \
$_revision,
169 'preserve-empty-dirs' =>
170 \
$Git::SVN
::Fetcher
::_preserve_empty_dirs
,
171 'placeholder-filename=s' =>
172 \
$Git::SVN
::Fetcher
::_placeholder_filename
,
173 %fc_opts, %init_opts } ],
174 init
=> [ \
&cmd_init
, "Initialize a repo for tracking" .
175 " (requires URL argument)",
177 'multi-init' => [ \
&cmd_multi_init
,
178 "Deprecated alias for ".
179 "'$0 init -T<trunk> -b<branches> -t<tags>'",
181 dcommit
=> [ \
&cmd_dcommit
,
182 'Commit several diffs to merge with upstream',
183 { 'merge|m|M' => \
$_merge,
184 'strategy|s=s' => \
$_strategy,
185 'verbose|v' => \
$_verbose,
186 'dry-run|n' => \
$_dry_run,
187 'fetch-all|all' => \
$_fetch_all,
188 'commit-url=s' => \
$_commit_url,
189 'revision|r=i' => \
$_revision,
190 'no-rebase' => \
$_no_rebase,
191 'mergeinfo=s' => \
$_merge_info,
192 'interactive|i' => \
$_interactive,
193 %cmt_opts, %fc_opts } ],
194 branch
=> [ \
&cmd_branch
,
195 'Create a branch in the SVN repository',
196 { 'message|m=s' => \
$_message,
197 'destination|d=s' => \
$_branch_dest,
198 'dry-run|n' => \
$_dry_run,
200 'username=s' => \
$Git::SVN
::Prompt
::_username
,
201 'commit-url=s' => \
$_commit_url } ],
202 tag
=> [ sub { $_tag = 1; cmd_branch
(@_) },
203 'Create a tag in the SVN repository',
204 { 'message|m=s' => \
$_message,
205 'destination|d=s' => \
$_branch_dest,
206 'dry-run|n' => \
$_dry_run,
207 'username=s' => \
$Git::SVN
::Prompt
::_username
,
208 'commit-url=s' => \
$_commit_url } ],
209 'set-tree' => [ \
&cmd_set_tree
,
210 "Set an SVN repository to a git tree-ish",
211 { 'stdin' => \
$_stdin, %cmt_opts, %fc_opts, } ],
212 'create-ignore' => [ \
&cmd_create_ignore
,
213 'Create a .gitignore per svn:ignore',
214 { 'revision|r=i' => \
$_revision
216 'mkdirs' => [ \
&cmd_mkdirs
,
217 "recreate empty directories after a checkout",
218 { 'revision|r=i' => \
$_revision } ],
219 'propget' => [ \
&cmd_propget
,
220 'Print the value of a property on a file or directory',
221 { 'revision|r=i' => \
$_revision } ],
222 'proplist' => [ \
&cmd_proplist
,
223 'List all properties of a file or directory',
224 { 'revision|r=i' => \
$_revision } ],
225 'show-ignore' => [ \
&cmd_show_ignore
, "Show svn:ignore listings",
226 { 'revision|r=i' => \
$_revision
228 'show-externals' => [ \
&cmd_show_externals
, "Show svn:externals listings",
229 { 'revision|r=i' => \
$_revision
231 'multi-fetch' => [ \
&cmd_multi_fetch
,
232 "Deprecated alias for $0 fetch --all",
233 { 'revision|r=s' => \
$_revision, %fc_opts } ],
234 'migrate' => [ sub { },
235 # no-op, we automatically run this anyways,
236 'Migrate configuration/metadata/layout from
237 previous versions of git-svn',
238 { 'minimize' => \
$Git::SVN
::Migration
::_minimize
,
240 'log' => [ \
&Git
::SVN
::Log
::cmd_show_log
, 'Show commit logs',
241 { 'limit=i' => \
$Git::SVN
::Log
::limit
,
242 'revision|r=s' => \
$_revision,
243 'verbose|v' => \
$Git::SVN
::Log
::verbose
,
244 'incremental' => \
$Git::SVN
::Log
::incremental
,
245 'oneline' => \
$Git::SVN
::Log
::oneline
,
246 'show-commit' => \
$Git::SVN
::Log
::show_commit
,
247 'non-recursive' => \
$Git::SVN
::Log
::non_recursive
,
248 'authors-file|A=s' => \
$_authors,
249 'color' => \
$Git::SVN
::Log
::color
,
250 'pager=s' => \
$Git::SVN
::Log
::pager
252 'find-rev' => [ \
&cmd_find_rev
,
253 "Translate between SVN revision numbers and tree-ish",
255 'rebase' => [ \
&cmd_rebase
, "Fetch and rebase your working directory",
256 { 'merge|m|M' => \
$_merge,
257 'verbose|v' => \
$_verbose,
258 'strategy|s=s' => \
$_strategy,
259 'local|l' => \
$_local,
260 'fetch-all|all' => \
$_fetch_all,
261 'dry-run|n' => \
$_dry_run,
262 'preserve-merges|p' => \
$_preserve_merges,
264 'commit-diff' => [ \
&cmd_commit_diff
,
265 'Commit a diff between two trees',
266 { 'message|m=s' => \
$_message,
267 'file|F=s' => \
$_file,
268 'revision|r=s' => \
$_revision,
270 'info' => [ \
&cmd_info
,
271 "Show info about the latest SVN revision
272 on the current branch",
273 { 'url' => \
$_url, } ],
274 'blame' => [ \
&Git
::SVN
::Log
::cmd_blame
,
275 "Show what revision and author last modified each line of a file",
276 { 'git-format' => \
$Git::SVN
::Log
::_git_format
} ],
277 'reset' => [ \
&cmd_reset
,
278 "Undo fetches back to the specified SVN revision",
279 { 'revision|r=s' => \
$_revision,
280 'parent|p' => \
$_fetch_parent } ],
282 "Compress unhandled.log files in .git/svn and remove " .
283 "index files in .git/svn",
290 my ($class, $reason) = @_;
291 return bless \
$reason, shift;
295 die "Cannot use readline on FakeTerm: $$self";
300 $ENV{"GIT_SVN_NOTTY"}
301 ? new Term
::ReadLine
'git-svn', \
*STDIN
, \
*STDOUT
302 : new Term
::ReadLine
'git-svn';
305 $term = new FakeTerm
"$@: going non-interactive";
309 for (my $i = 0; $i < @ARGV; $i++) {
310 if (defined $cmd{$ARGV[$i]}) {
314 } elsif ($ARGV[$i] eq 'help') {
320 # make sure we're always running at the top-level working directory
321 unless ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
322 unless (-d
$ENV{GIT_DIR
}) {
323 if ($git_dir_user_set) {
324 die "GIT_DIR=$ENV{GIT_DIR} explicitly set, ",
325 "but it is not a directory\n";
327 my $git_dir = delete $ENV{GIT_DIR
};
330 $cdup = command_oneline
(qw
/rev-parse --show-cdup/);
331 $git_dir = '.' unless ($cdup);
332 chomp $cdup if ($cdup);
333 $cdup = "." unless ($cdup && length $cdup);
334 } "Already at toplevel, but $git_dir not found\n";
335 chdir $cdup or die "Unable to chdir up to '$cdup'\n";
336 unless (-d
$git_dir) {
337 die "$git_dir still not found after going to ",
340 $ENV{GIT_DIR
} = $git_dir;
342 $_repository = Git
->repository(Repository
=> $ENV{GIT_DIR
});
345 my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
347 read_git_config
(\
%opts);
348 if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) {
349 Getopt
::Long
::Configure
('pass_through');
351 my $rv = GetOptions
(%opts, 'h|H' => \
$_help, 'version|V' => \
$_version,
352 'minimize-connections' => \
$Git::SVN
::Migration
::_minimize
,
353 'id|i=s' => \
$Git::SVN
::default_ref_id
,
354 'svn-remote|remote|R=s' => sub {
355 $Git::SVN
::no_reuse_existing
= 1;
356 $Git::SVN
::default_repo_id
= $_[1] });
357 exit 1 if (!$rv && $cmd && $cmd ne 'log');
360 version
() if $_version;
361 usage
(1) unless defined $cmd;
362 load_authors
() if $_authors;
363 if (defined $_authors_prog) {
364 $_authors_prog = "'" . File
::Spec
->rel2abs($_authors_prog) . "'";
367 unless ($cmd =~ /^(?:clone|init|multi-init|commit-diff)$/) {
368 Git
::SVN
::Migration
::migration_check
();
370 Git
::SVN
::init_vars
();
372 Git
::SVN
::verify_remotes_sanity
();
373 $cmd{$cmd}->[0]->(@ARGV);
374 post_fetch_checkout
();
379 ####################### primary functions ######################
381 my $exit = shift || 0;
382 my $fd = $exit ? \
*STDERR
: \
*STDOUT
;
384 git
-svn
- bidirectional operations between a single Subversion tree
and git
385 Usage
: git svn
<command
> [options
] [arguments
]\n
387 print $fd "Available commands:\n" unless $cmd;
389 foreach (sort keys %cmd) {
390 next if $cmd && $cmd ne $_;
391 next if /^multi-/; # don't show deprecated commands
392 print $fd ' ',pack('A17',$_),$cmd{$_}->[1],"\n";
393 foreach (sort keys %{$cmd{$_}->[2]}) {
394 # mixed-case options are for .git/config only
395 next if /[A-Z]/ && /^[a-z]+$/i;
396 # prints out arguments as they should be passed:
397 my $x = s
#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
398 print $fd ' ' x
21, join(', ', map { length $_ > 1 ?
400 split /\|/,$_)," $x\n";
404 \nGIT_SVN_ID may be set
in the environment
or via the
--id
/-i switch to an
405 arbitrary identifier
if you
're tracking multiple SVN branches/repositories in
406 one git repository and want to keep them separate. See git-svn(1) for more
414 print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
419 my ($prompt, %arg) = @_;
420 my $valid_re = $arg{valid_re};
421 my $default = $arg{default};
425 if ( !( defined($term->IN)
426 && defined( fileno($term->IN) )
427 && defined( $term->OUT )
428 && defined( fileno($term->OUT) ) ) ){
429 return defined($default) ? $default : undef;
433 $resp = $term->readline($prompt);
434 if (!defined $resp) { # EOF
436 return defined $default ? $default : undef;
438 if ($resp eq '' and defined $default) {
441 if (!defined $valid_re or $resp =~ /$valid_re/) {
449 unless (-d $ENV{GIT_DIR}) {
450 my @init_db = ('init
');
451 push @init_db, "--template=$_template" if defined $_template;
452 if (defined $_shared) {
453 if ($_shared =~ /[a-z]/) {
454 push @init_db, "--shared=$_shared";
456 push @init_db, "--shared";
459 command_noisy(@init_db);
460 $_repository = Git->repository(Repository => ".git");
463 my $pfx = "svn-remote.$Git::SVN::default_repo_id";
464 foreach my $i (keys %icv) {
465 die "'$set' and '$i' cannot both be set\n" if $set;
466 next unless defined $icv{$i};
467 command_noisy('config
', "$pfx.$i", $icv{$i});
470 my $ignore_paths_regex = \$Git::SVN::Fetcher::_ignore_regex;
471 command_noisy('config
', "$pfx.ignore-paths", $$ignore_paths_regex)
472 if defined $$ignore_paths_regex;
473 my $ignore_refs_regex = \$Git::SVN::Ra::_ignore_refs_regex;
474 command_noisy('config
', "$pfx.ignore-refs", $$ignore_refs_regex)
475 if defined $$ignore_refs_regex;
477 if (defined $Git::SVN::Fetcher::_preserve_empty_dirs) {
478 my $fname = \$Git::SVN::Fetcher::_placeholder_filename;
479 command_noisy('config
', "$pfx.preserve-empty-dirs", 'true
');
480 command_noisy('config
', "$pfx.placeholder-filename", $$fname);
485 my $repo_path = shift or return;
486 mkpath([$repo_path]) unless -d $repo_path;
487 chdir $repo_path or die "Couldn't
chdir to
$repo_path: $!\n";
488 $ENV{GIT_DIR} = '.git';
489 $_repository = Git->repository(Repository => $ENV{GIT_DIR});
493 my ($url, $path) = @_;
494 if (!defined $path &&
495 (defined $_trunk || @_branches || @_tags ||
496 defined $_stdlayout) &&
497 $url !~ m#^[a-z\+]+://#) {
500 $path = basename($url) if !defined $path || !length $path;
501 my $authors_absolute = $_authors ? File::Spec->rel2abs($_authors) : "";
502 cmd_init($url, $path);
503 command_oneline('config', 'svn.authorsfile', $authors_absolute)
505 Git::SVN::fetch_all($Git::SVN::default_repo_id);
509 if (defined $_stdlayout) {
510 $_trunk = 'trunk' if (!defined $_trunk);
511 @_tags = 'tags' if (! @_tags);
512 @_branches = 'branches' if (! @_branches);
514 if (defined $_trunk || @_branches || @_tags) {
515 return cmd_multi_init(@_);
517 my $url = shift or die "SVN repository location required
",
518 "as a command
-line argument
\n";
519 $url = canonicalize_url($url);
523 if ($Git::SVN::_minimize_url eq 'unset') {
524 $Git::SVN::_minimize_url = 0;
527 Git::SVN->init($url);
531 if (grep /^\d+=./, @_) {
532 die "'<rev>=<commit>' fetch arguments are
",
533 "no longer supported
.\n";
537 die "Usage
: $0 fetch
[--all
] [--parent
] [svn
-remote
]\n";
539 $Git::SVN::no_reuse_existing = undef;
540 if ($_fetch_parent) {
541 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
543 die "Unable to determine upstream SVN information from
",
544 "working tree history
\n";
546 # just fetch, don't checkout.
547 $_no_checkout = 'true';
548 $_fetch_all ? $gs->fetch_all : $gs->fetch;
549 } elsif ($_fetch_all) {
552 $remote ||= $Git::SVN::default_repo_id;
553 Git::SVN::fetch_all($remote, Git::SVN::read_all_remotes());
559 if ($_stdin || !@commits) {
560 print "Reading from stdin
...\n";
563 if (/\b($sha1_short)\b/o) {
564 unshift @commits, $1;
569 foreach my $c (@commits) {
570 my @tmp = command('rev-parse',$c);
571 if (scalar @tmp == 1) {
573 } elsif (scalar @tmp > 1) {
574 push @revs, reverse(command('rev-list',@tmp));
576 fatal "Failed to rev
-parse
$c";
579 my $gs = Git::SVN->new;
580 my ($r_last, $cmt_last) = $gs->last_rev_commit;
582 if (defined $gs->{last_rev} && $r_last != $gs->{last_rev}) {
583 fatal "There are new revisions that were fetched
",
584 "and need to be merged
(or acknowledged
) ",
585 "before committing
.\nlast rev
: $r_last\n",
586 " current
: $gs->{last_rev
}";
588 $gs->set_tree($_) foreach @revs;
589 print "Done committing
",scalar @revs," revisions to SVN
\n";
593 sub split_merge_info_range {
595 if ($range =~ /(\d+)-(\d+)/) {
596 return (int($1), int($2));
598 return (int($range), int($range));
606 my @arr = split(/,/, $in);
607 for my $element (@arr) {
608 my ($start, $end) = split_merge_info_range($element);
612 my @sorted = @arr [ sort {
613 $fnums[$a] <=> $fnums[$b]
619 for my $element (@sorted) {
620 my ($start, $end) = split_merge_info_range($element);
627 if ($start <= $last+1) {
633 if ($first == $last) {
634 push @return, "$first";
636 push @return, "$first-$last";
643 if ($first == $last) {
644 push @return, "$first";
646 push @return, "$first-$last";
650 return join(',', @return);
653 sub merge_revs_into_hash {
654 my ($hash, $minfo) = @_;
655 my @lines = split(' ', $minfo);
657 for my $line (@lines) {
658 my ($branchpath, $revs) = split(/:/, $line);
660 if (exists($hash->{$branchpath})) {
661 # Merge the two revision sets
662 my $combined = "$hash->{$branchpath},$revs";
663 $hash->{$branchpath} = combine_ranges($combined);
665 # Just do range combining for consolidation
666 $hash->{$branchpath} = combine_ranges($revs);
671 sub merge_merge_info {
672 my ($mergeinfo_one, $mergeinfo_two) = @_;
673 my %result_hash = ();
675 merge_revs_into_hash(\%result_hash, $mergeinfo_one);
676 merge_revs_into_hash(\%result_hash, $mergeinfo_two);
679 # Sort below is for consistency's sake
680 for my $branchname (sort keys(%result_hash)) {
681 my $revlist = $result_hash{$branchname};
682 $result .= "$branchname:$revlist\n"
687 sub populate_merge_info {
688 my ($d, $gs, $uuid, $linear_refs, $rewritten_parent) = @_;
691 read_commit_parents(\%parentshash, $d);
692 my @parents = @{$parentshash{$d}};
695 my $all_parents_ok = 1;
696 my $aggregate_mergeinfo = '';
697 my $rooturl = $gs->repos_root;
699 if (defined($rewritten_parent)) {
700 # Replace first parent with newly-rewritten version
702 unshift @parents, $rewritten_parent;
705 foreach my $parent (@parents) {
706 my ($branchurl, $svnrev, $paruuid) =
707 cmt_metadata($parent);
709 unless (defined($svnrev)) {
710 # Should have been caught be preflight check
711 fatal "merge commit
$d has ancestor
$parent, but that change
"
712 ."does
not have git
-svn metadata
!";
714 unless ($branchurl =~ /^\Q$rooturl\E(.*)/) {
715 fatal "commit
$parent git
-svn metadata changed mid
-run
!";
719 my $ra = Git::SVN::Ra->new($branchurl);
720 my (undef, undef, $props) =
721 $ra->get_dir(canonicalize_path("."), $svnrev);
722 my $par_mergeinfo = $props->{'svn:mergeinfo'};
723 unless (defined $par_mergeinfo) {
726 # Merge previous mergeinfo values
727 $aggregate_mergeinfo =
728 merge_merge_info($aggregate_mergeinfo,
731 next if $parent eq $parents[0]; # Skip first parent
732 # Add new changes being placed in tree by merge
733 my @cmd = (qw/rev-list --reverse/,
735 foreach my $par (@parents) {
736 unless ($par eq $parent) {
741 my ($revlist, $ctx) = command_output_pipe(@cmd);
745 my (undef, $csvnrev, undef) =
747 unless (defined $csvnrev) {
748 # A child is missing SVN annotations...
749 # this might be OK, or might not be.
750 warn "W
:child
$irev is merged into revision
"
751 ."$d but does
not have git
-svn metadata
. "
752 ."This means git
-svn cannot determine the
"
753 ."svn revision numbers to place into the
"
754 ."svn
:mergeinfo property
. You must ensure
"
755 ."a branch is entirely committed to
"
756 ."SVN before merging it
in order
for "
757 ."svn
:mergeinfo population to function
"
760 push @revsin, $csvnrev;
762 command_close_pipe($revlist, $ctx);
764 last unless $all_parents_ok;
766 # We now have a list of all SVN revnos which are
767 # merged by this particular parent. Integrate them.
768 next if $#revsin == -1;
769 my $newmergeinfo = "$branchpath:" . join(',', @revsin);
770 $aggregate_mergeinfo =
771 merge_merge_info($aggregate_mergeinfo,
774 if ($all_parents_ok and $aggregate_mergeinfo) {
775 return $aggregate_mergeinfo;
784 command_noisy(qw/update-index --refresh/);
785 git_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }
786 'Cannot dcommit with a dirty index. Commit your changes first, '
787 . "or stash them with
`git stash'.\n";
791 if ($head ne 'HEAD') {
793 command_oneline([qw/symbolic-ref -q HEAD/])
796 $old_head =~ s{^refs/heads/}{};
798 $old_head = eval { command_oneline(qw/rev-parse HEAD/) };
800 command(['checkout', $head], STDERR => 0);
804 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD', \@refs);
806 die "Unable to determine upstream SVN information from ",
807 "$head history.\nPerhaps the repository is empty.";
810 if (defined $_commit_url) {
813 $url = eval { command_oneline('config', '--get',
814 "svn-remote.$gs->{repo_id}.commiturl") };
816 $url = $gs->full_pushurl
820 my $last_rev = $_revision if defined $_revision;
822 print "Committing to $url ...\n";
824 my ($linear_refs, $parents) = linearize_history($gs, \@refs);
825 if ($_no_rebase && scalar(@$linear_refs) > 1) {
826 warn "Attempting to commit more than one change while ",
827 "--no-rebase is enabled.\n",
828 "If these changes depend on each other, re-running ",
829 "without --no-rebase may be required."
832 if (defined $_interactive){
833 my $ask_default = "y";
834 foreach my $d (@$linear_refs){
835 my ($fh, $ctx) = command_output_pipe(qw(show --summary), "$d");
839 command_close_pipe
($fh, $ctx);
840 $_ = ask
("Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): ",
841 valid_re
=> qr/^(?:yes|y|no|n|quit|q|all|a)/i,
842 default => $ask_default);
843 die "Commit this patch reply required" unless defined $_;
852 my $expect_url = $url;
854 my $push_merge_info = eval {
855 command_oneline
(qw
/config --get svn.pushmergeinfo/)
857 if (not defined($push_merge_info)
858 or $push_merge_info eq "false"
859 or $push_merge_info eq "no"
860 or $push_merge_info eq "never") {
861 $push_merge_info = 0;
864 unless (defined($_merge_info) || ! $push_merge_info) {
865 # Preflight check of changes to ensure no issues with mergeinfo
866 # This includes check for uncommitted-to-SVN parents
867 # (other than the first parent, which we will handle),
868 # information from different SVN repos, and paths
869 # which are not underneath this repository root.
870 my $rooturl = $gs->repos_root;
871 foreach my $d (@
$linear_refs) {
873 read_commit_parents
(\
%parentshash, $d);
874 my @realparents = @
{$parentshash{$d}};
875 if ($#realparents > 0) {
877 shift @realparents; # Remove/ignore first parent
878 foreach my $parent (@realparents) {
879 my ($branchurl, $svnrev, $paruuid) = cmt_metadata
($parent);
880 unless (defined $paruuid) {
881 # A parent is missing SVN annotations...
882 # abort the whole operation.
883 fatal
"$parent is merged into revision $d, "
884 ."but does not have git-svn metadata. "
885 ."Either dcommit the branch or use a "
886 ."local cherry-pick, FF merge, or rebase "
887 ."instead of an explicit merge commit.";
890 unless ($paruuid eq $uuid) {
891 # Parent has SVN metadata from different repository
892 fatal
"merge parent $parent for change $d has "
893 ."git-svn uuid $paruuid, while current change "
897 unless ($branchurl =~ /^\Q$rooturl\E(.*)/) {
898 # This branch is very strange indeed.
899 fatal
"merge parent $parent for $d is on branch "
900 ."$branchurl, which is not under the "
901 ."git-svn root $rooturl!";
908 my $rewritten_parent;
909 Git
::SVN
::remove_username
($expect_url);
910 if (defined($_merge_info)) {
911 $_merge_info =~ tr{ }{\n};
914 my $d = shift @
$linear_refs or last;
915 unless (defined $last_rev) {
916 (undef, $last_rev, undef) = cmt_metadata
("$d~1");
917 unless (defined $last_rev) {
918 fatal
"Unable to extract revision information ",
923 print "diff-tree $d~1 $d\n";
927 unless (defined($_merge_info) || ! $push_merge_info) {
928 $_merge_info = populate_merge_info
($d, $gs,
934 my %ed_opts = ( r
=> $last_rev,
935 log => get_commit_entry
($d)->{log},
936 ra
=> Git
::SVN
::Ra
->new($url),
937 config
=> SVN
::Core
::config_get_config
(
938 $Git::SVN
::Ra
::config_dir
943 print "Committed r$_[0]\n";
946 mergeinfo
=> $_merge_info,
948 if (!Git
::SVN
::Editor
->new(\
%ed_opts)->apply_diff) {
949 print "No changes\n$d~1 == $d\n";
950 } elsif ($parents->{$d} && @
{$parents->{$d}}) {
951 $gs->{inject_parents_dcommit
}->{$cmt_rev} =
954 $_fetch_all ?
$gs->fetch_all : $gs->fetch;
955 $last_rev = $cmt_rev;
958 # we always want to rebase against the current HEAD,
959 # not any head that was passed to us
960 my @diff = command
('diff-tree', $d,
964 @finish = rebase_cmd
();
965 print STDERR
"W: $d and ", $gs->refname,
966 " differ, using @finish:\n",
967 join("\n", @diff), "\n";
969 print "No changes between current HEAD and ",
971 "\nResetting to the latest ",
973 @finish = qw
/reset --mixed/;
975 command_noisy
(@finish, $gs->refname);
977 $rewritten_parent = command_oneline
(qw
/rev-parse HEAD/);
981 my ($url_, $rev_, $uuid_, $gs_) =
982 working_head_info
('HEAD', \
@refs);
983 my ($linear_refs_, $parents_) =
984 linearize_history
($gs_, \
@refs);
985 if (scalar(@
$linear_refs) !=
986 scalar(@
$linear_refs_)) {
987 fatal
"# of revisions changed ",
989 join("\n", @
$linear_refs),
991 join("\n", @
$linear_refs_), "\n",
992 'If you are attempting to commit ',
993 "merges, try running:\n\t",
994 'git rebase --interactive',
995 '--preserve-merges ',
997 "\nBefore dcommitting";
999 if ($url_ ne $expect_url) {
1000 if ($url_ eq $gs->metadata_url) {
1002 "Accepting rewritten URL:",
1006 "URL mismatch after rebase:",
1007 " $url_ != $expect_url";
1010 if ($uuid_ ne $uuid) {
1011 fatal
"uuid mismatch after rebase: ",
1016 for ($i = 0; $i < scalar @
$linear_refs; $i++) {
1017 my $new = $linear_refs_->[$i] or next;
1019 $parents->{$linear_refs->[$i]};
1029 my $new_head = command_oneline
(qw
/rev-parse HEAD/);
1030 my $new_is_symbolic = eval {
1031 command_oneline
(qw
/symbolic-ref -q HEAD/);
1033 if ($new_is_symbolic) {
1034 print "dcommitted the branch ", $head, "\n";
1036 print "dcommitted on a detached HEAD because you gave ",
1037 "a revision argument.\n",
1038 "The rewritten commit is: ", $new_head, "\n";
1040 command
(['checkout', $old_head], STDERR
=> 0);
1043 unlink $gs->{index};
1047 my ($branch_name, $head) = @_;
1049 unless (defined $branch_name && length $branch_name) {
1050 die(($_tag ?
"tag" : "branch") . " name required\n");
1054 my (undef, $rev, undef, $gs) = working_head_info
($head);
1055 my $src = $gs->full_pushurl;
1057 my $remote = Git
::SVN
::read_all_remotes
()->{$gs->{repo_id
}};
1058 my $allglobs = $remote->{ $_tag ?
'tags' : 'branches' };
1060 if ($#{$allglobs} == 0) {
1061 $glob = $allglobs->[0];
1063 unless(defined $_branch_dest) {
1065 $_tag ?
"tag" : "branch",
1066 " paths defined for Subversion repository.\n",
1067 "You must specify where you want to create the ",
1068 $_tag ?
"tag" : "branch",
1069 " with the --destination argument.\n";
1071 foreach my $g (@
{$allglobs}) {
1072 my $re = Git
::SVN
::Editor
::glob2pat
($g->{path
}->{left
});
1073 if ($_branch_dest =~ /$re/) {
1078 unless (defined $glob) {
1079 my $dest_re = qr/\b\Q$_branch_dest\E\b/;
1080 foreach my $g (@
{$allglobs}) {
1081 $g->{path
}->{left
} =~ /$dest_re/ or next;
1082 if (defined $glob) {
1083 die "Ambiguous destination: ",
1084 $_branch_dest, "\nmatches both '",
1085 $glob->{path
}->{left
}, "' and '",
1086 $g->{path
}->{left
}, "'\n";
1090 unless (defined $glob) {
1092 $_tag ?
"tag" : "branch",
1093 " destination $_branch_dest\n";
1097 my ($lft, $rgt) = @
{ $glob->{path
} }{qw
/left right/};
1099 if (defined $_commit_url) {
1100 $url = $_commit_url;
1102 $url = eval { command_oneline
('config', '--get',
1103 "svn-remote.$gs->{repo_id}.commiturl") };
1105 $url = $remote->{pushurl
} || $remote->{url
};
1108 my $dst = join '/', $url, $lft, $branch_name, ($rgt || ());
1110 if ($dst =~ /^https:/ && $src =~ /^http:/) {
1111 $src=~s/^http:/https:/;
1116 my $ctx = SVN
::Client
->new(
1117 auth
=> Git
::SVN
::Ra
::_auth_providers
(),
1119 ${ $_[0] } = defined $_message
1121 : 'Create ' . ($_tag ?
'tag ' : 'branch ' )
1127 $ctx->ls($dst, 'HEAD', 0);
1128 } and die "branch ${branch_name} already exists\n";
1130 print "Copying ${src} at r${rev} to ${dst}...\n";
1131 $ctx->copy($src, $rev, $dst)
1138 my $revision_or_hash = shift or die "SVN or git revision required ",
1139 "as a command-line argument\n";
1141 if ($revision_or_hash =~ /^r\d+$/) {
1145 my (undef, undef, $uuid, $gs) = working_head_info
($head, \
@refs);
1147 die "Unable to determine upstream SVN information from ",
1150 my $desired_revision = substr($revision_or_hash, 1);
1151 $result = $gs->rev_map_get($desired_revision, $uuid);
1153 my (undef, $rev, undef) = cmt_metadata
($revision_or_hash);
1156 print "$result\n" if $result;
1159 sub auto_create_empty_directories
{
1161 my $var = eval { command_oneline
('config', '--get', '--bool',
1162 "svn-remote.$gs->{repo_id}.automkdirs") };
1163 # By default, create empty directories by consulting the unhandled log,
1164 # but allow setting it to 'false' to skip it.
1165 return !($var && $var eq 'false');
1169 command_noisy
(qw
/update-index --refresh/);
1170 my ($url, $rev, $uuid, $gs) = working_head_info
('HEAD');
1172 die "Unable to determine upstream SVN information from ",
1173 "working tree history\n";
1176 print "Remote Branch: " . $gs->refname . "\n";
1177 print "SVN URL: " . $url . "\n";
1180 if (command
(qw
/diff-index HEAD --/)) {
1181 print STDERR
"Cannot rebase with uncommited changes:\n";
1182 command_noisy
('status');
1186 # rebase will checkout for us, so no need to do it explicitly
1187 $_no_checkout = 'true';
1188 $_fetch_all ?
$gs->fetch_all : $gs->fetch;
1190 command_noisy
(rebase_cmd
(), $gs->refname);
1191 if (auto_create_empty_directories
($gs)) {
1196 sub cmd_show_ignore
{
1197 my ($url, $rev, $uuid, $gs) = working_head_info
('HEAD');
1198 $gs ||= Git
::SVN
->new;
1199 my $r = (defined $_revision ?
$_revision : $gs->ra->get_latest_revnum);
1200 $gs->prop_walk($gs->{path
}, $r, sub {
1201 my ($gs, $path, $props) = @_;
1202 print STDOUT
"\n# $path\n";
1203 my $s = $props->{'svn:ignore'} or return;
1204 $s =~ s/[\r\n]+/\n/g;
1208 print STDOUT
"$s\n";
1212 sub cmd_show_externals
{
1213 my ($url, $rev, $uuid, $gs) = working_head_info
('HEAD');
1214 $gs ||= Git
::SVN
->new;
1215 my $r = (defined $_revision ?
$_revision : $gs->ra->get_latest_revnum);
1216 $gs->prop_walk($gs->{path
}, $r, sub {
1217 my ($gs, $path, $props) = @_;
1218 print STDOUT
"\n# $path\n";
1219 my $s = $props->{'svn:externals'} or return;
1220 $s =~ s/[\r\n]+/\n/g;
1223 print STDOUT
"$s\n";
1227 sub cmd_create_ignore
{
1228 my ($url, $rev, $uuid, $gs) = working_head_info
('HEAD');
1229 $gs ||= Git
::SVN
->new;
1230 my $r = (defined $_revision ?
$_revision : $gs->ra->get_latest_revnum);
1231 $gs->prop_walk($gs->{path
}, $r, sub {
1232 my ($gs, $path, $props) = @_;
1233 # $path is of the form /path/to/dir/
1234 $path = '.' . $path;
1235 # SVN can have attributes on empty directories,
1236 # which git won't track
1237 mkpath
([$path]) unless -d
$path;
1238 my $ignore = $path . '.gitignore';
1239 my $s = $props->{'svn:ignore'} or return;
1240 open(GITIGNORE
, '>', $ignore)
1241 or fatal
("Failed to open `$ignore' for writing: $!");
1242 $s =~ s/[\r\n]+/\n/g;
1245 # Prefix all patterns so that the ignore doesn't apply
1246 # to sub-directories.
1248 print GITIGNORE
"$s\n";
1250 or fatal
("Failed to close `$ignore': $!");
1251 command_noisy
('add', '-f', $ignore);
1256 my ($url, $rev, $uuid, $gs) = working_head_info
('HEAD');
1257 $gs ||= Git
::SVN
->new;
1258 $gs->mkemptydirs($_revision);
1261 sub canonicalize_path
{
1263 my $dot_slash_added = 0;
1264 if (substr($path, 0, 1) ne "/") {
1265 $path = "./" . $path;
1266 $dot_slash_added = 1;
1268 # File::Spec->canonpath doesn't collapse x/../y into y (for a
1269 # good reason), so let's do this manually.
1271 $path =~ s
#/\.(?:/|$)#/#g;
1272 $path =~ s
#/[^/]+/\.\.##g;
1274 $path =~ s
#^\./## if $dot_slash_added;
1280 sub canonicalize_url
{
1282 $url =~ s
#^([^:]+://[^/]*/)(.*)$#$1 . canonicalize_path($2)#e;
1286 # get_svnprops(PATH)
1287 # ------------------
1288 # Helper for cmd_propget and cmd_proplist below.
1291 my ($url, $rev, $uuid, $gs) = working_head_info
('HEAD');
1292 $gs ||= Git
::SVN
->new;
1294 # prefix THE PATH by the sub-directory from which the user
1296 $path = $cmd_dir_prefix . $path;
1297 fatal
("No such file or directory: $path") unless -e
$path;
1298 my $is_dir = -d
$path ?
1 : 0;
1299 $path = $gs->{path
} . '/' . $path;
1301 # canonicalize the path (otherwise libsvn will abort or fail to
1303 $path = canonicalize_path
($path);
1305 my $r = (defined $_revision ?
$_revision : $gs->ra->get_latest_revnum);
1308 (undef, undef, $props) = $gs->ra->get_dir($path, $r);
1311 (undef, $props) = $gs->ra->get_file($path, $r, undef);
1316 # cmd_propget (PROP, PATH)
1317 # ------------------------
1318 # Print the SVN property PROP for PATH.
1320 my ($prop, $path) = @_;
1321 $path = '.' if not defined $path;
1322 usage
(1) if not defined $prop;
1323 my $props = get_svnprops
($path);
1324 if (not defined $props->{$prop}) {
1325 fatal
("`$path' does not have a `$prop' SVN property.");
1327 print $props->{$prop} . "\n";
1330 # cmd_proplist (PATH)
1331 # -------------------
1332 # Print the list of SVN properties for PATH.
1335 $path = '.' if not defined $path;
1336 my $props = get_svnprops
($path);
1337 print "Properties on '$path':\n";
1338 foreach (sort keys %{$props}) {
1343 sub cmd_multi_init
{
1345 unless (defined $_trunk || @_branches || @_tags) {
1349 $_prefix = '' unless defined $_prefix;
1351 $url = canonicalize_url
($url);
1355 if (defined $_trunk) {
1357 my $trunk_ref = 'refs/remotes/' . $_prefix . 'trunk';
1358 # try both old-style and new-style lookups:
1359 my $gs_trunk = eval { Git
::SVN
->new($trunk_ref) };
1360 unless ($gs_trunk) {
1361 my ($trunk_url, $trunk_path) =
1362 complete_svn_url
($url, $_trunk);
1363 $gs_trunk = Git
::SVN
->init($trunk_url, $trunk_path,
1367 return unless @_branches || @_tags;
1368 my $ra = $url ? Git
::SVN
::Ra
->new($url) : undef;
1369 foreach my $path (@_branches) {
1370 complete_url_ls_init
($ra, $path, '--branches/-b', $_prefix);
1372 foreach my $path (@_tags) {
1373 complete_url_ls_init
($ra, $path, '--tags/-t', $_prefix.'tags/');
1377 sub cmd_multi_fetch
{
1378 $Git::SVN
::no_reuse_existing
= undef;
1379 my $remotes = Git
::SVN
::read_all_remotes
();
1380 foreach my $repo_id (sort keys %$remotes) {
1381 if ($remotes->{$repo_id}->{url
}) {
1382 Git
::SVN
::fetch_all
($repo_id, $remotes);
1387 # this command is special because it requires no metadata
1388 sub cmd_commit_diff
{
1389 my ($ta, $tb, $url) = @_;
1390 my $usage = "Usage: $0 commit-diff -r<revision> ".
1391 "<tree-ish> <tree-ish> [<URL>]";
1392 fatal
($usage) if (!defined $ta || !defined $tb);
1394 if (!defined $url) {
1395 my $gs = eval { Git
::SVN
->new };
1397 fatal
("Needed URL or usable git-svn --id in ",
1398 "the command-line\n", $usage);
1401 $svn_path = $gs->{path
};
1403 unless (defined $_revision) {
1404 fatal
("-r|--revision is a required argument\n", $usage);
1406 if (defined $_message && defined $_file) {
1407 fatal
("Both --message/-m and --file/-F specified ",
1408 "for the commit message.\n",
1409 "I have no idea what you mean");
1411 if (defined $_file) {
1412 $_message = file_to_s
($_file);
1414 $_message ||= get_commit_entry
($tb)->{log};
1416 my $ra ||= Git
::SVN
::Ra
->new($url);
1419 $r = $ra->get_latest_revnum;
1420 } elsif ($r !~ /^\d+$/) {
1421 die "revision argument: $r not understood by git-svn\n";
1423 my %ed_opts = ( r
=> $r,
1428 editor_cb
=> sub { print "Committed r$_[0]\n" },
1429 svn_path
=> $svn_path );
1430 if (!Git
::SVN
::Editor
->new(\
%ed_opts)->apply_diff) {
1431 print "No changes\n$ta == $tb\n";
1435 sub escape_uri_only
{
1438 foreach (split m{/}, $uri) {
1439 s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
1447 if ($url =~ m
#^([^:]+)://([^/]*)(.*)$#) {
1448 my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only
($3));
1449 $url = "$scheme://$domain$uri";
1455 my $path = canonicalize_path
(defined($_[0]) ?
$_[0] : ".");
1456 my $fullpath = canonicalize_path
($cmd_dir_prefix . $path);
1458 die "Too many arguments specified\n";
1461 my ($file_type, $diff_status) = find_file_type_and_diff_status
($path);
1463 if (!$file_type && !$diff_status) {
1464 print STDERR
"svn: '$path' is not under version control\n";
1468 my ($url, $rev, $uuid, $gs) = working_head_info
('HEAD');
1470 die "Unable to determine upstream SVN information from ",
1471 "working tree history\n";
1474 # canonicalize_path() will return "" to make libsvn 1.5.x happy,
1475 $path = "." if $path eq "";
1477 my $full_url = $url . ($fullpath eq "" ?
"" : "/$fullpath");
1480 print escape_url
($full_url), "\n";
1484 my $result = "Path: $path\n";
1485 $result .= "Name: " . basename
($path) . "\n" if $file_type ne "dir";
1486 $result .= "URL: " . escape_url
($full_url) . "\n";
1489 my $repos_root = $gs->repos_root;
1490 Git
::SVN
::remove_username
($repos_root);
1491 $result .= "Repository Root: " . escape_url
($repos_root) . "\n";
1494 $result .= "Repository Root: (offline)\n";
1497 $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A" &&
1498 (::compare_svn_version
('1.5.4') <= 0 || $file_type ne "dir");
1499 $result .= "Revision: " . ($diff_status eq "A" ?
0 : $rev) . "\n";
1501 $result .= "Node Kind: " .
1502 ($file_type eq "dir" ?
"directory" : "file") . "\n";
1504 my $schedule = $diff_status eq "A"
1506 : ($diff_status eq "D" ?
"delete" : "normal");
1507 $result .= "Schedule: $schedule\n";
1509 if ($diff_status eq "A") {
1510 print $result, "\n";
1514 my ($lc_author, $lc_rev, $lc_date_utc);
1515 my @args = Git
::SVN
::Log
::git_svn_log_cmd
($rev, $rev, "--", $fullpath);
1516 my $log = command_output_pipe
(@args);
1517 my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
1519 if (/^${esc_color}author (.+) <[^>]+> (\d+) ([\-\+]?\d+)$/o) {
1521 $lc_date_utc = Git
::SVN
::Log
::parse_git_date
($2, $3);
1522 } elsif (/^${esc_color} (git-svn-id:.+)$/o) {
1523 (undef, $lc_rev, undef) = ::extract_metadata
($1);
1528 Git
::SVN
::Log
::set_local_timezone
();
1530 $result .= "Last Changed Author: $lc_author\n";
1531 $result .= "Last Changed Rev: $lc_rev\n";
1532 $result .= "Last Changed Date: " .
1533 Git
::SVN
::Log
::format_svn_date
($lc_date_utc) . "\n";
1535 if ($file_type ne "dir") {
1536 my $text_last_updated_date =
1537 ($diff_status eq "D" ?
$lc_date_utc : (stat $path)[9]);
1539 "Text Last Updated: " .
1540 Git
::SVN
::Log
::format_svn_date
($text_last_updated_date) .
1543 if ($diff_status eq "D") {
1545 command_output_pipe
(qw(cat-file blob), "HEAD:$path");
1546 if ($file_type eq "link") {
1547 my $file_name = <$fh>;
1548 $checksum = md5sum
("link $file_name");
1550 $checksum = md5sum
($fh);
1552 command_close_pipe
($fh, $ctx);
1553 } elsif ($file_type eq "link") {
1555 command
(qw(cat-file blob), "HEAD:$path");
1557 md5sum
("link " . $file_name);
1559 open FILE
, "<", $path or die $!;
1560 $checksum = md5sum
(\
*FILE
);
1561 close FILE
or die $!;
1563 $result .= "Checksum: " . $checksum . "\n";
1566 print $result, "\n";
1570 my $target = shift || $_revision or die "SVN revision required\n";
1571 $target = $1 if $target =~ /^r(\d+)$/;
1572 $target =~ /^\d+$/ or die "Numeric SVN revision expected\n";
1573 my ($url, $rev, $uuid, $gs) = working_head_info
('HEAD');
1575 die "Unable to determine upstream SVN information from ".
1578 my ($r, $c) = $gs->find_rev_before($target, not $_fetch_parent);
1579 die "Cannot find SVN revision $target\n" unless defined($c);
1580 $gs->rev_map_set($r, $c, 'reset', $uuid);
1581 print "r$r = $c ($gs->{ref_id})\n";
1585 if (!can_compress
()) {
1586 warn "Compress::Zlib could not be found; unhandled.log " .
1587 "files will not be compressed.\n";
1589 find
({ wanted
=> \
&gc_directory
, no_chdir
=> 1}, "$ENV{GIT_DIR}/svn");
1592 ########################### utility functions #########################
1595 my @cmd = qw
/rebase/;
1596 push @cmd, '-v' if $_verbose;
1597 push @cmd, qw
/--merge/ if $_merge;
1598 push @cmd, "--strategy=$_strategy" if $_strategy;
1599 push @cmd, "--preserve-merges" if $_preserve_merges;
1603 sub post_fetch_checkout
{
1604 return if $_no_checkout;
1605 return if verify_ref
('HEAD^0');
1606 my $gs = $Git::SVN
::_head
or return;
1608 # look for "trunk" ref if it exists
1609 my $remote = Git
::SVN
::read_all_remotes
()->{$gs->{repo_id
}};
1610 my $fetch = $remote->{fetch
};
1612 foreach my $p (keys %$fetch) {
1613 basename
($fetch->{$p}) eq 'trunk' or next;
1614 $gs = Git
::SVN
->new($fetch->{$p}, $gs->{repo_id
}, $p);
1619 command_noisy
(qw(update-ref HEAD), $gs->refname);
1620 return unless verify_ref
('HEAD^0');
1622 return if $ENV{GIT_DIR
} !~ m
#^(?:.*/)?\.git$#;
1623 my $index = $ENV{GIT_INDEX_FILE
} || "$ENV{GIT_DIR}/index";
1624 return if -f
$index;
1626 return if command_oneline
(qw
/rev-parse --is-inside-work-tree/) eq 'false';
1627 return if command_oneline
(qw
/rev-parse --is-inside-git-dir/) eq 'true';
1628 command_noisy
(qw
/read-tree -m -u -v HEAD HEAD/);
1629 print STDERR
"Checked out HEAD:\n ",
1630 $gs->full_url, " r", $gs->last_rev, "\n";
1631 if (auto_create_empty_directories
($gs)) {
1632 $gs->mkemptydirs($gs->last_rev);
1636 sub complete_svn_url
{
1637 my ($url, $path) = @_;
1639 if ($path !~ m
#^[a-z\+]+://#) {
1640 if (!defined $url || $url !~ m
#^[a-z\+]+://#) {
1641 fatal
("E: '$path' is not a complete URL ",
1642 "and a separate URL is not specified");
1644 return ($url, $path);
1649 sub complete_url_ls_init
{
1650 my ($ra, $repo_path, $switch, $pfx) = @_;
1651 unless ($repo_path) {
1652 print STDERR
"W: $switch not specified\n";
1655 $repo_path =~ s
#/+$##;
1656 if ($repo_path =~ m
#^[a-z\+]+://#) {
1657 $ra = Git
::SVN
::Ra
->new($repo_path);
1660 $repo_path =~ s
#^/+##;
1662 fatal
("E: '$repo_path' is not a complete URL ",
1663 "and a separate URL is not specified");
1666 my $url = $ra->{url
};
1667 my $gs = Git
::SVN
->init($url, undef, undef, undef, 1);
1668 my $k = "svn-remote.$gs->{repo_id}.url";
1669 my $orig_url = eval { command_oneline
(qw
/config --get/, $k) };
1670 if ($orig_url && ($orig_url ne $gs->{url
})) {
1671 die "$k already set: $orig_url\n",
1672 "wanted to set to: $gs->{url}\n";
1674 command_oneline
('config', $k, $gs->{url
}) unless $orig_url;
1675 my $remote_path = "$gs->{path}/$repo_path";
1676 $remote_path =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
1677 $remote_path =~ s
#/+#/#g;
1678 $remote_path =~ s
#^/##g;
1679 $remote_path .= "/*" if $remote_path !~ /\
*/;
1680 my ($n) = ($switch =~ /^--(\w+)/);
1681 if (length $pfx && $pfx !~ m
#/$#) {
1682 die "--prefix='$pfx' must have a trailing slash '/'\n";
1684 command_noisy
('config',
1686 "svn-remote.$gs->{repo_id}.$n",
1687 "$remote_path:refs/remotes/$pfx*" .
1688 ('/*' x
(($remote_path =~ tr
/*/*/) - 1)) );
1693 eval { command_oneline
([ 'rev-parse', '--verify', $ref ],
1694 { STDERR
=> 0 }); };
1697 sub get_tree_from_treeish
{
1699 # $treeish can be a symbolic ref, too:
1700 my $type = command_oneline
(qw
/cat-file -t/, $treeish);
1702 while ($type eq 'tag') {
1703 ($treeish, $type) = command
(qw
/cat-file tag/, $treeish);
1705 if ($type eq 'commit') {
1706 $expected = (grep /^tree /, command
(qw
/cat-file commit/,
1708 ($expected) = ($expected =~ /^tree ($sha1)$/o);
1709 die "Unable to get tree from $treeish\n" unless $expected;
1710 } elsif ($type eq 'tree') {
1711 $expected = $treeish;
1713 die "$treeish is a $type, expected tree, tag or commit\n";
1718 sub get_commit_entry
{
1719 my ($treeish) = shift;
1720 my %log_entry = ( log => '', tree
=> get_tree_from_treeish
($treeish) );
1721 my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
1722 my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
1723 open my $log_fh, '>', $commit_editmsg or croak
$!;
1725 my $type = command_oneline
(qw
/cat-file -t/, $treeish);
1726 if ($type eq 'commit' || $type eq 'tag') {
1727 my ($msg_fh, $ctx) = command_output_pipe
('cat-file',
1735 $in_msg = 1 if (/^\s*$/);
1736 $author = $1 if (/^author (.*>)/);
1737 } elsif (/^git-svn-id: /) {
1738 # skip this for now, we regenerate the
1739 # correct one on re-fetch anyways
1740 # TODO: set *:merge properties or like...
1742 if (/^From:/ || /^Signed-off-by:/) {
1748 $msgbuf =~ s/\s+$//s;
1749 if ($Git::SVN
::_add_author_from
&& defined($author)
1751 $msgbuf .= "\n\nFrom: $author";
1753 print $log_fh $msgbuf or croak
$!;
1754 command_close_pipe
($msg_fh, $ctx);
1756 close $log_fh or croak
$!;
1758 if ($_edit || ($type eq 'tree')) {
1759 chomp(my $editor = command_oneline
(qw(var GIT_EDITOR)));
1760 system('sh', '-c', $editor.' "$@"', $editor, $commit_editmsg);
1762 rename $commit_editmsg, $commit_msg or croak
$!;
1765 # SVN requires messages to be UTF-8 when entering the repo
1767 open $log_fh, '<', $commit_msg or croak
$!;
1769 chomp($log_entry{log} = <$log_fh>);
1771 my $enc = Git
::config
('i18n.commitencoding') || 'UTF-8';
1772 my $msg = $log_entry{log};
1774 eval { $msg = Encode
::decode
($enc, $msg, 1) };
1776 die "Could not decode as $enc:\n", $msg,
1777 "\nPerhaps you need to set i18n.commitencoding\n";
1780 eval { $msg = Encode
::encode
('UTF-8', $msg, 1) };
1781 die "Could not encode as UTF-8:\n$msg\n" if $@
;
1783 $log_entry{log} = $msg;
1785 close $log_fh or croak
$!;
1792 my ($str, $file, $mode) = @_;
1793 open my $fd,'>',$file or croak
$!;
1794 print $fd $str,"\n" or croak
$!;
1795 close $fd or croak
$!;
1796 chmod ($mode &~ umask, $file) if (defined $mode);
1801 open my $fd,'<',$file or croak
"$!: file: $file\n";
1804 close $fd or croak
$!;
1809 # '<svn username> = real-name <email address>' mapping based on git-svnimport:
1811 open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
1812 my $log = $cmd eq 'log';
1813 while (<$authors>) {
1815 next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
1816 my ($user, $name, $email) = ($1, $2, $3);
1818 $Git::SVN
::Log
::rusers
{"$name <$email>"} = $user;
1820 $users{$user} = [$name, $email];
1823 close $authors or croak
$!;
1826 # convert GetOpt::Long specs for use by git-config
1827 sub read_git_config
{
1830 foreach my $o (keys %$opts) {
1831 # if we have mixedCase and a long option-only, then
1832 # it's a config-only variable that we don't need for
1834 push @config_only, $o if ($o =~ /[A-Z]/ && $o =~ /^[a-z]+$/i);
1835 my $v = $opts->{$o};
1836 my ($key) = ($o =~ /^([a-zA-Z\-]+)/);
1838 my $arg = 'git config';
1839 $arg .= ' --int' if ($o =~ /[:=]i$/);
1840 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
1841 if (ref $v eq 'ARRAY') {
1842 chomp(my @tmp = `$arg --get-all svn.$key`);
1845 chomp(my $tmp = `$arg --get svn.$key`);
1846 if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) {
1851 delete @
$opts{@config_only} if @config_only;
1854 sub extract_metadata
{
1855 my $id = shift or return (undef, undef, undef);
1856 my ($url, $rev, $uuid) = ($id =~ /^\s
*git
-svn
-id
:\s
+(.*)\@
(\d
+)
1857 \s
([a
-f\d\
-]+)$/ix
);
1858 if (!defined $rev || !$uuid || !$url) {
1859 # some of the original repositories I made had
1860 # identifiers like this:
1861 ($rev, $uuid) = ($id =~/^\s*git-svn-id:\s(\d+)\@([a-f\d\-]+)/i);
1863 return ($url, $rev, $uuid);
1867 return extract_metadata
((grep(/^git-svn-id: /,
1868 command
(qw
/cat-file commit/, shift)))[-1]);
1871 sub cmt_sha2rev_batch
{
1873 my ($pid, $in, $out, $ctx) = command_bidi_pipe
(qw
/cat-file --batch/);
1876 foreach my $sha (@
{$list}) {
1879 print $out $sha, "\n";
1881 while (my $line = <$in>) {
1882 if ($first && $line =~ /^[[:xdigit:]]{40}\smissing$/) {
1885 $line =~ /^[[:xdigit:]]{40}\scommit\s(\d+)$/) {
1889 } elsif ($line =~ /^(git-svn-id: )/) {
1890 my (undef, $rev, undef) =
1891 extract_metadata
($line);
1895 $size -= length($line);
1896 last if ($size == 0);
1900 command_close_bidi_pipe
($pid, $in, $out, $ctx);
1905 sub working_head_info
{
1906 my ($head, $refs) = @_;
1907 my @args = qw
/rev-list --first-parent --pretty=medium/;
1908 my ($fh, $ctx) = command_output_pipe
(@args, $head);
1912 if ( m{^commit ($::sha1)$} ) {
1913 unshift @
$refs, $hash if $hash and $refs;
1917 next unless s{^\s*(git-svn-id:)}{$1};
1918 my ($url, $rev, $uuid) = extract_metadata
($_);
1919 if (defined $url && defined $rev) {
1920 next if $max{$url} and $max{$url} < $rev;
1921 if (my $gs = Git
::SVN
->find_by_url($url)) {
1922 my $c = $gs->rev_map_get($rev, $uuid);
1923 if ($c && $c eq $hash) {
1924 close $fh; # break the pipe
1925 return ($url, $rev, $uuid, $gs);
1927 $max{$url} ||= $gs->rev_map_max;
1932 command_close_pipe
($fh, $ctx);
1933 (undef, undef, undef, undef);
1936 sub read_commit_parents
{
1937 my ($parents, $c) = @_;
1938 chomp(my $p = command_oneline
(qw
/rev-list --parents -1/, $c));
1939 $p =~ s/^($c)\s*// or die "rev-list --parents -1 $c failed!\n";
1940 @
{$parents->{$c}} = split(/ /, $p);
1943 sub linearize_history
{
1944 my ($gs, $refs) = @_;
1946 foreach my $c (@
$refs) {
1947 read_commit_parents
(\
%parents, $c);
1952 my $last_svn_commit = $gs->last_commit;
1953 foreach my $c (reverse @
$refs) {
1954 next if $c eq $last_svn_commit;
1957 unshift @linear_refs, $c;
1960 # we only want the first parent to diff against for linear
1961 # history, we save the rest to inject when we finalize the
1963 my $fp_a = verify_ref
("$c~1");
1964 my $fp_b = shift @
{$parents{$c}} if $parents{$c};
1965 if (!$fp_a || !$fp_b) {
1967 "has no parent commit, and therefore ",
1968 "nothing to diff against.\n",
1969 "You should be working from a repository ",
1970 "originally created by git-svn\n";
1972 if ($fp_a ne $fp_b) {
1973 die "$c~1 = $fp_a, however parsing commit $c ",
1974 "revealed that:\n$c~1 = $fp_b\nBUG!\n";
1977 foreach my $p (@
{$parents{$c}}) {
1981 (\
@linear_refs, \
%parents);
1984 sub find_file_type_and_diff_status
{
1986 return ('dir', '') if $path eq '';
1989 command_oneline
(qw(diff --cached --name-status --), $path) || "";
1990 my $diff_status = (split(' ', $diff_output))[0] || "";
1992 my $ls_tree = command_oneline
(qw(ls-tree HEAD), $path) || "";
1994 return (undef, undef) if !$diff_status && !$ls_tree;
1996 if ($diff_status eq "A") {
1997 return ("link", $diff_status) if -l
$path;
1998 return ("dir", $diff_status) if -d
$path;
1999 return ("file", $diff_status);
2002 my $mode = (split(' ', $ls_tree))[0] || "";
2004 return ("link", $diff_status) if $mode eq "120000";
2005 return ("dir", $diff_status) if $mode eq "040000";
2006 return ("file", $diff_status);
2012 my $md5 = Digest
::MD5
->new();
2013 if ($ref eq 'GLOB' || $ref eq 'IO::File' || $ref eq 'File::Temp') {
2014 $md5->addfile($arg) or croak
$!;
2015 } elsif ($ref eq 'SCALAR') {
2016 $md5->add($$arg) or croak
$!;
2018 $md5->add($arg) or croak
$!;
2020 fatal
"Can't provide MD5 hash for unknown ref type: '", $ref, "'";
2022 return $md5->hexdigest();
2026 if (can_compress
() && -f
$_ && basename
($_) eq "unhandled.log") {
2027 my $out_filename = $_ . ".gz";
2028 open my $in_fh, "<", $_ or die "Unable to open $_: $!\n";
2030 my $gz = Compress
::Zlib
::gzopen
($out_filename, "ab") or
2031 die "Unable to open $out_filename: $!\n";
2034 while ($res = sysread($in_fh, my $str, 1024)) {
2035 $gz->gzwrite($str) or
2036 die "Unable to write: ".$gz->gzerror()."!\n";
2038 unlink $_ or die "unlink $File::Find::name: $!\n";
2039 } elsif (-f
$_ && basename
($_) eq "index") {
2040 unlink $_ or die "unlink $_: $!\n";
2045 package Git
::IndexInfo
;
2048 use Git qw
/command_input_pipe command_close_pipe/;
2052 my ($gui, $ctx) = command_input_pipe
(qw
/update-index -z --index-info/);
2053 bless { gui
=> $gui, ctx
=> $ctx, nr
=> 0}, $class;
2057 my ($self, $path) = @_;
2058 if (print { $self->{gui
} } '0 ', 0 x
40, "\t", $path, "\0") {
2059 return ++$self->{nr
};
2065 my ($self, $mode, $hash, $path) = @_;
2066 if (print { $self->{gui
} } $mode, ' ', $hash, "\t", $path, "\0") {
2067 return ++$self->{nr
};
2074 command_close_pipe
($self->{gui
}, $self->{ctx
});
2077 package Git
::SVN
::GlobSpec
;
2082 my ($class, $glob, $pattern_ok) = @_;
2084 $re =~ s!/+$!!g; # no need for trailing slashes
2085 my (@left, @right, @patterns);
2087 my $die_msg = "Only one set of wildcard directories " .
2088 "(e.g. '*' or '*/*/*') is supported: '$glob'\n";
2089 for my $part (split(m
|/|, $glob)) {
2090 if ($part =~ /\*/ && $part ne "*") {
2091 die "Invalid pattern in '$glob': $part\n";
2092 } elsif ($pattern_ok && $part =~ /[{}]/ &&
2093 $part !~ /^\{[^{}]+\}/) {
2094 die "Invalid pattern in '$glob': $part\n";
2097 die $die_msg if $state eq "right";
2099 push(@patterns, "[^/]*");
2100 } elsif ($pattern_ok && $part =~ /^\{(.*)\}$/) {
2101 die $die_msg if $state eq "right";
2103 my $p = quotemeta($1);
2105 push(@patterns, "(?:$p)");
2107 if ($state eq "left") {
2110 push(@right, $part);
2115 my $depth = @patterns;
2117 die "One '*' is needed in glob: '$glob'\n";
2119 my $left = join('/', @left);
2120 my $right = join('/', @right);
2121 $re = join('/', @patterns);
2123 grep(length, quotemeta($left), "($re)", quotemeta($right)));
2124 my $left_re = qr/^\/\Q
$left\E
(\
/|$)/;
2125 bless { left
=> $left, right
=> $right, left_regex
=> $left_re,
2126 regex
=> qr/$re/, glob => $glob, depth
=> $depth }, $class;
2130 my ($self, $path) = @_;
2131 return (length $self->{left
} ?
"$self->{left}/" : '') .
2132 $path . (length $self->{right
} ?
"/$self->{right}" : '');
2140 $remotes = { # returned by read_all_remotes()
2142 # svn-remote.svn.url=https://svn.musicpd.org
2143 url
=> 'https://svn.musicpd.org',
2144 # svn-remote.svn.fetch=mpd/trunk:trunk
2146 'mpd/trunk' => 'trunk',
2148 # svn-remote.svn.tags=mpd/tags/*:tags/*
2153 regex
=> qr!mpd/tags/([^/]+)$!,
2159 regex
=> qr!tags/([^/]+)$!,
2166 $log_entry hashref as returned by libsvn_log_entry
()
2168 log => 'whitespace-formatted log entry
2169 ', # trailing newline is preserved
2170 revision
=> '8', # integer
2171 date
=> '2004-02-24T17:01:44.108345Z', # commit date
2172 author
=> 'committer name'
2176 # this is generated by generate_diff();
2177 @mods = array of diff
-index line hashes
, each element represents one line
2178 of diff
-index output
2180 diff
-index line
($m hash
)
2182 mode_a
=> first column of diff
-index output
, no leading
':',
2183 mode_b
=> second column of diff
-index output
,
2184 sha1_b
=> sha1sum of the final blob
,
2185 chg
=> change type
[MCRADT
],
2186 file_a
=> original file name of a file
(iff chg is
'C' or 'R')
2187 file_b
=> new
/current file name of a file
(any chg
)
2191 # retval of read_url_paths{,_all}();
2193 # repository root url
2194 'https://svn.musicpd.org' => {
2195 # repository path # GIT_SVN_ID
2196 'mpd/trunk' => 'trunk',
2197 'mpd/tags/0.11.5' => 'tags/0.11.5',
2202 I don
't trust the each() function on unless I created %hash myself
2203 because the internal iterator may not have started at base.