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