git-svn.perl

   1 #!/usr/bin/perl
   2 # Copyright (C) 2006, Eric Wong <normalperson@yhbt.net>
   3 # License: GPL v2 or later
   4 use 5.008;
   5 use warnings;
   6 use strict;
   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@@';
  12
  13 use Carp qw/croak/;
  14 use Digest::MD5;
  15 use IO::File qw//;
  16 use File::Basename qw/dirname basename/;
  17 use File::Path qw/mkpath/;
  18 use File::Spec;
  19 use File::Find;
  20 use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
  21 use IPC::Open3;
  22 use Memoize;
  23
  24 use Git::SVN;
  25 use Git::SVN::Editor;
  26 use Git::SVN::Fetcher;
  27 use Git::SVN::Ra;
  28 use Git::SVN::Prompt;
  29 use Git::SVN::Log;
  30 use Git::SVN::Migration;
  31
  32 use Git::SVN::Utils qw(fatal can_compress);
  33 use Git qw(
  34         git_cmd_try
  35         command
  36         command_oneline
  37         command_noisy
  38         command_output_pipe
  39         command_close_pipe
  40         command_bidi_pipe
  41         command_close_bidi_pipe
  42 );
  43
  44 BEGIN {
  45         Memoize::memoize 'Git::config';
  46         Memoize::memoize 'Git::config_bool';
  47 }
  48
  49
  50 # From which subdir have we been invoked?
  51 my $cmd_dir_prefix = eval {
  52         command_oneline([qw/rev-parse --show-prefix/], STDERR => 0)
  53 } || '';
  54
  55 my $git_dir_user_set = 1 if defined $ENV{GIT_DIR};
  56 $ENV{GIT_DIR} ||= '.git';
  57 $Git::SVN::Ra::_log_window_size = 100;
  58
  59 if (! exists $ENV{SVN_SSH} && exists $ENV{GIT_SSH}) {
  60         $ENV{SVN_SSH} = $ENV{GIT_SSH};
  61 }
  62
  63 if (exists $ENV{SVN_SSH} && $^O eq 'msys') {
  64         $ENV{SVN_SSH} =~ s/\\/\\\\/g;
  65         $ENV{SVN_SSH} =~ s/(.*)/"$1"/;
  66 }
  67
  68 $Git::SVN::Log::TZ = $ENV{TZ};
  69 $ENV{TZ} = 'UTC';
  70 $| = 1; # unbuffer STDOUT
  71
  72 # All SVN commands do it.  Otherwise we may die on SIGPIPE when the remote
  73 # repository decides to close the connection which we expect to be kept alive.
  74 $SIG{PIPE} = 'IGNORE';
  75
  76 # Given a dot separated version number, "subtract" it from
  77 # the SVN::Core::VERSION; non-negaitive return means the SVN::Core
  78 # is at least at the version the caller asked for.
  79 sub compare_svn_version {
  80         my (@ours) = split(/\./, $SVN::Core::VERSION);
  81         my (@theirs) = split(/\./, $_[0]);
  82         my ($i, $diff);
  83
  84         for ($i = 0; $i < @ours && $i < @theirs; $i++) {
  85                 $diff = $ours[$i] - $theirs[$i];
  86                 return $diff if ($diff);
  87         }
  88         return 1 if ($i < @ours);
  89         return -1 if ($i < @theirs);
  90         return 0;
  91 }
  92
  93 sub _req_svn {
  94         require SVN::Core; # use()-ing this causes segfaults for me... *shrug*
  95         require SVN::Ra;
  96         require SVN::Delta;
  97         if (::compare_svn_version('1.1.0') < 0) {
  98                 fatal "Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)";
  99         }
 100 }
 101
 102 $sha1 = qr/[a-f\d]{40}/;
 103 $sha1_short = qr/[a-f\d]{4,40}/;
 104 my ($_stdin, $_help, $_edit,
 105         $_message, $_file, $_branch_dest,
 106         $_template, $_shared,
 107         $_version, $_fetch_all, $_no_rebase, $_fetch_parent,
 108         $_merge, $_strategy, $_preserve_merges, $_dry_run, $_local,
 109         $_prefix, $_no_checkout, $_url, $_verbose,
 110         $_commit_url, $_tag, $_merge_info, $_interactive);
 111
 112 # This is a refactoring artifact so Git::SVN can get at this git-svn switch.
 113 sub opt_prefix { return $_prefix || '' }
 114
 115 $Git::SVN::Fetcher::_placeholder_filename = ".gitignore";
 116 $_q ||= 0;
 117 my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
 118                     'config-dir=s' => \$Git::SVN::Ra::config_dir,
 119                     'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache,
 120                     'ignore-paths=s' => \$Git::SVN::Fetcher::_ignore_regex,
 121                     'ignore-refs=s' => \$Git::SVN::Ra::_ignore_refs_regex );
 122 my %fc_opts = ( 'follow-parent|follow!' => \$Git::SVN::_follow_parent,
 123                 'authors-file|A=s' => \$_authors,
 124                 'authors-prog=s' => \$_authors_prog,
 125                 'repack:i' => \$Git::SVN::_repack,
 126                 'noMetadata' => \$Git::SVN::_no_metadata,
 127                 'useSvmProps' => \$Git::SVN::_use_svm_props,
 128                 'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props,
 129                 'log-window-size=i' => \$Git::SVN::Ra::_log_window_size,
 130                 'no-checkout' => \$_no_checkout,
 131                 'quiet|q+' => \$_q,
 132                 'repack-flags|repack-args|repack-opts=s' =>
 133                    \$Git::SVN::_repack_flags,
 134                 'use-log-author' => \$Git::SVN::_use_log_author,
 135                 'add-author-from' => \$Git::SVN::_add_author_from,
 136                 'localtime' => \$Git::SVN::_localtime,
 137                 %remote_opts );
 138
 139 my ($_trunk, @_tags, @_branches, $_stdlayout);
 140 my %icv;
 141 my %init_opts = ( 'template=s' => \$_template, 'shared:s' => \$_shared,
 142                   'trunk|T=s' => \$_trunk, 'tags|t=s@' => \@_tags,
 143                   'branches|b=s@' => \@_branches, 'prefix=s' => \$_prefix,
 144                   'stdlayout|s' => \$_stdlayout,
 145                   'minimize-url|m!' => \$Git::SVN::_minimize_url,
 146                   'no-metadata' => sub { $icv{noMetadata} = 1 },
 147                   'use-svm-props' => sub { $icv{useSvmProps} = 1 },
 148                   'use-svnsync-props' => sub { $icv{useSvnsyncProps} = 1 },
 149                   'rewrite-root=s' => sub { $icv{rewriteRoot} = $_[1] },
 150                   'rewrite-uuid=s' => sub { $icv{rewriteUUID} = $_[1] },
 151                   %remote_opts );
 152 my %cmt_opts = ( 'edit|e' => \$_edit,
 153                 'rmdir' => \$Git::SVN::Editor::_rmdir,
 154                 'find-copies-harder' => \$Git::SVN::Editor::_find_copies_harder,
 155                 'l=i' => \$Git::SVN::Editor::_rename_limit,
 156                 'copy-similarity|C=i'=> \$Git::SVN::Editor::_cp_similarity
 157 );
 158
 159 my %cmd = (
 160         fetch => [ \&cmd_fetch, "Download new revisions from SVN",
 161                         { 'revision|r=s' => \$_revision,
 162                           'fetch-all|all' => \$_fetch_all,
 163                           'parent|p' => \$_fetch_parent,
 164                            %fc_opts } ],
 165         clone => [ \&cmd_clone, "Initialize and fetch revisions",
 166                         { 'revision|r=s' => \$_revision,
 167                           'preserve-empty-dirs' =>
 168                                 \$Git::SVN::Fetcher::_preserve_empty_dirs,
 169                           'placeholder-filename=s' =>
 170                                 \$Git::SVN::Fetcher::_placeholder_filename,
 171                            %fc_opts, %init_opts } ],
 172         init => [ \&cmd_init, "Initialize a repo for tracking" .
 173                           " (requires URL argument)",
 174                           \%init_opts ],
 175         'multi-init' => [ \&cmd_multi_init,
 176                           "Deprecated alias for ".
 177                           "'$0 init -T<trunk> -b<branches> -t<tags>'",
 178                           \%init_opts ],
 179         dcommit => [ \&cmd_dcommit,
 180                      'Commit several diffs to merge with upstream',
 181                         { 'merge|m|M' => \$_merge,
 182                           'strategy|s=s' => \$_strategy,
 183                           'verbose|v' => \$_verbose,
 184                           'dry-run|n' => \$_dry_run,
 185                           'fetch-all|all' => \$_fetch_all,
 186                           'commit-url=s' => \$_commit_url,
 187                           'revision|r=i' => \$_revision,
 188                           'no-rebase' => \$_no_rebase,
 189                           'mergeinfo=s' => \$_merge_info,
 190                           'interactive|i' => \$_interactive,
 191                         %cmt_opts, %fc_opts } ],
 192         branch => [ \&cmd_branch,
 193                     'Create a branch in the SVN repository',
 194                     { 'message|m=s' => \$_message,
 195                       'destination|d=s' => \$_branch_dest,
 196                       'dry-run|n' => \$_dry_run,
 197                       'tag|t' => \$_tag,
 198                       'username=s' => \$Git::SVN::Prompt::_username,
 199                       'commit-url=s' => \$_commit_url } ],
 200         tag => [ sub { $_tag = 1; cmd_branch(@_) },
 201                  'Create a tag in the SVN repository',
 202                  { 'message|m=s' => \$_message,
 203                    'destination|d=s' => \$_branch_dest,
 204                    'dry-run|n' => \$_dry_run,
 205                    'username=s' => \$Git::SVN::Prompt::_username,
 206                    'commit-url=s' => \$_commit_url } ],
 207         'set-tree' => [ \&cmd_set_tree,
 208                         "Set an SVN repository to a git tree-ish",
 209                         { 'stdin' => \$_stdin, %cmt_opts, %fc_opts, } ],
 210         'create-ignore' => [ \&cmd_create_ignore,
 211                              'Create a .gitignore per svn:ignore',
 212                              { 'revision|r=i' => \$_revision
 213                              } ],
 214         'mkdirs' => [ \&cmd_mkdirs ,
 215                       "recreate empty directories after a checkout",
 216                       { 'revision|r=i' => \$_revision } ],
 217         'propget' => [ \&cmd_propget,
 218                        'Print the value of a property on a file or directory',
 219                        { 'revision|r=i' => \$_revision } ],
 220         'proplist' => [ \&cmd_proplist,
 221                        'List all properties of a file or directory',
 222                        { 'revision|r=i' => \$_revision } ],
 223         'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings",
 224                         { 'revision|r=i' => \$_revision
 225                         } ],
 226         'show-externals' => [ \&cmd_show_externals, "Show svn:externals listings",
 227                         { 'revision|r=i' => \$_revision
 228                         } ],
 229         'multi-fetch' => [ \&cmd_multi_fetch,
 230                            "Deprecated alias for $0 fetch --all",
 231                            { 'revision|r=s' => \$_revision, %fc_opts } ],
 232         'migrate' => [ sub { },
 233                        # no-op, we automatically run this anyways,
 234                        'Migrate configuration/metadata/layout from
 235                         previous versions of git-svn',
 236                        { 'minimize' => \$Git::SVN::Migration::_minimize,
 237                          %remote_opts } ],
 238         'log' => [ \&Git::SVN::Log::cmd_show_log, 'Show commit logs',
 239                         { 'limit=i' => \$Git::SVN::Log::limit,
 240                           'revision|r=s' => \$_revision,
 241                           'verbose|v' => \$Git::SVN::Log::verbose,
 242                           'incremental' => \$Git::SVN::Log::incremental,
 243                           'oneline' => \$Git::SVN::Log::oneline,
 244                           'show-commit' => \$Git::SVN::Log::show_commit,
 245                           'non-recursive' => \$Git::SVN::Log::non_recursive,
 246                           'authors-file|A=s' => \$_authors,
 247                           'color' => \$Git::SVN::Log::color,
 248                           'pager=s' => \$Git::SVN::Log::pager
 249                         } ],
 250         'find-rev' => [ \&cmd_find_rev,
 251                         "Translate between SVN revision numbers and tree-ish",
 252                         {} ],
 253         'rebase' => [ \&cmd_rebase, "Fetch and rebase your working directory",
 254                         { 'merge|m|M' => \$_merge,
 255                           'verbose|v' => \$_verbose,
 256                           'strategy|s=s' => \$_strategy,
 257                           'local|l' => \$_local,
 258                           'fetch-all|all' => \$_fetch_all,
 259                           'dry-run|n' => \$_dry_run,
 260                           'preserve-merges|p' => \$_preserve_merges,
 261                           %fc_opts } ],
 262         'commit-diff' => [ \&cmd_commit_diff,
 263                            'Commit a diff between two trees',
 264                         { 'message|m=s' => \$_message,
 265                           'file|F=s' => \$_file,
 266                           'revision|r=s' => \$_revision,
 267                         %cmt_opts } ],
 268         'info' => [ \&cmd_info,
 269                     "Show info about the latest SVN revision
 270                      on the current branch",
 271                     { 'url' => \$_url, } ],
 272         'blame' => [ \&Git::SVN::Log::cmd_blame,
 273                     "Show what revision and author last modified each line of a file",
 274                     { 'git-format' => \$Git::SVN::Log::_git_format } ],
 275         'reset' => [ \&cmd_reset,
 276                      "Undo fetches back to the specified SVN revision",
 277                      { 'revision|r=s' => \$_revision,
 278                        'parent|p' => \$_fetch_parent } ],
 279         'gc' => [ \&cmd_gc,
 280                   "Compress unhandled.log files in .git/svn and remove " .
 281                   "index files in .git/svn",
 282                 {} ],
 283 );
 284
 285 use Term::ReadLine;
 286 package FakeTerm;
 287 sub new {
 288         my ($class, $reason) = @_;
 289         return bless \$reason, shift;
 290 }
 291 sub readline {
 292         my $self = shift;
 293         die "Cannot use readline on FakeTerm: $$self";
 294 }
 295 package main;
 296
 297 my $term = eval {
 298         $ENV{"GIT_SVN_NOTTY"}
 299                 ? new Term::ReadLine 'git-svn', \*STDIN, \*STDOUT
 300                 : new Term::ReadLine 'git-svn';
 301 };
 302 if ($@) {
 303         $term = new FakeTerm "$@: going non-interactive";
 304 }
 305
 306 my $cmd;
 307 for (my $i = 0; $i < @ARGV; $i++) {
 308         if (defined $cmd{$ARGV[$i]}) {
 309                 $cmd = $ARGV[$i];
 310                 splice @ARGV, $i, 1;
 311                 last;
 312         } elsif ($ARGV[$i] eq 'help') {
 313                 $cmd = $ARGV[$i+1];
 314                 usage(0);
 315         }
 316 };
 317
 318 # make sure we're always running at the top-level working directory
 319 unless ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
 320         unless (-d $ENV{GIT_DIR}) {
 321                 if ($git_dir_user_set) {
 322                         die "GIT_DIR=$ENV{GIT_DIR} explicitly set, ",
 323                             "but it is not a directory\n";
 324                 }
 325                 my $git_dir = delete $ENV{GIT_DIR};
 326                 my $cdup = undef;
 327                 git_cmd_try {
 328                         $cdup = command_oneline(qw/rev-parse --show-cdup/);
 329                         $git_dir = '.' unless ($cdup);
 330                         chomp $cdup if ($cdup);
 331                         $cdup = "." unless ($cdup && length $cdup);
 332                 } "Already at toplevel, but $git_dir not found\n";
 333                 chdir $cdup or die "Unable to chdir up to '$cdup'\n";
 334                 unless (-d $git_dir) {
 335                         die "$git_dir still not found after going to ",
 336                             "'$cdup'\n";
 337                 }
 338                 $ENV{GIT_DIR} = $git_dir;
 339         }
 340         $_repository = Git->repository(Repository => $ENV{GIT_DIR});
 341 }
 342
 343 my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
 344
 345 read_git_config(\%opts);
 346 if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) {
 347         Getopt::Long::Configure('pass_through');
 348 }
 349 my $rv = GetOptions(%opts, 'h|H' => \$_help, 'version|V' => \$_version,
 350                     'minimize-connections' => \$Git::SVN::Migration::_minimize,
 351                     'id|i=s' => \$Git::SVN::default_ref_id,
 352                     'svn-remote|remote|R=s' => sub {
 353                        $Git::SVN::no_reuse_existing = 1;
 354                        $Git::SVN::default_repo_id = $_[1] });
 355 exit 1 if (!$rv && $cmd && $cmd ne 'log');
 356
 357 usage(0) if $_help;
 358 version() if $_version;
 359 usage(1) unless defined $cmd;
 360 load_authors() if $_authors;
 361 if (defined $_authors_prog) {
 362         $_authors_prog = "'" . File::Spec->rel2abs($_authors_prog) . "'";
 363 }
 364
 365 unless ($cmd =~ /^(?:clone|init|multi-init|commit-diff)$/) {
 366         Git::SVN::Migration::migration_check();
 367 }
 368 Git::SVN::init_vars();
 369 eval {
 370         Git::SVN::verify_remotes_sanity();
 371         $cmd{$cmd}->[0]->(@ARGV);
 372         post_fetch_checkout();
 373 };
 374 fatal $@ if $@;
 375 exit 0;
 376
 377 ####################### primary functions ######################
 378 sub usage {
 379         my $exit = shift || 0;
 380         my $fd = $exit ? \*STDERR : \*STDOUT;
 381         print $fd <<"";
 382 git-svn - bidirectional operations between a single Subversion tree and git
 383 Usage: git svn <command> [options] [arguments]\n
 384
 385         print $fd "Available commands:\n" unless $cmd;
 386
 387         foreach (sort keys %cmd) {
 388                 next if $cmd && $cmd ne $_;
 389                 next if /^multi-/; # don't show deprecated commands
 390                 print $fd '  ',pack('A17',$_),$cmd{$_}->[1],"\n";
 391                 foreach (sort keys %{$cmd{$_}->[2]}) {
 392                         # mixed-case options are for .git/config only
 393                         next if /[A-Z]/ && /^[a-z]+$/i;
 394                         # prints out arguments as they should be passed:
 395                         my $x = s#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
 396                         print $fd ' ' x 21, join(', ', map { length $_ > 1 ?
 397                                                         "--$_" : "-$_" }
 398                                                 split /\|/,$_)," $x\n";
 399                 }
 400         }
 401         print $fd <<"";
 402 \nGIT_SVN_ID may be set in the environment or via the --id/-i switch to an
 403 arbitrary identifier if you're tracking multiple SVN branches/repositories in
 404 one git repository and want to keep them separate.  See git-svn(1) for more
 405 information.
 406
 407         exit $exit;
 408 }
 409
 410 sub version {
 411         ::_req_svn();
 412         print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
 413         exit 0;
 414 }
 415
 416 sub ask {
 417         my ($prompt, %arg) = @_;
 418         my $valid_re = $arg{valid_re};
 419         my $default = $arg{default};
 420         my $resp;
 421         my $i = 0;
 422
 423         if ( !( defined($term->IN)
 424             && defined( fileno($term->IN) )
 425             && defined( $term->OUT )
 426             && defined( fileno($term->OUT) ) ) ){
 427                 return defined($default) ? $default : undef;
 428         }
 429
 430         while ($i++ < 10) {
 431                 $resp = $term->readline($prompt);
 432                 if (!defined $resp) { # EOF
 433                         print "\n";
 434                         return defined $default ? $default : undef;
 435                 }
 436                 if ($resp eq '' and defined $default) {
 437                         return $default;
 438                 }
 439                 if (!defined $valid_re or $resp =~ /$valid_re/) {
 440                         return $resp;
 441                 }
 442         }
 443         return undef;
 444 }
 445
 446 sub do_git_init_db {
 447         unless (-d $ENV{GIT_DIR}) {
 448                 my @init_db = ('init');
 449                 push @init_db, "--template=$_template" if defined $_template;
 450                 if (defined $_shared) {
 451                         if ($_shared =~ /[a-z]/) {
 452                                 push @init_db, "--shared=$_shared";
 453                         } else {
 454                                 push @init_db, "--shared";
 455                         }
 456                 }
 457                 command_noisy(@init_db);
 458                 $_repository = Git->repository(Repository => ".git");
 459         }
 460         my $set;
 461         my $pfx = "svn-remote.$Git::SVN::default_repo_id";
 462         foreach my $i (keys %icv) {
 463                 die "'$set' and '$i' cannot both be set\n" if $set;
 464                 next unless defined $icv{$i};
 465                 command_noisy('config', "$pfx.$i", $icv{$i});
 466                 $set = $i;
 467         }
 468         my $ignore_paths_regex = \$Git::SVN::Fetcher::_ignore_regex;
 469         command_noisy('config', "$pfx.ignore-paths", $$ignore_paths_regex)
 470                 if defined $$ignore_paths_regex;
 471         my $ignore_refs_regex = \$Git::SVN::Ra::_ignore_refs_regex;
 472         command_noisy('config', "$pfx.ignore-refs", $$ignore_refs_regex)
 473                 if defined $$ignore_refs_regex;
 474
 475         if (defined $Git::SVN::Fetcher::_preserve_empty_dirs) {
 476                 my $fname = \$Git::SVN::Fetcher::_placeholder_filename;
 477                 command_noisy('config', "$pfx.preserve-empty-dirs", 'true');
 478                 command_noisy('config', "$pfx.placeholder-filename", $$fname);
 479         }
 480 }
 481
 482 sub init_subdir {
 483         my $repo_path = shift or return;
 484         mkpath([$repo_path]) unless -d $repo_path;
 485         chdir $repo_path or die "Couldn't chdir to $repo_path: $!\n";
 486         $ENV{GIT_DIR} = '.git';
 487         $_repository = Git->repository(Repository => $ENV{GIT_DIR});
 488 }
 489
 490 sub cmd_clone {
 491         my ($url, $path) = @_;
 492         if (!defined $path &&
 493             (defined $_trunk || @_branches || @_tags ||
 494              defined $_stdlayout) &&
 495             $url !~ m#^[a-z\+]+://#) {
 496                 $path = $url;
 497         }
 498         $path = basename($url) if !defined $path || !length $path;
 499         my $authors_absolute = $_authors ? File::Spec->rel2abs($_authors) : "";
 500         cmd_init($url, $path);
 501         command_oneline('config', 'svn.authorsfile', $authors_absolute)
 502             if $_authors;
 503         Git::SVN::fetch_all($Git::SVN::default_repo_id);
 504 }
 505
 506 sub cmd_init {
 507         if (defined $_stdlayout) {
 508                 $_trunk = 'trunk' if (!defined $_trunk);
 509                 @_tags = 'tags' if (! @_tags);
 510                 @_branches = 'branches' if (! @_branches);
 511         }
 512         if (defined $_trunk || @_branches || @_tags) {
 513                 return cmd_multi_init(@_);
 514         }
 515         my $url = shift or die "SVN repository location required ",
 516                                "as a command-line argument\n";
 517         $url = canonicalize_url($url);
 518         init_subdir(@_);
 519         do_git_init_db();
 520
 521         if ($Git::SVN::_minimize_url eq 'unset') {
 522                 $Git::SVN::_minimize_url = 0;
 523         }
 524
 525         Git::SVN->init($url);
 526 }
 527
 528 sub cmd_fetch {
 529         if (grep /^\d+=./, @_) {
 530                 die "'<rev>=<commit>' fetch arguments are ",
 531                     "no longer supported.\n";
 532         }
 533         my ($remote) = @_;
 534         if (@_ > 1) {
 535                 die "Usage: $0 fetch [--all] [--parent] [svn-remote]\n";
 536         }
 537         $Git::SVN::no_reuse_existing = undef;
 538         if ($_fetch_parent) {
 539                 my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
 540                 unless ($gs) {
 541                         die "Unable to determine upstream SVN information from ",
 542                             "working tree history\n";
 543                 }
 544                 # just fetch, don't checkout.
 545                 $_no_checkout = 'true';
 546                 $_fetch_all ? $gs->fetch_all : $gs->fetch;
 547         } elsif ($_fetch_all) {
 548                 cmd_multi_fetch();
 549         } else {
 550                 $remote ||= $Git::SVN::default_repo_id;
 551                 Git::SVN::fetch_all($remote, Git::SVN::read_all_remotes());
 552         }
 553 }
 554
 555 sub cmd_set_tree {
 556         my (@commits) = @_;
 557         if ($_stdin || !@commits) {
 558                 print "Reading from stdin...\n";
 559                 @commits = ();
 560                 while (<STDIN>) {
 561                         if (/\b($sha1_short)\b/o) {
 562                                 unshift @commits, $1;
 563                         }
 564                 }
 565         }
 566         my @revs;
 567         foreach my $c (@commits) {
 568                 my @tmp = command('rev-parse',$c);
 569                 if (scalar @tmp == 1) {
 570                         push @revs, $tmp[0];
 571                 } elsif (scalar @tmp > 1) {
 572                         push @revs, reverse(command('rev-list',@tmp));
 573                 } else {
 574                         fatal "Failed to rev-parse $c";
 575                 }
 576         }
 577         my $gs = Git::SVN->new;
 578         my ($r_last, $cmt_last) = $gs->last_rev_commit;
 579         $gs->fetch;
 580         if (defined $gs->{last_rev} && $r_last != $gs->{last_rev}) {
 581                 fatal "There are new revisions that were fetched ",
 582                       "and need to be merged (or acknowledged) ",
 583                       "before committing.\nlast rev: $r_last\n",
 584                       " current: $gs->{last_rev}";
 585         }
 586         $gs->set_tree($_) foreach @revs;
 587         print "Done committing ",scalar @revs," revisions to SVN\n";
 588         unlink $gs->{index};
 589 }
 590
 591 sub split_merge_info_range {
 592         my ($range) = @_;
 593         if ($range =~ /(\d+)-(\d+)/) {
 594                 return (int($1), int($2));
 595         } else {
 596                 return (int($range), int($range));
 597         }
 598 }
 599
 600 sub combine_ranges {
 601         my ($in) = @_;
 602
 603         my @fnums = ();
 604         my @arr = split(/,/, $in);
 605         for my $element (@arr) {
 606                 my ($start, $end) = split_merge_info_range($element);
 607                 push @fnums, $start;
 608         }
 609
 610         my @sorted = @arr [ sort {
 611                 $fnums[$a] <=> $fnums[$b]
 612         } 0..$#arr ];
 613
 614         my @return = ();
 615         my $last = -1;
 616         my $first = -1;
 617         for my $element (@sorted) {
 618                 my ($start, $end) = split_merge_info_range($element);
 619
 620                 if ($last == -1) {
 621                         $first = $start;
 622                         $last = $end;
 623                         next;
 624                 }
 625                 if ($start <= $last+1) {
 626                         if ($end > $last) {
 627                                 $last = $end;
 628                         }
 629                         next;
 630                 }
 631                 if ($first == $last) {
 632                         push @return, "$first";
 633                 } else {
 634                         push @return, "$first-$last";
 635                 }
 636                 $first = $start;
 637                 $last = $end;
 638         }
 639
 640         if ($first != -1) {
 641                 if ($first == $last) {
 642                         push @return, "$first";
 643                 } else {
 644                         push @return, "$first-$last";
 645                 }
 646         }
 647
 648         return join(',', @return);
 649 }
 650
 651 sub merge_revs_into_hash {
 652         my ($hash, $minfo) = @_;
 653         my @lines = split(' ', $minfo);
 654
 655         for my $line (@lines) {
 656                 my ($branchpath, $revs) = split(/:/, $line);
 657
 658                 if (exists($hash->{$branchpath})) {
 659                         # Merge the two revision sets
 660                         my $combined = "$hash->{$branchpath},$revs";
 661                         $hash->{$branchpath} = combine_ranges($combined);
 662                 } else {
 663                         # Just do range combining for consolidation
 664                         $hash->{$branchpath} = combine_ranges($revs);
 665                 }
 666         }
 667 }
 668
 669 sub merge_merge_info {
 670         my ($mergeinfo_one, $mergeinfo_two) = @_;
 671         my %result_hash = ();
 672
 673         merge_revs_into_hash(\%result_hash, $mergeinfo_one);
 674         merge_revs_into_hash(\%result_hash, $mergeinfo_two);
 675
 676         my $result = '';
 677         # Sort below is for consistency's sake
 678         for my $branchname (sort keys(%result_hash)) {
 679                 my $revlist = $result_hash{$branchname};
 680                 $result .= "$branchname:$revlist\n"
 681         }
 682         return $result;
 683 }
 684
 685 sub populate_merge_info {
 686         my ($d, $gs, $uuid, $linear_refs, $rewritten_parent) = @_;
 687
 688         my %parentshash;
 689         read_commit_parents(\%parentshash, $d);
 690         my @parents = @{$parentshash{$d}};
 691         if ($#parents > 0) {
 692                 # Merge commit
 693                 my $all_parents_ok = 1;
 694                 my $aggregate_mergeinfo = '';
 695                 my $rooturl = $gs->repos_root;
 696
 697                 if (defined($rewritten_parent)) {
 698                         # Replace first parent with newly-rewritten version
 699                         shift @parents;
 700                         unshift @parents, $rewritten_parent;
 701                 }
 702
 703                 foreach my $parent (@parents) {
 704                         my ($branchurl, $svnrev, $paruuid) =
 705                                 cmt_metadata($parent);
 706
 707                         unless (defined($svnrev)) {
 708                                 # Should have been caught be preflight check
 709                                 fatal "merge commit $d has ancestor $parent, but that change "
 710                      ."does not have git-svn metadata!";
 711                         }
 712                         unless ($branchurl =~ /^\Q$rooturl\E(.*)/) {
 713                                 fatal "commit $parent git-svn metadata changed mid-run!";
 714                         }
 715                         my $branchpath = $1;
 716
 717                         my $ra = Git::SVN::Ra->new($branchurl);
 718                         my (undef, undef, $props) =
 719                                 $ra->get_dir(canonicalize_path("."), $svnrev);
 720                         my $par_mergeinfo = $props->{'svn:mergeinfo'};
 721                         unless (defined $par_mergeinfo) {
 722                                 $par_mergeinfo = '';
 723                         }
 724                         # Merge previous mergeinfo values
 725                         $aggregate_mergeinfo =
 726                                 merge_merge_info($aggregate_mergeinfo,
 727                                                                  $par_mergeinfo, 0);
 728
 729                         next if $parent eq $parents[0]; # Skip first parent
 730                         # Add new changes being placed in tree by merge
 731                         my @cmd = (qw/rev-list --reverse/,
 732                                            $parent, qw/--not/);
 733                         foreach my $par (@parents) {
 734                                 unless ($par eq $parent) {
 735                                         push @cmd, $par;
 736                                 }
 737                         }
 738                         my @revsin = ();
 739                         my ($revlist, $ctx) = command_output_pipe(@cmd);
 740                         while (<$revlist>) {
 741                                 my $irev = $_;
 742                                 chomp $irev;
 743                                 my (undef, $csvnrev, undef) =
 744                                         cmt_metadata($irev);
 745                                 unless (defined $csvnrev) {
 746                                         # A child is missing SVN annotations...
 747                                         # this might be OK, or might not be.
 748                                         warn "W:child $irev is merged into revision "
 749                                                  ."$d but does not have git-svn metadata. "
 750                                                  ."This means git-svn cannot determine the "
 751                                                  ."svn revision numbers to place into the "
 752                                                  ."svn:mergeinfo property. You must ensure "
 753                                                  ."a branch is entirely committed to "
 754                                                  ."SVN before merging it in order for "
 755                                                  ."svn:mergeinfo population to function "
 756                                                  ."properly";
 757                                 }
 758                                 push @revsin, $csvnrev;
 759                         }
 760                         command_close_pipe($revlist, $ctx);
 761
 762                         last unless $all_parents_ok;
 763
 764                         # We now have a list of all SVN revnos which are
 765                         # merged by this particular parent. Integrate them.
 766                         next if $#revsin == -1;
 767                         my $newmergeinfo = "$branchpath:" . join(',', @revsin);
 768                         $aggregate_mergeinfo =
 769                                 merge_merge_info($aggregate_mergeinfo,
 770                                                                  $newmergeinfo, 1);
 771                 }
 772                 if ($all_parents_ok and $aggregate_mergeinfo) {
 773                         return $aggregate_mergeinfo;
 774                 }
 775         }
 776
 777         return undef;
 778 }
 779
 780 sub dcommit_rebase {
 781         my ($is_last, $current, $fetched_ref, $svn_error) = @_;
 782         my @diff;
 783
 784         if ($svn_error) {
 785                 print STDERR "\nERROR from SVN:\n",
 786                                 $svn_error->expanded_message, "\n";
 787         }
 788         unless ($_no_rebase) {
 789                 # we always want to rebase against the current HEAD,
 790                 # not any head that was passed to us
 791                 @diff = command('diff-tree', $current,
 792                            $fetched_ref, '--');
 793                 my @finish;
 794                 if (@diff) {
 795                         @finish = rebase_cmd();
 796                         print STDERR "W: $current and ", $fetched_ref,
 797                                      " differ, using @finish:\n",
 798                                      join("\n", @diff), "\n";
 799                 } elsif ($is_last) {
 800                         print "No changes between ", $current, " and ",
 801                               $fetched_ref,
 802                               "\nResetting to the latest ",
 803                               $fetched_ref, "\n";
 804                         @finish = qw/reset --mixed/;
 805                 }
 806                 command_noisy(@finish, $fetched_ref) if @finish;
 807         }
 808         if ($svn_error) {
 809                 die "ERROR: Not all changes have been committed into SVN"
 810                         .($_no_rebase ? ".\n" : ", however the committed\n"
 811                         ."ones (if any) seem to be successfully integrated "
 812                         ."into the working tree.\n")
 813                         ."Please see the above messages for details.\n";
 814         }
 815         return @diff;
 816 }
 817
 818 sub cmd_dcommit {
 819         my $head = shift;
 820         command_noisy(qw/update-index --refresh/);
 821         git_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }
 822                 'Cannot dcommit with a dirty index.  Commit your changes first, '
 823                 . "or stash them with `git stash'.\n";
 824         $head ||= 'HEAD';
 825
 826         my $old_head;
 827         if ($head ne 'HEAD') {
 828                 $old_head = eval {
 829                         command_oneline([qw/symbolic-ref -q HEAD/])
 830                 };
 831                 if ($old_head) {
 832                         $old_head =~ s{^refs/heads/}{};
 833                 } else {
 834                         $old_head = eval { command_oneline(qw/rev-parse HEAD/) };
 835                 }
 836                 command(['checkout', $head], STDERR => 0);
 837         }
 838
 839         my @refs;
 840         my ($url, $rev, $uuid, $gs) = working_head_info('HEAD', \@refs);
 841         unless ($gs) {
 842                 die "Unable to determine upstream SVN information from ",
 843                     "$head history.\nPerhaps the repository is empty.";
 844         }
 845
 846         if (defined $_commit_url) {
 847                 $url = $_commit_url;
 848         } else {
 849                 $url = eval { command_oneline('config', '--get',
 850                               "svn-remote.$gs->{repo_id}.commiturl") };
 851                 if (!$url) {
 852                         $url = $gs->full_pushurl
 853                 }
 854         }
 855
 856         my $last_rev = $_revision if defined $_revision;
 857         if ($url) {
 858                 print "Committing to $url ...\n";
 859         }
 860         my ($linear_refs, $parents) = linearize_history($gs, \@refs);
 861         if ($_no_rebase && scalar(@$linear_refs) > 1) {
 862                 warn "Attempting to commit more than one change while ",
 863                      "--no-rebase is enabled.\n",
 864                      "If these changes depend on each other, re-running ",
 865                      "without --no-rebase may be required."
 866         }
 867
 868         if (defined $_interactive){
 869                 my $ask_default = "y";
 870                 foreach my $d (@$linear_refs){
 871                         my ($fh, $ctx) = command_output_pipe(qw(show --summary), "$d");
 872                         while (<$fh>){
 873                                 print $_;
 874                         }
 875                         command_close_pipe($fh, $ctx);
 876                         $_ = ask("Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): ",
 877                                  valid_re => qr/^(?:yes|y|no|n|quit|q|all|a)/i,
 878                                  default => $ask_default);
 879                         die "Commit this patch reply required" unless defined $_;
 880                         if (/^[nq]/i) {
 881                                 exit(0);
 882                         } elsif (/^a/i) {
 883                                 last;
 884                         }
 885                 }
 886         }
 887
 888         my $expect_url = $url;
 889
 890         my $push_merge_info = eval {
 891                 command_oneline(qw/config --get svn.pushmergeinfo/)
 892                 };
 893         if (not defined($push_merge_info)
 894                         or $push_merge_info eq "false"
 895                         or $push_merge_info eq "no"
 896                         or $push_merge_info eq "never") {
 897                 $push_merge_info = 0;
 898         }
 899
 900         unless (defined($_merge_info) || ! $push_merge_info) {
 901                 # Preflight check of changes to ensure no issues with mergeinfo
 902                 # This includes check for uncommitted-to-SVN parents
 903                 # (other than the first parent, which we will handle),
 904                 # information from different SVN repos, and paths
 905                 # which are not underneath this repository root.
 906                 my $rooturl = $gs->repos_root;
 907                 foreach my $d (@$linear_refs) {
 908                         my %parentshash;
 909                         read_commit_parents(\%parentshash, $d);
 910                         my @realparents = @{$parentshash{$d}};
 911                         if ($#realparents > 0) {
 912                                 # Merge commit
 913                                 shift @realparents; # Remove/ignore first parent
 914                                 foreach my $parent (@realparents) {
 915                                         my ($branchurl, $svnrev, $paruuid) = cmt_metadata($parent);
 916                                         unless (defined $paruuid) {
 917                                                 # A parent is missing SVN annotations...
 918                                                 # abort the whole operation.
 919                                                 fatal "$parent is merged into revision $d, "
 920                                                          ."but does not have git-svn metadata. "
 921                                                          ."Either dcommit the branch or use a "
 922                                                          ."local cherry-pick, FF merge, or rebase "
 923                                                          ."instead of an explicit merge commit.";
 924                                         }
 925
 926                                         unless ($paruuid eq $uuid) {
 927                                                 # Parent has SVN metadata from different repository
 928                                                 fatal "merge parent $parent for change $d has "
 929                                                          ."git-svn uuid $paruuid, while current change "
 930                                                          ."has uuid $uuid!";
 931                                         }
 932
 933                                         unless ($branchurl =~ /^\Q$rooturl\E(.*)/) {
 934                                                 # This branch is very strange indeed.
 935                                                 fatal "merge parent $parent for $d is on branch "
 936                                                          ."$branchurl, which is not under the "
 937                                                          ."git-svn root $rooturl!";
 938                                         }
 939                                 }
 940                         }
 941                 }
 942         }
 943
 944         my $rewritten_parent;
 945         my $current_head = command_oneline(qw/rev-parse HEAD/);
 946         Git::SVN::remove_username($expect_url);
 947         if (defined($_merge_info)) {
 948                 $_merge_info =~ tr{ }{\n};
 949         }
 950         while (1) {
 951                 my $d = shift @$linear_refs or last;
 952                 unless (defined $last_rev) {
 953                         (undef, $last_rev, undef) = cmt_metadata("$d~1");
 954                         unless (defined $last_rev) {
 955                                 fatal "Unable to extract revision information ",
 956                                       "from commit $d~1";
 957                         }
 958                 }
 959                 if ($_dry_run) {
 960                         print "diff-tree $d~1 $d\n";
 961                 } else {
 962                         my $cmt_rev;
 963
 964                         unless (defined($_merge_info) || ! $push_merge_info) {
 965                                 $_merge_info = populate_merge_info($d, $gs,
 966                                                              $uuid,
 967                                                              $linear_refs,
 968                                                              $rewritten_parent);
 969                         }
 970
 971                         my %ed_opts = ( r => $last_rev,
 972                                         log => get_commit_entry($d)->{log},
 973                                         ra => Git::SVN::Ra->new($url),
 974                                         config => SVN::Core::config_get_config(
 975                                                 $Git::SVN::Ra::config_dir
 976                                         ),
 977                                         tree_a => "$d~1",
 978                                         tree_b => $d,
 979                                         editor_cb => sub {
 980                                                print "Committed r$_[0]\n";
 981                                                $cmt_rev = $_[0];
 982                                         },
 983                                         mergeinfo => $_merge_info,
 984                                         svn_path => '');
 985
 986                         my $err_handler = $SVN::Error::handler;
 987                         $SVN::Error::handler = sub {
 988                                 my $err = shift;
 989                                 dcommit_rebase(1, $current_head, $gs->refname,
 990                                         $err);
 991                         };
 992
 993                         if (!Git::SVN::Editor->new(\%ed_opts)->apply_diff) {
 994                                 print "No changes\n$d~1 == $d\n";
 995                         } elsif ($parents->{$d} && @{$parents->{$d}}) {
 996                                 $gs->{inject_parents_dcommit}->{$cmt_rev} =
 997                                                                $parents->{$d};
 998                         }
 999                         $_fetch_all ? $gs->fetch_all : $gs->fetch;
1000                         $SVN::Error::handler = $err_handler;
1001                         $last_rev = $cmt_rev;
1002                         next if $_no_rebase;
1003
1004                         my @diff = dcommit_rebase(@$linear_refs == 0, $d,
1005                                                 $gs->refname, undef);
1006
1007                         $rewritten_parent = command_oneline(qw/rev-parse/,
1008                                                         $gs->refname);
1009
1010                         if (@diff) {
1011                                 $current_head = command_oneline(qw/rev-parse
1012                                                                 HEAD/);
1013                                 @refs = ();
1014                                 my ($url_, $rev_, $uuid_, $gs_) =
1015                                               working_head_info('HEAD', \@refs);
1016                                 my ($linear_refs_, $parents_) =
1017                                               linearize_history($gs_, \@refs);
1018                                 if (scalar(@$linear_refs) !=
1019                                     scalar(@$linear_refs_)) {
1020                                         fatal "# of revisions changed ",
1021                                           "\nbefore:\n",
1022                                           join("\n", @$linear_refs),
1023                                           "\n\nafter:\n",
1024                                           join("\n", @$linear_refs_), "\n",
1025                                           'If you are attempting to commit ',
1026                                           "merges, try running:\n\t",
1027                                           'git rebase --interactive',
1028                                           '--preserve-merges ',
1029                                           $gs->refname,
1030                                           "\nBefore dcommitting";
1031                                 }
1032                                 if ($url_ ne $expect_url) {
1033                                         if ($url_ eq $gs->metadata_url) {
1034                                                 print
1035                                                   "Accepting rewritten URL:",
1036                                                   " $url_\n";
1037                                         } else {
1038                                                 fatal
1039                                                   "URL mismatch after rebase:",
1040                                                   " $url_ != $expect_url";
1041                                         }
1042                                 }
1043                                 if ($uuid_ ne $uuid) {
1044                                         fatal "uuid mismatch after rebase: ",
1045                                               "$uuid_ != $uuid";
1046                                 }
1047                                 # remap parents
1048                                 my (%p, @l, $i);
1049                                 for ($i = 0; $i < scalar @$linear_refs; $i++) {
1050                                         my $new = $linear_refs_->[$i] or next;
1051                                         $p{$new} =
1052                                                 $parents->{$linear_refs->[$i]};
1053                                         push @l, $new;
1054                                 }
1055                                 $parents = \%p;
1056                                 $linear_refs = \@l;
1057                                 undef $last_rev;
1058                         }
1059                 }
1060         }
1061
1062         if ($old_head) {
1063                 my $new_head = command_oneline(qw/rev-parse HEAD/);
1064                 my $new_is_symbolic = eval {
1065                         command_oneline(qw/symbolic-ref -q HEAD/);
1066                 };
1067                 if ($new_is_symbolic) {
1068                         print "dcommitted the branch ", $head, "\n";
1069                 } else {
1070                         print "dcommitted on a detached HEAD because you gave ",
1071                               "a revision argument.\n",
1072                               "The rewritten commit is: ", $new_head, "\n";
1073                 }
1074                 command(['checkout', $old_head], STDERR => 0);
1075         }
1076
1077         unlink $gs->{index};
1078 }
1079
1080 sub cmd_branch {
1081         my ($branch_name, $head) = @_;
1082
1083         unless (defined $branch_name && length $branch_name) {
1084                 die(($_tag ? "tag" : "branch") . " name required\n");
1085         }
1086         $head ||= 'HEAD';
1087
1088         my (undef, $rev, undef, $gs) = working_head_info($head);
1089         my $src = $gs->full_pushurl;
1090
1091         my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
1092         my $allglobs = $remote->{ $_tag ? 'tags' : 'branches' };
1093         my $glob;
1094         if ($#{$allglobs} == 0) {
1095                 $glob = $allglobs->[0];
1096         } else {
1097                 unless(defined $_branch_dest) {
1098                         die "Multiple ",
1099                             $_tag ? "tag" : "branch",
1100                             " paths defined for Subversion repository.\n",
1101                             "You must specify where you want to create the ",
1102                             $_tag ? "tag" : "branch",
1103                             " with the --destination argument.\n";
1104                 }
1105                 foreach my $g (@{$allglobs}) {
1106                         my $re = Git::SVN::Editor::glob2pat($g->{path}->{left});
1107                         if ($_branch_dest =~ /$re/) {
1108                                 $glob = $g;
1109                                 last;
1110                         }
1111                 }
1112                 unless (defined $glob) {
1113                         my $dest_re = qr/\b\Q$_branch_dest\E\b/;
1114                         foreach my $g (@{$allglobs}) {
1115                                 $g->{path}->{left} =~ /$dest_re/ or next;
1116                                 if (defined $glob) {
1117                                         die "Ambiguous destination: ",
1118                                             $_branch_dest, "\nmatches both '",
1119                                             $glob->{path}->{left}, "' and '",
1120                                             $g->{path}->{left}, "'\n";
1121                                 }
1122                                 $glob = $g;
1123                         }
1124                         unless (defined $glob) {
1125                                 die "Unknown ",
1126                                     $_tag ? "tag" : "branch",
1127                                     " destination $_branch_dest\n";
1128                         }
1129                 }
1130         }
1131         my ($lft, $rgt) = @{ $glob->{path} }{qw/left right/};
1132         my $url;
1133         if (defined $_commit_url) {
1134                 $url = $_commit_url;
1135         } else {
1136                 $url = eval { command_oneline('config', '--get',
1137                         "svn-remote.$gs->{repo_id}.commiturl") };
1138                 if (!$url) {
1139                         $url = $remote->{pushurl} || $remote->{url};
1140                 }
1141         }
1142         my $dst = join '/', $url, $lft, $branch_name, ($rgt || ());
1143
1144         if ($dst =~ /^https:/ && $src =~ /^http:/) {
1145                 $src=~s/^http:/https:/;
1146         }
1147
1148         ::_req_svn();
1149
1150         my $ctx = SVN::Client->new(
1151                 auth    => Git::SVN::Ra::_auth_providers(),
1152                 log_msg => sub {
1153                         ${ $_[0] } = defined $_message
1154                                 ? $_message
1155                                 : 'Create ' . ($_tag ? 'tag ' : 'branch ' )
1156                                 . $branch_name;
1157                 },
1158         );
1159
1160         eval {
1161                 $ctx->ls($dst, 'HEAD', 0);
1162         } and die "branch ${branch_name} already exists\n";
1163
1164         print "Copying ${src} at r${rev} to ${dst}...\n";
1165         $ctx->copy($src, $rev, $dst)
1166                 unless $_dry_run;
1167
1168         $gs->fetch_all;
1169 }
1170
1171 sub cmd_find_rev {
1172         my $revision_or_hash = shift or die "SVN or git revision required ",
1173                                             "as a command-line argument\n";
1174         my $result;
1175         if ($revision_or_hash =~ /^r\d+$/) {
1176                 my $head = shift;
1177                 $head ||= 'HEAD';
1178                 my @refs;
1179                 my (undef, undef, $uuid, $gs) = working_head_info($head, \@refs);
1180                 unless ($gs) {
1181                         die "Unable to determine upstream SVN information from ",
1182                             "$head history\n";
1183                 }
1184                 my $desired_revision = substr($revision_or_hash, 1);
1185                 $result = $gs->rev_map_get($desired_revision, $uuid);
1186         } else {
1187                 my (undef, $rev, undef) = cmt_metadata($revision_or_hash);
1188                 $result = $rev;
1189         }
1190         print "$result\n" if $result;
1191 }
1192
1193 sub auto_create_empty_directories {
1194         my ($gs) = @_;
1195         my $var = eval { command_oneline('config', '--get', '--bool',
1196                                          "svn-remote.$gs->{repo_id}.automkdirs") };
1197         # By default, create empty directories by consulting the unhandled log,
1198         # but allow setting it to 'false' to skip it.
1199         return !($var && $var eq 'false');
1200 }
1201
1202 sub cmd_rebase {
1203         command_noisy(qw/update-index --refresh/);
1204         my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1205         unless ($gs) {
1206                 die "Unable to determine upstream SVN information from ",
1207                     "working tree history\n";
1208         }
1209         if ($_dry_run) {
1210                 print "Remote Branch: " . $gs->refname . "\n";
1211                 print "SVN URL: " . $url . "\n";
1212                 return;
1213         }
1214         if (command(qw/diff-index HEAD --/)) {
1215                 print STDERR "Cannot rebase with uncommited changes:\n";
1216                 command_noisy('status');
1217                 exit 1;
1218         }
1219         unless ($_local) {
1220                 # rebase will checkout for us, so no need to do it explicitly
1221                 $_no_checkout = 'true';
1222                 $_fetch_all ? $gs->fetch_all : $gs->fetch;
1223         }
1224         command_noisy(rebase_cmd(), $gs->refname);
1225         if (auto_create_empty_directories($gs)) {
1226                 $gs->mkemptydirs;
1227         }
1228 }
1229
1230 sub cmd_show_ignore {
1231         my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1232         $gs ||= Git::SVN->new;
1233         my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
1234         $gs->prop_walk($gs->{path}, $r, sub {
1235                 my ($gs, $path, $props) = @_;
1236                 print STDOUT "\n# $path\n";
1237                 my $s = $props->{'svn:ignore'} or return;
1238                 $s =~ s/[\r\n]+/\n/g;
1239                 $s =~ s/^\n+//;
1240                 chomp $s;
1241                 $s =~ s#^#$path#gm;
1242                 print STDOUT "$s\n";
1243         });
1244 }
1245
1246 sub cmd_show_externals {
1247         my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1248         $gs ||= Git::SVN->new;
1249         my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
1250         $gs->prop_walk($gs->{path}, $r, sub {
1251                 my ($gs, $path, $props) = @_;
1252                 print STDOUT "\n# $path\n";
1253                 my $s = $props->{'svn:externals'} or return;
1254                 $s =~ s/[\r\n]+/\n/g;
1255                 chomp $s;
1256                 $s =~ s#^#$path#gm;
1257                 print STDOUT "$s\n";
1258         });
1259 }
1260
1261 sub cmd_create_ignore {
1262         my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1263         $gs ||= Git::SVN->new;
1264         my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
1265         $gs->prop_walk($gs->{path}, $r, sub {
1266                 my ($gs, $path, $props) = @_;
1267                 # $path is of the form /path/to/dir/
1268                 $path = '.' . $path;
1269                 # SVN can have attributes on empty directories,
1270                 # which git won't track
1271                 mkpath([$path]) unless -d $path;
1272                 my $ignore = $path . '.gitignore';
1273                 my $s = $props->{'svn:ignore'} or return;
1274                 open(GITIGNORE, '>', $ignore)
1275                   or fatal("Failed to open `$ignore' for writing: $!");
1276                 $s =~ s/[\r\n]+/\n/g;
1277                 $s =~ s/^\n+//;
1278                 chomp $s;
1279                 # Prefix all patterns so that the ignore doesn't apply
1280                 # to sub-directories.
1281                 $s =~ s#^#/#gm;
1282                 print GITIGNORE "$s\n";
1283                 close(GITIGNORE)
1284                   or fatal("Failed to close `$ignore': $!");
1285                 command_noisy('add', '-f', $ignore);
1286         });
1287 }
1288
1289 sub cmd_mkdirs {
1290         my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1291         $gs ||= Git::SVN->new;
1292         $gs->mkemptydirs($_revision);
1293 }
1294
1295 sub canonicalize_path {
1296         my ($path) = @_;
1297         my $dot_slash_added = 0;
1298         if (substr($path, 0, 1) ne "/") {
1299                 $path = "./" . $path;
1300                 $dot_slash_added = 1;
1301         }
1302         # File::Spec->canonpath doesn't collapse x/../y into y (for a
1303         # good reason), so let's do this manually.
1304         $path =~ s#/+#/#g;
1305         $path =~ s#/\.(?:/|$)#/#g;
1306         $path =~ s#/[^/]+/\.\.##g;
1307         $path =~ s#/$##g;
1308         $path =~ s#^\./## if $dot_slash_added;
1309         $path =~ s#^/##;
1310         $path =~ s#^\.$##;
1311         return $path;
1312 }
1313
1314 sub canonicalize_url {
1315         my ($url) = @_;
1316         $url =~ s#^([^:]+://[^/]*/)(.*)$#$1 . canonicalize_path($2)#e;
1317         return $url;
1318 }
1319
1320 # get_svnprops(PATH)
1321 # ------------------
1322 # Helper for cmd_propget and cmd_proplist below.
1323 sub get_svnprops {
1324         my $path = shift;
1325         my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1326         $gs ||= Git::SVN->new;
1327
1328         # prefix THE PATH by the sub-directory from which the user
1329         # invoked us.
1330         $path = $cmd_dir_prefix . $path;
1331         fatal("No such file or directory: $path") unless -e $path;
1332         my $is_dir = -d $path ? 1 : 0;
1333         $path = $gs->{path} . '/' . $path;
1334
1335         # canonicalize the path (otherwise libsvn will abort or fail to
1336         # find the file)
1337         $path = canonicalize_path($path);
1338
1339         my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
1340         my $props;
1341         if ($is_dir) {
1342                 (undef, undef, $props) = $gs->ra->get_dir($path, $r);
1343         }
1344         else {
1345                 (undef, $props) = $gs->ra->get_file($path, $r, undef);
1346         }
1347         return $props;
1348 }
1349
1350 # cmd_propget (PROP, PATH)
1351 # ------------------------
1352 # Print the SVN property PROP for PATH.
1353 sub cmd_propget {
1354         my ($prop, $path) = @_;
1355         $path = '.' if not defined $path;
1356         usage(1) if not defined $prop;
1357         my $props = get_svnprops($path);
1358         if (not defined $props->{$prop}) {
1359                 fatal("`$path' does not have a `$prop' SVN property.");
1360         }
1361         print $props->{$prop} . "\n";
1362 }
1363
1364 # cmd_proplist (PATH)
1365 # -------------------
1366 # Print the list of SVN properties for PATH.
1367 sub cmd_proplist {
1368         my $path = shift;
1369         $path = '.' if not defined $path;
1370         my $props = get_svnprops($path);
1371         print "Properties on '$path':\n";
1372         foreach (sort keys %{$props}) {
1373                 print "  $_\n";
1374         }
1375 }
1376
1377 sub cmd_multi_init {
1378         my $url = shift;
1379         unless (defined $_trunk || @_branches || @_tags) {
1380                 usage(1);
1381         }
1382
1383         $_prefix = '' unless defined $_prefix;
1384         if (defined $url) {
1385                 $url = canonicalize_url($url);
1386                 init_subdir(@_);
1387         }
1388         do_git_init_db();
1389         if (defined $_trunk) {
1390                 $_trunk =~ s#^/+##;
1391                 my $trunk_ref = 'refs/remotes/' . $_prefix . 'trunk';
1392                 # try both old-style and new-style lookups:
1393                 my $gs_trunk = eval { Git::SVN->new($trunk_ref) };
1394                 unless ($gs_trunk) {
1395                         my ($trunk_url, $trunk_path) =
1396                                               complete_svn_url($url, $_trunk);
1397                         $gs_trunk = Git::SVN->init($trunk_url, $trunk_path,
1398                                                    undef, $trunk_ref);
1399                 }
1400         }
1401         return unless @_branches || @_tags;
1402         my $ra = $url ? Git::SVN::Ra->new($url) : undef;
1403         foreach my $path (@_branches) {
1404                 complete_url_ls_init($ra, $path, '--branches/-b', $_prefix);
1405         }
1406         foreach my $path (@_tags) {
1407                 complete_url_ls_init($ra, $path, '--tags/-t', $_prefix.'tags/');
1408         }
1409 }
1410
1411 sub cmd_multi_fetch {
1412         $Git::SVN::no_reuse_existing = undef;
1413         my $remotes = Git::SVN::read_all_remotes();
1414         foreach my $repo_id (sort keys %$remotes) {
1415                 if ($remotes->{$repo_id}->{url}) {
1416                         Git::SVN::fetch_all($repo_id, $remotes);
1417                 }
1418         }
1419 }
1420
1421 # this command is special because it requires no metadata
1422 sub cmd_commit_diff {
1423         my ($ta, $tb, $url) = @_;
1424         my $usage = "Usage: $0 commit-diff -r<revision> ".
1425                     "<tree-ish> <tree-ish> [<URL>]";
1426         fatal($usage) if (!defined $ta || !defined $tb);
1427         my $svn_path = '';
1428         if (!defined $url) {
1429                 my $gs = eval { Git::SVN->new };
1430                 if (!$gs) {
1431                         fatal("Needed URL or usable git-svn --id in ",
1432                               "the command-line\n", $usage);
1433                 }
1434                 $url = $gs->{url};
1435                 $svn_path = $gs->{path};
1436         }
1437         unless (defined $_revision) {
1438                 fatal("-r|--revision is a required argument\n", $usage);
1439         }
1440         if (defined $_message && defined $_file) {
1441                 fatal("Both --message/-m and --file/-F specified ",
1442                       "for the commit message.\n",
1443                       "I have no idea what you mean");
1444         }
1445         if (defined $_file) {
1446                 $_message = file_to_s($_file);
1447         } else {
1448                 $_message ||= get_commit_entry($tb)->{log};
1449         }
1450         my $ra ||= Git::SVN::Ra->new($url);
1451         my $r = $_revision;
1452         if ($r eq 'HEAD') {
1453                 $r = $ra->get_latest_revnum;
1454         } elsif ($r !~ /^\d+$/) {
1455                 die "revision argument: $r not understood by git-svn\n";
1456         }
1457         my %ed_opts = ( r => $r,
1458                         log => $_message,
1459                         ra => $ra,
1460                         tree_a => $ta,
1461                         tree_b => $tb,
1462                         editor_cb => sub { print "Committed r$_[0]\n" },
1463                         svn_path => $svn_path );
1464         if (!Git::SVN::Editor->new(\%ed_opts)->apply_diff) {
1465                 print "No changes\n$ta == $tb\n";
1466         }
1467 }
1468
1469 sub escape_uri_only {
1470         my ($uri) = @_;
1471         my @tmp;
1472         foreach (split m{/}, $uri) {
1473                 s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
1474                 push @tmp, $_;
1475         }
1476         join('/', @tmp);
1477 }
1478
1479 sub escape_url {
1480         my ($url) = @_;
1481         if ($url =~ m#^([^:]+)://([^/]*)(.*)$#) {
1482                 my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
1483                 $url = "$scheme://$domain$uri";
1484         }
1485         $url;
1486 }
1487
1488 sub cmd_info {
1489         my $path = canonicalize_path(defined($_[0]) ? $_[0] : ".");
1490         my $fullpath = canonicalize_path($cmd_dir_prefix . $path);
1491         if (exists $_[1]) {
1492                 die "Too many arguments specified\n";
1493         }
1494
1495         my ($file_type, $diff_status) = find_file_type_and_diff_status($path);
1496
1497         if (!$file_type && !$diff_status) {
1498                 print STDERR "svn: '$path' is not under version control\n";
1499                 exit 1;
1500         }
1501
1502         my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1503         unless ($gs) {
1504                 die "Unable to determine upstream SVN information from ",
1505                     "working tree history\n";
1506         }
1507
1508         # canonicalize_path() will return "" to make libsvn 1.5.x happy,
1509         $path = "." if $path eq "";
1510
1511         my $full_url = $url . ($fullpath eq "" ? "" : "/$fullpath");
1512
1513         if ($_url) {
1514                 print escape_url($full_url), "\n";
1515                 return;
1516         }
1517
1518         my $result = "Path: $path\n";
1519         $result .= "Name: " . basename($path) . "\n" if $file_type ne "dir";
1520         $result .= "URL: " . escape_url($full_url) . "\n";
1521
1522         eval {
1523                 my $repos_root = $gs->repos_root;
1524                 Git::SVN::remove_username($repos_root);
1525                 $result .= "Repository Root: " . escape_url($repos_root) . "\n";
1526         };
1527         if ($@) {
1528                 $result .= "Repository Root: (offline)\n";
1529         }
1530         ::_req_svn();
1531         $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A" &&
1532                 (::compare_svn_version('1.5.4') <= 0 || $file_type ne "dir");
1533         $result .= "Revision: " . ($diff_status eq "A" ? 0 : $rev) . "\n";
1534
1535         $result .= "Node Kind: " .
1536                    ($file_type eq "dir" ? "directory" : "file") . "\n";
1537
1538         my $schedule = $diff_status eq "A"
1539                        ? "add"
1540                        : ($diff_status eq "D" ? "delete" : "normal");
1541         $result .= "Schedule: $schedule\n";
1542
1543         if ($diff_status eq "A") {
1544                 print $result, "\n";
1545                 return;
1546         }
1547
1548         my ($lc_author, $lc_rev, $lc_date_utc);
1549         my @args = Git::SVN::Log::git_svn_log_cmd($rev, $rev, "--", $fullpath);
1550         my $log = command_output_pipe(@args);
1551         my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
1552         while (<$log>) {
1553                 if (/^${esc_color}author (.+) <[^>]+> (\d+) ([\-\+]?\d+)$/o) {
1554                         $lc_author = $1;
1555                         $lc_date_utc = Git::SVN::Log::parse_git_date($2, $3);
1556                 } elsif (/^${esc_color}    (git-svn-id:.+)$/o) {
1557                         (undef, $lc_rev, undef) = ::extract_metadata($1);
1558                 }
1559         }
1560         close $log;
1561
1562         Git::SVN::Log::set_local_timezone();
1563
1564         $result .= "Last Changed Author: $lc_author\n";
1565         $result .= "Last Changed Rev: $lc_rev\n";
1566         $result .= "Last Changed Date: " .
1567                    Git::SVN::Log::format_svn_date($lc_date_utc) . "\n";
1568
1569         if ($file_type ne "dir") {
1570                 my $text_last_updated_date =
1571                     ($diff_status eq "D" ? $lc_date_utc : (stat $path)[9]);
1572                 $result .=
1573                     "Text Last Updated: " .
1574                     Git::SVN::Log::format_svn_date($text_last_updated_date) .
1575                     "\n";
1576                 my $checksum;
1577                 if ($diff_status eq "D") {
1578                         my ($fh, $ctx) =
1579                             command_output_pipe(qw(cat-file blob), "HEAD:$path");
1580                         if ($file_type eq "link") {
1581                                 my $file_name = <$fh>;
1582                                 $checksum = md5sum("link $file_name");
1583                         } else {
1584                                 $checksum = md5sum($fh);
1585                         }
1586                         command_close_pipe($fh, $ctx);
1587                 } elsif ($file_type eq "link") {
1588                         my $file_name =
1589                             command(qw(cat-file blob), "HEAD:$path");
1590                         $checksum =
1591                             md5sum("link " . $file_name);
1592                 } else {
1593                         open FILE, "<", $path or die $!;
1594                         $checksum = md5sum(\*FILE);
1595                         close FILE or die $!;
1596                 }
1597                 $result .= "Checksum: " . $checksum . "\n";
1598         }
1599
1600         print $result, "\n";
1601 }
1602
1603 sub cmd_reset {
1604         my $target = shift || $_revision or die "SVN revision required\n";
1605         $target = $1 if $target =~ /^r(\d+)$/;
1606         $target =~ /^\d+$/ or die "Numeric SVN revision expected\n";
1607         my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
1608         unless ($gs) {
1609                 die "Unable to determine upstream SVN information from ".
1610                     "history\n";
1611         }
1612         my ($r, $c) = $gs->find_rev_before($target, not $_fetch_parent);
1613         die "Cannot find SVN revision $target\n" unless defined($c);
1614         $gs->rev_map_set($r, $c, 'reset', $uuid);
1615         print "r$r = $c ($gs->{ref_id})\n";
1616 }
1617
1618 sub cmd_gc {
1619         if (!can_compress()) {
1620                 warn "Compress::Zlib could not be found; unhandled.log " .
1621                      "files will not be compressed.\n";
1622         }
1623         find({ wanted => \&gc_directory, no_chdir => 1}, "$ENV{GIT_DIR}/svn");
1624 }
1625
1626 ########################### utility functions #########################
1627
1628 sub rebase_cmd {
1629         my @cmd = qw/rebase/;
1630         push @cmd, '-v' if $_verbose;
1631         push @cmd, qw/--merge/ if $_merge;
1632         push @cmd, "--strategy=$_strategy" if $_strategy;
1633         push @cmd, "--preserve-merges" if $_preserve_merges;
1634         @cmd;
1635 }
1636
1637 sub post_fetch_checkout {
1638         return if $_no_checkout;
1639         return if verify_ref('HEAD^0');
1640         my $gs = $Git::SVN::_head or return;
1641
1642         # look for "trunk" ref if it exists
1643         my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
1644         my $fetch = $remote->{fetch};
1645         if ($fetch) {
1646                 foreach my $p (keys %$fetch) {
1647                         basename($fetch->{$p}) eq 'trunk' or next;
1648                         $gs = Git::SVN->new($fetch->{$p}, $gs->{repo_id}, $p);
1649                         last;
1650                 }
1651         }
1652
1653         command_noisy(qw(update-ref HEAD), $gs->refname);
1654         return unless verify_ref('HEAD^0');
1655
1656         return if $ENV{GIT_DIR} !~ m#^(?:.*/)?\.git$#;
1657         my $index = $ENV{GIT_INDEX_FILE} || "$ENV{GIT_DIR}/index";
1658         return if -f $index;
1659
1660         return if command_oneline(qw/rev-parse --is-inside-work-tree/) eq 'false';
1661         return if command_oneline(qw/rev-parse --is-inside-git-dir/) eq 'true';
1662         command_noisy(qw/read-tree -m -u -v HEAD HEAD/);
1663         print STDERR "Checked out HEAD:\n  ",
1664                      $gs->full_url, " r", $gs->last_rev, "\n";
1665         if (auto_create_empty_directories($gs)) {
1666                 $gs->mkemptydirs($gs->last_rev);
1667         }
1668 }
1669
1670 sub complete_svn_url {
1671         my ($url, $path) = @_;
1672         $path =~ s#/+$##;
1673         if ($path !~ m#^[a-z\+]+://#) {
1674                 if (!defined $url || $url !~ m#^[a-z\+]+://#) {
1675                         fatal("E: '$path' is not a complete URL ",
1676                               "and a separate URL is not specified");
1677                 }
1678                 return ($url, $path);
1679         }
1680         return ($path, '');
1681 }
1682
1683 sub complete_url_ls_init {
1684         my ($ra, $repo_path, $switch, $pfx) = @_;
1685         unless ($repo_path) {
1686                 print STDERR "W: $switch not specified\n";
1687                 return;
1688         }
1689         $repo_path =~ s#/+$##;
1690         if ($repo_path =~ m#^[a-z\+]+://#) {
1691                 $ra = Git::SVN::Ra->new($repo_path);
1692                 $repo_path = '';
1693         } else {
1694                 $repo_path =~ s#^/+##;
1695                 unless ($ra) {
1696                         fatal("E: '$repo_path' is not a complete URL ",
1697                               "and a separate URL is not specified");
1698                 }
1699         }
1700         my $url = $ra->{url};
1701         my $gs = Git::SVN->init($url, undef, undef, undef, 1);
1702         my $k = "svn-remote.$gs->{repo_id}.url";
1703         my $orig_url = eval { command_oneline(qw/config --get/, $k) };
1704         if ($orig_url && ($orig_url ne $gs->{url})) {
1705                 die "$k already set: $orig_url\n",
1706                     "wanted to set to: $gs->{url}\n";
1707         }
1708         command_oneline('config', $k, $gs->{url}) unless $orig_url;
1709         my $remote_path = "$gs->{path}/$repo_path";
1710         $remote_path =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
1711         $remote_path =~ s#/+#/#g;
1712         $remote_path =~ s#^/##g;
1713         $remote_path .= "/*" if $remote_path !~ /\*/;
1714         my ($n) = ($switch =~ /^--(\w+)/);
1715         if (length $pfx && $pfx !~ m#/$#) {
1716                 die "--prefix='$pfx' must have a trailing slash '/'\n";
1717         }
1718         command_noisy('config',
1719                       '--add',
1720                       "svn-remote.$gs->{repo_id}.$n",
1721                       "$remote_path:refs/remotes/$pfx*" .
1722                         ('/*' x (($remote_path =~ tr/*/*/) - 1)) );
1723 }
1724
1725 sub verify_ref {
1726         my ($ref) = @_;
1727         eval { command_oneline([ 'rev-parse', '--verify', $ref ],
1728                                { STDERR => 0 }); };
1729 }
1730
1731 sub get_tree_from_treeish {
1732         my ($treeish) = @_;
1733         # $treeish can be a symbolic ref, too:
1734         my $type = command_oneline(qw/cat-file -t/, $treeish);
1735         my $expected;
1736         while ($type eq 'tag') {
1737                 ($treeish, $type) = command(qw/cat-file tag/, $treeish);
1738         }
1739         if ($type eq 'commit') {
1740                 $expected = (grep /^tree /, command(qw/cat-file commit/,
1741                                                     $treeish))[0];
1742                 ($expected) = ($expected =~ /^tree ($sha1)$/o);
1743                 die "Unable to get tree from $treeish\n" unless $expected;
1744         } elsif ($type eq 'tree') {
1745                 $expected = $treeish;
1746         } else {
1747                 die "$treeish is a $type, expected tree, tag or commit\n";
1748         }
1749         return $expected;
1750 }
1751
1752 sub get_commit_entry {
1753         my ($treeish) = shift;
1754         my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) );
1755         my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
1756         my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
1757         open my $log_fh, '>', $commit_editmsg or croak $!;
1758
1759         my $type = command_oneline(qw/cat-file -t/, $treeish);
1760         if ($type eq 'commit' || $type eq 'tag') {
1761                 my ($msg_fh, $ctx) = command_output_pipe('cat-file',
1762                                                          $type, $treeish);
1763                 my $in_msg = 0;
1764                 my $author;
1765                 my $saw_from = 0;
1766                 my $msgbuf = "";
1767                 while (<$msg_fh>) {
1768                         if (!$in_msg) {
1769                                 $in_msg = 1 if (/^\s*$/);
1770                                 $author = $1 if (/^author (.*>)/);
1771                         } elsif (/^git-svn-id: /) {
1772                                 # skip this for now, we regenerate the
1773                                 # correct one on re-fetch anyways
1774                                 # TODO: set *:merge properties or like...
1775                         } else {
1776                                 if (/^From:/ || /^Signed-off-by:/) {
1777                                         $saw_from = 1;
1778                                 }
1779                                 $msgbuf .= $_;
1780                         }
1781                 }
1782                 $msgbuf =~ s/\s+$//s;
1783                 if ($Git::SVN::_add_author_from && defined($author)
1784                     && !$saw_from) {
1785                         $msgbuf .= "\n\nFrom: $author";
1786                 }
1787                 print $log_fh $msgbuf or croak $!;
1788                 command_close_pipe($msg_fh, $ctx);
1789         }
1790         close $log_fh or croak $!;
1791
1792         if ($_edit || ($type eq 'tree')) {
1793                 chomp(my $editor = command_oneline(qw(var GIT_EDITOR)));
1794                 system('sh', '-c', $editor.' "$@"', $editor, $commit_editmsg);
1795         }
1796         rename $commit_editmsg, $commit_msg or croak $!;
1797         {
1798                 require Encode;
1799                 # SVN requires messages to be UTF-8 when entering the repo
1800                 local $/;
1801                 open $log_fh, '<', $commit_msg or croak $!;
1802                 binmode $log_fh;
1803                 chomp($log_entry{log} = <$log_fh>);
1804
1805                 my $enc = Git::config('i18n.commitencoding') || 'UTF-8';
1806                 my $msg = $log_entry{log};
1807
1808                 eval { $msg = Encode::decode($enc, $msg, 1) };
1809                 if ($@) {
1810                         die "Could not decode as $enc:\n", $msg,
1811                             "\nPerhaps you need to set i18n.commitencoding\n";
1812                 }
1813
1814                 eval { $msg = Encode::encode('UTF-8', $msg, 1) };
1815                 die "Could not encode as UTF-8:\n$msg\n" if $@;
1816
1817                 $log_entry{log} = $msg;
1818
1819                 close $log_fh or croak $!;
1820         }
1821         unlink $commit_msg;
1822         \%log_entry;
1823 }
1824
1825 sub s_to_file {
1826         my ($str, $file, $mode) = @_;
1827         open my $fd,'>',$file or croak $!;
1828         print $fd $str,"\n" or croak $!;
1829         close $fd or croak $!;
1830         chmod ($mode &~ umask, $file) if (defined $mode);
1831 }
1832
1833 sub file_to_s {
1834         my $file = shift;
1835         open my $fd,'<',$file or croak "$!: file: $file\n";
1836         local $/;
1837         my $ret = <$fd>;
1838         close $fd or croak $!;
1839         $ret =~ s/\s*$//s;
1840         return $ret;
1841 }
1842
1843 # '<svn username> = real-name <email address>' mapping based on git-svnimport:
1844 sub load_authors {
1845         open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
1846         my $log = $cmd eq 'log';
1847         while (<$authors>) {
1848                 chomp;
1849                 next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
1850                 my ($user, $name, $email) = ($1, $2, $3);
1851                 if ($log) {
1852                         $Git::SVN::Log::rusers{"$name <$email>"} = $user;
1853                 } else {
1854                         $users{$user} = [$name, $email];
1855                 }
1856         }
1857         close $authors or croak $!;
1858 }
1859
1860 # convert GetOpt::Long specs for use by git-config
1861 sub read_git_config {
1862         my $opts = shift;
1863         my @config_only;
1864         foreach my $o (keys %$opts) {
1865                 # if we have mixedCase and a long option-only, then
1866                 # it's a config-only variable that we don't need for
1867                 # the command-line.
1868                 push @config_only, $o if ($o =~ /[A-Z]/ && $o =~ /^[a-z]+$/i);
1869                 my $v = $opts->{$o};
1870                 my ($key) = ($o =~ /^([a-zA-Z\-]+)/);
1871                 $key =~ s/-//g;
1872                 my $arg = 'git config';
1873                 $arg .= ' --int' if ($o =~ /[:=]i$/);
1874                 $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
1875                 if (ref $v eq 'ARRAY') {
1876                         chomp(my @tmp = `$arg --get-all svn.$key`);
1877                         @$v = @tmp if @tmp;
1878                 } else {
1879                         chomp(my $tmp = `$arg --get svn.$key`);
1880                         if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) {
1881                                 $$v = $tmp;
1882                         }
1883                 }
1884         }
1885         delete @$opts{@config_only} if @config_only;
1886 }
1887
1888 sub extract_metadata {
1889         my $id = shift or return (undef, undef, undef);
1890         my ($url, $rev, $uuid) = ($id =~ /^\s*git-svn-id:\s+(.*)\@(\d+)
1891                                                         \s([a-f\d\-]+)$/ix);
1892         if (!defined $rev || !$uuid || !$url) {
1893                 # some of the original repositories I made had
1894                 # identifiers like this:
1895                 ($rev, $uuid) = ($id =~/^\s*git-svn-id:\s(\d+)\@([a-f\d\-]+)/i);
1896         }
1897         return ($url, $rev, $uuid);
1898 }
1899
1900 sub cmt_metadata {
1901         return extract_metadata((grep(/^git-svn-id: /,
1902                 command(qw/cat-file commit/, shift)))[-1]);
1903 }
1904
1905 sub cmt_sha2rev_batch {
1906         my %s2r;
1907         my ($pid, $in, $out, $ctx) = command_bidi_pipe(qw/cat-file --batch/);
1908         my $list = shift;
1909
1910         foreach my $sha (@{$list}) {
1911                 my $first = 1;
1912                 my $size = 0;
1913                 print $out $sha, "\n";
1914
1915                 while (my $line = <$in>) {
1916                         if ($first && $line =~ /^[[:xdigit:]]{40}\smissing$/) {
1917                                 last;
1918                         } elsif ($first &&
1919                                $line =~ /^[[:xdigit:]]{40}\scommit\s(\d+)$/) {
1920                                 $first = 0;
1921                                 $size = $1;
1922                                 next;
1923                         } elsif ($line =~ /^(git-svn-id: )/) {
1924                                 my (undef, $rev, undef) =
1925                                                       extract_metadata($line);
1926                                 $s2r{$sha} = $rev;
1927                         }
1928
1929                         $size -= length($line);
1930                         last if ($size == 0);
1931                 }
1932         }
1933
1934         command_close_bidi_pipe($pid, $in, $out, $ctx);
1935
1936         return \%s2r;
1937 }
1938
1939 sub working_head_info {
1940         my ($head, $refs) = @_;
1941         my @args = qw/rev-list --first-parent --pretty=medium/;
1942         my ($fh, $ctx) = command_output_pipe(@args, $head);
1943         my $hash;
1944         my %max;
1945         while (<$fh>) {
1946                 if ( m{^commit ($::sha1)$} ) {
1947                         unshift @$refs, $hash if $hash and $refs;
1948                         $hash = $1;
1949                         next;
1950                 }
1951                 next unless s{^\s*(git-svn-id:)}{$1};
1952                 my ($url, $rev, $uuid) = extract_metadata($_);
1953                 if (defined $url && defined $rev) {
1954                         next if $max{$url} and $max{$url} < $rev;
1955                         if (my $gs = Git::SVN->find_by_url($url)) {
1956                                 my $c = $gs->rev_map_get($rev, $uuid);
1957                                 if ($c && $c eq $hash) {
1958                                         close $fh; # break the pipe
1959                                         return ($url, $rev, $uuid, $gs);
1960                                 } else {
1961                                         $max{$url} ||= $gs->rev_map_max;
1962                                 }
1963                         }
1964                 }
1965         }
1966         command_close_pipe($fh, $ctx);
1967         (undef, undef, undef, undef);
1968 }
1969
1970 sub read_commit_parents {
1971         my ($parents, $c) = @_;
1972         chomp(my $p = command_oneline(qw/rev-list --parents -1/, $c));
1973         $p =~ s/^($c)\s*// or die "rev-list --parents -1 $c failed!\n";
1974         @{$parents->{$c}} = split(/ /, $p);
1975 }
1976
1977 sub linearize_history {
1978         my ($gs, $refs) = @_;
1979         my %parents;
1980         foreach my $c (@$refs) {
1981                 read_commit_parents(\%parents, $c);
1982         }
1983
1984         my @linear_refs;
1985         my %skip = ();
1986         my $last_svn_commit = $gs->last_commit;
1987         foreach my $c (reverse @$refs) {
1988                 next if $c eq $last_svn_commit;
1989                 last if $skip{$c};
1990
1991                 unshift @linear_refs, $c;
1992                 $skip{$c} = 1;
1993
1994                 # we only want the first parent to diff against for linear
1995                 # history, we save the rest to inject when we finalize the
1996                 # svn commit
1997                 my $fp_a = verify_ref("$c~1");
1998                 my $fp_b = shift @{$parents{$c}} if $parents{$c};
1999                 if (!$fp_a || !$fp_b) {
2000                         die "Commit $c\n",
2001                             "has no parent commit, and therefore ",
2002                             "nothing to diff against.\n",
2003                             "You should be working from a repository ",
2004                             "originally created by git-svn\n";
2005                 }
2006                 if ($fp_a ne $fp_b) {
2007                         die "$c~1 = $fp_a, however parsing commit $c ",
2008                             "revealed that:\n$c~1 = $fp_b\nBUG!\n";
2009                 }
2010
2011                 foreach my $p (@{$parents{$c}}) {
2012                         $skip{$p} = 1;
2013                 }
2014         }
2015         (\@linear_refs, \%parents);
2016 }
2017
2018 sub find_file_type_and_diff_status {
2019         my ($path) = @_;
2020         return ('dir', '') if $path eq '';
2021
2022         my $diff_output =
2023             command_oneline(qw(diff --cached --name-status --), $path) || "";
2024         my $diff_status = (split(' ', $diff_output))[0] || "";
2025
2026         my $ls_tree = command_oneline(qw(ls-tree HEAD), $path) || "";
2027
2028         return (undef, undef) if !$diff_status && !$ls_tree;
2029
2030         if ($diff_status eq "A") {
2031                 return ("link", $diff_status) if -l $path;
2032                 return ("dir", $diff_status) if -d $path;
2033                 return ("file", $diff_status);
2034         }
2035
2036         my $mode = (split(' ', $ls_tree))[0] || "";
2037
2038         return ("link", $diff_status) if $mode eq "120000";
2039         return ("dir", $diff_status) if $mode eq "040000";
2040         return ("file", $diff_status);
2041 }
2042
2043 sub md5sum {
2044         my $arg = shift;
2045         my $ref = ref $arg;
2046         my $md5 = Digest::MD5->new();
2047         if ($ref eq 'GLOB' || $ref eq 'IO::File' || $ref eq 'File::Temp') {
2048                 $md5->addfile($arg) or croak $!;
2049         } elsif ($ref eq 'SCALAR') {
2050                 $md5->add($$arg) or croak $!;
2051         } elsif (!$ref) {
2052                 $md5->add($arg) or croak $!;
2053         } else {
2054                 fatal "Can't provide MD5 hash for unknown ref type: '", $ref, "'";
2055         }
2056         return $md5->hexdigest();
2057 }
2058
2059 sub gc_directory {
2060         if (can_compress() && -f $_ && basename($_) eq "unhandled.log") {
2061                 my $out_filename = $_ . ".gz";
2062                 open my $in_fh, "<", $_ or die "Unable to open $_: $!\n";
2063                 binmode $in_fh;
2064                 my $gz = Compress::Zlib::gzopen($out_filename, "ab") or
2065                                 die "Unable to open $out_filename: $!\n";
2066
2067                 my $res;
2068                 while ($res = sysread($in_fh, my $str, 1024)) {
2069                         $gz->gzwrite($str) or
2070                                 die "Unable to write: ".$gz->gzerror()."!\n";
2071                 }
2072                 unlink $_ or die "unlink $File::Find::name: $!\n";
2073         } elsif (-f $_ && basename($_) eq "index") {
2074                 unlink $_ or die "unlink $_: $!\n";
2075         }
2076 }
2077
2078 __END__
2079
2080 Data structures:
2081
2082
2083 $remotes = { # returned by read_all_remotes()
2084         'svn' => {
2085                 # svn-remote.svn.url=https://svn.musicpd.org
2086                 url => 'https://svn.musicpd.org',
2087                 # svn-remote.svn.fetch=mpd/trunk:trunk
2088                 fetch => {
2089                         'mpd/trunk' => 'trunk',
2090                 },
2091                 # svn-remote.svn.tags=mpd/tags/*:tags/*
2092                 tags => {
2093                         path => {
2094                                 left => 'mpd/tags',
2095                                 right => '',
2096                                 regex => qr!mpd/tags/([^/]+)$!,
2097                                 glob => 'tags/*',
2098                         },
2099                         ref => {
2100                                 left => 'tags',
2101                                 right => '',
2102                                 regex => qr!tags/([^/]+)$!,
2103                                 glob => 'tags/*',
2104                         },
2105                 }
2106         }
2107 };
2108
2109 $log_entry hashref as returned by libsvn_log_entry()
2110 {
2111         log => 'whitespace-formatted log entry
2112 ',                                              # trailing newline is preserved
2113         revision => '8',                        # integer
2114         date => '2004-02-24T17:01:44.108345Z',  # commit date
2115         author => 'committer name'
2116 };
2117
2118
2119 # this is generated by generate_diff();
2120 @mods = array of diff-index line hashes, each element represents one line
2121         of diff-index output
2122
2123 diff-index line ($m hash)
2124 {
2125         mode_a => first column of diff-index output, no leading ':',
2126         mode_b => second column of diff-index output,
2127         sha1_b => sha1sum of the final blob,
2128         chg => change type [MCRADT],
2129         file_a => original file name of a file (iff chg is 'C' or 'R')
2130         file_b => new/current file name of a file (any chg)
2131 }
2132 ;
2133
2134 # retval of read_url_paths{,_all}();
2135 $l_map = {
2136         # repository root url
2137         'https://svn.musicpd.org' => {
2138                 # repository path               # GIT_SVN_ID
2139                 'mpd/trunk'             =>      'trunk',
2140                 'mpd/tags/0.11.5'       =>      'tags/0.11.5',
2141         },
2142 }
2143
2144 Notes:
2145         I don't trust the each() function on unless I created %hash myself
2146         because the internal iterator may not have started at base.