Andrew's git - gitweb.git/blob

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