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