Andrew's git - gitweb.git/blob

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