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