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