git-svn.perlon commit alloc_ref_from_str(): factor out a common pattern of alloc_ref from string (737922a)
   1#!/usr/bin/env perl
   2# Copyright (C) 2006, Eric Wong <normalperson@yhbt.net>
   3# License: GPL v2 or later
   4use warnings;
   5use strict;
   6use vars qw/    $AUTHOR $VERSION
   7                $sha1 $sha1_short $_revision
   8                $_q $_authors %users/;
   9$AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
  10$VERSION = '@@GIT_VERSION@@';
  11
  12# From which subdir have we been invoked?
  13my $cmd_dir_prefix = eval {
  14        command_oneline([qw/rev-parse --show-prefix/], STDERR => 0)
  15} || '';
  16
  17my $git_dir_user_set = 1 if defined $ENV{GIT_DIR};
  18$ENV{GIT_DIR} ||= '.git';
  19$Git::SVN::default_repo_id = 'svn';
  20$Git::SVN::default_ref_id = $ENV{GIT_SVN_ID} || 'git-svn';
  21$Git::SVN::Ra::_log_window_size = 100;
  22
  23$Git::SVN::Log::TZ = $ENV{TZ};
  24$ENV{TZ} = 'UTC';
  25$| = 1; # unbuffer STDOUT
  26
  27sub fatal (@) { print STDERR "@_\n"; exit 1 }
  28require SVN::Core; # use()-ing this causes segfaults for me... *shrug*
  29require SVN::Ra;
  30require SVN::Delta;
  31if ($SVN::Core::VERSION lt '1.1.0') {
  32        fatal "Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)";
  33}
  34push @Git::SVN::Ra::ISA, 'SVN::Ra';
  35push @SVN::Git::Editor::ISA, 'SVN::Delta::Editor';
  36push @SVN::Git::Fetcher::ISA, 'SVN::Delta::Editor';
  37use Carp qw/croak/;
  38use Digest::MD5;
  39use IO::File qw//;
  40use File::Basename qw/dirname basename/;
  41use File::Path qw/mkpath/;
  42use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
  43use IPC::Open3;
  44use Git;
  45
  46BEGIN {
  47        # import functions from Git into our packages, en masse
  48        no strict 'refs';
  49        foreach (qw/command command_oneline command_noisy command_output_pipe
  50                    command_input_pipe command_close_pipe/) {
  51                for my $package ( qw(SVN::Git::Editor SVN::Git::Fetcher
  52                        Git::SVN::Migration Git::SVN::Log Git::SVN),
  53                        __PACKAGE__) {
  54                        *{"${package}::$_"} = \&{"Git::$_"};
  55                }
  56        }
  57}
  58
  59my ($SVN);
  60
  61$sha1 = qr/[a-f\d]{40}/;
  62$sha1_short = qr/[a-f\d]{4,40}/;
  63my ($_stdin, $_help, $_edit,
  64        $_message, $_file,
  65        $_template, $_shared,
  66        $_version, $_fetch_all, $_no_rebase,
  67        $_merge, $_strategy, $_dry_run, $_local,
  68        $_prefix, $_no_checkout, $_url, $_verbose);
  69$Git::SVN::_follow_parent = 1;
  70my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
  71                    'config-dir=s' => \$Git::SVN::Ra::config_dir,
  72                    'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache );
  73my %fc_opts = ( 'follow-parent|follow!' => \$Git::SVN::_follow_parent,
  74                'authors-file|A=s' => \$_authors,
  75                'repack:i' => \$Git::SVN::_repack,
  76                'noMetadata' => \$Git::SVN::_no_metadata,
  77                'useSvmProps' => \$Git::SVN::_use_svm_props,
  78                'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props,
  79                'log-window-size=i' => \$Git::SVN::Ra::_log_window_size,
  80                'no-checkout' => \$_no_checkout,
  81                'quiet|q' => \$_q,
  82                'repack-flags|repack-args|repack-opts=s' =>
  83                   \$Git::SVN::_repack_flags,
  84                'use-log-author' => \$Git::SVN::_use_log_author,
  85                %remote_opts );
  86
  87my ($_trunk, $_tags, $_branches, $_stdlayout);
  88my %icv;
  89my %init_opts = ( 'template=s' => \$_template, 'shared:s' => \$_shared,
  90                  'trunk|T=s' => \$_trunk, 'tags|t=s' => \$_tags,
  91                  'branches|b=s' => \$_branches, 'prefix=s' => \$_prefix,
  92                  'stdlayout|s' => \$_stdlayout,
  93                  'minimize-url|m' => \$Git::SVN::_minimize_url,
  94                  'no-metadata' => sub { $icv{noMetadata} = 1 },
  95                  'use-svm-props' => sub { $icv{useSvmProps} = 1 },
  96                  'use-svnsync-props' => sub { $icv{useSvnsyncProps} = 1 },
  97                  'rewrite-root=s' => sub { $icv{rewriteRoot} = $_[1] },
  98                  %remote_opts );
  99my %cmt_opts = ( 'edit|e' => \$_edit,
 100                'rmdir' => \$SVN::Git::Editor::_rmdir,
 101                'find-copies-harder' => \$SVN::Git::Editor::_find_copies_harder,
 102                'l=i' => \$SVN::Git::Editor::_rename_limit,
 103                'copy-similarity|C=i'=> \$SVN::Git::Editor::_cp_similarity
 104);
 105
 106my %cmd = (
 107        fetch => [ \&cmd_fetch, "Download new revisions from SVN",
 108                        { 'revision|r=s' => \$_revision,
 109                          'fetch-all|all' => \$_fetch_all,
 110                           %fc_opts } ],
 111        clone => [ \&cmd_clone, "Initialize and fetch revisions",
 112                        { 'revision|r=s' => \$_revision,
 113                           %fc_opts, %init_opts } ],
 114        init => [ \&cmd_init, "Initialize a repo for tracking" .
 115                          " (requires URL argument)",
 116                          \%init_opts ],
 117        'multi-init' => [ \&cmd_multi_init,
 118                          "Deprecated alias for ".
 119                          "'$0 init -T<trunk> -b<branches> -t<tags>'",
 120                          \%init_opts ],
 121        dcommit => [ \&cmd_dcommit,
 122                     'Commit several diffs to merge with upstream',
 123                        { 'merge|m|M' => \$_merge,
 124                          'strategy|s=s' => \$_strategy,
 125                          'verbose|v' => \$_verbose,
 126                          'dry-run|n' => \$_dry_run,
 127                          'fetch-all|all' => \$_fetch_all,
 128                          'no-rebase' => \$_no_rebase,
 129                        %cmt_opts, %fc_opts } ],
 130        'set-tree' => [ \&cmd_set_tree,
 131                        "Set an SVN repository to a git tree-ish",
 132                        { 'stdin|' => \$_stdin, %cmt_opts, %fc_opts, } ],
 133        'create-ignore' => [ \&cmd_create_ignore,
 134                             'Create a .gitignore per svn:ignore',
 135                             { 'revision|r=i' => \$_revision
 136                             } ],
 137        'propget' => [ \&cmd_propget,
 138                       'Print the value of a property on a file or directory',
 139                       { 'revision|r=i' => \$_revision } ],
 140        'proplist' => [ \&cmd_proplist,
 141                       'List all properties of a file or directory',
 142                       { 'revision|r=i' => \$_revision } ],
 143        'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings",
 144                        { 'revision|r=i' => \$_revision
 145                        } ],
 146        'show-externals' => [ \&cmd_show_externals, "Show svn:externals listings",
 147                        { 'revision|r=i' => \$_revision
 148                        } ],
 149        'multi-fetch' => [ \&cmd_multi_fetch,
 150                           "Deprecated alias for $0 fetch --all",
 151                           { 'revision|r=s' => \$_revision, %fc_opts } ],
 152        'migrate' => [ sub { },
 153                       # no-op, we automatically run this anyways,
 154                       'Migrate configuration/metadata/layout from
 155                        previous versions of git-svn',
 156                       { 'minimize' => \$Git::SVN::Migration::_minimize,
 157                         %remote_opts } ],
 158        'log' => [ \&Git::SVN::Log::cmd_show_log, 'Show commit logs',
 159                        { 'limit=i' => \$Git::SVN::Log::limit,
 160                          'revision|r=s' => \$_revision,
 161                          'verbose|v' => \$Git::SVN::Log::verbose,
 162                          'incremental' => \$Git::SVN::Log::incremental,
 163                          'oneline' => \$Git::SVN::Log::oneline,
 164                          'show-commit' => \$Git::SVN::Log::show_commit,
 165                          'non-recursive' => \$Git::SVN::Log::non_recursive,
 166                          'authors-file|A=s' => \$_authors,
 167                          'color' => \$Git::SVN::Log::color,
 168                          'pager=s' => \$Git::SVN::Log::pager
 169                        } ],
 170        'find-rev' => [ \&cmd_find_rev, "Translate between SVN revision numbers and tree-ish",
 171                        {} ],
 172        'rebase' => [ \&cmd_rebase, "Fetch and rebase your working directory",
 173                        { 'merge|m|M' => \$_merge,
 174                          'verbose|v' => \$_verbose,
 175                          'strategy|s=s' => \$_strategy,
 176                          'local|l' => \$_local,
 177                          'fetch-all|all' => \$_fetch_all,
 178                          %fc_opts } ],
 179        'commit-diff' => [ \&cmd_commit_diff,
 180                           'Commit a diff between two trees',
 181                        { 'message|m=s' => \$_message,
 182                          'file|F=s' => \$_file,
 183                          'revision|r=s' => \$_revision,
 184                        %cmt_opts } ],
 185        'info' => [ \&cmd_info,
 186                    "Show info about the latest SVN revision
 187                     on the current branch",
 188                    { 'url' => \$_url, } ],
 189        'blame' => [ \&Git::SVN::Log::cmd_blame,
 190                    "Show what revision and author last modified each line of a file",
 191                    {} ],
 192);
 193
 194my $cmd;
 195for (my $i = 0; $i < @ARGV; $i++) {
 196        if (defined $cmd{$ARGV[$i]}) {
 197                $cmd = $ARGV[$i];
 198                splice @ARGV, $i, 1;
 199                last;
 200        }
 201};
 202
 203# make sure we're always running at the top-level working directory
 204unless ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
 205        unless (-d $ENV{GIT_DIR}) {
 206                if ($git_dir_user_set) {
 207                        die "GIT_DIR=$ENV{GIT_DIR} explicitly set, ",
 208                            "but it is not a directory\n";
 209                }
 210                my $git_dir = delete $ENV{GIT_DIR};
 211                chomp(my $cdup = command_oneline(qw/rev-parse --show-cdup/));
 212                unless (length $cdup) {
 213                        die "Already at toplevel, but $git_dir ",
 214                            "not found '$cdup'\n";
 215                }
 216                chdir $cdup or die "Unable to chdir up to '$cdup'\n";
 217                unless (-d $git_dir) {
 218                        die "$git_dir still not found after going to ",
 219                            "'$cdup'\n";
 220                }
 221                $ENV{GIT_DIR} = $git_dir;
 222        }
 223}
 224
 225my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
 226
 227read_repo_config(\%opts);
 228Getopt::Long::Configure('pass_through') if ($cmd && $cmd eq 'log');
 229my $rv = GetOptions(%opts, 'help|H|h' => \$_help, 'version|V' => \$_version,
 230                    'minimize-connections' => \$Git::SVN::Migration::_minimize,
 231                    'id|i=s' => \$Git::SVN::default_ref_id,
 232                    'svn-remote|remote|R=s' => sub {
 233                       $Git::SVN::no_reuse_existing = 1;
 234                       $Git::SVN::default_repo_id = $_[1] });
 235exit 1 if (!$rv && $cmd && $cmd ne 'log');
 236
 237usage(0) if $_help;
 238version() if $_version;
 239usage(1) unless defined $cmd;
 240load_authors() if $_authors;
 241
 242unless ($cmd =~ /^(?:clone|init|multi-init|commit-diff)$/) {
 243        Git::SVN::Migration::migration_check();
 244}
 245Git::SVN::init_vars();
 246eval {
 247        Git::SVN::verify_remotes_sanity();
 248        $cmd{$cmd}->[0]->(@ARGV);
 249};
 250fatal $@ if $@;
 251post_fetch_checkout();
 252exit 0;
 253
 254####################### primary functions ######################
 255sub usage {
 256        my $exit = shift || 0;
 257        my $fd = $exit ? \*STDERR : \*STDOUT;
 258        print $fd <<"";
 259git-svn - bidirectional operations between a single Subversion tree and git
 260Usage: $0 <command> [options] [arguments]\n
 261
 262        print $fd "Available commands:\n" unless $cmd;
 263
 264        foreach (sort keys %cmd) {
 265                next if $cmd && $cmd ne $_;
 266                next if /^multi-/; # don't show deprecated commands
 267                print $fd '  ',pack('A17',$_),$cmd{$_}->[1],"\n";
 268                foreach (sort keys %{$cmd{$_}->[2]}) {
 269                        # mixed-case options are for .git/config only
 270                        next if /[A-Z]/ && /^[a-z]+$/i;
 271                        # prints out arguments as they should be passed:
 272                        my $x = s#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
 273                        print $fd ' ' x 21, join(', ', map { length $_ > 1 ?
 274                                                        "--$_" : "-$_" }
 275                                                split /\|/,$_)," $x\n";
 276                }
 277        }
 278        print $fd <<"";
 279\nGIT_SVN_ID may be set in the environment or via the --id/-i switch to an
 280arbitrary identifier if you're tracking multiple SVN branches/repositories in
 281one git repository and want to keep them separate.  See git-svn(1) for more
 282information.
 283
 284        exit $exit;
 285}
 286
 287sub version {
 288        print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
 289        exit 0;
 290}
 291
 292sub do_git_init_db {
 293        unless (-d $ENV{GIT_DIR}) {
 294                my @init_db = ('init');
 295                push @init_db, "--template=$_template" if defined $_template;
 296                if (defined $_shared) {
 297                        if ($_shared =~ /[a-z]/) {
 298                                push @init_db, "--shared=$_shared";
 299                        } else {
 300                                push @init_db, "--shared";
 301                        }
 302                }
 303                command_noisy(@init_db);
 304        }
 305        my $set;
 306        my $pfx = "svn-remote.$Git::SVN::default_repo_id";
 307        foreach my $i (keys %icv) {
 308                die "'$set' and '$i' cannot both be set\n" if $set;
 309                next unless defined $icv{$i};
 310                command_noisy('config', "$pfx.$i", $icv{$i});
 311                $set = $i;
 312        }
 313}
 314
 315sub init_subdir {
 316        my $repo_path = shift or return;
 317        mkpath([$repo_path]) unless -d $repo_path;
 318        chdir $repo_path or die "Couldn't chdir to $repo_path: $!\n";
 319        $ENV{GIT_DIR} = '.git';
 320}
 321
 322sub cmd_clone {
 323        my ($url, $path) = @_;
 324        if (!defined $path &&
 325            (defined $_trunk || defined $_branches || defined $_tags ||
 326             defined $_stdlayout) &&
 327            $url !~ m#^[a-z\+]+://#) {
 328                $path = $url;
 329        }
 330        $path = basename($url) if !defined $path || !length $path;
 331        cmd_init($url, $path);
 332        Git::SVN::fetch_all($Git::SVN::default_repo_id);
 333}
 334
 335sub cmd_init {
 336        if (defined $_stdlayout) {
 337                $_trunk = 'trunk' if (!defined $_trunk);
 338                $_tags = 'tags' if (!defined $_tags);
 339                $_branches = 'branches' if (!defined $_branches);
 340        }
 341        if (defined $_trunk || defined $_branches || defined $_tags) {
 342                return cmd_multi_init(@_);
 343        }
 344        my $url = shift or die "SVN repository location required ",
 345                               "as a command-line argument\n";
 346        init_subdir(@_);
 347        do_git_init_db();
 348
 349        Git::SVN->init($url);
 350}
 351
 352sub cmd_fetch {
 353        if (grep /^\d+=./, @_) {
 354                die "'<rev>=<commit>' fetch arguments are ",
 355                    "no longer supported.\n";
 356        }
 357        my ($remote) = @_;
 358        if (@_ > 1) {
 359                die "Usage: $0 fetch [--all] [svn-remote]\n";
 360        }
 361        $remote ||= $Git::SVN::default_repo_id;
 362        if ($_fetch_all) {
 363                cmd_multi_fetch();
 364        } else {
 365                Git::SVN::fetch_all($remote, Git::SVN::read_all_remotes());
 366        }
 367}
 368
 369sub cmd_set_tree {
 370        my (@commits) = @_;
 371        if ($_stdin || !@commits) {
 372                print "Reading from stdin...\n";
 373                @commits = ();
 374                while (<STDIN>) {
 375                        if (/\b($sha1_short)\b/o) {
 376                                unshift @commits, $1;
 377                        }
 378                }
 379        }
 380        my @revs;
 381        foreach my $c (@commits) {
 382                my @tmp = command('rev-parse',$c);
 383                if (scalar @tmp == 1) {
 384                        push @revs, $tmp[0];
 385                } elsif (scalar @tmp > 1) {
 386                        push @revs, reverse(command('rev-list',@tmp));
 387                } else {
 388                        fatal "Failed to rev-parse $c";
 389                }
 390        }
 391        my $gs = Git::SVN->new;
 392        my ($r_last, $cmt_last) = $gs->last_rev_commit;
 393        $gs->fetch;
 394        if (defined $gs->{last_rev} && $r_last != $gs->{last_rev}) {
 395                fatal "There are new revisions that were fetched ",
 396                      "and need to be merged (or acknowledged) ",
 397                      "before committing.\nlast rev: $r_last\n",
 398                      " current: $gs->{last_rev}";
 399        }
 400        $gs->set_tree($_) foreach @revs;
 401        print "Done committing ",scalar @revs," revisions to SVN\n";
 402        unlink $gs->{index};
 403}
 404
 405sub cmd_dcommit {
 406        my $head = shift;
 407        git_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }
 408                'Cannot dcommit with a dirty index.  Commit your changes first, '
 409                . "or stash them with `git stash'.\n";
 410        $head ||= 'HEAD';
 411        my @refs;
 412        my ($url, $rev, $uuid, $gs) = working_head_info($head, \@refs);
 413        if ($url) {
 414                print "Committing to $url ...\n";
 415        }
 416        unless ($gs) {
 417                die "Unable to determine upstream SVN information from ",
 418                    "$head history.\nPerhaps the repository is empty.";
 419        }
 420        my $last_rev;
 421        my ($linear_refs, $parents) = linearize_history($gs, \@refs);
 422        if ($_no_rebase && scalar(@$linear_refs) > 1) {
 423                warn "Attempting to commit more than one change while ",
 424                     "--no-rebase is enabled.\n",
 425                     "If these changes depend on each other, re-running ",
 426                     "without --no-rebase may be required."
 427        }
 428        while (1) {
 429                my $d = shift @$linear_refs or last;
 430                unless (defined $last_rev) {
 431                        (undef, $last_rev, undef) = cmt_metadata("$d~1");
 432                        unless (defined $last_rev) {
 433                                fatal "Unable to extract revision information ",
 434                                      "from commit $d~1";
 435                        }
 436                }
 437                if ($_dry_run) {
 438                        print "diff-tree $d~1 $d\n";
 439                } else {
 440                        my $cmt_rev;
 441                        my %ed_opts = ( r => $last_rev,
 442                                        log => get_commit_entry($d)->{log},
 443                                        ra => Git::SVN::Ra->new($gs->full_url),
 444                                        config => SVN::Core::config_get_config(
 445                                                $Git::SVN::Ra::config_dir
 446                                        ),
 447                                        tree_a => "$d~1",
 448                                        tree_b => $d,
 449                                        editor_cb => sub {
 450                                               print "Committed r$_[0]\n";
 451                                               $cmt_rev = $_[0];
 452                                        },
 453                                        svn_path => '');
 454                        if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
 455                                print "No changes\n$d~1 == $d\n";
 456                        } elsif ($parents->{$d} && @{$parents->{$d}}) {
 457                                $gs->{inject_parents_dcommit}->{$cmt_rev} =
 458                                                               $parents->{$d};
 459                        }
 460                        $_fetch_all ? $gs->fetch_all : $gs->fetch;
 461                        $last_rev = $cmt_rev;
 462                        next if $_no_rebase;
 463
 464                        # we always want to rebase against the current HEAD,
 465                        # not any head that was passed to us
 466                        my @diff = command('diff-tree', $d,
 467                                           $gs->refname, '--');
 468                        my @finish;
 469                        if (@diff) {
 470                                @finish = rebase_cmd();
 471                                print STDERR "W: $d and ", $gs->refname,
 472                                             " differ, using @finish:\n",
 473                                             join("\n", @diff), "\n";
 474                        } else {
 475                                print "No changes between current HEAD and ",
 476                                      $gs->refname,
 477                                      "\nResetting to the latest ",
 478                                      $gs->refname, "\n";
 479                                @finish = qw/reset --mixed/;
 480                        }
 481                        command_noisy(@finish, $gs->refname);
 482                        if (@diff) {
 483                                @refs = ();
 484                                my ($url_, $rev_, $uuid_, $gs_) =
 485                                              working_head_info($head, \@refs);
 486                                my ($linear_refs_, $parents_) =
 487                                              linearize_history($gs_, \@refs);
 488                                if (scalar(@$linear_refs) !=
 489                                    scalar(@$linear_refs_)) {
 490                                        fatal "# of revisions changed ",
 491                                          "\nbefore:\n",
 492                                          join("\n", @$linear_refs),
 493                                          "\n\nafter:\n",
 494                                          join("\n", @$linear_refs_), "\n",
 495                                          'If you are attempting to commit ',
 496                                          "merges, try running:\n\t",
 497                                          'git rebase --interactive',
 498                                          '--preserve-merges ',
 499                                          $gs->refname,
 500                                          "\nBefore dcommitting";
 501                                }
 502                                if ($url_ ne $url) {
 503                                        fatal "URL mismatch after rebase: ",
 504                                              "$url_ != $url";
 505                                }
 506                                if ($uuid_ ne $uuid) {
 507                                        fatal "uuid mismatch after rebase: ",
 508                                              "$uuid_ != $uuid";
 509                                }
 510                                # remap parents
 511                                my (%p, @l, $i);
 512                                for ($i = 0; $i < scalar @$linear_refs; $i++) {
 513                                        my $new = $linear_refs_->[$i] or next;
 514                                        $p{$new} =
 515                                                $parents->{$linear_refs->[$i]};
 516                                        push @l, $new;
 517                                }
 518                                $parents = \%p;
 519                                $linear_refs = \@l;
 520                        }
 521                }
 522        }
 523        unlink $gs->{index};
 524}
 525
 526sub cmd_find_rev {
 527        my $revision_or_hash = shift or die "SVN or git revision required ",
 528                                            "as a command-line argument\n";
 529        my $result;
 530        if ($revision_or_hash =~ /^r\d+$/) {
 531                my $head = shift;
 532                $head ||= 'HEAD';
 533                my @refs;
 534                my (undef, undef, undef, $gs) = working_head_info($head, \@refs);
 535                unless ($gs) {
 536                        die "Unable to determine upstream SVN information from ",
 537                            "$head history\n";
 538                }
 539                my $desired_revision = substr($revision_or_hash, 1);
 540                $result = $gs->rev_map_get($desired_revision);
 541        } else {
 542                my (undef, $rev, undef) = cmt_metadata($revision_or_hash);
 543                $result = $rev;
 544        }
 545        print "$result\n" if $result;
 546}
 547
 548sub cmd_rebase {
 549        command_noisy(qw/update-index --refresh/);
 550        my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
 551        unless ($gs) {
 552                die "Unable to determine upstream SVN information from ",
 553                    "working tree history\n";
 554        }
 555        if (command(qw/diff-index HEAD --/)) {
 556                print STDERR "Cannot rebase with uncommited changes:\n";
 557                command_noisy('status');
 558                exit 1;
 559        }
 560        unless ($_local) {
 561                # rebase will checkout for us, so no need to do it explicitly
 562                $_no_checkout = 'true';
 563                $_fetch_all ? $gs->fetch_all : $gs->fetch;
 564        }
 565        command_noisy(rebase_cmd(), $gs->refname);
 566}
 567
 568sub cmd_show_ignore {
 569        my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
 570        $gs ||= Git::SVN->new;
 571        my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
 572        $gs->prop_walk($gs->{path}, $r, sub {
 573                my ($gs, $path, $props) = @_;
 574                print STDOUT "\n# $path\n";
 575                my $s = $props->{'svn:ignore'} or return;
 576                $s =~ s/[\r\n]+/\n/g;
 577                chomp $s;
 578                $s =~ s#^#$path#gm;
 579                print STDOUT "$s\n";
 580        });
 581}
 582
 583sub cmd_show_externals {
 584        my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
 585        $gs ||= Git::SVN->new;
 586        my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
 587        $gs->prop_walk($gs->{path}, $r, sub {
 588                my ($gs, $path, $props) = @_;
 589                print STDOUT "\n# $path\n";
 590                my $s = $props->{'svn:externals'} or return;
 591                $s =~ s/[\r\n]+/\n/g;
 592                chomp $s;
 593                $s =~ s#^#$path#gm;
 594                print STDOUT "$s\n";
 595        });
 596}
 597
 598sub cmd_create_ignore {
 599        my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
 600        $gs ||= Git::SVN->new;
 601        my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
 602        $gs->prop_walk($gs->{path}, $r, sub {
 603                my ($gs, $path, $props) = @_;
 604                # $path is of the form /path/to/dir/
 605                my $ignore = '.' . $path . '.gitignore';
 606                my $s = $props->{'svn:ignore'} or return;
 607                open(GITIGNORE, '>', $ignore)
 608                  or fatal("Failed to open `$ignore' for writing: $!");
 609                $s =~ s/[\r\n]+/\n/g;
 610                chomp $s;
 611                # Prefix all patterns so that the ignore doesn't apply
 612                # to sub-directories.
 613                $s =~ s#^#/#gm;
 614                print GITIGNORE "$s\n";
 615                close(GITIGNORE)
 616                  or fatal("Failed to close `$ignore': $!");
 617                command_noisy('add', '-f', $ignore);
 618        });
 619}
 620
 621sub canonicalize_path {
 622        my ($path) = @_;
 623        my $dot_slash_added = 0;
 624        if (substr($path, 0, 1) ne "/") {
 625                $path = "./" . $path;
 626                $dot_slash_added = 1;
 627        }
 628        # File::Spec->canonpath doesn't collapse x/../y into y (for a
 629        # good reason), so let's do this manually.
 630        $path =~ s#/+#/#g;
 631        $path =~ s#/\.(?:/|$)#/#g;
 632        $path =~ s#/[^/]+/\.\.##g;
 633        $path =~ s#/$##g;
 634        $path =~ s#^\./## if $dot_slash_added;
 635        return $path;
 636}
 637
 638# get_svnprops(PATH)
 639# ------------------
 640# Helper for cmd_propget and cmd_proplist below.
 641sub get_svnprops {
 642        my $path = shift;
 643        my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
 644        $gs ||= Git::SVN->new;
 645
 646        # prefix THE PATH by the sub-directory from which the user
 647        # invoked us.
 648        $path = $cmd_dir_prefix . $path;
 649        fatal("No such file or directory: $path") unless -e $path;
 650        my $is_dir = -d $path ? 1 : 0;
 651        $path = $gs->{path} . '/' . $path;
 652
 653        # canonicalize the path (otherwise libsvn will abort or fail to
 654        # find the file)
 655        $path = canonicalize_path($path);
 656
 657        my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
 658        my $props;
 659        if ($is_dir) {
 660                (undef, undef, $props) = $gs->ra->get_dir($path, $r);
 661        }
 662        else {
 663                (undef, $props) = $gs->ra->get_file($path, $r, undef);
 664        }
 665        return $props;
 666}
 667
 668# cmd_propget (PROP, PATH)
 669# ------------------------
 670# Print the SVN property PROP for PATH.
 671sub cmd_propget {
 672        my ($prop, $path) = @_;
 673        $path = '.' if not defined $path;
 674        usage(1) if not defined $prop;
 675        my $props = get_svnprops($path);
 676        if (not defined $props->{$prop}) {
 677                fatal("`$path' does not have a `$prop' SVN property.");
 678        }
 679        print $props->{$prop} . "\n";
 680}
 681
 682# cmd_proplist (PATH)
 683# -------------------
 684# Print the list of SVN properties for PATH.
 685sub cmd_proplist {
 686        my $path = shift;
 687        $path = '.' if not defined $path;
 688        my $props = get_svnprops($path);
 689        print "Properties on '$path':\n";
 690        foreach (sort keys %{$props}) {
 691                print "  $_\n";
 692        }
 693}
 694
 695sub cmd_multi_init {
 696        my $url = shift;
 697        unless (defined $_trunk || defined $_branches || defined $_tags) {
 698                usage(1);
 699        }
 700
 701        # there are currently some bugs that prevent multi-init/multi-fetch
 702        # setups from working well without this.
 703        $Git::SVN::_minimize_url = 1;
 704
 705        $_prefix = '' unless defined $_prefix;
 706        if (defined $url) {
 707                $url =~ s#/+$##;
 708                init_subdir(@_);
 709        }
 710        do_git_init_db();
 711        if (defined $_trunk) {
 712                my $trunk_ref = $_prefix . 'trunk';
 713                # try both old-style and new-style lookups:
 714                my $gs_trunk = eval { Git::SVN->new($trunk_ref) };
 715                unless ($gs_trunk) {
 716                        my ($trunk_url, $trunk_path) =
 717                                              complete_svn_url($url, $_trunk);
 718                        $gs_trunk = Git::SVN->init($trunk_url, $trunk_path,
 719                                                   undef, $trunk_ref);
 720                }
 721        }
 722        return unless defined $_branches || defined $_tags;
 723        my $ra = $url ? Git::SVN::Ra->new($url) : undef;
 724        complete_url_ls_init($ra, $_branches, '--branches/-b', $_prefix);
 725        complete_url_ls_init($ra, $_tags, '--tags/-t', $_prefix . 'tags/');
 726}
 727
 728sub cmd_multi_fetch {
 729        my $remotes = Git::SVN::read_all_remotes();
 730        foreach my $repo_id (sort keys %$remotes) {
 731                if ($remotes->{$repo_id}->{url}) {
 732                        Git::SVN::fetch_all($repo_id, $remotes);
 733                }
 734        }
 735}
 736
 737# this command is special because it requires no metadata
 738sub cmd_commit_diff {
 739        my ($ta, $tb, $url) = @_;
 740        my $usage = "Usage: $0 commit-diff -r<revision> ".
 741                    "<tree-ish> <tree-ish> [<URL>]";
 742        fatal($usage) if (!defined $ta || !defined $tb);
 743        my $svn_path;
 744        if (!defined $url) {
 745                my $gs = eval { Git::SVN->new };
 746                if (!$gs) {
 747                        fatal("Needed URL or usable git-svn --id in ",
 748                              "the command-line\n", $usage);
 749                }
 750                $url = $gs->{url};
 751                $svn_path = $gs->{path};
 752        }
 753        unless (defined $_revision) {
 754                fatal("-r|--revision is a required argument\n", $usage);
 755        }
 756        if (defined $_message && defined $_file) {
 757                fatal("Both --message/-m and --file/-F specified ",
 758                      "for the commit message.\n",
 759                      "I have no idea what you mean");
 760        }
 761        if (defined $_file) {
 762                $_message = file_to_s($_file);
 763        } else {
 764                $_message ||= get_commit_entry($tb)->{log};
 765        }
 766        my $ra ||= Git::SVN::Ra->new($url);
 767        $svn_path ||= $ra->{svn_path};
 768        my $r = $_revision;
 769        if ($r eq 'HEAD') {
 770                $r = $ra->get_latest_revnum;
 771        } elsif ($r !~ /^\d+$/) {
 772                die "revision argument: $r not understood by git-svn\n";
 773        }
 774        my %ed_opts = ( r => $r,
 775                        log => $_message,
 776                        ra => $ra,
 777                        tree_a => $ta,
 778                        tree_b => $tb,
 779                        editor_cb => sub { print "Committed r$_[0]\n" },
 780                        svn_path => $svn_path );
 781        if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
 782                print "No changes\n$ta == $tb\n";
 783        }
 784}
 785
 786sub cmd_info {
 787        my $path = canonicalize_path(shift or ".");
 788        unless (scalar(@_) == 0) {
 789                die "Too many arguments specified\n";
 790        }
 791
 792        my ($file_type, $diff_status) = find_file_type_and_diff_status($path);
 793
 794        if (!$file_type && !$diff_status) {
 795                print STDERR "$path:  (Not a versioned resource)\n\n";
 796                return;
 797        }
 798
 799        my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
 800        unless ($gs) {
 801                die "Unable to determine upstream SVN information from ",
 802                    "working tree history\n";
 803        }
 804        my $full_url = $url . ($path eq "." ? "" : "/$path");
 805
 806        if ($_url) {
 807                print $full_url, "\n";
 808                return;
 809        }
 810
 811        my $result = "Path: $path\n";
 812        $result .= "Name: " . basename($path) . "\n" if $file_type ne "dir";
 813        $result .= "URL: " . $full_url . "\n";
 814
 815        eval {
 816                my $repos_root = $gs->repos_root;
 817                Git::SVN::remove_username($repos_root);
 818                $result .= "Repository Root: $repos_root\n";
 819        };
 820        if ($@) {
 821                $result .= "Repository Root: (offline)\n";
 822        }
 823        $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A";
 824        $result .= "Revision: " . ($diff_status eq "A" ? 0 : $rev) . "\n";
 825
 826        $result .= "Node Kind: " .
 827                   ($file_type eq "dir" ? "directory" : "file") . "\n";
 828
 829        my $schedule = $diff_status eq "A"
 830                       ? "add"
 831                       : ($diff_status eq "D" ? "delete" : "normal");
 832        $result .= "Schedule: $schedule\n";
 833
 834        if ($diff_status eq "A") {
 835                print $result, "\n";
 836                return;
 837        }
 838
 839        my ($lc_author, $lc_rev, $lc_date_utc);
 840        my @args = Git::SVN::Log::git_svn_log_cmd($rev, $rev, "--", $path);
 841        my $log = command_output_pipe(@args);
 842        my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
 843        while (<$log>) {
 844                if (/^${esc_color}author (.+) <[^>]+> (\d+) ([\-\+]?\d+)$/o) {
 845                        $lc_author = $1;
 846                        $lc_date_utc = Git::SVN::Log::parse_git_date($2, $3);
 847                } elsif (/^${esc_color}    (git-svn-id:.+)$/o) {
 848                        (undef, $lc_rev, undef) = ::extract_metadata($1);
 849                }
 850        }
 851        close $log;
 852
 853        Git::SVN::Log::set_local_timezone();
 854
 855        $result .= "Last Changed Author: $lc_author\n";
 856        $result .= "Last Changed Rev: $lc_rev\n";
 857        $result .= "Last Changed Date: " .
 858                   Git::SVN::Log::format_svn_date($lc_date_utc) . "\n";
 859
 860        if ($file_type ne "dir") {
 861                my $text_last_updated_date =
 862                    ($diff_status eq "D" ? $lc_date_utc : (stat $path)[9]);
 863                $result .=
 864                    "Text Last Updated: " .
 865                    Git::SVN::Log::format_svn_date($text_last_updated_date) .
 866                    "\n";
 867                my $checksum;
 868                if ($diff_status eq "D") {
 869                        my ($fh, $ctx) =
 870                            command_output_pipe(qw(cat-file blob), "HEAD:$path");
 871                        if ($file_type eq "link") {
 872                                my $file_name = <$fh>;
 873                                $checksum = md5sum("link $file_name");
 874                        } else {
 875                                $checksum = md5sum($fh);
 876                        }
 877                        command_close_pipe($fh, $ctx);
 878                } elsif ($file_type eq "link") {
 879                        my $file_name =
 880                            command(qw(cat-file blob), "HEAD:$path");
 881                        $checksum =
 882                            md5sum("link " . $file_name);
 883                } else {
 884                        open FILE, "<", $path or die $!;
 885                        $checksum = md5sum(\*FILE);
 886                        close FILE or die $!;
 887                }
 888                $result .= "Checksum: " . $checksum . "\n";
 889        }
 890
 891        print $result, "\n";
 892}
 893
 894########################### utility functions #########################
 895
 896sub rebase_cmd {
 897        my @cmd = qw/rebase/;
 898        push @cmd, '-v' if $_verbose;
 899        push @cmd, qw/--merge/ if $_merge;
 900        push @cmd, "--strategy=$_strategy" if $_strategy;
 901        @cmd;
 902}
 903
 904sub post_fetch_checkout {
 905        return if $_no_checkout;
 906        my $gs = $Git::SVN::_head or return;
 907        return if verify_ref('refs/heads/master^0');
 908
 909        my $valid_head = verify_ref('HEAD^0');
 910        command_noisy(qw(update-ref refs/heads/master), $gs->refname);
 911        return if ($valid_head || !verify_ref('HEAD^0'));
 912
 913        return if $ENV{GIT_DIR} !~ m#^(?:.*/)?\.git$#;
 914        my $index = $ENV{GIT_INDEX_FILE} || "$ENV{GIT_DIR}/index";
 915        return if -f $index;
 916
 917        return if command_oneline(qw/rev-parse --is-inside-work-tree/) eq 'false';
 918        return if command_oneline(qw/rev-parse --is-inside-git-dir/) eq 'true';
 919        command_noisy(qw/read-tree -m -u -v HEAD HEAD/);
 920        print STDERR "Checked out HEAD:\n  ",
 921                     $gs->full_url, " r", $gs->last_rev, "\n";
 922}
 923
 924sub complete_svn_url {
 925        my ($url, $path) = @_;
 926        $path =~ s#/+$##;
 927        if ($path !~ m#^[a-z\+]+://#) {
 928                if (!defined $url || $url !~ m#^[a-z\+]+://#) {
 929                        fatal("E: '$path' is not a complete URL ",
 930                              "and a separate URL is not specified");
 931                }
 932                return ($url, $path);
 933        }
 934        return ($path, '');
 935}
 936
 937sub complete_url_ls_init {
 938        my ($ra, $repo_path, $switch, $pfx) = @_;
 939        unless ($repo_path) {
 940                print STDERR "W: $switch not specified\n";
 941                return;
 942        }
 943        $repo_path =~ s#/+$##;
 944        if ($repo_path =~ m#^[a-z\+]+://#) {
 945                $ra = Git::SVN::Ra->new($repo_path);
 946                $repo_path = '';
 947        } else {
 948                $repo_path =~ s#^/+##;
 949                unless ($ra) {
 950                        fatal("E: '$repo_path' is not a complete URL ",
 951                              "and a separate URL is not specified");
 952                }
 953        }
 954        my $url = $ra->{url};
 955        my $gs = Git::SVN->init($url, undef, undef, undef, 1);
 956        my $k = "svn-remote.$gs->{repo_id}.url";
 957        my $orig_url = eval { command_oneline(qw/config --get/, $k) };
 958        if ($orig_url && ($orig_url ne $gs->{url})) {
 959                die "$k already set: $orig_url\n",
 960                    "wanted to set to: $gs->{url}\n";
 961        }
 962        command_oneline('config', $k, $gs->{url}) unless $orig_url;
 963        my $remote_path = "$ra->{svn_path}/$repo_path";
 964        $remote_path =~ s#/+#/#g;
 965        $remote_path =~ s#^/##g;
 966        $remote_path .= "/*" if $remote_path !~ /\*/;
 967        my ($n) = ($switch =~ /^--(\w+)/);
 968        if (length $pfx && $pfx !~ m#/$#) {
 969                die "--prefix='$pfx' must have a trailing slash '/'\n";
 970        }
 971        command_noisy('config', "svn-remote.$gs->{repo_id}.$n",
 972                                "$remote_path:refs/remotes/$pfx*");
 973}
 974
 975sub verify_ref {
 976        my ($ref) = @_;
 977        eval { command_oneline([ 'rev-parse', '--verify', $ref ],
 978                               { STDERR => 0 }); };
 979}
 980
 981sub get_tree_from_treeish {
 982        my ($treeish) = @_;
 983        # $treeish can be a symbolic ref, too:
 984        my $type = command_oneline(qw/cat-file -t/, $treeish);
 985        my $expected;
 986        while ($type eq 'tag') {
 987                ($treeish, $type) = command(qw/cat-file tag/, $treeish);
 988        }
 989        if ($type eq 'commit') {
 990                $expected = (grep /^tree /, command(qw/cat-file commit/,
 991                                                    $treeish))[0];
 992                ($expected) = ($expected =~ /^tree ($sha1)$/o);
 993                die "Unable to get tree from $treeish\n" unless $expected;
 994        } elsif ($type eq 'tree') {
 995                $expected = $treeish;
 996        } else {
 997                die "$treeish is a $type, expected tree, tag or commit\n";
 998        }
 999        return $expected;
1000}
1001
1002sub get_commit_entry {
1003        my ($treeish) = shift;
1004        my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) );
1005        my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
1006        my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
1007        open my $log_fh, '>', $commit_editmsg or croak $!;
1008
1009        my $type = command_oneline(qw/cat-file -t/, $treeish);
1010        if ($type eq 'commit' || $type eq 'tag') {
1011                my ($msg_fh, $ctx) = command_output_pipe('cat-file',
1012                                                         $type, $treeish);
1013                my $in_msg = 0;
1014                while (<$msg_fh>) {
1015                        if (!$in_msg) {
1016                                $in_msg = 1 if (/^\s*$/);
1017                        } elsif (/^git-svn-id: /) {
1018                                # skip this for now, we regenerate the
1019                                # correct one on re-fetch anyways
1020                                # TODO: set *:merge properties or like...
1021                        } else {
1022                                print $log_fh $_ or croak $!;
1023                        }
1024                }
1025                command_close_pipe($msg_fh, $ctx);
1026        }
1027        close $log_fh or croak $!;
1028
1029        if ($_edit || ($type eq 'tree')) {
1030                my $editor = $ENV{VISUAL} || $ENV{EDITOR} || 'vi';
1031                # TODO: strip out spaces, comments, like git-commit.sh
1032                system($editor, $commit_editmsg);
1033        }
1034        rename $commit_editmsg, $commit_msg or croak $!;
1035        open $log_fh, '<', $commit_msg or croak $!;
1036        { local $/; chomp($log_entry{log} = <$log_fh>); }
1037        close $log_fh or croak $!;
1038        unlink $commit_msg;
1039        \%log_entry;
1040}
1041
1042sub s_to_file {
1043        my ($str, $file, $mode) = @_;
1044        open my $fd,'>',$file or croak $!;
1045        print $fd $str,"\n" or croak $!;
1046        close $fd or croak $!;
1047        chmod ($mode &~ umask, $file) if (defined $mode);
1048}
1049
1050sub file_to_s {
1051        my $file = shift;
1052        open my $fd,'<',$file or croak "$!: file: $file\n";
1053        local $/;
1054        my $ret = <$fd>;
1055        close $fd or croak $!;
1056        $ret =~ s/\s*$//s;
1057        return $ret;
1058}
1059
1060# '<svn username> = real-name <email address>' mapping based on git-svnimport:
1061sub load_authors {
1062        open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
1063        my $log = $cmd eq 'log';
1064        while (<$authors>) {
1065                chomp;
1066                next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
1067                my ($user, $name, $email) = ($1, $2, $3);
1068                if ($log) {
1069                        $Git::SVN::Log::rusers{"$name <$email>"} = $user;
1070                } else {
1071                        $users{$user} = [$name, $email];
1072                }
1073        }
1074        close $authors or croak $!;
1075}
1076
1077# convert GetOpt::Long specs for use by git-config
1078sub read_repo_config {
1079        return unless -d $ENV{GIT_DIR};
1080        my $opts = shift;
1081        my @config_only;
1082        foreach my $o (keys %$opts) {
1083                # if we have mixedCase and a long option-only, then
1084                # it's a config-only variable that we don't need for
1085                # the command-line.
1086                push @config_only, $o if ($o =~ /[A-Z]/ && $o =~ /^[a-z]+$/i);
1087                my $v = $opts->{$o};
1088                my ($key) = ($o =~ /^([a-zA-Z\-]+)/);
1089                $key =~ s/-//g;
1090                my $arg = 'git-config';
1091                $arg .= ' --int' if ($o =~ /[:=]i$/);
1092                $arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
1093                if (ref $v eq 'ARRAY') {
1094                        chomp(my @tmp = `$arg --get-all svn.$key`);
1095                        @$v = @tmp if @tmp;
1096                } else {
1097                        chomp(my $tmp = `$arg --get svn.$key`);
1098                        if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) {
1099                                $$v = $tmp;
1100                        }
1101                }
1102        }
1103        delete @$opts{@config_only} if @config_only;
1104}
1105
1106sub extract_metadata {
1107        my $id = shift or return (undef, undef, undef);
1108        my ($url, $rev, $uuid) = ($id =~ /^\s*git-svn-id:\s+(.*)\@(\d+)
1109                                                        \s([a-f\d\-]+)$/x);
1110        if (!defined $rev || !$uuid || !$url) {
1111                # some of the original repositories I made had
1112                # identifiers like this:
1113                ($rev, $uuid) = ($id =~/^\s*git-svn-id:\s(\d+)\@([a-f\d\-]+)/);
1114        }
1115        return ($url, $rev, $uuid);
1116}
1117
1118sub cmt_metadata {
1119        return extract_metadata((grep(/^git-svn-id: /,
1120                command(qw/cat-file commit/, shift)))[-1]);
1121}
1122
1123sub working_head_info {
1124        my ($head, $refs) = @_;
1125        my @args = ('log', '--no-color', '--first-parent', '--pretty=medium');
1126        my ($fh, $ctx) = command_output_pipe(@args, $head);
1127        my $hash;
1128        my %max;
1129        while (<$fh>) {
1130                if ( m{^commit ($::sha1)$} ) {
1131                        unshift @$refs, $hash if $hash and $refs;
1132                        $hash = $1;
1133                        next;
1134                }
1135                next unless s{^\s*(git-svn-id:)}{$1};
1136                my ($url, $rev, $uuid) = extract_metadata($_);
1137                if (defined $url && defined $rev) {
1138                        next if $max{$url} and $max{$url} < $rev;
1139                        if (my $gs = Git::SVN->find_by_url($url)) {
1140                                my $c = $gs->rev_map_get($rev);
1141                                if ($c && $c eq $hash) {
1142                                        close $fh; # break the pipe
1143                                        return ($url, $rev, $uuid, $gs);
1144                                } else {
1145                                        $max{$url} ||= $gs->rev_map_max;
1146                                }
1147                        }
1148                }
1149        }
1150        command_close_pipe($fh, $ctx);
1151        (undef, undef, undef, undef);
1152}
1153
1154sub read_commit_parents {
1155        my ($parents, $c) = @_;
1156        chomp(my $p = command_oneline(qw/rev-list --parents -1/, $c));
1157        $p =~ s/^($c)\s*// or die "rev-list --parents -1 $c failed!\n";
1158        @{$parents->{$c}} = split(/ /, $p);
1159}
1160
1161sub linearize_history {
1162        my ($gs, $refs) = @_;
1163        my %parents;
1164        foreach my $c (@$refs) {
1165                read_commit_parents(\%parents, $c);
1166        }
1167
1168        my @linear_refs;
1169        my %skip = ();
1170        my $last_svn_commit = $gs->last_commit;
1171        foreach my $c (reverse @$refs) {
1172                next if $c eq $last_svn_commit;
1173                last if $skip{$c};
1174
1175                unshift @linear_refs, $c;
1176                $skip{$c} = 1;
1177
1178                # we only want the first parent to diff against for linear
1179                # history, we save the rest to inject when we finalize the
1180                # svn commit
1181                my $fp_a = verify_ref("$c~1");
1182                my $fp_b = shift @{$parents{$c}} if $parents{$c};
1183                if (!$fp_a || !$fp_b) {
1184                        die "Commit $c\n",
1185                            "has no parent commit, and therefore ",
1186                            "nothing to diff against.\n",
1187                            "You should be working from a repository ",
1188                            "originally created by git-svn\n";
1189                }
1190                if ($fp_a ne $fp_b) {
1191                        die "$c~1 = $fp_a, however parsing commit $c ",
1192                            "revealed that:\n$c~1 = $fp_b\nBUG!\n";
1193                }
1194
1195                foreach my $p (@{$parents{$c}}) {
1196                        $skip{$p} = 1;
1197                }
1198        }
1199        (\@linear_refs, \%parents);
1200}
1201
1202sub find_file_type_and_diff_status {
1203        my ($path) = @_;
1204        return ('dir', '') if $path eq '.';
1205
1206        my $diff_output =
1207            command_oneline(qw(diff --cached --name-status --), $path) || "";
1208        my $diff_status = (split(' ', $diff_output))[0] || "";
1209
1210        my $ls_tree = command_oneline(qw(ls-tree HEAD), $path) || "";
1211
1212        return (undef, undef) if !$diff_status && !$ls_tree;
1213
1214        if ($diff_status eq "A") {
1215                return ("link", $diff_status) if -l $path;
1216                return ("dir", $diff_status) if -d $path;
1217                return ("file", $diff_status);
1218        }
1219
1220        my $mode = (split(' ', $ls_tree))[0] || "";
1221
1222        return ("link", $diff_status) if $mode eq "120000";
1223        return ("dir", $diff_status) if $mode eq "040000";
1224        return ("file", $diff_status);
1225}
1226
1227sub md5sum {
1228        my $arg = shift;
1229        my $ref = ref $arg;
1230        my $md5 = Digest::MD5->new();
1231        if ($ref eq 'GLOB' || $ref eq 'IO::File') {
1232                $md5->addfile($arg) or croak $!;
1233        } elsif ($ref eq 'SCALAR') {
1234                $md5->add($$arg) or croak $!;
1235        } elsif (!$ref) {
1236                $md5->add($arg) or croak $!;
1237        } else {
1238                ::fatal "Can't provide MD5 hash for unknown ref type: '", $ref, "'";
1239        }
1240        return $md5->hexdigest();
1241}
1242
1243package Git::SVN;
1244use strict;
1245use warnings;
1246use Fcntl qw/:DEFAULT :seek/;
1247use constant rev_map_fmt => 'NH40';
1248use vars qw/$default_repo_id $default_ref_id $_no_metadata $_follow_parent
1249            $_repack $_repack_flags $_use_svm_props $_head
1250            $_use_svnsync_props $no_reuse_existing $_minimize_url
1251            $_use_log_author/;
1252use Carp qw/croak/;
1253use File::Path qw/mkpath/;
1254use File::Copy qw/copy/;
1255use IPC::Open3;
1256
1257my ($_gc_nr, $_gc_period);
1258
1259# properties that we do not log:
1260my %SKIP_PROP;
1261BEGIN {
1262        %SKIP_PROP = map { $_ => 1 } qw/svn:wc:ra_dav:version-url
1263                                        svn:special svn:executable
1264                                        svn:entry:committed-rev
1265                                        svn:entry:last-author
1266                                        svn:entry:uuid
1267                                        svn:entry:committed-date/;
1268
1269        # some options are read globally, but can be overridden locally
1270        # per [svn-remote "..."] section.  Command-line options will *NOT*
1271        # override options set in an [svn-remote "..."] section
1272        no strict 'refs';
1273        for my $option (qw/follow_parent no_metadata use_svm_props
1274                           use_svnsync_props/) {
1275                my $key = $option;
1276                $key =~ tr/_//d;
1277                my $prop = "-$option";
1278                *$option = sub {
1279                        my ($self) = @_;
1280                        return $self->{$prop} if exists $self->{$prop};
1281                        my $k = "svn-remote.$self->{repo_id}.$key";
1282                        eval { command_oneline(qw/config --get/, $k) };
1283                        if ($@) {
1284                                $self->{$prop} = ${"Git::SVN::_$option"};
1285                        } else {
1286                                my $v = command_oneline(qw/config --bool/,$k);
1287                                $self->{$prop} = $v eq 'false' ? 0 : 1;
1288                        }
1289                        return $self->{$prop};
1290                }
1291        }
1292}
1293
1294my (%LOCKFILES, %INDEX_FILES);
1295END {
1296        unlink keys %LOCKFILES if %LOCKFILES;
1297        unlink keys %INDEX_FILES if %INDEX_FILES;
1298}
1299
1300sub resolve_local_globs {
1301        my ($url, $fetch, $glob_spec) = @_;
1302        return unless defined $glob_spec;
1303        my $ref = $glob_spec->{ref};
1304        my $path = $glob_spec->{path};
1305        foreach (command(qw#for-each-ref --format=%(refname) refs/remotes#)) {
1306                next unless m#^refs/remotes/$ref->{regex}$#;
1307                my $p = $1;
1308                my $pathname = desanitize_refname($path->full_path($p));
1309                my $refname = desanitize_refname($ref->full_path($p));
1310                if (my $existing = $fetch->{$pathname}) {
1311                        if ($existing ne $refname) {
1312                                die "Refspec conflict:\n",
1313                                    "existing: refs/remotes/$existing\n",
1314                                    " globbed: refs/remotes/$refname\n";
1315                        }
1316                        my $u = (::cmt_metadata("refs/remotes/$refname"))[0];
1317                        $u =~ s!^\Q$url\E(/|$)!! or die
1318                          "refs/remotes/$refname: '$url' not found in '$u'\n";
1319                        if ($pathname ne $u) {
1320                                warn "W: Refspec glob conflict ",
1321                                     "(ref: refs/remotes/$refname):\n",
1322                                     "expected path: $pathname\n",
1323                                     "    real path: $u\n",
1324                                     "Continuing ahead with $u\n";
1325                                next;
1326                        }
1327                } else {
1328                        $fetch->{$pathname} = $refname;
1329                }
1330        }
1331}
1332
1333sub parse_revision_argument {
1334        my ($base, $head) = @_;
1335        if (!defined $::_revision || $::_revision eq 'BASE:HEAD') {
1336                return ($base, $head);
1337        }
1338        return ($1, $2) if ($::_revision =~ /^(\d+):(\d+)$/);
1339        return ($::_revision, $::_revision) if ($::_revision =~ /^\d+$/);
1340        return ($head, $head) if ($::_revision eq 'HEAD');
1341        return ($base, $1) if ($::_revision =~ /^BASE:(\d+)$/);
1342        return ($1, $head) if ($::_revision =~ /^(\d+):HEAD$/);
1343        die "revision argument: $::_revision not understood by git-svn\n";
1344}
1345
1346sub fetch_all {
1347        my ($repo_id, $remotes) = @_;
1348        if (ref $repo_id) {
1349                my $gs = $repo_id;
1350                $repo_id = undef;
1351                $repo_id = $gs->{repo_id};
1352        }
1353        $remotes ||= read_all_remotes();
1354        my $remote = $remotes->{$repo_id} or
1355                     die "[svn-remote \"$repo_id\"] unknown\n";
1356        my $fetch = $remote->{fetch};
1357        my $url = $remote->{url} or die "svn-remote.$repo_id.url not defined\n";
1358        my (@gs, @globs);
1359        my $ra = Git::SVN::Ra->new($url);
1360        my $uuid = $ra->get_uuid;
1361        my $head = $ra->get_latest_revnum;
1362        my $base = defined $fetch ? $head : 0;
1363
1364        # read the max revs for wildcard expansion (branches/*, tags/*)
1365        foreach my $t (qw/branches tags/) {
1366                defined $remote->{$t} or next;
1367                push @globs, $remote->{$t};
1368                my $max_rev = eval { tmp_config(qw/--int --get/,
1369                                         "svn-remote.$repo_id.${t}-maxRev") };
1370                if (defined $max_rev && ($max_rev < $base)) {
1371                        $base = $max_rev;
1372                } elsif (!defined $max_rev) {
1373                        $base = 0;
1374                }
1375        }
1376
1377        if ($fetch) {
1378                foreach my $p (sort keys %$fetch) {
1379                        my $gs = Git::SVN->new($fetch->{$p}, $repo_id, $p);
1380                        my $lr = $gs->rev_map_max;
1381                        if (defined $lr) {
1382                                $base = $lr if ($lr < $base);
1383                        }
1384                        push @gs, $gs;
1385                }
1386        }
1387
1388        ($base, $head) = parse_revision_argument($base, $head);
1389        $ra->gs_fetch_loop_common($base, $head, \@gs, \@globs);
1390}
1391
1392sub read_all_remotes {
1393        my $r = {};
1394        foreach (grep { s/^svn-remote\.// } command(qw/config -l/)) {
1395                if (m!^(.+)\.fetch=\s*(.*)\s*:\s*refs/remotes/(.+)\s*$!) {
1396                        my ($remote, $local_ref, $remote_ref) = ($1, $2, $3);
1397                        $local_ref =~ s{^/}{};
1398                        $r->{$remote}->{fetch}->{$local_ref} = $remote_ref;
1399                } elsif (m!^(.+)\.url=\s*(.*)\s*$!) {
1400                        $r->{$1}->{url} = $2;
1401                } elsif (m!^(.+)\.(branches|tags)=
1402                           (.*):refs/remotes/(.+)\s*$/!x) {
1403                        my ($p, $g) = ($3, $4);
1404                        my $rs = $r->{$1}->{$2} = {
1405                                          t => $2,
1406                                          remote => $1,
1407                                          path => Git::SVN::GlobSpec->new($p),
1408                                          ref => Git::SVN::GlobSpec->new($g) };
1409                        if (length($rs->{ref}->{right}) != 0) {
1410                                die "The '*' glob character must be the last ",
1411                                    "character of '$g'\n";
1412                        }
1413                }
1414        }
1415        $r;
1416}
1417
1418sub init_vars {
1419        $_gc_nr = $_gc_period = 1000;
1420        if (defined $_repack || defined $_repack_flags) {
1421               warn "Repack options are obsolete; they have no effect.\n";
1422        }
1423}
1424
1425sub verify_remotes_sanity {
1426        return unless -d $ENV{GIT_DIR};
1427        my %seen;
1428        foreach (command(qw/config -l/)) {
1429                if (m!^svn-remote\.(?:.+)\.fetch=.*:refs/remotes/(\S+)\s*$!) {
1430                        if ($seen{$1}) {
1431                                die "Remote ref refs/remote/$1 is tracked by",
1432                                    "\n  \"$_\"\nand\n  \"$seen{$1}\"\n",
1433                                    "Please resolve this ambiguity in ",
1434                                    "your git configuration file before ",
1435                                    "continuing\n";
1436                        }
1437                        $seen{$1} = $_;
1438                }
1439        }
1440}
1441
1442# we allow more chars than remotes2config.sh...
1443sub sanitize_remote_name {
1444        my ($name) = @_;
1445        $name =~ tr{A-Za-z0-9:,/+-}{.}c;
1446        $name;
1447}
1448
1449sub find_existing_remote {
1450        my ($url, $remotes) = @_;
1451        return undef if $no_reuse_existing;
1452        my $existing;
1453        foreach my $repo_id (keys %$remotes) {
1454                my $u = $remotes->{$repo_id}->{url} or next;
1455                next if $u ne $url;
1456                $existing = $repo_id;
1457                last;
1458        }
1459        $existing;
1460}
1461
1462sub init_remote_config {
1463        my ($self, $url, $no_write) = @_;
1464        $url =~ s!/+$!!; # strip trailing slash
1465        my $r = read_all_remotes();
1466        my $existing = find_existing_remote($url, $r);
1467        if ($existing) {
1468                unless ($no_write) {
1469                        print STDERR "Using existing ",
1470                                     "[svn-remote \"$existing\"]\n";
1471                }
1472                $self->{repo_id} = $existing;
1473        } elsif ($_minimize_url) {
1474                my $min_url = Git::SVN::Ra->new($url)->minimize_url;
1475                $existing = find_existing_remote($min_url, $r);
1476                if ($existing) {
1477                        unless ($no_write) {
1478                                print STDERR "Using existing ",
1479                                             "[svn-remote \"$existing\"]\n";
1480                        }
1481                        $self->{repo_id} = $existing;
1482                }
1483                if ($min_url ne $url) {
1484                        unless ($no_write) {
1485                                print STDERR "Using higher level of URL: ",
1486                                             "$url => $min_url\n";
1487                        }
1488                        my $old_path = $self->{path};
1489                        $self->{path} = $url;
1490                        $self->{path} =~ s!^\Q$min_url\E(/|$)!!;
1491                        if (length $old_path) {
1492                                $self->{path} .= "/$old_path";
1493                        }
1494                        $url = $min_url;
1495                }
1496        }
1497        my $orig_url;
1498        if (!$existing) {
1499                # verify that we aren't overwriting anything:
1500                $orig_url = eval {
1501                        command_oneline('config', '--get',
1502                                        "svn-remote.$self->{repo_id}.url")
1503                };
1504                if ($orig_url && ($orig_url ne $url)) {
1505                        die "svn-remote.$self->{repo_id}.url already set: ",
1506                            "$orig_url\nwanted to set to: $url\n";
1507                }
1508        }
1509        my ($xrepo_id, $xpath) = find_ref($self->refname);
1510        if (defined $xpath) {
1511                die "svn-remote.$xrepo_id.fetch already set to track ",
1512                    "$xpath:refs/remotes/", $self->refname, "\n";
1513        }
1514        unless ($no_write) {
1515                command_noisy('config',
1516                              "svn-remote.$self->{repo_id}.url", $url);
1517                $self->{path} =~ s{^/}{};
1518                command_noisy('config', '--add',
1519                              "svn-remote.$self->{repo_id}.fetch",
1520                              "$self->{path}:".$self->refname);
1521        }
1522        $self->{url} = $url;
1523}
1524
1525sub find_by_url { # repos_root and, path are optional
1526        my ($class, $full_url, $repos_root, $path) = @_;
1527
1528        return undef unless defined $full_url;
1529        remove_username($full_url);
1530        remove_username($repos_root) if defined $repos_root;
1531        my $remotes = read_all_remotes();
1532        if (defined $full_url && defined $repos_root && !defined $path) {
1533                $path = $full_url;
1534                $path =~ s#^\Q$repos_root\E(?:/|$)##;
1535        }
1536        foreach my $repo_id (keys %$remotes) {
1537                my $u = $remotes->{$repo_id}->{url} or next;
1538                remove_username($u);
1539                next if defined $repos_root && $repos_root ne $u;
1540
1541                my $fetch = $remotes->{$repo_id}->{fetch} || {};
1542                foreach (qw/branches tags/) {
1543                        resolve_local_globs($u, $fetch,
1544                                            $remotes->{$repo_id}->{$_});
1545                }
1546                my $p = $path;
1547                my $rwr = rewrite_root({repo_id => $repo_id});
1548                unless (defined $p) {
1549                        $p = $full_url;
1550                        my $z = $u;
1551                        if ($rwr) {
1552                                $z = $rwr;
1553                        }
1554                        $p =~ s#^\Q$z\E(?:/|$)## or next;
1555                }
1556                foreach my $f (keys %$fetch) {
1557                        next if $f ne $p;
1558                        return Git::SVN->new($fetch->{$f}, $repo_id, $f);
1559                }
1560        }
1561        undef;
1562}
1563
1564sub init {
1565        my ($class, $url, $path, $repo_id, $ref_id, $no_write) = @_;
1566        my $self = _new($class, $repo_id, $ref_id, $path);
1567        if (defined $url) {
1568                $self->init_remote_config($url, $no_write);
1569        }
1570        $self;
1571}
1572
1573sub find_ref {
1574        my ($ref_id) = @_;
1575        foreach (command(qw/config -l/)) {
1576                next unless m!^svn-remote\.(.+)\.fetch=
1577                              \s*(.*)\s*:\s*refs/remotes/(.+)\s*$!x;
1578                my ($repo_id, $path, $ref) = ($1, $2, $3);
1579                if ($ref eq $ref_id) {
1580                        $path = '' if ($path =~ m#^\./?#);
1581                        return ($repo_id, $path);
1582                }
1583        }
1584        (undef, undef, undef);
1585}
1586
1587sub new {
1588        my ($class, $ref_id, $repo_id, $path) = @_;
1589        if (defined $ref_id && !defined $repo_id && !defined $path) {
1590                ($repo_id, $path) = find_ref($ref_id);
1591                if (!defined $repo_id) {
1592                        die "Could not find a \"svn-remote.*.fetch\" key ",
1593                            "in the repository configuration matching: ",
1594                            "refs/remotes/$ref_id\n";
1595                }
1596        }
1597        my $self = _new($class, $repo_id, $ref_id, $path);
1598        if (!defined $self->{path} || !length $self->{path}) {
1599                my $fetch = command_oneline('config', '--get',
1600                                            "svn-remote.$repo_id.fetch",
1601                                            ":refs/remotes/$ref_id\$") or
1602                     die "Failed to read \"svn-remote.$repo_id.fetch\" ",
1603                         "\":refs/remotes/$ref_id\$\" in config\n";
1604                ($self->{path}, undef) = split(/\s*:\s*/, $fetch);
1605        }
1606        $self->{url} = command_oneline('config', '--get',
1607                                       "svn-remote.$repo_id.url") or
1608                  die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
1609        $self->rebuild;
1610        $self;
1611}
1612
1613sub refname {
1614        my ($refname) = "refs/remotes/$_[0]->{ref_id}" ;
1615
1616        # It cannot end with a slash /, we'll throw up on this because
1617        # SVN can't have directories with a slash in their name, either:
1618        if ($refname =~ m{/$}) {
1619                die "ref: '$refname' ends with a trailing slash, this is ",
1620                    "not permitted by git nor Subversion\n";
1621        }
1622
1623        # It cannot have ASCII control character space, tilde ~, caret ^,
1624        # colon :, question-mark ?, asterisk *, space, or open bracket [
1625        # anywhere.
1626        #
1627        # Additionally, % must be escaped because it is used for escaping
1628        # and we want our escaped refname to be reversible
1629        $refname =~ s{([ \%~\^:\?\*\[\t])}{uc sprintf('%%%02x',ord($1))}eg;
1630
1631        # no slash-separated component can begin with a dot .
1632        # /.* becomes /%2E*
1633        $refname =~ s{/\.}{/%2E}g;
1634
1635        # It cannot have two consecutive dots .. anywhere
1636        # .. becomes %2E%2E
1637        $refname =~ s{\.\.}{%2E%2E}g;
1638
1639        return $refname;
1640}
1641
1642sub desanitize_refname {
1643        my ($refname) = @_;
1644        $refname =~ s{%(?:([0-9A-F]{2}))}{chr hex($1)}eg;
1645        return $refname;
1646}
1647
1648sub svm_uuid {
1649        my ($self) = @_;
1650        return $self->{svm}->{uuid} if $self->svm;
1651        $self->ra;
1652        unless ($self->{svm}) {
1653                die "SVM UUID not cached, and reading remotely failed\n";
1654        }
1655        $self->{svm}->{uuid};
1656}
1657
1658sub svm {
1659        my ($self) = @_;
1660        return $self->{svm} if $self->{svm};
1661        my $svm;
1662        # see if we have it in our config, first:
1663        eval {
1664                my $section = "svn-remote.$self->{repo_id}";
1665                $svm = {
1666                  source => tmp_config('--get', "$section.svm-source"),
1667                  uuid => tmp_config('--get', "$section.svm-uuid"),
1668                  replace => tmp_config('--get', "$section.svm-replace"),
1669                }
1670        };
1671        if ($svm && $svm->{source} && $svm->{uuid} && $svm->{replace}) {
1672                $self->{svm} = $svm;
1673        }
1674        $self->{svm};
1675}
1676
1677sub _set_svm_vars {
1678        my ($self, $ra) = @_;
1679        return $ra if $self->svm;
1680
1681        my @err = ( "useSvmProps set, but failed to read SVM properties\n",
1682                    "(svm:source, svm:uuid) ",
1683                    "from the following URLs:\n" );
1684        sub read_svm_props {
1685                my ($self, $ra, $path, $r) = @_;
1686                my $props = ($ra->get_dir($path, $r))[2];
1687                my $src = $props->{'svm:source'};
1688                my $uuid = $props->{'svm:uuid'};
1689                return undef if (!$src || !$uuid);
1690
1691                chomp($src, $uuid);
1692
1693                $uuid =~ m{^[0-9a-f\-]{30,}$}
1694                    or die "doesn't look right - svm:uuid is '$uuid'\n";
1695
1696                # the '!' is used to mark the repos_root!/relative/path
1697                $src =~ s{/?!/?}{/};
1698                $src =~ s{/+$}{}; # no trailing slashes please
1699                # username is of no interest
1700                $src =~ s{(^[a-z\+]*://)[^/@]*@}{$1};
1701
1702                my $replace = $ra->{url};
1703                $replace .= "/$path" if length $path;
1704
1705                my $section = "svn-remote.$self->{repo_id}";
1706                tmp_config("$section.svm-source", $src);
1707                tmp_config("$section.svm-replace", $replace);
1708                tmp_config("$section.svm-uuid", $uuid);
1709                $self->{svm} = {
1710                        source => $src,
1711                        uuid => $uuid,
1712                        replace => $replace
1713                };
1714        }
1715
1716        my $r = $ra->get_latest_revnum;
1717        my $path = $self->{path};
1718        my %tried;
1719        while (length $path) {
1720                unless ($tried{"$self->{url}/$path"}) {
1721                        return $ra if $self->read_svm_props($ra, $path, $r);
1722                        $tried{"$self->{url}/$path"} = 1;
1723                }
1724                $path =~ s#/?[^/]+$##;
1725        }
1726        die "Path: '$path' should be ''\n" if $path ne '';
1727        return $ra if $self->read_svm_props($ra, $path, $r);
1728        $tried{"$self->{url}/$path"} = 1;
1729
1730        if ($ra->{repos_root} eq $self->{url}) {
1731                die @err, (map { "  $_\n" } keys %tried), "\n";
1732        }
1733
1734        # nope, make sure we're connected to the repository root:
1735        my $ok;
1736        my @tried_b;
1737        $path = $ra->{svn_path};
1738        $ra = Git::SVN::Ra->new($ra->{repos_root});
1739        while (length $path) {
1740                unless ($tried{"$ra->{url}/$path"}) {
1741                        $ok = $self->read_svm_props($ra, $path, $r);
1742                        last if $ok;
1743                        $tried{"$ra->{url}/$path"} = 1;
1744                }
1745                $path =~ s#/?[^/]+$##;
1746        }
1747        die "Path: '$path' should be ''\n" if $path ne '';
1748        $ok ||= $self->read_svm_props($ra, $path, $r);
1749        $tried{"$ra->{url}/$path"} = 1;
1750        if (!$ok) {
1751                die @err, (map { "  $_\n" } keys %tried), "\n";
1752        }
1753        Git::SVN::Ra->new($self->{url});
1754}
1755
1756sub svnsync {
1757        my ($self) = @_;
1758        return $self->{svnsync} if $self->{svnsync};
1759
1760        if ($self->no_metadata) {
1761                die "Can't have both 'noMetadata' and ",
1762                    "'useSvnsyncProps' options set!\n";
1763        }
1764        if ($self->rewrite_root) {
1765                die "Can't have both 'useSvnsyncProps' and 'rewriteRoot' ",
1766                    "options set!\n";
1767        }
1768
1769        my $svnsync;
1770        # see if we have it in our config, first:
1771        eval {
1772                my $section = "svn-remote.$self->{repo_id}";
1773
1774                my $url = tmp_config('--get', "$section.svnsync-url");
1775                ($url) = ($url =~ m{^([a-z\+]+://\S+)$}) or
1776                   die "doesn't look right - svn:sync-from-url is '$url'\n";
1777
1778                my $uuid = tmp_config('--get', "$section.svnsync-uuid");
1779                ($uuid) = ($uuid =~ m{^([0-9a-f\-]{30,})$}) or
1780                   die "doesn't look right - svn:sync-from-uuid is '$uuid'\n";
1781
1782                $svnsync = { url => $url, uuid => $uuid }
1783        };
1784        if ($svnsync && $svnsync->{url} && $svnsync->{uuid}) {
1785                return $self->{svnsync} = $svnsync;
1786        }
1787
1788        my $err = "useSvnsyncProps set, but failed to read " .
1789                  "svnsync property: svn:sync-from-";
1790        my $rp = $self->ra->rev_proplist(0);
1791
1792        my $url = $rp->{'svn:sync-from-url'} or die $err . "url\n";
1793        ($url) = ($url =~ m{^([a-z\+]+://\S+)$}) or
1794                   die "doesn't look right - svn:sync-from-url is '$url'\n";
1795
1796        my $uuid = $rp->{'svn:sync-from-uuid'} or die $err . "uuid\n";
1797        ($uuid) = ($uuid =~ m{^([0-9a-f\-]{30,})$}) or
1798                   die "doesn't look right - svn:sync-from-uuid is '$uuid'\n";
1799
1800        my $section = "svn-remote.$self->{repo_id}";
1801        tmp_config('--add', "$section.svnsync-uuid", $uuid);
1802        tmp_config('--add', "$section.svnsync-url", $url);
1803        return $self->{svnsync} = { url => $url, uuid => $uuid };
1804}
1805
1806# this allows us to memoize our SVN::Ra UUID locally and avoid a
1807# remote lookup (useful for 'git svn log').
1808sub ra_uuid {
1809        my ($self) = @_;
1810        unless ($self->{ra_uuid}) {
1811                my $key = "svn-remote.$self->{repo_id}.uuid";
1812                my $uuid = eval { tmp_config('--get', $key) };
1813                if (!$@ && $uuid && $uuid =~ /^([a-f\d\-]{30,})$/) {
1814                        $self->{ra_uuid} = $uuid;
1815                } else {
1816                        die "ra_uuid called without URL\n" unless $self->{url};
1817                        $self->{ra_uuid} = $self->ra->get_uuid;
1818                        tmp_config('--add', $key, $self->{ra_uuid});
1819                }
1820        }
1821        $self->{ra_uuid};
1822}
1823
1824sub _set_repos_root {
1825        my ($self, $repos_root) = @_;
1826        my $k = "svn-remote.$self->{repo_id}.reposRoot";
1827        $repos_root ||= $self->ra->{repos_root};
1828        tmp_config($k, $repos_root);
1829        $repos_root;
1830}
1831
1832sub repos_root {
1833        my ($self) = @_;
1834        my $k = "svn-remote.$self->{repo_id}.reposRoot";
1835        eval { tmp_config('--get', $k) } || $self->_set_repos_root;
1836}
1837
1838sub ra {
1839        my ($self) = shift;
1840        my $ra = Git::SVN::Ra->new($self->{url});
1841        $self->_set_repos_root($ra->{repos_root});
1842        if ($self->use_svm_props && !$self->{svm}) {
1843                if ($self->no_metadata) {
1844                        die "Can't have both 'noMetadata' and ",
1845                            "'useSvmProps' options set!\n";
1846                } elsif ($self->use_svnsync_props) {
1847                        die "Can't have both 'useSvnsyncProps' and ",
1848                            "'useSvmProps' options set!\n";
1849                }
1850                $ra = $self->_set_svm_vars($ra);
1851                $self->{-want_revprops} = 1;
1852        }
1853        $ra;
1854}
1855
1856sub rel_path {
1857        my ($self) = @_;
1858        my $repos_root = $self->ra->{repos_root};
1859        return $self->{path} if ($self->{url} eq $repos_root);
1860        my $url = $self->{url} .
1861                  (length $self->{path} ? "/$self->{path}" : $self->{path});
1862        $url =~ s!^\Q$repos_root\E(?:/+|$)!!g;
1863        $url;
1864}
1865
1866# prop_walk(PATH, REV, SUB)
1867# -------------------------
1868# Recursively traverse PATH at revision REV and invoke SUB for each
1869# directory that contains a SVN property.  SUB will be invoked as
1870# follows:  &SUB(gs, path, props);  where `gs' is this instance of
1871# Git::SVN, `path' the path to the directory where the properties
1872# `props' were found.  The `path' will be relative to point of checkout,
1873# that is, if url://repo/trunk is the current Git branch, and that
1874# directory contains a sub-directory `d', SUB will be invoked with `/d/'
1875# as `path' (note the trailing `/').
1876sub prop_walk {
1877        my ($self, $path, $rev, $sub) = @_;
1878
1879        $path =~ s#^/##;
1880        my ($dirent, undef, $props) = $self->ra->get_dir($path, $rev);
1881        $path =~ s#^/*#/#g;
1882        my $p = $path;
1883        # Strip the irrelevant part of the path.
1884        $p =~ s#^/+\Q$self->{path}\E(/|$)#/#;
1885        # Ensure the path is terminated by a `/'.
1886        $p =~ s#/*$#/#;
1887
1888        # The properties contain all the internal SVN stuff nobody
1889        # (usually) cares about.
1890        my $interesting_props = 0;
1891        foreach (keys %{$props}) {
1892                # If it doesn't start with `svn:', it must be a
1893                # user-defined property.
1894                ++$interesting_props and next if $_ !~ /^svn:/;
1895                # FIXME: Fragile, if SVN adds new public properties,
1896                # this needs to be updated.
1897                ++$interesting_props if /^svn:(?:ignore|keywords|executable
1898                                                 |eol-style|mime-type
1899                                                 |externals|needs-lock)$/x;
1900        }
1901        &$sub($self, $p, $props) if $interesting_props;
1902
1903        foreach (sort keys %$dirent) {
1904                next if $dirent->{$_}->{kind} != $SVN::Node::dir;
1905                $self->prop_walk($p . $_, $rev, $sub);
1906        }
1907}
1908
1909sub last_rev { ($_[0]->last_rev_commit)[0] }
1910sub last_commit { ($_[0]->last_rev_commit)[1] }
1911
1912# returns the newest SVN revision number and newest commit SHA1
1913sub last_rev_commit {
1914        my ($self) = @_;
1915        if (defined $self->{last_rev} && defined $self->{last_commit}) {
1916                return ($self->{last_rev}, $self->{last_commit});
1917        }
1918        my $c = ::verify_ref($self->refname.'^0');
1919        if ($c && !$self->use_svm_props && !$self->no_metadata) {
1920                my $rev = (::cmt_metadata($c))[1];
1921                if (defined $rev) {
1922                        ($self->{last_rev}, $self->{last_commit}) = ($rev, $c);
1923                        return ($rev, $c);
1924                }
1925        }
1926        my $map_path = $self->map_path;
1927        unless (-e $map_path) {
1928                ($self->{last_rev}, $self->{last_commit}) = (undef, undef);
1929                return (undef, undef);
1930        }
1931        my ($rev, $commit) = $self->rev_map_max(1);
1932        ($self->{last_rev}, $self->{last_commit}) = ($rev, $commit);
1933        return ($rev, $commit);
1934}
1935
1936sub get_fetch_range {
1937        my ($self, $min, $max) = @_;
1938        $max ||= $self->ra->get_latest_revnum;
1939        $min ||= $self->rev_map_max;
1940        (++$min, $max);
1941}
1942
1943sub tmp_config {
1944        my (@args) = @_;
1945        my $old_def_config = "$ENV{GIT_DIR}/svn/config";
1946        my $config = "$ENV{GIT_DIR}/svn/.metadata";
1947        if (! -f $config && -f $old_def_config) {
1948                rename $old_def_config, $config or
1949                       die "Failed rename $old_def_config => $config: $!\n";
1950        }
1951        my $old_config = $ENV{GIT_CONFIG};
1952        $ENV{GIT_CONFIG} = $config;
1953        $@ = undef;
1954        my @ret = eval {
1955                unless (-f $config) {
1956                        mkfile($config);
1957                        open my $fh, '>', $config or
1958                            die "Can't open $config: $!\n";
1959                        print $fh "; This file is used internally by ",
1960                                  "git-svn\n" or die
1961                                  "Couldn't write to $config: $!\n";
1962                        print $fh "; You should not have to edit it\n" or
1963                              die "Couldn't write to $config: $!\n";
1964                        close $fh or die "Couldn't close $config: $!\n";
1965                }
1966                command('config', @args);
1967        };
1968        my $err = $@;
1969        if (defined $old_config) {
1970                $ENV{GIT_CONFIG} = $old_config;
1971        } else {
1972                delete $ENV{GIT_CONFIG};
1973        }
1974        die $err if $err;
1975        wantarray ? @ret : $ret[0];
1976}
1977
1978sub tmp_index_do {
1979        my ($self, $sub) = @_;
1980        my $old_index = $ENV{GIT_INDEX_FILE};
1981        $ENV{GIT_INDEX_FILE} = $self->{index};
1982        $@ = undef;
1983        my @ret = eval {
1984                my ($dir, $base) = ($self->{index} =~ m#^(.*?)/?([^/]+)$#);
1985                mkpath([$dir]) unless -d $dir;
1986                &$sub;
1987        };
1988        my $err = $@;
1989        if (defined $old_index) {
1990                $ENV{GIT_INDEX_FILE} = $old_index;
1991        } else {
1992                delete $ENV{GIT_INDEX_FILE};
1993        }
1994        die $err if $err;
1995        wantarray ? @ret : $ret[0];
1996}
1997
1998sub assert_index_clean {
1999        my ($self, $treeish) = @_;
2000
2001        $self->tmp_index_do(sub {
2002                command_noisy('read-tree', $treeish) unless -e $self->{index};
2003                my $x = command_oneline('write-tree');
2004                my ($y) = (command(qw/cat-file commit/, $treeish) =~
2005                           /^tree ($::sha1)/mo);
2006                return if $y eq $x;
2007
2008                warn "Index mismatch: $y != $x\nrereading $treeish\n";
2009                unlink $self->{index} or die "unlink $self->{index}: $!\n";
2010                command_noisy('read-tree', $treeish);
2011                $x = command_oneline('write-tree');
2012                if ($y ne $x) {
2013                        ::fatal "trees ($treeish) $y != $x\n",
2014                                "Something is seriously wrong...";
2015                }
2016        });
2017}
2018
2019sub get_commit_parents {
2020        my ($self, $log_entry) = @_;
2021        my (%seen, @ret, @tmp);
2022        # legacy support for 'set-tree'; this is only used by set_tree_cb:
2023        if (my $ip = $self->{inject_parents}) {
2024                if (my $commit = delete $ip->{$log_entry->{revision}}) {
2025                        push @tmp, $commit;
2026                }
2027        }
2028        if (my $cur = ::verify_ref($self->refname.'^0')) {
2029                push @tmp, $cur;
2030        }
2031        if (my $ipd = $self->{inject_parents_dcommit}) {
2032                if (my $commit = delete $ipd->{$log_entry->{revision}}) {
2033                        push @tmp, @$commit;
2034                }
2035        }
2036        push @tmp, $_ foreach (@{$log_entry->{parents}}, @tmp);
2037        while (my $p = shift @tmp) {
2038                next if $seen{$p};
2039                $seen{$p} = 1;
2040                push @ret, $p;
2041                # MAXPARENT is defined to 16 in commit-tree.c:
2042                last if @ret >= 16;
2043        }
2044        if (@tmp) {
2045                die "r$log_entry->{revision}: No room for parents:\n\t",
2046                    join("\n\t", @tmp), "\n";
2047        }
2048        @ret;
2049}
2050
2051sub rewrite_root {
2052        my ($self) = @_;
2053        return $self->{-rewrite_root} if exists $self->{-rewrite_root};
2054        my $k = "svn-remote.$self->{repo_id}.rewriteRoot";
2055        my $rwr = eval { command_oneline(qw/config --get/, $k) };
2056        if ($rwr) {
2057                $rwr =~ s#/+$##;
2058                if ($rwr !~ m#^[a-z\+]+://#) {
2059                        die "$rwr is not a valid URL (key: $k)\n";
2060                }
2061        }
2062        $self->{-rewrite_root} = $rwr;
2063}
2064
2065sub metadata_url {
2066        my ($self) = @_;
2067        ($self->rewrite_root || $self->{url}) .
2068           (length $self->{path} ? '/' . $self->{path} : '');
2069}
2070
2071sub full_url {
2072        my ($self) = @_;
2073        $self->{url} . (length $self->{path} ? '/' . $self->{path} : '');
2074}
2075
2076
2077sub set_commit_header_env {
2078        my ($log_entry) = @_;
2079        my %env;
2080        foreach my $ned (qw/NAME EMAIL DATE/) {
2081                foreach my $ac (qw/AUTHOR COMMITTER/) {
2082                        $env{"GIT_${ac}_${ned}"} = $ENV{"GIT_${ac}_${ned}"};
2083                }
2084        }
2085
2086        $ENV{GIT_AUTHOR_NAME} = $log_entry->{name};
2087        $ENV{GIT_AUTHOR_EMAIL} = $log_entry->{email};
2088        $ENV{GIT_AUTHOR_DATE} = $ENV{GIT_COMMITTER_DATE} = $log_entry->{date};
2089
2090        $ENV{GIT_COMMITTER_NAME} = (defined $log_entry->{commit_name})
2091                                                ? $log_entry->{commit_name}
2092                                                : $log_entry->{name};
2093        $ENV{GIT_COMMITTER_EMAIL} = (defined $log_entry->{commit_email})
2094                                                ? $log_entry->{commit_email}
2095                                                : $log_entry->{email};
2096        \%env;
2097}
2098
2099sub restore_commit_header_env {
2100        my ($env) = @_;
2101        foreach my $ned (qw/NAME EMAIL DATE/) {
2102                foreach my $ac (qw/AUTHOR COMMITTER/) {
2103                        my $k = "GIT_${ac}_${ned}";
2104                        if (defined $env->{$k}) {
2105                                $ENV{$k} = $env->{$k};
2106                        } else {
2107                                delete $ENV{$k};
2108                        }
2109                }
2110        }
2111}
2112
2113sub gc {
2114        command_noisy('gc', '--auto');
2115};
2116
2117sub do_git_commit {
2118        my ($self, $log_entry) = @_;
2119        my $lr = $self->last_rev;
2120        if (defined $lr && $lr >= $log_entry->{revision}) {
2121                die "Last fetched revision of ", $self->refname,
2122                    " was r$lr, but we are about to fetch: ",
2123                    "r$log_entry->{revision}!\n";
2124        }
2125        if (my $c = $self->rev_map_get($log_entry->{revision})) {
2126                croak "$log_entry->{revision} = $c already exists! ",
2127                      "Why are we refetching it?\n";
2128        }
2129        my $old_env = set_commit_header_env($log_entry);
2130        my $tree = $log_entry->{tree};
2131        if (!defined $tree) {
2132                $tree = $self->tmp_index_do(sub {
2133                                            command_oneline('write-tree') });
2134        }
2135        die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o;
2136
2137        my @exec = ('git-commit-tree', $tree);
2138        foreach ($self->get_commit_parents($log_entry)) {
2139                push @exec, '-p', $_;
2140        }
2141        defined(my $pid = open3(my $msg_fh, my $out_fh, '>&STDERR', @exec))
2142                                                                   or croak $!;
2143        print $msg_fh $log_entry->{log} or croak $!;
2144        restore_commit_header_env($old_env);
2145        unless ($self->no_metadata) {
2146                print $msg_fh "\ngit-svn-id: $log_entry->{metadata}\n"
2147                              or croak $!;
2148        }
2149        $msg_fh->flush == 0 or croak $!;
2150        close $msg_fh or croak $!;
2151        chomp(my $commit = do { local $/; <$out_fh> });
2152        close $out_fh or croak $!;
2153        waitpid $pid, 0;
2154        croak $? if $?;
2155        if ($commit !~ /^$::sha1$/o) {
2156                die "Failed to commit, invalid sha1: $commit\n";
2157        }
2158
2159        $self->rev_map_set($log_entry->{revision}, $commit, 1);
2160
2161        $self->{last_rev} = $log_entry->{revision};
2162        $self->{last_commit} = $commit;
2163        print "r$log_entry->{revision}";
2164        if (defined $log_entry->{svm_revision}) {
2165                 print " (\@$log_entry->{svm_revision})";
2166                 $self->rev_map_set($log_entry->{svm_revision}, $commit,
2167                                   0, $self->svm_uuid);
2168        }
2169        print " = $commit ($self->{ref_id})\n";
2170        if (--$_gc_nr == 0) {
2171                $_gc_nr = $_gc_period;
2172                gc();
2173        }
2174        return $commit;
2175}
2176
2177sub match_paths {
2178        my ($self, $paths, $r) = @_;
2179        return 1 if $self->{path} eq '';
2180        if (my $path = $paths->{"/$self->{path}"}) {
2181                return ($path->{action} eq 'D') ? 0 : 1;
2182        }
2183        $self->{path_regex} ||= qr/^\/\Q$self->{path}\E\//;
2184        if (grep /$self->{path_regex}/, keys %$paths) {
2185                return 1;
2186        }
2187        my $c = '';
2188        foreach (split m#/#, $self->{path}) {
2189                $c .= "/$_";
2190                next unless ($paths->{$c} &&
2191                             ($paths->{$c}->{action} =~ /^[AR]$/));
2192                if ($self->ra->check_path($self->{path}, $r) ==
2193                    $SVN::Node::dir) {
2194                        return 1;
2195                }
2196        }
2197        return 0;
2198}
2199
2200sub find_parent_branch {
2201        my ($self, $paths, $rev) = @_;
2202        return undef unless $self->follow_parent;
2203        unless (defined $paths) {
2204                my $err_handler = $SVN::Error::handler;
2205                $SVN::Error::handler = \&Git::SVN::Ra::skip_unknown_revs;
2206                $self->ra->get_log([$self->{path}], $rev, $rev, 0, 1, 1, sub {
2207                                   $paths =
2208                                      Git::SVN::Ra::dup_changed_paths($_[0]) });
2209                $SVN::Error::handler = $err_handler;
2210        }
2211        return undef unless defined $paths;
2212
2213        # look for a parent from another branch:
2214        my @b_path_components = split m#/#, $self->rel_path;
2215        my @a_path_components;
2216        my $i;
2217        while (@b_path_components) {
2218                $i = $paths->{'/'.join('/', @b_path_components)};
2219                last if $i && defined $i->{copyfrom_path};
2220                unshift(@a_path_components, pop(@b_path_components));
2221        }
2222        return undef unless defined $i && defined $i->{copyfrom_path};
2223        my $branch_from = $i->{copyfrom_path};
2224        if (@a_path_components) {
2225                print STDERR "branch_from: $branch_from => ";
2226                $branch_from .= '/'.join('/', @a_path_components);
2227                print STDERR $branch_from, "\n";
2228        }
2229        my $r = $i->{copyfrom_rev};
2230        my $repos_root = $self->ra->{repos_root};
2231        my $url = $self->ra->{url};
2232        my $new_url = $repos_root . $branch_from;
2233        print STDERR  "Found possible branch point: ",
2234                      "$new_url => ", $self->full_url, ", $r\n";
2235        $branch_from =~ s#^/##;
2236        my $gs = Git::SVN->find_by_url($new_url, $repos_root, $branch_from);
2237        unless ($gs) {
2238                my $ref_id = $self->{ref_id};
2239                $ref_id =~ s/\@\d+$//;
2240                $ref_id .= "\@$r";
2241                # just grow a tail if we're not unique enough :x
2242                $ref_id .= '-' while find_ref($ref_id);
2243                print STDERR "Initializing parent: $ref_id\n";
2244                my ($u, $p, $repo_id) = ($new_url, '', $ref_id);
2245                if ($u =~ s#^\Q$url\E(/|$)##) {
2246                        $p = $u;
2247                        $u = $url;
2248                        $repo_id = $self->{repo_id};
2249                }
2250                $gs = Git::SVN->init($u, $p, $repo_id, $ref_id, 1);
2251        }
2252        my ($r0, $parent) = $gs->find_rev_before($r, 1);
2253        if (!defined $r0 || !defined $parent) {
2254                my ($base, $head) = parse_revision_argument(0, $r);
2255                if ($base <= $r) {
2256                        $gs->fetch($base, $r);
2257                }
2258                ($r0, $parent) = $gs->last_rev_commit;
2259        }
2260        if (defined $r0 && defined $parent) {
2261                print STDERR "Found branch parent: ($self->{ref_id}) $parent\n";
2262                my $ed;
2263                if ($self->ra->can_do_switch) {
2264                        $self->assert_index_clean($parent);
2265                        print STDERR "Following parent with do_switch\n";
2266                        # do_switch works with svn/trunk >= r22312, but that
2267                        # is not included with SVN 1.4.3 (the latest version
2268                        # at the moment), so we can't rely on it
2269                        $self->{last_commit} = $parent;
2270                        $ed = SVN::Git::Fetcher->new($self);
2271                        $gs->ra->gs_do_switch($r0, $rev, $gs,
2272                                              $self->full_url, $ed)
2273                          or die "SVN connection failed somewhere...\n";
2274                } elsif ($self->ra->trees_match($new_url, $r0,
2275                                                $self->full_url, $rev)) {
2276                        print STDERR "Trees match:\n",
2277                                     "  $new_url\@$r0\n",
2278                                     "  ${\$self->full_url}\@$rev\n",
2279                                     "Following parent with no changes\n";
2280                        $self->tmp_index_do(sub {
2281                            command_noisy('read-tree', $parent);
2282                        });
2283                        $self->{last_commit} = $parent;
2284                } else {
2285                        print STDERR "Following parent with do_update\n";
2286                        $ed = SVN::Git::Fetcher->new($self);
2287                        $self->ra->gs_do_update($rev, $rev, $self, $ed)
2288                          or die "SVN connection failed somewhere...\n";
2289                }
2290                print STDERR "Successfully followed parent\n";
2291                return $self->make_log_entry($rev, [$parent], $ed);
2292        }
2293        return undef;
2294}
2295
2296sub do_fetch {
2297        my ($self, $paths, $rev) = @_;
2298        my $ed;
2299        my ($last_rev, @parents);
2300        if (my $lc = $self->last_commit) {
2301                # we can have a branch that was deleted, then re-added
2302                # under the same name but copied from another path, in
2303                # which case we'll have multiple parents (we don't
2304                # want to break the original ref, nor lose copypath info):
2305                if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
2306                        push @{$log_entry->{parents}}, $lc;
2307                        return $log_entry;
2308                }
2309                $ed = SVN::Git::Fetcher->new($self);
2310                $last_rev = $self->{last_rev};
2311                $ed->{c} = $lc;
2312                @parents = ($lc);
2313        } else {
2314                $last_rev = $rev;
2315                if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
2316                        return $log_entry;
2317                }
2318                $ed = SVN::Git::Fetcher->new($self);
2319        }
2320        unless ($self->ra->gs_do_update($last_rev, $rev, $self, $ed)) {
2321                die "SVN connection failed somewhere...\n";
2322        }
2323        $self->make_log_entry($rev, \@parents, $ed);
2324}
2325
2326sub get_untracked {
2327        my ($self, $ed) = @_;
2328        my @out;
2329        my $h = $ed->{empty};
2330        foreach (sort keys %$h) {
2331                my $act = $h->{$_} ? '+empty_dir' : '-empty_dir';
2332                push @out, "  $act: " . uri_encode($_);
2333                warn "W: $act: $_\n";
2334        }
2335        foreach my $t (qw/dir_prop file_prop/) {
2336                $h = $ed->{$t} or next;
2337                foreach my $path (sort keys %$h) {
2338                        my $ppath = $path eq '' ? '.' : $path;
2339                        foreach my $prop (sort keys %{$h->{$path}}) {
2340                                next if $SKIP_PROP{$prop};
2341                                my $v = $h->{$path}->{$prop};
2342                                my $t_ppath_prop = "$t: " .
2343                                                    uri_encode($ppath) . ' ' .
2344                                                    uri_encode($prop);
2345                                if (defined $v) {
2346                                        push @out, "  +$t_ppath_prop " .
2347                                                   uri_encode($v);
2348                                } else {
2349                                        push @out, "  -$t_ppath_prop";
2350                                }
2351                        }
2352                }
2353        }
2354        foreach my $t (qw/absent_file absent_directory/) {
2355                $h = $ed->{$t} or next;
2356                foreach my $parent (sort keys %$h) {
2357                        foreach my $path (sort @{$h->{$parent}}) {
2358                                push @out, "  $t: " .
2359                                           uri_encode("$parent/$path");
2360                                warn "W: $t: $parent/$path ",
2361                                     "Insufficient permissions?\n";
2362                        }
2363                }
2364        }
2365        \@out;
2366}
2367
2368sub parse_svn_date {
2369        my $date = shift || return '+0000 1970-01-01 00:00:00';
2370        my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d{4})\-(\d\d)\-(\d\d)T
2371                                            (\d\d)\:(\d\d)\:(\d\d).\d+Z$/x) or
2372                                         croak "Unable to parse date: $date\n";
2373        "+0000 $Y-$m-$d $H:$M:$S";
2374}
2375
2376sub check_author {
2377        my ($author) = @_;
2378        if (!defined $author || length $author == 0) {
2379                $author = '(no author)';
2380        } elsif (defined $::_authors && ! defined $::users{$author}) {
2381                die "Author: $author not defined in $::_authors file\n";
2382        }
2383        $author;
2384}
2385
2386sub make_log_entry {
2387        my ($self, $rev, $parents, $ed) = @_;
2388        my $untracked = $self->get_untracked($ed);
2389
2390        open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;
2391        print $un "r$rev\n" or croak $!;
2392        print $un $_, "\n" foreach @$untracked;
2393        my %log_entry = ( parents => $parents || [], revision => $rev,
2394                          log => '');
2395
2396        my $headrev;
2397        my $logged = delete $self->{logged_rev_props};
2398        if (!$logged || $self->{-want_revprops}) {
2399                my $rp = $self->ra->rev_proplist($rev);
2400                foreach (sort keys %$rp) {
2401                        my $v = $rp->{$_};
2402                        if (/^svn:(author|date|log)$/) {
2403                                $log_entry{$1} = $v;
2404                        } elsif ($_ eq 'svm:headrev') {
2405                                $headrev = $v;
2406                        } else {
2407                                print $un "  rev_prop: ", uri_encode($_), ' ',
2408                                          uri_encode($v), "\n";
2409                        }
2410                }
2411        } else {
2412                map { $log_entry{$_} = $logged->{$_} } keys %$logged;
2413        }
2414        close $un or croak $!;
2415
2416        $log_entry{date} = parse_svn_date($log_entry{date});
2417        $log_entry{log} .= "\n";
2418        my $author = $log_entry{author} = check_author($log_entry{author});
2419        my ($name, $email) = defined $::users{$author} ? @{$::users{$author}}
2420                                                       : ($author, undef);
2421
2422        my ($commit_name, $commit_email) = ($name, $email);
2423        if ($_use_log_author) {
2424                my $name_field;
2425                if ($log_entry{log} =~ /From:\s+(.*\S)\s*\n/i) {
2426                        $name_field = $1;
2427                } elsif ($log_entry{log} =~ /Signed-off-by:\s+(.*\S)\s*\n/i) {
2428                        $name_field = $1;
2429                }
2430                if (!defined $name_field) {
2431                        if (!defined $email) {
2432                                $email = $name;
2433                        }
2434                } elsif ($name_field =~ /(.*?)\s+<(.*)>/) {
2435                        ($name, $email) = ($1, $2);
2436                } elsif ($name_field =~ /(.*)@/) {
2437                        ($name, $email) = ($1, $name_field);
2438                } else {
2439                        ($name, $email) = ($name_field, $name_field);
2440                }
2441        }
2442        if (defined $headrev && $self->use_svm_props) {
2443                if ($self->rewrite_root) {
2444                        die "Can't have both 'useSvmProps' and 'rewriteRoot' ",
2445                            "options set!\n";
2446                }
2447                my ($uuid, $r) = $headrev =~ m{^([a-f\d\-]{30,}):(\d+)$};
2448                # we don't want "SVM: initializing mirror for junk" ...
2449                return undef if $r == 0;
2450                my $svm = $self->svm;
2451                if ($uuid ne $svm->{uuid}) {
2452                        die "UUID mismatch on SVM path:\n",
2453                            "expected: $svm->{uuid}\n",
2454                            "     got: $uuid\n";
2455                }
2456                my $full_url = $self->full_url;
2457                $full_url =~ s#^\Q$svm->{replace}\E(/|$)#$svm->{source}$1# or
2458                             die "Failed to replace '$svm->{replace}' with ",
2459                                 "'$svm->{source}' in $full_url\n";
2460                # throw away username for storing in records
2461                remove_username($full_url);
2462                $log_entry{metadata} = "$full_url\@$r $uuid";
2463                $log_entry{svm_revision} = $r;
2464                $email ||= "$author\@$uuid";
2465                $commit_email ||= "$author\@$uuid";
2466        } elsif ($self->use_svnsync_props) {
2467                my $full_url = $self->svnsync->{url};
2468                $full_url .= "/$self->{path}" if length $self->{path};
2469                remove_username($full_url);
2470                my $uuid = $self->svnsync->{uuid};
2471                $log_entry{metadata} = "$full_url\@$rev $uuid";
2472                $email ||= "$author\@$uuid";
2473                $commit_email ||= "$author\@$uuid";
2474        } else {
2475                my $url = $self->metadata_url;
2476                remove_username($url);
2477                $log_entry{metadata} = "$url\@$rev " .
2478                                       $self->ra->get_uuid;
2479                $email ||= "$author\@" . $self->ra->get_uuid;
2480                $commit_email ||= "$author\@" . $self->ra->get_uuid;
2481        }
2482        $log_entry{name} = $name;
2483        $log_entry{email} = $email;
2484        $log_entry{commit_name} = $commit_name;
2485        $log_entry{commit_email} = $commit_email;
2486        \%log_entry;
2487}
2488
2489sub fetch {
2490        my ($self, $min_rev, $max_rev, @parents) = @_;
2491        my ($last_rev, $last_commit) = $self->last_rev_commit;
2492        my ($base, $head) = $self->get_fetch_range($min_rev, $max_rev);
2493        $self->ra->gs_fetch_loop_common($base, $head, [$self]);
2494}
2495
2496sub set_tree_cb {
2497        my ($self, $log_entry, $tree, $rev, $date, $author) = @_;
2498        $self->{inject_parents} = { $rev => $tree };
2499        $self->fetch(undef, undef);
2500}
2501
2502sub set_tree {
2503        my ($self, $tree) = (shift, shift);
2504        my $log_entry = ::get_commit_entry($tree);
2505        unless ($self->{last_rev}) {
2506                fatal("Must have an existing revision to commit");
2507        }
2508        my %ed_opts = ( r => $self->{last_rev},
2509                        log => $log_entry->{log},
2510                        ra => $self->ra,
2511                        tree_a => $self->{last_commit},
2512                        tree_b => $tree,
2513                        editor_cb => sub {
2514                               $self->set_tree_cb($log_entry, $tree, @_) },
2515                        svn_path => $self->{path} );
2516        if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
2517                print "No changes\nr$self->{last_rev} = $tree\n";
2518        }
2519}
2520
2521sub rebuild_from_rev_db {
2522        my ($self, $path) = @_;
2523        my $r = -1;
2524        open my $fh, '<', $path or croak "open: $!";
2525        binmode $fh or croak "binmode: $!";
2526        while (<$fh>) {
2527                length($_) == 41 or croak "inconsistent size in ($_) != 41";
2528                chomp($_);
2529                ++$r;
2530                next if $_ eq ('0' x 40);
2531                $self->rev_map_set($r, $_);
2532                print "r$r = $_\n";
2533        }
2534        close $fh or croak "close: $!";
2535        unlink $path or croak "unlink: $!";
2536}
2537
2538sub rebuild {
2539        my ($self) = @_;
2540        my $map_path = $self->map_path;
2541        return if (-e $map_path && ! -z $map_path);
2542        return unless ::verify_ref($self->refname.'^0');
2543        if ($self->use_svm_props || $self->no_metadata) {
2544                my $rev_db = $self->rev_db_path;
2545                $self->rebuild_from_rev_db($rev_db);
2546                if ($self->use_svm_props) {
2547                        my $svm_rev_db = $self->rev_db_path($self->svm_uuid);
2548                        $self->rebuild_from_rev_db($svm_rev_db);
2549                }
2550                $self->unlink_rev_db_symlink;
2551                return;
2552        }
2553        print "Rebuilding $map_path ...\n";
2554        my ($log, $ctx) =
2555            command_output_pipe(qw/rev-list --pretty=raw --no-color --reverse/,
2556                                $self->refname, '--');
2557        my $full_url = $self->full_url;
2558        remove_username($full_url);
2559        my $svn_uuid = $self->ra_uuid;
2560        my $c;
2561        while (<$log>) {
2562                if ( m{^commit ($::sha1)$} ) {
2563                        $c = $1;
2564                        next;
2565                }
2566                next unless s{^\s*(git-svn-id:)}{$1};
2567                my ($url, $rev, $uuid) = ::extract_metadata($_);
2568                remove_username($url);
2569
2570                # ignore merges (from set-tree)
2571                next if (!defined $rev || !$uuid);
2572
2573                # if we merged or otherwise started elsewhere, this is
2574                # how we break out of it
2575                if (($uuid ne $svn_uuid) ||
2576                    ($full_url && $url && ($url ne $full_url))) {
2577                        next;
2578                }
2579
2580                $self->rev_map_set($rev, $c);
2581                print "r$rev = $c\n";
2582        }
2583        command_close_pipe($log, $ctx);
2584        print "Done rebuilding $map_path\n";
2585        my $rev_db_path = $self->rev_db_path;
2586        if (-f $self->rev_db_path) {
2587                unlink $self->rev_db_path or croak "unlink: $!";
2588        }
2589        $self->unlink_rev_db_symlink;
2590}
2591
2592# rev_map:
2593# Tie::File seems to be prone to offset errors if revisions get sparse,
2594# it's not that fast, either.  Tie::File is also not in Perl 5.6.  So
2595# one of my favorite modules is out :<  Next up would be one of the DBM
2596# modules, but I'm not sure which is most portable...
2597#
2598# This is the replacement for the rev_db format, which was too big
2599# and inefficient for large repositories with a lot of sparse history
2600# (mainly tags)
2601#
2602# The format is this:
2603#   - 24 bytes for every record,
2604#     * 4 bytes for the integer representing an SVN revision number
2605#     * 20 bytes representing the sha1 of a git commit
2606#   - No empty padding records like the old format
2607#     (except the last record, which can be overwritten)
2608#   - new records are written append-only since SVN revision numbers
2609#     increase monotonically
2610#   - lookups on SVN revision number are done via a binary search
2611#   - Piping the file to xxd -c24 is a good way of dumping it for
2612#     viewing or editing (piped back through xxd -r), should the need
2613#     ever arise.
2614#   - The last record can be padding revision with an all-zero sha1
2615#     This is used to optimize fetch performance when using multiple
2616#     "fetch" directives in .git/config
2617#
2618# These files are disposable unless noMetadata or useSvmProps is set
2619
2620sub _rev_map_set {
2621        my ($fh, $rev, $commit) = @_;
2622
2623        binmode $fh or croak "binmode: $!";
2624        my $size = (stat($fh))[7];
2625        ($size % 24) == 0 or croak "inconsistent size: $size";
2626
2627        my $wr_offset = 0;
2628        if ($size > 0) {
2629                sysseek($fh, -24, SEEK_END) or croak "seek: $!";
2630                my $read = sysread($fh, my $buf, 24) or croak "read: $!";
2631                $read == 24 or croak "read only $read bytes (!= 24)";
2632                my ($last_rev, $last_commit) = unpack(rev_map_fmt, $buf);
2633                if ($last_commit eq ('0' x40)) {
2634                        if ($size >= 48) {
2635                                sysseek($fh, -48, SEEK_END) or croak "seek: $!";
2636                                $read = sysread($fh, $buf, 24) or
2637                                    croak "read: $!";
2638                                $read == 24 or
2639                                    croak "read only $read bytes (!= 24)";
2640                                ($last_rev, $last_commit) =
2641                                    unpack(rev_map_fmt, $buf);
2642                                if ($last_commit eq ('0' x40)) {
2643                                        croak "inconsistent .rev_map\n";
2644                                }
2645                        }
2646                        if ($last_rev >= $rev) {
2647                                croak "last_rev is higher!: $last_rev >= $rev";
2648                        }
2649                        $wr_offset = -24;
2650                }
2651        }
2652        sysseek($fh, $wr_offset, SEEK_END) or croak "seek: $!";
2653        syswrite($fh, pack(rev_map_fmt, $rev, $commit), 24) == 24 or
2654          croak "write: $!";
2655}
2656
2657sub mkfile {
2658        my ($path) = @_;
2659        unless (-e $path) {
2660                my ($dir, $base) = ($path =~ m#^(.*?)/?([^/]+)$#);
2661                mkpath([$dir]) unless -d $dir;
2662                open my $fh, '>>', $path or die "Couldn't create $path: $!\n";
2663                close $fh or die "Couldn't close (create) $path: $!\n";
2664        }
2665}
2666
2667sub rev_map_set {
2668        my ($self, $rev, $commit, $update_ref, $uuid) = @_;
2669        length $commit == 40 or die "arg3 must be a full SHA1 hexsum\n";
2670        my $db = $self->map_path($uuid);
2671        my $db_lock = "$db.lock";
2672        my $sig;
2673        if ($update_ref) {
2674                $SIG{INT} = $SIG{HUP} = $SIG{TERM} = $SIG{ALRM} = $SIG{PIPE} =
2675                            $SIG{USR1} = $SIG{USR2} = sub { $sig = $_[0] };
2676        }
2677        mkfile($db);
2678
2679        $LOCKFILES{$db_lock} = 1;
2680        my $sync;
2681        # both of these options make our .rev_db file very, very important
2682        # and we can't afford to lose it because rebuild() won't work
2683        if ($self->use_svm_props || $self->no_metadata) {
2684                $sync = 1;
2685                copy($db, $db_lock) or die "rev_map_set(@_): ",
2686                                           "Failed to copy: ",
2687                                           "$db => $db_lock ($!)\n";
2688        } else {
2689                rename $db, $db_lock or die "rev_map_set(@_): ",
2690                                            "Failed to rename: ",
2691                                            "$db => $db_lock ($!)\n";
2692        }
2693
2694        sysopen(my $fh, $db_lock, O_RDWR | O_CREAT)
2695             or croak "Couldn't open $db_lock: $!\n";
2696        _rev_map_set($fh, $rev, $commit);
2697        if ($sync) {
2698                $fh->flush or die "Couldn't flush $db_lock: $!\n";
2699                $fh->sync or die "Couldn't sync $db_lock: $!\n";
2700        }
2701        close $fh or croak $!;
2702        if ($update_ref) {
2703                $_head = $self;
2704                command_noisy('update-ref', '-m', "r$rev",
2705                              $self->refname, $commit);
2706        }
2707        rename $db_lock, $db or die "rev_map_set(@_): ", "Failed to rename: ",
2708                                    "$db_lock => $db ($!)\n";
2709        delete $LOCKFILES{$db_lock};
2710        if ($update_ref) {
2711                $SIG{INT} = $SIG{HUP} = $SIG{TERM} = $SIG{ALRM} = $SIG{PIPE} =
2712                            $SIG{USR1} = $SIG{USR2} = 'DEFAULT';
2713                kill $sig, $$ if defined $sig;
2714        }
2715}
2716
2717# If want_commit, this will return an array of (rev, commit) where
2718# commit _must_ be a valid commit in the archive.
2719# Otherwise, it'll return the max revision (whether or not the
2720# commit is valid or just a 0x40 placeholder).
2721sub rev_map_max {
2722        my ($self, $want_commit) = @_;
2723        $self->rebuild;
2724        my $map_path = $self->map_path;
2725        stat $map_path or return $want_commit ? (0, undef) : 0;
2726        sysopen(my $fh, $map_path, O_RDONLY) or croak "open: $!";
2727        binmode $fh or croak "binmode: $!";
2728        my $size = (stat($fh))[7];
2729        ($size % 24) == 0 or croak "inconsistent size: $size";
2730
2731        if ($size == 0) {
2732                close $fh or croak "close: $!";
2733                return $want_commit ? (0, undef) : 0;
2734        }
2735
2736        sysseek($fh, -24, SEEK_END) or croak "seek: $!";
2737        sysread($fh, my $buf, 24) == 24 or croak "read: $!";
2738        my ($r, $c) = unpack(rev_map_fmt, $buf);
2739        if ($want_commit && $c eq ('0' x40)) {
2740                if ($size < 48) {
2741                        return $want_commit ? (0, undef) : 0;
2742                }
2743                sysseek($fh, -48, SEEK_END) or croak "seek: $!";
2744                sysread($fh, $buf, 24) == 24 or croak "read: $!";
2745                ($r, $c) = unpack(rev_map_fmt, $buf);
2746                if ($c eq ('0'x40)) {
2747                        croak "Penultimate record is all-zeroes in $map_path";
2748                }
2749        }
2750        close $fh or croak "close: $!";
2751        $want_commit ? ($r, $c) : $r;
2752}
2753
2754sub rev_map_get {
2755        my ($self, $rev, $uuid) = @_;
2756        my $map_path = $self->map_path($uuid);
2757        return undef unless -e $map_path;
2758
2759        sysopen(my $fh, $map_path, O_RDONLY) or croak "open: $!";
2760        binmode $fh or croak "binmode: $!";
2761        my $size = (stat($fh))[7];
2762        ($size % 24) == 0 or croak "inconsistent size: $size";
2763
2764        if ($size == 0) {
2765                close $fh or croak "close: $fh";
2766                return undef;
2767        }
2768
2769        my ($l, $u) = (0, $size - 24);
2770        my ($r, $c, $buf);
2771
2772        while ($l <= $u) {
2773                my $i = int(($l/24 + $u/24) / 2) * 24;
2774                sysseek($fh, $i, SEEK_SET) or croak "seek: $!";
2775                sysread($fh, my $buf, 24) == 24 or croak "read: $!";
2776                my ($r, $c) = unpack('NH40', $buf);
2777
2778                if ($r < $rev) {
2779                        $l = $i + 24;
2780                } elsif ($r > $rev) {
2781                        $u = $i - 24;
2782                } else { # $r == $rev
2783                        close($fh) or croak "close: $!";
2784                        return $c eq ('0' x 40) ? undef : $c;
2785                }
2786        }
2787        close($fh) or croak "close: $!";
2788        undef;
2789}
2790
2791# Finds the first svn revision that exists on (if $eq_ok is true) or
2792# before $rev for the current branch.  It will not search any lower
2793# than $min_rev.  Returns the git commit hash and svn revision number
2794# if found, else (undef, undef).
2795sub find_rev_before {
2796        my ($self, $rev, $eq_ok, $min_rev) = @_;
2797        --$rev unless $eq_ok;
2798        $min_rev ||= 1;
2799        while ($rev >= $min_rev) {
2800                if (my $c = $self->rev_map_get($rev)) {
2801                        return ($rev, $c);
2802                }
2803                --$rev;
2804        }
2805        return (undef, undef);
2806}
2807
2808# Finds the first svn revision that exists on (if $eq_ok is true) or
2809# after $rev for the current branch.  It will not search any higher
2810# than $max_rev.  Returns the git commit hash and svn revision number
2811# if found, else (undef, undef).
2812sub find_rev_after {
2813        my ($self, $rev, $eq_ok, $max_rev) = @_;
2814        ++$rev unless $eq_ok;
2815        $max_rev ||= $self->rev_map_max;
2816        while ($rev <= $max_rev) {
2817                if (my $c = $self->rev_map_get($rev)) {
2818                        return ($rev, $c);
2819                }
2820                ++$rev;
2821        }
2822        return (undef, undef);
2823}
2824
2825sub _new {
2826        my ($class, $repo_id, $ref_id, $path) = @_;
2827        unless (defined $repo_id && length $repo_id) {
2828                $repo_id = $Git::SVN::default_repo_id;
2829        }
2830        unless (defined $ref_id && length $ref_id) {
2831                $_[2] = $ref_id = $Git::SVN::default_ref_id;
2832        }
2833        $_[1] = $repo_id = sanitize_remote_name($repo_id);
2834        my $dir = "$ENV{GIT_DIR}/svn/$ref_id";
2835        $_[3] = $path = '' unless (defined $path);
2836        mkpath(["$ENV{GIT_DIR}/svn"]);
2837        bless {
2838                ref_id => $ref_id, dir => $dir, index => "$dir/index",
2839                path => $path, config => "$ENV{GIT_DIR}/svn/config",
2840                map_root => "$dir/.rev_map", repo_id => $repo_id }, $class;
2841}
2842
2843# for read-only access of old .rev_db formats
2844sub unlink_rev_db_symlink {
2845        my ($self) = @_;
2846        my $link = $self->rev_db_path;
2847        $link =~ s/\.[\w-]+$// or croak "missing UUID at the end of $link";
2848        if (-l $link) {
2849                unlink $link or croak "unlink: $link failed!";
2850        }
2851}
2852
2853sub rev_db_path {
2854        my ($self, $uuid) = @_;
2855        my $db_path = $self->map_path($uuid);
2856        $db_path =~ s{/\.rev_map\.}{/\.rev_db\.}
2857            or croak "map_path: $db_path does not contain '/.rev_map.' !";
2858        $db_path;
2859}
2860
2861# the new replacement for .rev_db
2862sub map_path {
2863        my ($self, $uuid) = @_;
2864        $uuid ||= $self->ra_uuid;
2865        "$self->{map_root}.$uuid";
2866}
2867
2868sub uri_encode {
2869        my ($f) = @_;
2870        $f =~ s#([^a-zA-Z0-9\*!\:_\./\-])#uc sprintf("%%%02x",ord($1))#eg;
2871        $f
2872}
2873
2874sub remove_username {
2875        $_[0] =~ s{^([^:]*://)[^@]+@}{$1};
2876}
2877
2878package Git::SVN::Prompt;
2879use strict;
2880use warnings;
2881require SVN::Core;
2882use vars qw/$_no_auth_cache $_username/;
2883
2884sub simple {
2885        my ($cred, $realm, $default_username, $may_save, $pool) = @_;
2886        $may_save = undef if $_no_auth_cache;
2887        $default_username = $_username if defined $_username;
2888        if (defined $default_username && length $default_username) {
2889                if (defined $realm && length $realm) {
2890                        print STDERR "Authentication realm: $realm\n";
2891                        STDERR->flush;
2892                }
2893                $cred->username($default_username);
2894        } else {
2895                username($cred, $realm, $may_save, $pool);
2896        }
2897        $cred->password(_read_password("Password for '" .
2898                                       $cred->username . "': ", $realm));
2899        $cred->may_save($may_save);
2900        $SVN::_Core::SVN_NO_ERROR;
2901}
2902
2903sub ssl_server_trust {
2904        my ($cred, $realm, $failures, $cert_info, $may_save, $pool) = @_;
2905        $may_save = undef if $_no_auth_cache;
2906        print STDERR "Error validating server certificate for '$realm':\n";
2907        {
2908                no warnings 'once';
2909                # All variables SVN::Auth::SSL::* are used only once,
2910                # so we're shutting up Perl warnings about this.
2911                if ($failures & $SVN::Auth::SSL::UNKNOWNCA) {
2912                        print STDERR " - The certificate is not issued ",
2913                            "by a trusted authority. Use the\n",
2914                            "   fingerprint to validate ",
2915                            "the certificate manually!\n";
2916                }
2917                if ($failures & $SVN::Auth::SSL::CNMISMATCH) {
2918                        print STDERR " - The certificate hostname ",
2919                            "does not match.\n";
2920                }
2921                if ($failures & $SVN::Auth::SSL::NOTYETVALID) {
2922                        print STDERR " - The certificate is not yet valid.\n";
2923                }
2924                if ($failures & $SVN::Auth::SSL::EXPIRED) {
2925                        print STDERR " - The certificate has expired.\n";
2926                }
2927                if ($failures & $SVN::Auth::SSL::OTHER) {
2928                        print STDERR " - The certificate has ",
2929                            "an unknown error.\n";
2930                }
2931        } # no warnings 'once'
2932        printf STDERR
2933                "Certificate information:\n".
2934                " - Hostname: %s\n".
2935                " - Valid: from %s until %s\n".
2936                " - Issuer: %s\n".
2937                " - Fingerprint: %s\n",
2938                map $cert_info->$_, qw(hostname valid_from valid_until
2939                                       issuer_dname fingerprint);
2940        my $choice;
2941prompt:
2942        print STDERR $may_save ?
2943              "(R)eject, accept (t)emporarily or accept (p)ermanently? " :
2944              "(R)eject or accept (t)emporarily? ";
2945        STDERR->flush;
2946        $choice = lc(substr(<STDIN> || 'R', 0, 1));
2947        if ($choice =~ /^t$/i) {
2948                $cred->may_save(undef);
2949        } elsif ($choice =~ /^r$/i) {
2950                return -1;
2951        } elsif ($may_save && $choice =~ /^p$/i) {
2952                $cred->may_save($may_save);
2953        } else {
2954                goto prompt;
2955        }
2956        $cred->accepted_failures($failures);
2957        $SVN::_Core::SVN_NO_ERROR;
2958}
2959
2960sub ssl_client_cert {
2961        my ($cred, $realm, $may_save, $pool) = @_;
2962        $may_save = undef if $_no_auth_cache;
2963        print STDERR "Client certificate filename: ";
2964        STDERR->flush;
2965        chomp(my $filename = <STDIN>);
2966        $cred->cert_file($filename);
2967        $cred->may_save($may_save);
2968        $SVN::_Core::SVN_NO_ERROR;
2969}
2970
2971sub ssl_client_cert_pw {
2972        my ($cred, $realm, $may_save, $pool) = @_;
2973        $may_save = undef if $_no_auth_cache;
2974        $cred->password(_read_password("Password: ", $realm));
2975        $cred->may_save($may_save);
2976        $SVN::_Core::SVN_NO_ERROR;
2977}
2978
2979sub username {
2980        my ($cred, $realm, $may_save, $pool) = @_;
2981        $may_save = undef if $_no_auth_cache;
2982        if (defined $realm && length $realm) {
2983                print STDERR "Authentication realm: $realm\n";
2984        }
2985        my $username;
2986        if (defined $_username) {
2987                $username = $_username;
2988        } else {
2989                print STDERR "Username: ";
2990                STDERR->flush;
2991                chomp($username = <STDIN>);
2992        }
2993        $cred->username($username);
2994        $cred->may_save($may_save);
2995        $SVN::_Core::SVN_NO_ERROR;
2996}
2997
2998sub _read_password {
2999        my ($prompt, $realm) = @_;
3000        print STDERR $prompt;
3001        STDERR->flush;
3002        require Term::ReadKey;
3003        Term::ReadKey::ReadMode('noecho');
3004        my $password = '';
3005        while (defined(my $key = Term::ReadKey::ReadKey(0))) {
3006                last if $key =~ /[\012\015]/; # \n\r
3007                $password .= $key;
3008        }
3009        Term::ReadKey::ReadMode('restore');
3010        print STDERR "\n";
3011        STDERR->flush;
3012        $password;
3013}
3014
3015package SVN::Git::Fetcher;
3016use vars qw/@ISA/;
3017use strict;
3018use warnings;
3019use Carp qw/croak/;
3020use IO::File qw//;
3021
3022# file baton members: path, mode_a, mode_b, pool, fh, blob, base
3023sub new {
3024        my ($class, $git_svn) = @_;
3025        my $self = SVN::Delta::Editor->new;
3026        bless $self, $class;
3027        $self->{c} = $git_svn->{last_commit} if exists $git_svn->{last_commit};
3028        $self->{empty} = {};
3029        $self->{dir_prop} = {};
3030        $self->{file_prop} = {};
3031        $self->{absent_dir} = {};
3032        $self->{absent_file} = {};
3033        $self->{gii} = $git_svn->tmp_index_do(sub { Git::IndexInfo->new });
3034        $self;
3035}
3036
3037sub set_path_strip {
3038        my ($self, $path) = @_;
3039        $self->{path_strip} = qr/^\Q$path\E(\/|$)/ if length $path;
3040}
3041
3042sub open_root {
3043        { path => '' };
3044}
3045
3046sub open_directory {
3047        my ($self, $path, $pb, $rev) = @_;
3048        { path => $path };
3049}
3050
3051sub git_path {
3052        my ($self, $path) = @_;
3053        if ($self->{path_strip}) {
3054                $path =~ s!$self->{path_strip}!! or
3055                  die "Failed to strip path '$path' ($self->{path_strip})\n";
3056        }
3057        $path;
3058}
3059
3060sub delete_entry {
3061        my ($self, $path, $rev, $pb) = @_;
3062
3063        my $gpath = $self->git_path($path);
3064        return undef if ($gpath eq '');
3065
3066        # remove entire directories.
3067        if (command('ls-tree', $self->{c}, '--', $gpath) =~ /^040000 tree/) {
3068                my ($ls, $ctx) = command_output_pipe(qw/ls-tree
3069                                                     -r --name-only -z/,
3070                                                     $self->{c}, '--', $gpath);
3071                local $/ = "\0";
3072                while (<$ls>) {
3073                        chomp;
3074                        $self->{gii}->remove($_);
3075                        print "\tD\t$_\n" unless $::_q;
3076                }
3077                print "\tD\t$gpath/\n" unless $::_q;
3078                command_close_pipe($ls, $ctx);
3079                $self->{empty}->{$path} = 0
3080        } else {
3081                $self->{gii}->remove($gpath);
3082                print "\tD\t$gpath\n" unless $::_q;
3083        }
3084        undef;
3085}
3086
3087sub open_file {
3088        my ($self, $path, $pb, $rev) = @_;
3089        my $gpath = $self->git_path($path);
3090        my ($mode, $blob) = (command('ls-tree', $self->{c}, '--', $gpath)
3091                             =~ /^(\d{6}) blob ([a-f\d]{40})\t/);
3092        unless (defined $mode && defined $blob) {
3093                die "$path was not found in commit $self->{c} (r$rev)\n";
3094        }
3095        { path => $path, mode_a => $mode, mode_b => $mode, blob => $blob,
3096          pool => SVN::Pool->new, action => 'M' };
3097}
3098
3099sub add_file {
3100        my ($self, $path, $pb, $cp_path, $cp_rev) = @_;
3101        my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#);
3102        delete $self->{empty}->{$dir};
3103        { path => $path, mode_a => 100644, mode_b => 100644,
3104          pool => SVN::Pool->new, action => 'A' };
3105}
3106
3107sub add_directory {
3108        my ($self, $path, $cp_path, $cp_rev) = @_;
3109        my $gpath = $self->git_path($path);
3110        if ($gpath eq '') {
3111                my ($ls, $ctx) = command_output_pipe(qw/ls-tree
3112                                                     -r --name-only -z/,
3113                                                     $self->{c});
3114                local $/ = "\0";
3115                while (<$ls>) {
3116                        chomp;
3117                        $self->{gii}->remove($_);
3118                        print "\tD\t$_\n" unless $::_q;
3119                }
3120                command_close_pipe($ls, $ctx);
3121                $self->{empty}->{$path} = 0;
3122        }
3123        my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#);
3124        delete $self->{empty}->{$dir};
3125        $self->{empty}->{$path} = 1;
3126        { path => $path };
3127}
3128
3129sub change_dir_prop {
3130        my ($self, $db, $prop, $value) = @_;
3131        $self->{dir_prop}->{$db->{path}} ||= {};
3132        $self->{dir_prop}->{$db->{path}}->{$prop} = $value;
3133        undef;
3134}
3135
3136sub absent_directory {
3137        my ($self, $path, $pb) = @_;
3138        $self->{absent_dir}->{$pb->{path}} ||= [];
3139        push @{$self->{absent_dir}->{$pb->{path}}}, $path;
3140        undef;
3141}
3142
3143sub absent_file {
3144        my ($self, $path, $pb) = @_;
3145        $self->{absent_file}->{$pb->{path}} ||= [];
3146        push @{$self->{absent_file}->{$pb->{path}}}, $path;
3147        undef;
3148}
3149
3150sub change_file_prop {
3151        my ($self, $fb, $prop, $value) = @_;
3152        if ($prop eq 'svn:executable') {
3153                if ($fb->{mode_b} != 120000) {
3154                        $fb->{mode_b} = defined $value ? 100755 : 100644;
3155                }
3156        } elsif ($prop eq 'svn:special') {
3157                $fb->{mode_b} = defined $value ? 120000 : 100644;
3158        } else {
3159                $self->{file_prop}->{$fb->{path}} ||= {};
3160                $self->{file_prop}->{$fb->{path}}->{$prop} = $value;
3161        }
3162        undef;
3163}
3164
3165sub apply_textdelta {
3166        my ($self, $fb, $exp) = @_;
3167        my $fh = IO::File->new_tmpfile;
3168        $fh->autoflush(1);
3169        # $fh gets auto-closed() by SVN::TxDelta::apply(),
3170        # (but $base does not,) so dup() it for reading in close_file
3171        open my $dup, '<&', $fh or croak $!;
3172        my $base = IO::File->new_tmpfile;
3173        $base->autoflush(1);
3174        if ($fb->{blob}) {
3175                defined (my $pid = fork) or croak $!;
3176                if (!$pid) {
3177                        open STDOUT, '>&', $base or croak $!;
3178                        print STDOUT 'link ' if ($fb->{mode_a} == 120000);
3179                        exec qw/git-cat-file blob/, $fb->{blob} or croak $!;
3180                }
3181                waitpid $pid, 0;
3182                croak $? if $?;
3183
3184                if (defined $exp) {
3185                        seek $base, 0, 0 or croak $!;
3186                        my $got = ::md5sum($base);
3187                        die "Checksum mismatch: $fb->{path} $fb->{blob}\n",
3188                            "expected: $exp\n",
3189                            "     got: $got\n" if ($got ne $exp);
3190                }
3191        }
3192        seek $base, 0, 0 or croak $!;
3193        $fb->{fh} = $dup;
3194        $fb->{base} = $base;
3195        [ SVN::TxDelta::apply($base, $fh, undef, $fb->{path}, $fb->{pool}) ];
3196}
3197
3198sub close_file {
3199        my ($self, $fb, $exp) = @_;
3200        my $hash;
3201        my $path = $self->git_path($fb->{path});
3202        if (my $fh = $fb->{fh}) {
3203                if (defined $exp) {
3204                        seek($fh, 0, 0) or croak $!;
3205                        my $got = ::md5sum($fh);
3206                        if ($got ne $exp) {
3207                                die "Checksum mismatch: $path\n",
3208                                    "expected: $exp\n    got: $got\n";
3209                        }
3210                }
3211                sysseek($fh, 0, 0) or croak $!;
3212                if ($fb->{mode_b} == 120000) {
3213                        eval {
3214                                sysread($fh, my $buf, 5) == 5 or croak $!;
3215                                $buf eq 'link ' or die "$path has mode 120000",
3216                                                       " but is not a link";
3217                        };
3218                        if ($@) {
3219                                warn "$@\n";
3220                                sysseek($fh, 0, 0) or croak $!;
3221                        }
3222                }
3223                defined(my $pid = open my $out,'-|') or die "Can't fork: $!\n";
3224                if (!$pid) {
3225                        open STDIN, '<&', $fh or croak $!;
3226                        exec qw/git-hash-object -w --stdin/ or croak $!;
3227                }
3228                chomp($hash = do { local $/; <$out> });
3229                close $out or croak $!;
3230                close $fh or croak $!;
3231                $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n";
3232                close $fb->{base} or croak $!;
3233        } else {
3234                $hash = $fb->{blob} or die "no blob information\n";
3235        }
3236        $fb->{pool}->clear;
3237        $self->{gii}->update($fb->{mode_b}, $hash, $path) or croak $!;
3238        print "\t$fb->{action}\t$path\n" if $fb->{action} && ! $::_q;
3239        undef;
3240}
3241
3242sub abort_edit {
3243        my $self = shift;
3244        $self->{nr} = $self->{gii}->{nr};
3245        delete $self->{gii};
3246        $self->SUPER::abort_edit(@_);
3247}
3248
3249sub close_edit {
3250        my $self = shift;
3251        $self->{git_commit_ok} = 1;
3252        $self->{nr} = $self->{gii}->{nr};
3253        delete $self->{gii};
3254        $self->SUPER::close_edit(@_);
3255}
3256
3257package SVN::Git::Editor;
3258use vars qw/@ISA $_rmdir $_cp_similarity $_find_copies_harder $_rename_limit/;
3259use strict;
3260use warnings;
3261use Carp qw/croak/;
3262use IO::File;
3263
3264sub new {
3265        my ($class, $opts) = @_;
3266        foreach (qw/svn_path r ra tree_a tree_b log editor_cb/) {
3267                die "$_ required!\n" unless (defined $opts->{$_});
3268        }
3269
3270        my $pool = SVN::Pool->new;
3271        my $mods = generate_diff($opts->{tree_a}, $opts->{tree_b});
3272        my $types = check_diff_paths($opts->{ra}, $opts->{svn_path},
3273                                     $opts->{r}, $mods);
3274
3275        # $opts->{ra} functions should not be used after this:
3276        my @ce  = $opts->{ra}->get_commit_editor($opts->{log},
3277                                                $opts->{editor_cb}, $pool);
3278        my $self = SVN::Delta::Editor->new(@ce, $pool);
3279        bless $self, $class;
3280        foreach (qw/svn_path r tree_a tree_b/) {
3281                $self->{$_} = $opts->{$_};
3282        }
3283        $self->{url} = $opts->{ra}->{url};
3284        $self->{mods} = $mods;
3285        $self->{types} = $types;
3286        $self->{pool} = $pool;
3287        $self->{bat} = { '' => $self->open_root($self->{r}, $self->{pool}) };
3288        $self->{rm} = { };
3289        $self->{path_prefix} = length $self->{svn_path} ?
3290                               "$self->{svn_path}/" : '';
3291        return $self;
3292}
3293
3294sub generate_diff {
3295        my ($tree_a, $tree_b) = @_;
3296        my @diff_tree = qw(diff-tree -z -r);
3297        if ($_cp_similarity) {
3298                push @diff_tree, "-C$_cp_similarity";
3299        } else {
3300                push @diff_tree, '-C';
3301        }
3302        push @diff_tree, '--find-copies-harder' if $_find_copies_harder;
3303        push @diff_tree, "-l$_rename_limit" if defined $_rename_limit;
3304        push @diff_tree, $tree_a, $tree_b;
3305        my ($diff_fh, $ctx) = command_output_pipe(@diff_tree);
3306        local $/ = "\0";
3307        my $state = 'meta';
3308        my @mods;
3309        while (<$diff_fh>) {
3310                chomp $_; # this gets rid of the trailing "\0"
3311                if ($state eq 'meta' && /^:(\d{6})\s(\d{6})\s
3312                                        $::sha1\s($::sha1)\s
3313                                        ([MTCRAD])\d*$/xo) {
3314                        push @mods, {   mode_a => $1, mode_b => $2,
3315                                        sha1_b => $3, chg => $4 };
3316                        if ($4 =~ /^(?:C|R)$/) {
3317                                $state = 'file_a';
3318                        } else {
3319                                $state = 'file_b';
3320                        }
3321                } elsif ($state eq 'file_a') {
3322                        my $x = $mods[$#mods] or croak "Empty array\n";
3323                        if ($x->{chg} !~ /^(?:C|R)$/) {
3324                                croak "Error parsing $_, $x->{chg}\n";
3325                        }
3326                        $x->{file_a} = $_;
3327                        $state = 'file_b';
3328                } elsif ($state eq 'file_b') {
3329                        my $x = $mods[$#mods] or croak "Empty array\n";
3330                        if (exists $x->{file_a} && $x->{chg} !~ /^(?:C|R)$/) {
3331                                croak "Error parsing $_, $x->{chg}\n";
3332                        }
3333                        if (!exists $x->{file_a} && $x->{chg} =~ /^(?:C|R)$/) {
3334                                croak "Error parsing $_, $x->{chg}\n";
3335                        }
3336                        $x->{file_b} = $_;
3337                        $state = 'meta';
3338                } else {
3339                        croak "Error parsing $_\n";
3340                }
3341        }
3342        command_close_pipe($diff_fh, $ctx);
3343        \@mods;
3344}
3345
3346sub check_diff_paths {
3347        my ($ra, $pfx, $rev, $mods) = @_;
3348        my %types;
3349        $pfx .= '/' if length $pfx;
3350
3351        sub type_diff_paths {
3352                my ($ra, $types, $path, $rev) = @_;
3353                my @p = split m#/+#, $path;
3354                my $c = shift @p;
3355                unless (defined $types->{$c}) {
3356                        $types->{$c} = $ra->check_path($c, $rev);
3357                }
3358                while (@p) {
3359                        $c .= '/' . shift @p;
3360                        next if defined $types->{$c};
3361                        $types->{$c} = $ra->check_path($c, $rev);
3362                }
3363        }
3364
3365        foreach my $m (@$mods) {
3366                foreach my $f (qw/file_a file_b/) {
3367                        next unless defined $m->{$f};
3368                        my ($dir) = ($m->{$f} =~ m#^(.*?)/?(?:[^/]+)$#);
3369                        if (length $pfx.$dir && ! defined $types{$dir}) {
3370                                type_diff_paths($ra, \%types, $pfx.$dir, $rev);
3371                        }
3372                }
3373        }
3374        \%types;
3375}
3376
3377sub split_path {
3378        return ($_[0] =~ m#^(.*?)/?([^/]+)$#);
3379}
3380
3381sub repo_path {
3382        my ($self, $path) = @_;
3383        $self->{path_prefix}.(defined $path ? $path : '');
3384}
3385
3386sub url_path {
3387        my ($self, $path) = @_;
3388        if ($self->{url} =~ m#^https?://#) {
3389                $path =~ s/([^a-zA-Z0-9_.-])/uc sprintf("%%%02x",ord($1))/eg;
3390        }
3391        $self->{url} . '/' . $self->repo_path($path);
3392}
3393
3394sub rmdirs {
3395        my ($self) = @_;
3396        my $rm = $self->{rm};
3397        delete $rm->{''}; # we never delete the url we're tracking
3398        return unless %$rm;
3399
3400        foreach (keys %$rm) {
3401                my @d = split m#/#, $_;
3402                my $c = shift @d;
3403                $rm->{$c} = 1;
3404                while (@d) {
3405                        $c .= '/' . shift @d;
3406                        $rm->{$c} = 1;
3407                }
3408        }
3409        delete $rm->{$self->{svn_path}};
3410        delete $rm->{''}; # we never delete the url we're tracking
3411        return unless %$rm;
3412
3413        my ($fh, $ctx) = command_output_pipe(qw/ls-tree --name-only -r -z/,
3414                                             $self->{tree_b});
3415        local $/ = "\0";
3416        while (<$fh>) {
3417                chomp;
3418                my @dn = split m#/#, $_;
3419                while (pop @dn) {
3420                        delete $rm->{join '/', @dn};
3421                }
3422                unless (%$rm) {
3423                        close $fh;
3424                        return;
3425                }
3426        }
3427        command_close_pipe($fh, $ctx);
3428
3429        my ($r, $p, $bat) = ($self->{r}, $self->{pool}, $self->{bat});
3430        foreach my $d (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$rm) {
3431                $self->close_directory($bat->{$d}, $p);
3432                my ($dn) = ($d =~ m#^(.*?)/?(?:[^/]+)$#);
3433                print "\tD+\t$d/\n" unless $::_q;
3434                $self->SUPER::delete_entry($d, $r, $bat->{$dn}, $p);
3435                delete $bat->{$d};
3436        }
3437}
3438
3439sub open_or_add_dir {
3440        my ($self, $full_path, $baton) = @_;
3441        my $t = $self->{types}->{$full_path};
3442        if (!defined $t) {
3443                die "$full_path not known in r$self->{r} or we have a bug!\n";
3444        }
3445        {
3446                no warnings 'once';
3447                # SVN::Node::none and SVN::Node::file are used only once,
3448                # so we're shutting up Perl's warnings about them.
3449                if ($t == $SVN::Node::none) {
3450                        return $self->add_directory($full_path, $baton,
3451                            undef, -1, $self->{pool});
3452                } elsif ($t == $SVN::Node::dir) {
3453                        return $self->open_directory($full_path, $baton,
3454                            $self->{r}, $self->{pool});
3455                } # no warnings 'once'
3456                print STDERR "$full_path already exists in repository at ",
3457                    "r$self->{r} and it is not a directory (",
3458                    ($t == $SVN::Node::file ? 'file' : 'unknown'),"/$t)\n";
3459        } # no warnings 'once'
3460        exit 1;
3461}
3462
3463sub ensure_path {
3464        my ($self, $path) = @_;
3465        my $bat = $self->{bat};
3466        my $repo_path = $self->repo_path($path);
3467        return $bat->{''} unless (length $repo_path);
3468        my @p = split m#/+#, $repo_path;
3469        my $c = shift @p;
3470        $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{''});
3471        while (@p) {
3472                my $c0 = $c;
3473                $c .= '/' . shift @p;
3474                $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{$c0});
3475        }
3476        return $bat->{$c};
3477}
3478
3479sub A {
3480        my ($self, $m) = @_;
3481        my ($dir, $file) = split_path($m->{file_b});
3482        my $pbat = $self->ensure_path($dir);
3483        my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
3484                                        undef, -1);
3485        print "\tA\t$m->{file_b}\n" unless $::_q;
3486        $self->chg_file($fbat, $m);
3487        $self->close_file($fbat,undef,$self->{pool});
3488}
3489
3490sub C {
3491        my ($self, $m) = @_;
3492        my ($dir, $file) = split_path($m->{file_b});
3493        my $pbat = $self->ensure_path($dir);
3494        my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
3495                                $self->url_path($m->{file_a}), $self->{r});
3496        print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
3497        $self->chg_file($fbat, $m);
3498        $self->close_file($fbat,undef,$self->{pool});
3499}
3500
3501sub delete_entry {
3502        my ($self, $path, $pbat) = @_;
3503        my $rpath = $self->repo_path($path);
3504        my ($dir, $file) = split_path($rpath);
3505        $self->{rm}->{$dir} = 1;
3506        $self->SUPER::delete_entry($rpath, $self->{r}, $pbat, $self->{pool});
3507}
3508
3509sub R {
3510        my ($self, $m) = @_;
3511        my ($dir, $file) = split_path($m->{file_b});
3512        my $pbat = $self->ensure_path($dir);
3513        my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
3514                                $self->url_path($m->{file_a}), $self->{r});
3515        print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
3516        $self->chg_file($fbat, $m);
3517        $self->close_file($fbat,undef,$self->{pool});
3518
3519        ($dir, $file) = split_path($m->{file_a});
3520        $pbat = $self->ensure_path($dir);
3521        $self->delete_entry($m->{file_a}, $pbat);
3522}
3523
3524sub M {
3525        my ($self, $m) = @_;
3526        my ($dir, $file) = split_path($m->{file_b});
3527        my $pbat = $self->ensure_path($dir);
3528        my $fbat = $self->open_file($self->repo_path($m->{file_b}),
3529                                $pbat,$self->{r},$self->{pool});
3530        print "\t$m->{chg}\t$m->{file_b}\n" unless $::_q;
3531        $self->chg_file($fbat, $m);
3532        $self->close_file($fbat,undef,$self->{pool});
3533}
3534
3535sub T { shift->M(@_) }
3536
3537sub change_file_prop {
3538        my ($self, $fbat, $pname, $pval) = @_;
3539        $self->SUPER::change_file_prop($fbat, $pname, $pval, $self->{pool});
3540}
3541
3542sub chg_file {
3543        my ($self, $fbat, $m) = @_;
3544        if ($m->{mode_b} =~ /755$/ && $m->{mode_a} !~ /755$/) {
3545                $self->change_file_prop($fbat,'svn:executable','*');
3546        } elsif ($m->{mode_b} !~ /755$/ && $m->{mode_a} =~ /755$/) {
3547                $self->change_file_prop($fbat,'svn:executable',undef);
3548        }
3549        my $fh = IO::File->new_tmpfile or croak $!;
3550        if ($m->{mode_b} =~ /^120/) {
3551                print $fh 'link ' or croak $!;
3552                $self->change_file_prop($fbat,'svn:special','*');
3553        } elsif ($m->{mode_a} =~ /^120/ && $m->{mode_b} !~ /^120/) {
3554                $self->change_file_prop($fbat,'svn:special',undef);
3555        }
3556        defined(my $pid = fork) or croak $!;
3557        if (!$pid) {
3558                open STDOUT, '>&', $fh or croak $!;
3559                exec qw/git-cat-file blob/, $m->{sha1_b} or croak $!;
3560        }
3561        waitpid $pid, 0;
3562        croak $? if $?;
3563        $fh->flush == 0 or croak $!;
3564        seek $fh, 0, 0 or croak $!;
3565
3566        my $exp = ::md5sum($fh);
3567        seek $fh, 0, 0 or croak $!;
3568
3569        my $pool = SVN::Pool->new;
3570        my $atd = $self->apply_textdelta($fbat, undef, $pool);
3571        my $got = SVN::TxDelta::send_stream($fh, @$atd, $pool);
3572        die "Checksum mismatch\nexpected: $exp\ngot: $got\n" if ($got ne $exp);
3573        $pool->clear;
3574
3575        close $fh or croak $!;
3576}
3577
3578sub D {
3579        my ($self, $m) = @_;
3580        my ($dir, $file) = split_path($m->{file_b});
3581        my $pbat = $self->ensure_path($dir);
3582        print "\tD\t$m->{file_b}\n" unless $::_q;
3583        $self->delete_entry($m->{file_b}, $pbat);
3584}
3585
3586sub close_edit {
3587        my ($self) = @_;
3588        my ($p,$bat) = ($self->{pool}, $self->{bat});
3589        foreach (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$bat) {
3590                next if $_ eq '';
3591                $self->close_directory($bat->{$_}, $p);
3592        }
3593        $self->close_directory($bat->{''}, $p);
3594        $self->SUPER::close_edit($p);
3595        $p->clear;
3596}
3597
3598sub abort_edit {
3599        my ($self) = @_;
3600        $self->SUPER::abort_edit($self->{pool});
3601}
3602
3603sub DESTROY {
3604        my $self = shift;
3605        $self->SUPER::DESTROY(@_);
3606        $self->{pool}->clear;
3607}
3608
3609# this drives the editor
3610sub apply_diff {
3611        my ($self) = @_;
3612        my $mods = $self->{mods};
3613        my %o = ( D => 1, R => 0, C => -1, A => 3, M => 3, T => 3 );
3614        foreach my $m (sort { $o{$a->{chg}} <=> $o{$b->{chg}} } @$mods) {
3615                my $f = $m->{chg};
3616                if (defined $o{$f}) {
3617                        $self->$f($m);
3618                } else {
3619                        fatal("Invalid change type: $f");
3620                }
3621        }
3622        $self->rmdirs if $_rmdir;
3623        if (@$mods == 0) {
3624                $self->abort_edit;
3625        } else {
3626                $self->close_edit;
3627        }
3628        return scalar @$mods;
3629}
3630
3631package Git::SVN::Ra;
3632use vars qw/@ISA $config_dir $_log_window_size/;
3633use strict;
3634use warnings;
3635my ($ra_invalid, $can_do_switch, %ignored_err, $RA);
3636
3637BEGIN {
3638        # enforce temporary pool usage for some simple functions
3639        no strict 'refs';
3640        for my $f (qw/rev_proplist get_latest_revnum get_uuid get_repos_root/) {
3641                my $SUPER = "SUPER::$f";
3642                *$f = sub {
3643                        my $self = shift;
3644                        my $pool = SVN::Pool->new;
3645                        my @ret = $self->$SUPER(@_,$pool);
3646                        $pool->clear;
3647                        wantarray ? @ret : $ret[0];
3648                };
3649        }
3650}
3651
3652sub _auth_providers () {
3653        [
3654          SVN::Client::get_simple_provider(),
3655          SVN::Client::get_ssl_server_trust_file_provider(),
3656          SVN::Client::get_simple_prompt_provider(
3657            \&Git::SVN::Prompt::simple, 2),
3658          SVN::Client::get_ssl_client_cert_file_provider(),
3659          SVN::Client::get_ssl_client_cert_prompt_provider(
3660            \&Git::SVN::Prompt::ssl_client_cert, 2),
3661          SVN::Client::get_ssl_client_cert_pw_file_provider(),
3662          SVN::Client::get_ssl_client_cert_pw_prompt_provider(
3663            \&Git::SVN::Prompt::ssl_client_cert_pw, 2),
3664          SVN::Client::get_username_provider(),
3665          SVN::Client::get_ssl_server_trust_prompt_provider(
3666            \&Git::SVN::Prompt::ssl_server_trust),
3667          SVN::Client::get_username_prompt_provider(
3668            \&Git::SVN::Prompt::username, 2)
3669        ]
3670}
3671
3672sub escape_uri_only {
3673        my ($uri) = @_;
3674        my @tmp;
3675        foreach (split m{/}, $uri) {
3676                s/([^\w.%-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
3677                push @tmp, $_;
3678        }
3679        join('/', @tmp);
3680}
3681
3682sub escape_url {
3683        my ($url) = @_;
3684        if ($url =~ m#^(https?)://([^/]+)(.*)$#) {
3685                my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
3686                $url = "$scheme://$domain$uri";
3687        }
3688        $url;
3689}
3690
3691sub new {
3692        my ($class, $url) = @_;
3693        $url =~ s!/+$!!;
3694        return $RA if ($RA && $RA->{url} eq $url);
3695
3696        SVN::_Core::svn_config_ensure($config_dir, undef);
3697        my ($baton, $callbacks) = SVN::Core::auth_open_helper(_auth_providers);
3698        my $config = SVN::Core::config_get_config($config_dir);
3699        $RA = undef;
3700        my $dont_store_passwords = 1;
3701        my $conf_t = ${$config}{'config'};
3702        {
3703                no warnings 'once';
3704                # The usage of $SVN::_Core::SVN_CONFIG_* variables
3705                # produces warnings that variables are used only once.
3706                # I had not found the better way to shut them up, so
3707                # the warnings of type 'once' are disabled in this block.
3708                if (SVN::_Core::svn_config_get_bool($conf_t,
3709                    $SVN::_Core::SVN_CONFIG_SECTION_AUTH,
3710                    $SVN::_Core::SVN_CONFIG_OPTION_STORE_PASSWORDS,
3711                    1) == 0) {
3712                        SVN::_Core::svn_auth_set_parameter($baton,
3713                            $SVN::_Core::SVN_AUTH_PARAM_DONT_STORE_PASSWORDS,
3714                            bless (\$dont_store_passwords, "_p_void"));
3715                }
3716                if (SVN::_Core::svn_config_get_bool($conf_t,
3717                    $SVN::_Core::SVN_CONFIG_SECTION_AUTH,
3718                    $SVN::_Core::SVN_CONFIG_OPTION_STORE_AUTH_CREDS,
3719                    1) == 0) {
3720                        $Git::SVN::Prompt::_no_auth_cache = 1;
3721                }
3722        } # no warnings 'once'
3723        my $self = SVN::Ra->new(url => escape_url($url), auth => $baton,
3724                              config => $config,
3725                              pool => SVN::Pool->new,
3726                              auth_provider_callbacks => $callbacks);
3727        $self->{url} = $url;
3728        $self->{svn_path} = $url;
3729        $self->{repos_root} = $self->get_repos_root;
3730        $self->{svn_path} =~ s#^\Q$self->{repos_root}\E(/|$)##;
3731        $self->{cache} = { check_path => { r => 0, data => {} },
3732                           get_dir => { r => 0, data => {} } };
3733        $RA = bless $self, $class;
3734}
3735
3736sub check_path {
3737        my ($self, $path, $r) = @_;
3738        my $cache = $self->{cache}->{check_path};
3739        if ($r == $cache->{r} && exists $cache->{data}->{$path}) {
3740                return $cache->{data}->{$path};
3741        }
3742        my $pool = SVN::Pool->new;
3743        my $t = $self->SUPER::check_path($path, $r, $pool);
3744        $pool->clear;
3745        if ($r != $cache->{r}) {
3746                %{$cache->{data}} = ();
3747                $cache->{r} = $r;
3748        }
3749        $cache->{data}->{$path} = $t;
3750}
3751
3752sub get_dir {
3753        my ($self, $dir, $r) = @_;
3754        my $cache = $self->{cache}->{get_dir};
3755        if ($r == $cache->{r}) {
3756                if (my $x = $cache->{data}->{$dir}) {
3757                        return wantarray ? @$x : $x->[0];
3758                }
3759        }
3760        my $pool = SVN::Pool->new;
3761        my ($d, undef, $props) = $self->SUPER::get_dir($dir, $r, $pool);
3762        my %dirents = map { $_ => { kind => $d->{$_}->kind } } keys %$d;
3763        $pool->clear;
3764        if ($r != $cache->{r}) {
3765                %{$cache->{data}} = ();
3766                $cache->{r} = $r;
3767        }
3768        $cache->{data}->{$dir} = [ \%dirents, $r, $props ];
3769        wantarray ? (\%dirents, $r, $props) : \%dirents;
3770}
3771
3772sub DESTROY {
3773        # do not call the real DESTROY since we store ourselves in $RA
3774}
3775
3776sub get_log {
3777        my ($self, @args) = @_;
3778        my $pool = SVN::Pool->new;
3779        splice(@args, 3, 1) if ($SVN::Core::VERSION le '1.2.0');
3780        my $ret = $self->SUPER::get_log(@args, $pool);
3781        $pool->clear;
3782        $ret;
3783}
3784
3785sub trees_match {
3786        my ($self, $url1, $rev1, $url2, $rev2) = @_;
3787        my $ctx = SVN::Client->new(auth => _auth_providers);
3788        my $out = IO::File->new_tmpfile;
3789
3790        # older SVN (1.1.x) doesn't take $pool as the last parameter for
3791        # $ctx->diff(), so we'll create a default one
3792        my $pool = SVN::Pool->new_default_sub;
3793
3794        $ra_invalid = 1; # this will open a new SVN::Ra connection to $url1
3795        $ctx->diff([], $url1, $rev1, $url2, $rev2, 1, 1, 0, $out, $out);
3796        $out->flush;
3797        my $ret = (($out->stat)[7] == 0);
3798        close $out or croak $!;
3799
3800        $ret;
3801}
3802
3803sub get_commit_editor {
3804        my ($self, $log, $cb, $pool) = @_;
3805        my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef, 0) : ();
3806        $self->SUPER::get_commit_editor($log, $cb, @lock, $pool);
3807}
3808
3809sub gs_do_update {
3810        my ($self, $rev_a, $rev_b, $gs, $editor) = @_;
3811        my $new = ($rev_a == $rev_b);
3812        my $path = $gs->{path};
3813
3814        if ($new && -e $gs->{index}) {
3815                unlink $gs->{index} or die
3816                  "Couldn't unlink index: $gs->{index}: $!\n";
3817        }
3818        my $pool = SVN::Pool->new;
3819        $editor->set_path_strip($path);
3820        my (@pc) = split m#/#, $path;
3821        my $reporter = $self->do_update($rev_b, (@pc ? shift @pc : ''),
3822                                        1, $editor, $pool);
3823        my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : ();
3824
3825        # Since we can't rely on svn_ra_reparent being available, we'll
3826        # just have to do some magic with set_path to make it so
3827        # we only want a partial path.
3828        my $sp = '';
3829        my $final = join('/', @pc);
3830        while (@pc) {
3831                $reporter->set_path($sp, $rev_b, 0, @lock, $pool);
3832                $sp .= '/' if length $sp;
3833                $sp .= shift @pc;
3834        }
3835        die "BUG: '$sp' != '$final'\n" if ($sp ne $final);
3836
3837        $reporter->set_path($sp, $rev_a, $new, @lock, $pool);
3838
3839        $reporter->finish_report($pool);
3840        $pool->clear;
3841        $editor->{git_commit_ok};
3842}
3843
3844# this requires SVN 1.4.3 or later (do_switch didn't work before 1.4.3, and
3845# svn_ra_reparent didn't work before 1.4)
3846sub gs_do_switch {
3847        my ($self, $rev_a, $rev_b, $gs, $url_b, $editor) = @_;
3848        my $path = $gs->{path};
3849        my $pool = SVN::Pool->new;
3850
3851        my $full_url = $self->{url};
3852        my $old_url = $full_url;
3853        $full_url .= '/' . escape_uri_only($path) if length $path;
3854        my ($ra, $reparented);
3855        if ($old_url ne $full_url) {
3856                if ($old_url !~ m#^svn(\+ssh)?://#) {
3857                        SVN::_Ra::svn_ra_reparent($self->{session}, $full_url,
3858                                                  $pool);
3859                        $self->{url} = $full_url;
3860                        $reparented = 1;
3861                } else {
3862                        $_[0] = undef;
3863                        $self = undef;
3864                        $RA = undef;
3865                        $ra = Git::SVN::Ra->new($full_url);
3866                        $ra_invalid = 1;
3867                }
3868        }
3869        $ra ||= $self;
3870        my $reporter = $ra->do_switch($rev_b, '', 1, $url_b, $editor, $pool);
3871        my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : ();
3872        $reporter->set_path('', $rev_a, 0, @lock, $pool);
3873        $reporter->finish_report($pool);
3874
3875        if ($reparented) {
3876                SVN::_Ra::svn_ra_reparent($self->{session}, $old_url, $pool);
3877                $self->{url} = $old_url;
3878        }
3879
3880        $pool->clear;
3881        $editor->{git_commit_ok};
3882}
3883
3884sub longest_common_path {
3885        my ($gsv, $globs) = @_;
3886        my %common;
3887        my $common_max = scalar @$gsv;
3888
3889        foreach my $gs (@$gsv) {
3890                my @tmp = split m#/#, $gs->{path};
3891                my $p = '';
3892                foreach (@tmp) {
3893                        $p .= length($p) ? "/$_" : $_;
3894                        $common{$p} ||= 0;
3895                        $common{$p}++;
3896                }
3897        }
3898        $globs ||= [];
3899        $common_max += scalar @$globs;
3900        foreach my $glob (@$globs) {
3901                my @tmp = split m#/#, $glob->{path}->{left};
3902                my $p = '';
3903                foreach (@tmp) {
3904                        $p .= length($p) ? "/$_" : $_;
3905                        $common{$p} ||= 0;
3906                        $common{$p}++;
3907                }
3908        }
3909
3910        my $longest_path = '';
3911        foreach (sort {length $b <=> length $a} keys %common) {
3912                if ($common{$_} == $common_max) {
3913                        $longest_path = $_;
3914                        last;
3915                }
3916        }
3917        $longest_path;
3918}
3919
3920sub gs_fetch_loop_common {
3921        my ($self, $base, $head, $gsv, $globs) = @_;
3922        return if ($base > $head);
3923        my $inc = $_log_window_size;
3924        my ($min, $max) = ($base, $head < $base + $inc ? $head : $base + $inc);
3925        my $longest_path = longest_common_path($gsv, $globs);
3926        my $ra_url = $self->{url};
3927        while (1) {
3928                my %revs;
3929                my $err;
3930                my $err_handler = $SVN::Error::handler;
3931                $SVN::Error::handler = sub {
3932                        ($err) = @_;
3933                        skip_unknown_revs($err);
3934                };
3935                sub _cb {
3936                        my ($paths, $r, $author, $date, $log) = @_;
3937                        [ dup_changed_paths($paths),
3938                          { author => $author, date => $date, log => $log } ];
3939                }
3940                $self->get_log([$longest_path], $min, $max, 0, 1, 1,
3941                               sub { $revs{$_[1]} = _cb(@_) });
3942                if ($err && $max >= $head) {
3943                        print STDERR "Path '$longest_path' ",
3944                                     "was probably deleted:\n",
3945                                     $err->expanded_message,
3946                                     "\nWill attempt to follow ",
3947                                     "revisions r$min .. r$max ",
3948                                     "committed before the deletion\n";
3949                        my $hi = $max;
3950                        while (--$hi >= $min) {
3951                                my $ok;
3952                                $self->get_log([$longest_path], $min, $hi,
3953                                               0, 1, 1, sub {
3954                                               $ok ||= $_[1];
3955                                               $revs{$_[1]} = _cb(@_) });
3956                                if ($ok) {
3957                                        print STDERR "r$min .. r$ok OK\n";
3958                                        last;
3959                                }
3960                        }
3961                }
3962                $SVN::Error::handler = $err_handler;
3963
3964                my %exists = map { $_->{path} => $_ } @$gsv;
3965                foreach my $r (sort {$a <=> $b} keys %revs) {
3966                        my ($paths, $logged) = @{$revs{$r}};
3967
3968                        foreach my $gs ($self->match_globs(\%exists, $paths,
3969                                                           $globs, $r)) {
3970                                if ($gs->rev_map_max >= $r) {
3971                                        next;
3972                                }
3973                                next unless $gs->match_paths($paths, $r);
3974                                $gs->{logged_rev_props} = $logged;
3975                                if (my $last_commit = $gs->last_commit) {
3976                                        $gs->assert_index_clean($last_commit);
3977                                }
3978                                my $log_entry = $gs->do_fetch($paths, $r);
3979                                if ($log_entry) {
3980                                        $gs->do_git_commit($log_entry);
3981                                }
3982                                $INDEX_FILES{$gs->{index}} = 1;
3983                        }
3984                        foreach my $g (@$globs) {
3985                                my $k = "svn-remote.$g->{remote}." .
3986                                        "$g->{t}-maxRev";
3987                                Git::SVN::tmp_config($k, $r);
3988                        }
3989                        if ($ra_invalid) {
3990                                $_[0] = undef;
3991                                $self = undef;
3992                                $RA = undef;
3993                                $self = Git::SVN::Ra->new($ra_url);
3994                                $ra_invalid = undef;
3995                        }
3996                }
3997                # pre-fill the .rev_db since it'll eventually get filled in
3998                # with '0' x40 if something new gets committed
3999                foreach my $gs (@$gsv) {
4000                        next if $gs->rev_map_max >= $max;
4001                        next if defined $gs->rev_map_get($max);
4002                        $gs->rev_map_set($max, 0 x40);
4003                }
4004                foreach my $g (@$globs) {
4005                        my $k = "svn-remote.$g->{remote}.$g->{t}-maxRev";
4006                        Git::SVN::tmp_config($k, $max);
4007                }
4008                last if $max >= $head;
4009                $min = $max + 1;
4010                $max += $inc;
4011                $max = $head if ($max > $head);
4012        }
4013        Git::SVN::gc();
4014}
4015
4016sub match_globs {
4017        my ($self, $exists, $paths, $globs, $r) = @_;
4018
4019        sub get_dir_check {
4020                my ($self, $exists, $g, $r) = @_;
4021                my @x = eval { $self->get_dir($g->{path}->{left}, $r) };
4022                return unless scalar @x == 3;
4023                my $dirents = $x[0];
4024                foreach my $de (keys %$dirents) {
4025                        next if $dirents->{$de}->{kind} != $SVN::Node::dir;
4026                        my $p = $g->{path}->full_path($de);
4027                        next if $exists->{$p};
4028                        next if (length $g->{path}->{right} &&
4029                                 ($self->check_path($p, $r) !=
4030                                  $SVN::Node::dir));
4031                        $exists->{$p} = Git::SVN->init($self->{url}, $p, undef,
4032                                         $g->{ref}->full_path($de), 1);
4033                }
4034        }
4035        foreach my $g (@$globs) {
4036                if (my $path = $paths->{"/$g->{path}->{left}"}) {
4037                        if ($path->{action} =~ /^[AR]$/) {
4038                                get_dir_check($self, $exists, $g, $r);
4039                        }
4040                }
4041                foreach (keys %$paths) {
4042                        if (/$g->{path}->{left_regex}/ &&
4043                            !/$g->{path}->{regex}/) {
4044                                next if $paths->{$_}->{action} !~ /^[AR]$/;
4045                                get_dir_check($self, $exists, $g, $r);
4046                        }
4047                        next unless /$g->{path}->{regex}/;
4048                        my $p = $1;
4049                        my $pathname = $g->{path}->full_path($p);
4050                        next if $exists->{$pathname};
4051                        next if ($self->check_path($pathname, $r) !=
4052                                 $SVN::Node::dir);
4053                        $exists->{$pathname} = Git::SVN->init(
4054                                              $self->{url}, $pathname, undef,
4055                                              $g->{ref}->full_path($p), 1);
4056                }
4057                my $c = '';
4058                foreach (split m#/#, $g->{path}->{left}) {
4059                        $c .= "/$_";
4060                        next unless ($paths->{$c} &&
4061                                     ($paths->{$c}->{action} =~ /^[AR]$/));
4062                        get_dir_check($self, $exists, $g, $r);
4063                }
4064        }
4065        values %$exists;
4066}
4067
4068sub minimize_url {
4069        my ($self) = @_;
4070        return $self->{url} if ($self->{url} eq $self->{repos_root});
4071        my $url = $self->{repos_root};
4072        my @components = split(m!/!, $self->{svn_path});
4073        my $c = '';
4074        do {
4075                $url .= "/$c" if length $c;
4076                eval { (ref $self)->new($url)->get_latest_revnum };
4077        } while ($@ && ($c = shift @components));
4078        $url;
4079}
4080
4081sub can_do_switch {
4082        my $self = shift;
4083        unless (defined $can_do_switch) {
4084                my $pool = SVN::Pool->new;
4085                my $rep = eval {
4086                        $self->do_switch(1, '', 0, $self->{url},
4087                                         SVN::Delta::Editor->new, $pool);
4088                };
4089                if ($@) {
4090                        $can_do_switch = 0;
4091                } else {
4092                        $rep->abort_report($pool);
4093                        $can_do_switch = 1;
4094                }
4095                $pool->clear;
4096        }
4097        $can_do_switch;
4098}
4099
4100sub skip_unknown_revs {
4101        my ($err) = @_;
4102        my $errno = $err->apr_err();
4103        # Maybe the branch we're tracking didn't
4104        # exist when the repo started, so it's
4105        # not an error if it doesn't, just continue
4106        #
4107        # Wonderfully consistent library, eh?
4108        # 160013 - svn:// and file://
4109        # 175002 - http(s)://
4110        # 175007 - http(s):// (this repo required authorization, too...)
4111        #   More codes may be discovered later...
4112        if ($errno == 175007 || $errno == 175002 || $errno == 160013) {
4113                my $err_key = $err->expanded_message;
4114                # revision numbers change every time, filter them out
4115                $err_key =~ s/\d+/\0/g;
4116                $err_key = "$errno\0$err_key";
4117                unless ($ignored_err{$err_key}) {
4118                        warn "W: Ignoring error from SVN, path probably ",
4119                             "does not exist: ($errno): ",
4120                             $err->expanded_message,"\n";
4121                        warn "W: Do not be alarmed at the above message ",
4122                             "git-svn is just searching aggressively for ",
4123                             "old history.\n",
4124                             "This may take a while on large repositories\n";
4125                        $ignored_err{$err_key} = 1;
4126                }
4127                return;
4128        }
4129        die "Error from SVN, ($errno): ", $err->expanded_message,"\n";
4130}
4131
4132# svn_log_changed_path_t objects passed to get_log are likely to be
4133# overwritten even if only the refs are copied to an external variable,
4134# so we should dup the structures in their entirety.  Using an externally
4135# passed pool (instead of our temporary and quickly cleared pool in
4136# Git::SVN::Ra) does not help matters at all...
4137sub dup_changed_paths {
4138        my ($paths) = @_;
4139        return undef unless $paths;
4140        my %ret;
4141        foreach my $p (keys %$paths) {
4142                my $i = $paths->{$p};
4143                my %s = map { $_ => $i->$_ }
4144                              qw/copyfrom_path copyfrom_rev action/;
4145                $ret{$p} = \%s;
4146        }
4147        \%ret;
4148}
4149
4150package Git::SVN::Log;
4151use strict;
4152use warnings;
4153use POSIX qw/strftime/;
4154use constant commit_log_separator => ('-' x 72) . "\n";
4155use vars qw/$TZ $limit $color $pager $non_recursive $verbose $oneline
4156            %rusers $show_commit $incremental/;
4157my $l_fmt;
4158
4159sub cmt_showable {
4160        my ($c) = @_;
4161        return 1 if defined $c->{r};
4162
4163        # big commit message got truncated by the 16k pretty buffer in rev-list
4164        if ($c->{l} && $c->{l}->[-1] eq "...\n" &&
4165                                $c->{a_raw} =~ /\@([a-f\d\-]+)>$/) {
4166                @{$c->{l}} = ();
4167                my @log = command(qw/cat-file commit/, $c->{c});
4168
4169                # shift off the headers
4170                shift @log while ($log[0] ne '');
4171                shift @log;
4172
4173                # TODO: make $c->{l} not have a trailing newline in the future
4174                @{$c->{l}} = map { "$_\n" } grep !/^git-svn-id: /, @log;
4175
4176                (undef, $c->{r}, undef) = ::extract_metadata(
4177                                (grep(/^git-svn-id: /, @log))[-1]);
4178        }
4179        return defined $c->{r};
4180}
4181
4182sub log_use_color {
4183        return $color || Git->repository->get_colorbool('color.diff');
4184}
4185
4186sub git_svn_log_cmd {
4187        my ($r_min, $r_max, @args) = @_;
4188        my $head = 'HEAD';
4189        my (@files, @log_opts);
4190        foreach my $x (@args) {
4191                if ($x eq '--' || @files) {
4192                        push @files, $x;
4193                } else {
4194                        if (::verify_ref("$x^0")) {
4195                                $head = $x;
4196                        } else {
4197                                push @log_opts, $x;
4198                        }
4199                }
4200        }
4201
4202        my ($url, $rev, $uuid, $gs) = ::working_head_info($head);
4203        $gs ||= Git::SVN->_new;
4204        my @cmd = (qw/log --abbrev-commit --pretty=raw --default/,
4205                   $gs->refname);
4206        push @cmd, '-r' unless $non_recursive;
4207        push @cmd, qw/--raw --name-status/ if $verbose;
4208        push @cmd, '--color' if log_use_color();
4209        push @cmd, @log_opts;
4210        if (defined $r_max && $r_max == $r_min) {
4211                push @cmd, '--max-count=1';
4212                if (my $c = $gs->rev_map_get($r_max)) {
4213                        push @cmd, $c;
4214                }
4215        } elsif (defined $r_max) {
4216                if ($r_max < $r_min) {
4217                        ($r_min, $r_max) = ($r_max, $r_min);
4218                }
4219                my (undef, $c_max) = $gs->find_rev_before($r_max, 1, $r_min);
4220                my (undef, $c_min) = $gs->find_rev_after($r_min, 1, $r_max);
4221                # If there are no commits in the range, both $c_max and $c_min
4222                # will be undefined.  If there is at least 1 commit in the
4223                # range, both will be defined.
4224                return () if !defined $c_min || !defined $c_max;
4225                if ($c_min eq $c_max) {
4226                        push @cmd, '--max-count=1', $c_min;
4227                } else {
4228                        push @cmd, '--boundary', "$c_min..$c_max";
4229                }
4230        }
4231        return (@cmd, @files);
4232}
4233
4234# adapted from pager.c
4235sub config_pager {
4236        $pager ||= $ENV{GIT_PAGER} || $ENV{PAGER};
4237        if (!defined $pager) {
4238                $pager = 'less';
4239        } elsif (length $pager == 0 || $pager eq 'cat') {
4240                $pager = undef;
4241        }
4242        $ENV{GIT_PAGER_IN_USE} = defined($pager);
4243}
4244
4245sub run_pager {
4246        return unless -t *STDOUT && defined $pager;
4247        pipe my $rfd, my $wfd or return;
4248        defined(my $pid = fork) or ::fatal "Can't fork: $!";
4249        if (!$pid) {
4250                open STDOUT, '>&', $wfd or
4251                                     ::fatal "Can't redirect to stdout: $!";
4252                return;
4253        }
4254        open STDIN, '<&', $rfd or ::fatal "Can't redirect stdin: $!";
4255        $ENV{LESS} ||= 'FRSX';
4256        exec $pager or ::fatal "Can't run pager: $! ($pager)";
4257}
4258
4259sub format_svn_date {
4260        return strftime("%Y-%m-%d %H:%M:%S %z (%a, %d %b %Y)", localtime(shift));
4261}
4262
4263sub parse_git_date {
4264        my ($t, $tz) = @_;
4265        # Date::Parse isn't in the standard Perl distro :(
4266        if ($tz =~ s/^\+//) {
4267                $t += tz_to_s_offset($tz);
4268        } elsif ($tz =~ s/^\-//) {
4269                $t -= tz_to_s_offset($tz);
4270        }
4271        return $t;
4272}
4273
4274sub set_local_timezone {
4275        if (defined $TZ) {
4276                $ENV{TZ} = $TZ;
4277        } else {
4278                delete $ENV{TZ};
4279        }
4280}
4281
4282sub tz_to_s_offset {
4283        my ($tz) = @_;
4284        $tz =~ s/(\d\d)$//;
4285        return ($1 * 60) + ($tz * 3600);
4286}
4287
4288sub get_author_info {
4289        my ($dest, $author, $t, $tz) = @_;
4290        $author =~ s/(?:^\s*|\s*$)//g;
4291        $dest->{a_raw} = $author;
4292        my $au;
4293        if ($::_authors) {
4294                $au = $rusers{$author} || undef;
4295        }
4296        if (!$au) {
4297                ($au) = ($author =~ /<([^>]+)\@[^>]+>$/);
4298        }
4299        $dest->{t} = $t;
4300        $dest->{tz} = $tz;
4301        $dest->{a} = $au;
4302        $dest->{t_utc} = parse_git_date($t, $tz);
4303}
4304
4305sub process_commit {
4306        my ($c, $r_min, $r_max, $defer) = @_;
4307        if (defined $r_min && defined $r_max) {
4308                if ($r_min == $c->{r} && $r_min == $r_max) {
4309                        show_commit($c);
4310                        return 0;
4311                }
4312                return 1 if $r_min == $r_max;
4313                if ($r_min < $r_max) {
4314                        # we need to reverse the print order
4315                        return 0 if (defined $limit && --$limit < 0);
4316                        push @$defer, $c;
4317                        return 1;
4318                }
4319                if ($r_min != $r_max) {
4320                        return 1 if ($r_min < $c->{r});
4321                        return 1 if ($r_max > $c->{r});
4322                }
4323        }
4324        return 0 if (defined $limit && --$limit < 0);
4325        show_commit($c);
4326        return 1;
4327}
4328
4329sub show_commit {
4330        my $c = shift;
4331        if ($oneline) {
4332                my $x = "\n";
4333                if (my $l = $c->{l}) {
4334                        while ($l->[0] =~ /^\s*$/) { shift @$l }
4335                        $x = $l->[0];
4336                }
4337                $l_fmt ||= 'A' . length($c->{r});
4338                print 'r',pack($l_fmt, $c->{r}),' | ';
4339                print "$c->{c} | " if $show_commit;
4340                print $x;
4341        } else {
4342                show_commit_normal($c);
4343        }
4344}
4345
4346sub show_commit_changed_paths {
4347        my ($c) = @_;
4348        return unless $c->{changed};
4349        print "Changed paths:\n", @{$c->{changed}};
4350}
4351
4352sub show_commit_normal {
4353        my ($c) = @_;
4354        print commit_log_separator, "r$c->{r} | ";
4355        print "$c->{c} | " if $show_commit;
4356        print "$c->{a} | ", format_svn_date($c->{t_utc}), ' | ';
4357        my $nr_line = 0;
4358
4359        if (my $l = $c->{l}) {
4360                while ($l->[$#$l] eq "\n" && $#$l > 0
4361                                          && $l->[($#$l - 1)] eq "\n") {
4362                        pop @$l;
4363                }
4364                $nr_line = scalar @$l;
4365                if (!$nr_line) {
4366                        print "1 line\n\n\n";
4367                } else {
4368                        if ($nr_line == 1) {
4369                                $nr_line = '1 line';
4370                        } else {
4371                                $nr_line .= ' lines';
4372                        }
4373                        print $nr_line, "\n";
4374                        show_commit_changed_paths($c);
4375                        print "\n";
4376                        print $_ foreach @$l;
4377                }
4378        } else {
4379                print "1 line\n";
4380                show_commit_changed_paths($c);
4381                print "\n";
4382
4383        }
4384        foreach my $x (qw/raw stat diff/) {
4385                if ($c->{$x}) {
4386                        print "\n";
4387                        print $_ foreach @{$c->{$x}}
4388                }
4389        }
4390}
4391
4392sub cmd_show_log {
4393        my (@args) = @_;
4394        my ($r_min, $r_max);
4395        my $r_last = -1; # prevent dupes
4396        set_local_timezone();
4397        if (defined $::_revision) {
4398                if ($::_revision =~ /^(\d+):(\d+)$/) {
4399                        ($r_min, $r_max) = ($1, $2);
4400                } elsif ($::_revision =~ /^\d+$/) {
4401                        $r_min = $r_max = $::_revision;
4402                } else {
4403                        ::fatal "-r$::_revision is not supported, use ",
4404                                "standard 'git log' arguments instead";
4405                }
4406        }
4407
4408        config_pager();
4409        @args = git_svn_log_cmd($r_min, $r_max, @args);
4410        if (!@args) {
4411                print commit_log_separator unless $incremental || $oneline;
4412                return;
4413        }
4414        my $log = command_output_pipe(@args);
4415        run_pager();
4416        my (@k, $c, $d, $stat);
4417        my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
4418        while (<$log>) {
4419                if (/^${esc_color}commit -?($::sha1_short)/o) {
4420                        my $cmt = $1;
4421                        if ($c && cmt_showable($c) && $c->{r} != $r_last) {
4422                                $r_last = $c->{r};
4423                                process_commit($c, $r_min, $r_max, \@k) or
4424                                                                goto out;
4425                        }
4426                        $d = undef;
4427                        $c = { c => $cmt };
4428                } elsif (/^${esc_color}author (.+) (\d+) ([\-\+]?\d+)$/o) {
4429                        get_author_info($c, $1, $2, $3);
4430                } elsif (/^${esc_color}(?:tree|parent|committer) /o) {
4431                        # ignore
4432                } elsif (/^${esc_color}:\d{6} \d{6} $::sha1_short/o) {
4433                        push @{$c->{raw}}, $_;
4434                } elsif (/^${esc_color}[ACRMDT]\t/) {
4435                        # we could add $SVN->{svn_path} here, but that requires
4436                        # remote access at the moment (repo_path_split)...
4437                        s#^(${esc_color})([ACRMDT])\t#$1   $2 #o;
4438                        push @{$c->{changed}}, $_;
4439                } elsif (/^${esc_color}diff /o) {
4440                        $d = 1;
4441                        push @{$c->{diff}}, $_;
4442                } elsif ($d) {
4443                        push @{$c->{diff}}, $_;
4444                } elsif (/^\ .+\ \|\s*\d+\ $esc_color[\+\-]*
4445                          $esc_color*[\+\-]*$esc_color$/x) {
4446                        $stat = 1;
4447                        push @{$c->{stat}}, $_;
4448                } elsif ($stat && /^ \d+ files changed, \d+ insertions/) {
4449                        push @{$c->{stat}}, $_;
4450                        $stat = undef;
4451                } elsif (/^${esc_color}    (git-svn-id:.+)$/o) {
4452                        ($c->{url}, $c->{r}, undef) = ::extract_metadata($1);
4453                } elsif (s/^${esc_color}    //o) {
4454                        push @{$c->{l}}, $_;
4455                }
4456        }
4457        if ($c && defined $c->{r} && $c->{r} != $r_last) {
4458                $r_last = $c->{r};
4459                process_commit($c, $r_min, $r_max, \@k);
4460        }
4461        if (@k) {
4462                ($r_min, $r_max) = ($r_max, $r_min);
4463                process_commit($_, $r_min, $r_max) foreach reverse @k;
4464        }
4465out:
4466        close $log;
4467        print commit_log_separator unless $incremental || $oneline;
4468}
4469
4470sub cmd_blame {
4471        my $path = shift;
4472
4473        config_pager();
4474        run_pager();
4475
4476        my ($fh, $ctx) = command_output_pipe('blame', @_, $path);
4477        while (my $line = <$fh>) {
4478                if ($line =~ /^\^?([[:xdigit:]]+)\s/) {
4479                        my (undef, $rev, undef) = ::cmt_metadata($1);
4480                        $rev = sprintf('%-10s', $rev);
4481                        $line =~ s/^\^?[[:xdigit:]]+(\s)/$rev$1/;
4482                }
4483                print $line;
4484        }
4485        command_close_pipe($fh, $ctx);
4486}
4487
4488package Git::SVN::Migration;
4489# these version numbers do NOT correspond to actual version numbers
4490# of git nor git-svn.  They are just relative.
4491#
4492# v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
4493#
4494# v1 layout: .git/$id/info/url, refs/remotes/$id
4495#
4496# v2 layout: .git/svn/$id/info/url, refs/remotes/$id
4497#
4498# v3 layout: .git/svn/$id, refs/remotes/$id
4499#            - info/url may remain for backwards compatibility
4500#            - this is what we migrate up to this layout automatically,
4501#            - this will be used by git svn init on single branches
4502# v3.1 layout (auto migrated):
4503#            - .rev_db => .rev_db.$UUID, .rev_db will remain as a symlink
4504#              for backwards compatibility
4505#
4506# v4 layout: .git/svn/$repo_id/$id, refs/remotes/$repo_id/$id
4507#            - this is only created for newly multi-init-ed
4508#              repositories.  Similar in spirit to the
4509#              --use-separate-remotes option in git-clone (now default)
4510#            - we do not automatically migrate to this (following
4511#              the example set by core git)
4512#
4513# v5 layout: .rev_db.$UUID => .rev_map.$UUID
4514#            - newer, more-efficient format that uses 24-bytes per record
4515#              with no filler space.
4516#            - use xxd -c24 < .rev_map.$UUID to view and debug
4517#            - This is a one-way migration, repositories updated to the
4518#              new format will not be able to use old git-svn without
4519#              rebuilding the .rev_db.  Rebuilding the rev_db is not
4520#              possible if noMetadata or useSvmProps are set; but should
4521#              be no problem for users that use the (sensible) defaults.
4522use strict;
4523use warnings;
4524use Carp qw/croak/;
4525use File::Path qw/mkpath/;
4526use File::Basename qw/dirname basename/;
4527use vars qw/$_minimize/;
4528
4529sub migrate_from_v0 {
4530        my $git_dir = $ENV{GIT_DIR};
4531        return undef unless -d $git_dir;
4532        my ($fh, $ctx) = command_output_pipe(qw/rev-parse --symbolic --all/);
4533        my $migrated = 0;
4534        while (<$fh>) {
4535                chomp;
4536                my ($id, $orig_ref) = ($_, $_);
4537                next unless $id =~ s#^refs/heads/(.+)-HEAD$#$1#;
4538                next unless -f "$git_dir/$id/info/url";
4539                my $new_ref = "refs/remotes/$id";
4540                if (::verify_ref("$new_ref^0")) {
4541                        print STDERR "W: $orig_ref is probably an old ",
4542                                     "branch used by an ancient version of ",
4543                                     "git-svn.\n",
4544                                     "However, $new_ref also exists.\n",
4545                                     "We will not be able ",
4546                                     "to use this branch until this ",
4547                                     "ambiguity is resolved.\n";
4548                        next;
4549                }
4550                print STDERR "Migrating from v0 layout...\n" if !$migrated;
4551                print STDERR "Renaming ref: $orig_ref => $new_ref\n";
4552                command_noisy('update-ref', $new_ref, $orig_ref);
4553                command_noisy('update-ref', '-d', $orig_ref, $orig_ref);
4554                $migrated++;
4555        }
4556        command_close_pipe($fh, $ctx);
4557        print STDERR "Done migrating from v0 layout...\n" if $migrated;
4558        $migrated;
4559}
4560
4561sub migrate_from_v1 {
4562        my $git_dir = $ENV{GIT_DIR};
4563        my $migrated = 0;
4564        return $migrated unless -d $git_dir;
4565        my $svn_dir = "$git_dir/svn";
4566
4567        # just in case somebody used 'svn' as their $id at some point...
4568        return $migrated if -d $svn_dir && ! -f "$svn_dir/info/url";
4569
4570        print STDERR "Migrating from a git-svn v1 layout...\n";
4571        mkpath([$svn_dir]);
4572        print STDERR "Data from a previous version of git-svn exists, but\n\t",
4573                     "$svn_dir\n\t(required for this version ",
4574                     "($::VERSION) of git-svn) does not. exist\n";
4575        my ($fh, $ctx) = command_output_pipe(qw/rev-parse --symbolic --all/);
4576        while (<$fh>) {
4577                my $x = $_;
4578                next unless $x =~ s#^refs/remotes/##;
4579                chomp $x;
4580                next unless -f "$git_dir/$x/info/url";
4581                my $u = eval { ::file_to_s("$git_dir/$x/info/url") };
4582                next unless $u;
4583                my $dn = dirname("$git_dir/svn/$x");
4584                mkpath([$dn]) unless -d $dn;
4585                if ($x eq 'svn') { # they used 'svn' as GIT_SVN_ID:
4586                        mkpath(["$git_dir/svn/svn"]);
4587                        print STDERR " - $git_dir/$x/info => ",
4588                                        "$git_dir/svn/$x/info\n";
4589                        rename "$git_dir/$x/info", "$git_dir/svn/$x/info" or
4590                               croak "$!: $x";
4591                        # don't worry too much about these, they probably
4592                        # don't exist with repos this old (save for index,
4593                        # and we can easily regenerate that)
4594                        foreach my $f (qw/unhandled.log index .rev_db/) {
4595                                rename "$git_dir/$x/$f", "$git_dir/svn/$x/$f";
4596                        }
4597                } else {
4598                        print STDERR " - $git_dir/$x => $git_dir/svn/$x\n";
4599                        rename "$git_dir/$x", "$git_dir/svn/$x" or
4600                               croak "$!: $x";
4601                }
4602                $migrated++;
4603        }
4604        command_close_pipe($fh, $ctx);
4605        print STDERR "Done migrating from a git-svn v1 layout\n";
4606        $migrated;
4607}
4608
4609sub read_old_urls {
4610        my ($l_map, $pfx, $path) = @_;
4611        my @dir;
4612        foreach (<$path/*>) {
4613                if (-r "$_/info/url") {
4614                        $pfx .= '/' if $pfx && $pfx !~ m!/$!;
4615                        my $ref_id = $pfx . basename $_;
4616                        my $url = ::file_to_s("$_/info/url");
4617                        $l_map->{$ref_id} = $url;
4618                } elsif (-d $_) {
4619                        push @dir, $_;
4620                }
4621        }
4622        foreach (@dir) {
4623                my $x = $_;
4624                $x =~ s!^\Q$ENV{GIT_DIR}\E/svn/!!o;
4625                read_old_urls($l_map, $x, $_);
4626        }
4627}
4628
4629sub migrate_from_v2 {
4630        my @cfg = command(qw/config -l/);
4631        return if grep /^svn-remote\..+\.url=/, @cfg;
4632        my %l_map;
4633        read_old_urls(\%l_map, '', "$ENV{GIT_DIR}/svn");
4634        my $migrated = 0;
4635
4636        foreach my $ref_id (sort keys %l_map) {
4637                eval { Git::SVN->init($l_map{$ref_id}, '', undef, $ref_id) };
4638                if ($@) {
4639                        Git::SVN->init($l_map{$ref_id}, '', $ref_id, $ref_id);
4640                }
4641                $migrated++;
4642        }
4643        $migrated;
4644}
4645
4646sub minimize_connections {
4647        my $r = Git::SVN::read_all_remotes();
4648        my $new_urls = {};
4649        my $root_repos = {};
4650        foreach my $repo_id (keys %$r) {
4651                my $url = $r->{$repo_id}->{url} or next;
4652                my $fetch = $r->{$repo_id}->{fetch} or next;
4653                my $ra = Git::SVN::Ra->new($url);
4654
4655                # skip existing cases where we already connect to the root
4656                if (($ra->{url} eq $ra->{repos_root}) ||
4657                    (Git::SVN::sanitize_remote_name($ra->{repos_root}) eq
4658                     $repo_id)) {
4659                        $root_repos->{$ra->{url}} = $repo_id;
4660                        next;
4661                }
4662
4663                my $root_ra = Git::SVN::Ra->new($ra->{repos_root});
4664                my $root_path = $ra->{url};
4665                $root_path =~ s#^\Q$ra->{repos_root}\E(/|$)##;
4666                foreach my $path (keys %$fetch) {
4667                        my $ref_id = $fetch->{$path};
4668                        my $gs = Git::SVN->new($ref_id, $repo_id, $path);
4669
4670                        # make sure we can read when connecting to
4671                        # a higher level of a repository
4672                        my ($last_rev, undef) = $gs->last_rev_commit;
4673                        if (!defined $last_rev) {
4674                                $last_rev = eval {
4675                                        $root_ra->get_latest_revnum;
4676                                };
4677                                next if $@;
4678                        }
4679                        my $new = $root_path;
4680                        $new .= length $path ? "/$path" : '';
4681                        eval {
4682                                $root_ra->get_log([$new], $last_rev, $last_rev,
4683                                                  0, 0, 1, sub { });
4684                        };
4685                        next if $@;
4686                        $new_urls->{$ra->{repos_root}}->{$new} =
4687                                { ref_id => $ref_id,
4688                                  old_repo_id => $repo_id,
4689                                  old_path => $path };
4690                }
4691        }
4692
4693        my @emptied;
4694        foreach my $url (keys %$new_urls) {
4695                # see if we can re-use an existing [svn-remote "repo_id"]
4696                # instead of creating a(n ugly) new section:
4697                my $repo_id = $root_repos->{$url} ||
4698                              Git::SVN::sanitize_remote_name($url);
4699
4700                my $fetch = $new_urls->{$url};
4701                foreach my $path (keys %$fetch) {
4702                        my $x = $fetch->{$path};
4703                        Git::SVN->init($url, $path, $repo_id, $x->{ref_id});
4704                        my $pfx = "svn-remote.$x->{old_repo_id}";
4705
4706                        my $old_fetch = quotemeta("$x->{old_path}:".
4707                                                  "refs/remotes/$x->{ref_id}");
4708                        command_noisy(qw/config --unset/,
4709                                      "$pfx.fetch", '^'. $old_fetch . '$');
4710                        delete $r->{$x->{old_repo_id}}->
4711                               {fetch}->{$x->{old_path}};
4712                        if (!keys %{$r->{$x->{old_repo_id}}->{fetch}}) {
4713                                command_noisy(qw/config --unset/,
4714                                              "$pfx.url");
4715                                push @emptied, $x->{old_repo_id}
4716                        }
4717                }
4718        }
4719        if (@emptied) {
4720                my $file = $ENV{GIT_CONFIG} || $ENV{GIT_CONFIG_LOCAL} ||
4721                           "$ENV{GIT_DIR}/config";
4722                print STDERR <<EOF;
4723The following [svn-remote] sections in your config file ($file) are empty
4724and can be safely removed:
4725EOF
4726                print STDERR "[svn-remote \"$_\"]\n" foreach @emptied;
4727        }
4728}
4729
4730sub migration_check {
4731        migrate_from_v0();
4732        migrate_from_v1();
4733        migrate_from_v2();
4734        minimize_connections() if $_minimize;
4735}
4736
4737package Git::IndexInfo;
4738use strict;
4739use warnings;
4740use Git qw/command_input_pipe command_close_pipe/;
4741
4742sub new {
4743        my ($class) = @_;
4744        my ($gui, $ctx) = command_input_pipe(qw/update-index -z --index-info/);
4745        bless { gui => $gui, ctx => $ctx, nr => 0}, $class;
4746}
4747
4748sub remove {
4749        my ($self, $path) = @_;
4750        if (print { $self->{gui} } '0 ', 0 x 40, "\t", $path, "\0") {
4751                return ++$self->{nr};
4752        }
4753        undef;
4754}
4755
4756sub update {
4757        my ($self, $mode, $hash, $path) = @_;
4758        if (print { $self->{gui} } $mode, ' ', $hash, "\t", $path, "\0") {
4759                return ++$self->{nr};
4760        }
4761        undef;
4762}
4763
4764sub DESTROY {
4765        my ($self) = @_;
4766        command_close_pipe($self->{gui}, $self->{ctx});
4767}
4768
4769package Git::SVN::GlobSpec;
4770use strict;
4771use warnings;
4772
4773sub new {
4774        my ($class, $glob) = @_;
4775        my $re = $glob;
4776        $re =~ s!/+$!!g; # no need for trailing slashes
4777        my $nr = ($re =~ s!^(.*)\*(.*)$!\(\[^/\]+\)!g);
4778        my ($left, $right) = ($1, $2);
4779        if ($nr > 1) {
4780                die "Only one '*' wildcard expansion ",
4781                    "is supported (got $nr): '$glob'\n";
4782        } elsif ($nr == 0) {
4783                die "One '*' is needed for glob: '$glob'\n";
4784        }
4785        $re = quotemeta($left) . $re . quotemeta($right);
4786        if (length $left && !($left =~ s!/+$!!g)) {
4787                die "Missing trailing '/' on left side of: '$glob' ($left)\n";
4788        }
4789        if (length $right && !($right =~ s!^/+!!g)) {
4790                die "Missing leading '/' on right side of: '$glob' ($right)\n";
4791        }
4792        my $left_re = qr/^\/\Q$left\E(\/|$)/;
4793        bless { left => $left, right => $right, left_regex => $left_re,
4794                regex => qr/$re/, glob => $glob }, $class;
4795}
4796
4797sub full_path {
4798        my ($self, $path) = @_;
4799        return (length $self->{left} ? "$self->{left}/" : '') .
4800               $path . (length $self->{right} ? "/$self->{right}" : '');
4801}
4802
4803__END__
4804
4805Data structures:
4806
4807
4808$remotes = { # returned by read_all_remotes()
4809        'svn' => {
4810                # svn-remote.svn.url=https://svn.musicpd.org
4811                url => 'https://svn.musicpd.org',
4812                # svn-remote.svn.fetch=mpd/trunk:trunk
4813                fetch => {
4814                        'mpd/trunk' => 'trunk',
4815                },
4816                # svn-remote.svn.tags=mpd/tags/*:tags/*
4817                tags => {
4818                        path => {
4819                                left => 'mpd/tags',
4820                                right => '',
4821                                regex => qr!mpd/tags/([^/]+)$!,
4822                                glob => 'tags/*',
4823                        },
4824                        ref => {
4825                                left => 'tags',
4826                                right => '',
4827                                regex => qr!tags/([^/]+)$!,
4828                                glob => 'tags/*',
4829                        },
4830                }
4831        }
4832};
4833
4834$log_entry hashref as returned by libsvn_log_entry()
4835{
4836        log => 'whitespace-formatted log entry
4837',                                              # trailing newline is preserved
4838        revision => '8',                        # integer
4839        date => '2004-02-24T17:01:44.108345Z',  # commit date
4840        author => 'committer name'
4841};
4842
4843
4844# this is generated by generate_diff();
4845@mods = array of diff-index line hashes, each element represents one line
4846        of diff-index output
4847
4848diff-index line ($m hash)
4849{
4850        mode_a => first column of diff-index output, no leading ':',
4851        mode_b => second column of diff-index output,
4852        sha1_b => sha1sum of the final blob,
4853        chg => change type [MCRADT],
4854        file_a => original file name of a file (iff chg is 'C' or 'R')
4855        file_b => new/current file name of a file (any chg)
4856}
4857;
4858
4859# retval of read_url_paths{,_all}();
4860$l_map = {
4861        # repository root url
4862        'https://svn.musicpd.org' => {
4863                # repository path               # GIT_SVN_ID
4864                'mpd/trunk'             =>      'trunk',
4865                'mpd/tags/0.11.5'       =>      'tags/0.11.5',
4866        },
4867}
4868
4869Notes:
4870        I don't trust the each() function on unless I created %hash myself
4871        because the internal iterator may not have started at base.