PageRenderTime 68ms CodeModel.GetById 18ms RepoModel.GetById 1ms app.codeStats 2ms

/git-svn.perl

https://bitbucket.org/definitelylion/git
Perl | 6787 lines | 5997 code | 471 blank | 319 comment | 835 complexity | 87a358f677d3b1a4ea91c10ac4040b68 MD5 | raw file
Possible License(s): GPL-2.0, LGPL-2.1, BSD-2-Clause

Large files files are truncated, but you can click here to view the full file

    

  1. #!/usr/bin/env perl
    2. 

  2. # Copyright (C) 2006, Eric Wong <normalperson@yhbt.net>
    3. 

  3. # License: GPL v2 or later
    4. 

  4. use 5.008;
    5. 

  5. use warnings;
    6. 

  6. use strict;
    7. 

  7. use vars qw/	$AUTHOR $VERSION
    8. 

  8. 		$sha1 $sha1_short $_revision $_repository
    9. 

  9. 		$_q $_authors $_authors_prog %users/;
    10. 

  10. $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
    11. 

  11. $VERSION = '@@GIT_VERSION@@';
    12. 

  12. 

  13. # From which subdir have we been invoked?
    14. 

  14. my $cmd_dir_prefix = eval {
    15. 

  15. 	command_oneline([qw/rev-parse --show-prefix/], STDERR => 0)
    16. 

  16. } || '';
    17. 

  17. 

  18. my $git_dir_user_set = 1 if defined $ENV{GIT_DIR};
    19. 

  19. $ENV{GIT_DIR} ||= '.git';
    20. 

  20. $Git::SVN::default_repo_id = 'svn';
    21. 

  21. $Git::SVN::default_ref_id = $ENV{GIT_SVN_ID} || 'git-svn';
    22. 

  22. $Git::SVN::Ra::_log_window_size = 100;
    23. 

  23. $Git::SVN::_minimize_url = 'unset';
    24. 

  24. 

  25. if (! exists $ENV{SVN_SSH} && exists $ENV{GIT_SSH}) {
    26. 

  26. 	$ENV{SVN_SSH} = $ENV{GIT_SSH};
    27. 

  27. }
    28. 

  28. 

  29. if (exists $ENV{SVN_SSH} && $^O eq 'msys') {
    30. 

  30. 	$ENV{SVN_SSH} =~ s/\\/\\\\/g;
    31. 

  31. 	$ENV{SVN_SSH} =~ s/(.*)/"$1"/;
    32. 

  32. }
    33. 

  33. 

  34. $Git::SVN::Log::TZ = $ENV{TZ};
    35. 

  35. $ENV{TZ} = 'UTC';
    36. 

  36. $| = 1; # unbuffer STDOUT
    37. 

  37. 

  38. sub fatal (@) { print STDERR "@_\n"; exit 1 }
    39. 

  39. sub _req_svn {
    40. 

  40. 	require SVN::Core; # use()-ing this causes segfaults for me... *shrug*
    41. 

  41. 	require SVN::Ra;
    42. 

  42. 	require SVN::Delta;
    43. 

  43. 	if ($SVN::Core::VERSION lt '1.1.0') {
    44. 

  44. 		fatal "Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)";
    45. 

  45. 	}
    46. 

  46. }
    47. 

  47. my $can_compress = eval { require Compress::Zlib; 1};
    48. 

  48. push @Git::SVN::Ra::ISA, 'SVN::Ra';
    49. 

  49. push @SVN::Git::Editor::ISA, 'SVN::Delta::Editor';
    50. 

  50. push @SVN::Git::Fetcher::ISA, 'SVN::Delta::Editor';
    51. 

  51. use Carp qw/croak/;
    52. 

  52. use Digest::MD5;
    53. 

  53. use IO::File qw//;
    54. 

  54. use File::Basename qw/dirname basename/;
    55. 

  55. use File::Path qw/mkpath/;
    56. 

  56. use File::Spec;
    57. 

  57. use File::Find;
    58. 

  58. use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
    59. 

  59. use IPC::Open3;
    60. 

  60. use Git;
    61. 

  61. use Memoize;  # core since 5.8.0, Jul 2002
    62. 

  62. 

  63. BEGIN {
    64. 

  64. 	# import functions from Git into our packages, en masse
    65. 

  65. 	no strict 'refs';
    66. 

  66. 	foreach (qw/command command_oneline command_noisy command_output_pipe
    67. 

  67. 	            command_input_pipe command_close_pipe
    68. 

  68. 	            command_bidi_pipe command_close_bidi_pipe/) {
    69. 

  69. 		for my $package ( qw(SVN::Git::Editor SVN::Git::Fetcher
    70. 

  70. 			Git::SVN::Migration Git::SVN::Log Git::SVN),
    71. 

  71. 			__PACKAGE__) {
    72. 

  72. 			*{"${package}::$_"} = \&{"Git::$_"};
    73. 

  73. 		}
    74. 

  74. 	}
    75. 

  75. 	Memoize::memoize 'Git::config';
    76. 

  76. 	Memoize::memoize 'Git::config_bool';
    77. 

  77. }
    78. 

  78. 

  79. my ($SVN);
    80. 

  80. 

  81. $sha1 = qr/[a-f\d]{40}/;
    82. 

  82. $sha1_short = qr/[a-f\d]{4,40}/;
    83. 

  83. my ($_stdin, $_help, $_edit,
    84. 

  84. 	$_message, $_file, $_branch_dest,
    85. 

  85. 	$_template, $_shared,
    86. 

  86. 	$_version, $_fetch_all, $_no_rebase, $_fetch_parent,
    87. 

  87. 	$_merge, $_strategy, $_dry_run, $_local,
    88. 

  88. 	$_prefix, $_no_checkout, $_url, $_verbose,
    89. 

  89. 	$_git_format, $_commit_url, $_tag, $_merge_info, $_interactive);
    90. 

  90. $Git::SVN::_follow_parent = 1;
    91. 

  91. $SVN::Git::Fetcher::_placeholder_filename = ".gitignore";
    92. 

  92. $_q ||= 0;
    93. 

  93. my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
    94. 

  94.                     'config-dir=s' => \$Git::SVN::Ra::config_dir,
    95. 

  95.                     'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache,
    96. 

  96.                     'ignore-paths=s' => \$SVN::Git::Fetcher::_ignore_regex,
    97. 

  97.                     'ignore-refs=s' => \$Git::SVN::Ra::_ignore_refs_regex );
    98. 

  98. my %fc_opts = ( 'follow-parent|follow!' => \$Git::SVN::_follow_parent,
    99. 

  99. 		'authors-file|A=s' => \$_authors,
    100. 

  100. 		'authors-prog=s' => \$_authors_prog,
    101. 

  101. 		'repack:i' => \$Git::SVN::_repack,
    102. 

  102. 		'noMetadata' => \$Git::SVN::_no_metadata,
    103. 

  103. 		'useSvmProps' => \$Git::SVN::_use_svm_props,
    104. 

  104. 		'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props,
    105. 

  105. 		'log-window-size=i' => \$Git::SVN::Ra::_log_window_size,
    106. 

  106. 		'no-checkout' => \$_no_checkout,
    107. 

  107. 		'quiet|q+' => \$_q,
    108. 

  108. 		'repack-flags|repack-args|repack-opts=s' =>
    109. 

  109. 		   \$Git::SVN::_repack_flags,
    110. 

  110. 		'use-log-author' => \$Git::SVN::_use_log_author,
    111. 

  111. 		'add-author-from' => \$Git::SVN::_add_author_from,
    112. 

  112. 		'localtime' => \$Git::SVN::_localtime,
    113. 

  113. 		%remote_opts );
    114. 

  114. 

  115. my ($_trunk, @_tags, @_branches, $_stdlayout);
    116. 

  116. my %icv;
    117. 

  117. my %init_opts = ( 'template=s' => \$_template, 'shared:s' => \$_shared,
    118. 

  118.                   'trunk|T=s' => \$_trunk, 'tags|t=s@' => \@_tags,
    119. 

  119.                   'branches|b=s@' => \@_branches, 'prefix=s' => \$_prefix,
    120. 

  120.                   'stdlayout|s' => \$_stdlayout,
    121. 

  121.                   'minimize-url|m!' => \$Git::SVN::_minimize_url,
    122. 

  122. 		  'no-metadata' => sub { $icv{noMetadata} = 1 },
    123. 

  123. 		  'use-svm-props' => sub { $icv{useSvmProps} = 1 },
    124. 

  124. 		  'use-svnsync-props' => sub { $icv{useSvnsyncProps} = 1 },
    125. 

  125. 		  'rewrite-root=s' => sub { $icv{rewriteRoot} = $_[1] },
    126. 

  126. 		  'rewrite-uuid=s' => sub { $icv{rewriteUUID} = $_[1] },
    127. 

  127.                   %remote_opts );
    128. 

  128. my %cmt_opts = ( 'edit|e' => \$_edit,
    129. 

  129. 		'rmdir' => \$SVN::Git::Editor::_rmdir,
    130. 

  130. 		'find-copies-harder' => \$SVN::Git::Editor::_find_copies_harder,
    131. 

  131. 		'l=i' => \$SVN::Git::Editor::_rename_limit,
    132. 

  132. 		'copy-similarity|C=i'=> \$SVN::Git::Editor::_cp_similarity
    133. 

  133. );
    134. 

  134. 

  135. my %cmd = (
    136. 

  136. 	fetch => [ \&cmd_fetch, "Download new revisions from SVN",
    137. 

  137. 			{ 'revision|r=s' => \$_revision,
    138. 

  138. 			  'fetch-all|all' => \$_fetch_all,
    139. 

  139. 			  'parent|p' => \$_fetch_parent,
    140. 

  140. 			   %fc_opts } ],
    141. 

  141. 	clone => [ \&cmd_clone, "Initialize and fetch revisions",
    142. 

  142. 			{ 'revision|r=s' => \$_revision,
    143. 

  143. 			  'preserve-empty-dirs' =>
    144. 

  144. 				\$SVN::Git::Fetcher::_preserve_empty_dirs,
    145. 

  145. 			  'placeholder-filename=s' =>
    146. 

  146. 				\$SVN::Git::Fetcher::_placeholder_filename,
    147. 

  147. 			   %fc_opts, %init_opts } ],
    148. 

  148. 	init => [ \&cmd_init, "Initialize a repo for tracking" .
    149. 

  149. 			  " (requires URL argument)",
    150. 

  150. 			  \%init_opts ],
    151. 

  151. 	'multi-init' => [ \&cmd_multi_init,
    152. 

  152. 	                  "Deprecated alias for ".
    153. 

  153. 			  "'$0 init -T<trunk> -b<branches> -t<tags>'",
    154. 

  154. 			  \%init_opts ],
    155. 

  155. 	dcommit => [ \&cmd_dcommit,
    156. 

  156. 	             'Commit several diffs to merge with upstream',
    157. 

  157. 			{ 'merge|m|M' => \$_merge,
    158. 

  158. 			  'strategy|s=s' => \$_strategy,
    159. 

  159. 			  'verbose|v' => \$_verbose,
    160. 

  160. 			  'dry-run|n' => \$_dry_run,
    161. 

  161. 			  'fetch-all|all' => \$_fetch_all,
    162. 

  162. 			  'commit-url=s' => \$_commit_url,
    163. 

  163. 			  'revision|r=i' => \$_revision,
    164. 

  164. 			  'no-rebase' => \$_no_rebase,
    165. 

  165. 			  'mergeinfo=s' => \$_merge_info,
    166. 

  166. 			  'interactive|i' => \$_interactive,
    167. 

  167. 			%cmt_opts, %fc_opts } ],
    168. 

  168. 	branch => [ \&cmd_branch,
    169. 

  169. 	            'Create a branch in the SVN repository',
    170. 

  170. 	            { 'message|m=s' => \$_message,
    171. 

  171. 	              'destination|d=s' => \$_branch_dest,
    172. 

  172. 	              'dry-run|n' => \$_dry_run,
    173. 

  173. 	              'tag|t' => \$_tag,
    174. 

  174. 	              'username=s' => \$Git::SVN::Prompt::_username,
    175. 

  175. 	              'commit-url=s' => \$_commit_url } ],
    176. 

  176. 	tag => [ sub { $_tag = 1; cmd_branch(@_) },
    177. 

  177. 	         'Create a tag in the SVN repository',
    178. 

  178. 	         { 'message|m=s' => \$_message,
    179. 

  179. 	           'destination|d=s' => \$_branch_dest,
    180. 

  180. 	           'dry-run|n' => \$_dry_run,
    181. 

  181. 	           'username=s' => \$Git::SVN::Prompt::_username,
    182. 

  182. 	           'commit-url=s' => \$_commit_url } ],
    183. 

  183. 	'set-tree' => [ \&cmd_set_tree,
    184. 

  184. 	                "Set an SVN repository to a git tree-ish",
    185. 

  185. 			{ 'stdin' => \$_stdin, %cmt_opts, %fc_opts, } ],
    186. 

  186. 	'create-ignore' => [ \&cmd_create_ignore,
    187. 

  187. 			     'Create a .gitignore per svn:ignore',
    188. 

  188. 			     { 'revision|r=i' => \$_revision
    189. 

  189. 			     } ],
    190. 

  190. 	'mkdirs' => [ \&cmd_mkdirs ,
    191. 

  191. 	              "recreate empty directories after a checkout",
    192. 

  192. 	              { 'revision|r=i' => \$_revision } ],
    193. 

  193.         'propget' => [ \&cmd_propget,
    194. 

  194. 		       'Print the value of a property on a file or directory',
    195. 

  195. 		       { 'revision|r=i' => \$_revision } ],
    196. 

  196.         'proplist' => [ \&cmd_proplist,
    197. 

  197. 		       'List all properties of a file or directory',
    198. 

  198. 		       { 'revision|r=i' => \$_revision } ],
    199. 

  199. 	'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings",
    200. 

  200. 			{ 'revision|r=i' => \$_revision
    201. 

  201. 			} ],
    202. 

  202. 	'show-externals' => [ \&cmd_show_externals, "Show svn:externals listings",
    203. 

  203. 			{ 'revision|r=i' => \$_revision
    204. 

  204. 			} ],
    205. 

  205. 	'multi-fetch' => [ \&cmd_multi_fetch,
    206. 

  206. 	                   "Deprecated alias for $0 fetch --all",
    207. 

  207. 			   { 'revision|r=s' => \$_revision, %fc_opts } ],
    208. 

  208. 	'migrate' => [ sub { },
    209. 

  209. 	               # no-op, we automatically run this anyways,
    210. 

  210. 	               'Migrate configuration/metadata/layout from
    211. 

  211. 		        previous versions of git-svn',
    212. 

  212.                        { 'minimize' => \$Git::SVN::Migration::_minimize,
    213. 

  213. 			 %remote_opts } ],
    214. 

  214. 	'log' => [ \&Git::SVN::Log::cmd_show_log, 'Show commit logs',
    215. 

  215. 			{ 'limit=i' => \$Git::SVN::Log::limit,
    216. 

  216. 			  'revision|r=s' => \$_revision,
    217. 

  217. 			  'verbose|v' => \$Git::SVN::Log::verbose,
    218. 

  218. 			  'incremental' => \$Git::SVN::Log::incremental,
    219. 

  219. 			  'oneline' => \$Git::SVN::Log::oneline,
    220. 

  220. 			  'show-commit' => \$Git::SVN::Log::show_commit,
    221. 

  221. 			  'non-recursive' => \$Git::SVN::Log::non_recursive,
    222. 

  222. 			  'authors-file|A=s' => \$_authors,
    223. 

  223. 			  'color' => \$Git::SVN::Log::color,
    224. 

  224. 			  'pager=s' => \$Git::SVN::Log::pager
    225. 

  225. 			} ],
    226. 

  226. 	'find-rev' => [ \&cmd_find_rev,
    227. 

  227. 	                "Translate between SVN revision numbers and tree-ish",
    228. 

  228. 			{} ],
    229. 

  229. 	'rebase' => [ \&cmd_rebase, "Fetch and rebase your working directory",
    230. 

  230. 			{ 'merge|m|M' => \$_merge,
    231. 

  231. 			  'verbose|v' => \$_verbose,
    232. 

  232. 			  'strategy|s=s' => \$_strategy,
    233. 

  233. 			  'local|l' => \$_local,
    234. 

  234. 			  'fetch-all|all' => \$_fetch_all,
    235. 

  235. 			  'dry-run|n' => \$_dry_run,
    236. 

  236. 			  %fc_opts } ],
    237. 

  237. 	'commit-diff' => [ \&cmd_commit_diff,
    238. 

  238. 	                   'Commit a diff between two trees',
    239. 

  239. 			{ 'message|m=s' => \$_message,
    240. 

  240. 			  'file|F=s' => \$_file,
    241. 

  241. 			  'revision|r=s' => \$_revision,
    242. 

  242. 			%cmt_opts } ],
    243. 

  243. 	'info' => [ \&cmd_info,
    244. 

  244. 		    "Show info about the latest SVN revision
    245. 

  245. 		     on the current branch",
    246. 

  246. 		    { 'url' => \$_url, } ],
    247. 

  247. 	'blame' => [ \&Git::SVN::Log::cmd_blame,
    248. 

  248. 	            "Show what revision and author last modified each line of a file",
    249. 

  249. 		    { 'git-format' => \$_git_format } ],
    250. 

  250. 	'reset' => [ \&cmd_reset,
    251. 

  251. 		     "Undo fetches back to the specified SVN revision",
    252. 

  252. 		     { 'revision|r=s' => \$_revision,
    253. 

  253. 		       'parent|p' => \$_fetch_parent } ],
    254. 

  254. 	'gc' => [ \&cmd_gc,
    255. 

  255. 		  "Compress unhandled.log files in .git/svn and remove " .
    256. 

  256. 		  "index files in .git/svn",
    257. 

  257. 		{} ],
    258. 

  258. );
    259. 

  259. 

  260. use Term::ReadLine;
    261. 

  261. package FakeTerm;
    262. 

  262. sub new {
    263. 

  263. 	my ($class, $reason) = @_;
    264. 

  264. 	return bless \$reason, shift;
    265. 

  265. }
    266. 

  266. sub readline {
    267. 

  267. 	my $self = shift;
    268. 

  268. 	die "Cannot use readline on FakeTerm: $$self";
    269. 

  269. }
    270. 

  270. package main;
    271. 

  271. 

  272. my $term = eval {
    273. 

  273. 	$ENV{"GIT_SVN_NOTTY"}
    274. 

  274. 		? new Term::ReadLine 'git-svn', \*STDIN, \*STDOUT
    275. 

  275. 		: new Term::ReadLine 'git-svn';
    276. 

  276. };
    277. 

  277. if ($@) {
    278. 

  278. 	$term = new FakeTerm "$@: going non-interactive";
    279. 

  279. }
    280. 

  280. 

  281. my $cmd;
    282. 

  282. for (my $i = 0; $i < @ARGV; $i++) {
    283. 

  283. 	if (defined $cmd{$ARGV[$i]}) {
    284. 

  284. 		$cmd = $ARGV[$i];
    285. 

  285. 		splice @ARGV, $i, 1;
    286. 

  286. 		last;
    287. 

  287. 	} elsif ($ARGV[$i] eq 'help') {
    288. 

  288. 		$cmd = $ARGV[$i+1];
    289. 

  289. 		usage(0);
    290. 

  290. 	}
    291. 

  291. };
    292. 

  292. 

  293. # make sure we're always running at the top-level working directory
    294. 

  294. unless ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
    295. 

  295. 	unless (-d $ENV{GIT_DIR}) {
    296. 

  296. 		if ($git_dir_user_set) {
    297. 

  297. 			die "GIT_DIR=$ENV{GIT_DIR} explicitly set, ",
    298. 

  298. 			    "but it is not a directory\n";
    299. 

  299. 		}
    300. 

  300. 		my $git_dir = delete $ENV{GIT_DIR};
    301. 

  301. 		my $cdup = undef;
    302. 

  302. 		git_cmd_try {
    303. 

  303. 			$cdup = command_oneline(qw/rev-parse --show-cdup/);
    304. 

  304. 			$git_dir = '.' unless ($cdup);
    305. 

  305. 			chomp $cdup if ($cdup);
    306. 

  306. 			$cdup = "." unless ($cdup && length $cdup);
    307. 

  307. 		} "Already at toplevel, but $git_dir not found\n";
    308. 

  308. 		chdir $cdup or die "Unable to chdir up to '$cdup'\n";
    309. 

  309. 		unless (-d $git_dir) {
    310. 

  310. 			die "$git_dir still not found after going to ",
    311. 

  311. 			    "'$cdup'\n";
    312. 

  312. 		}
    313. 

  313. 		$ENV{GIT_DIR} = $git_dir;
    314. 

  314. 	}
    315. 

  315. 	$_repository = Git->repository(Repository => $ENV{GIT_DIR});
    316. 

  316. }
    317. 

  317. 

  318. my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
    319. 

  319. 

  320. read_git_config(\%opts);
    321. 

  321. if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) {
    322. 

  322. 	Getopt::Long::Configure('pass_through');
    323. 

  323. }
    324. 

  324. my $rv = GetOptions(%opts, 'h|H' => \$_help, 'version|V' => \$_version,
    325. 

  325.                     'minimize-connections' => \$Git::SVN::Migration::_minimize,
    326. 

  326.                     'id|i=s' => \$Git::SVN::default_ref_id,
    327. 

  327.                     'svn-remote|remote|R=s' => sub {
    328. 

  328.                        $Git::SVN::no_reuse_existing = 1;
    329. 

  329.                        $Git::SVN::default_repo_id = $_[1] });
    330. 

  330. exit 1 if (!$rv && $cmd && $cmd ne 'log');
    331. 

  331. 

  332. usage(0) if $_help;
    333. 

  333. version() if $_version;
    334. 

  334. usage(1) unless defined $cmd;
    335. 

  335. load_authors() if $_authors;
    336. 

  336. if (defined $_authors_prog) {
    337. 

  337. 	$_authors_prog = "'" . File::Spec->rel2abs($_authors_prog) . "'";
    338. 

  338. }
    339. 

  339. 

  340. unless ($cmd =~ /^(?:clone|init|multi-init|commit-diff)$/) {
    341. 

  341. 	Git::SVN::Migration::migration_check();
    342. 

  342. }
    343. 

  343. Git::SVN::init_vars();
    344. 

  344. eval {
    345. 

  345. 	Git::SVN::verify_remotes_sanity();
    346. 

  346. 	$cmd{$cmd}->[0]->(@ARGV);
    347. 

  347. };
    348. 

  348. fatal $@ if $@;
    349. 

  349. post_fetch_checkout();
    350. 

  350. exit 0;
    351. 

  351. 

  352. ####################### primary functions ######################
    353. 

  353. sub usage {
    354. 

  354. 	my $exit = shift || 0;
    355. 

  355. 	my $fd = $exit ? \*STDERR : \*STDOUT;
    356. 

  356. 	print $fd <<"";
    357. 

  357. git-svn - bidirectional operations between a single Subversion tree and git
    358. 

  358. Usage: git svn <command> [options] [arguments]\n
    359. 

  359. 

  360. 	print $fd "Available commands:\n" unless $cmd;
    361. 

  361. 

  362. 	foreach (sort keys %cmd) {
    363. 

  363. 		next if $cmd && $cmd ne $_;
    364. 

  364. 		next if /^multi-/; # don't show deprecated commands
    365. 

  365. 		print $fd '  ',pack('A17',$_),$cmd{$_}->[1],"\n";
    366. 

  366. 		foreach (sort keys %{$cmd{$_}->[2]}) {
    367. 

  367. 			# mixed-case options are for .git/config only
    368. 

  368. 			next if /[A-Z]/ && /^[a-z]+$/i;
    369. 

  369. 			# prints out arguments as they should be passed:
    370. 

  370. 			my $x = s#[:=]s$## ? '<arg>' : s#[:=]i$## ? '<num>' : '';
    371. 

  371. 			print $fd ' ' x 21, join(', ', map { length $_ > 1 ?
    372. 

  372. 							"--$_" : "-$_" }
    373. 

  373. 						split /\|/,$_)," $x\n";
    374. 

  374. 		}
    375. 

  375. 	}
    376. 

  376. 	print $fd <<"";
    377. 

  377. \nGIT_SVN_ID may be set in the environment or via the --id/-i switch to an
    378. 

  378. arbitrary identifier if you're tracking multiple SVN branches/repositories in
    379. 

  379. one git repository and want to keep them separate.  See git-svn(1) for more
    380. 

  380. information.
    381. 

  381. 

  382. 	exit $exit;
    383. 

  383. }
    384. 

  384. 

  385. sub version {
    386. 

  386. 	::_req_svn();
    387. 

  387. 	print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n";
    388. 

  388. 	exit 0;
    389. 

  389. }
    390. 

  390. 

  391. sub ask {
    392. 

  392. 	my ($prompt, %arg) = @_;
    393. 

  393. 	my $valid_re = $arg{valid_re};
    394. 

  394. 	my $default = $arg{default};
    395. 

  395. 	my $resp;
    396. 

  396. 	my $i = 0;
    397. 

  397. 

  398. 	if ( !( defined($term->IN)
    399. 

  399.             && defined( fileno($term->IN) )
    400. 

  400.             && defined( $term->OUT )
    401. 

  401.             && defined( fileno($term->OUT) ) ) ){
    402. 

  402. 		return defined($default) ? $default : undef;
    403. 

  403. 	}
    404. 

  404. 

  405. 	while ($i++ < 10) {
    406. 

  406. 		$resp = $term->readline($prompt);
    407. 

  407. 		if (!defined $resp) { # EOF
    408. 

  408. 			print "\n";
    409. 

  409. 			return defined $default ? $default : undef;
    410. 

  410. 		}
    411. 

  411. 		if ($resp eq '' and defined $default) {
    412. 

  412. 			return $default;
    413. 

  413. 		}
    414. 

  414. 		if (!defined $valid_re or $resp =~ /$valid_re/) {
    415. 

  415. 			return $resp;
    416. 

  416. 		}
    417. 

  417. 	}
    418. 

  418. 	return undef;
    419. 

  419. }
    420. 

  420. 

  421. sub do_git_init_db {
    422. 

  422. 	unless (-d $ENV{GIT_DIR}) {
    423. 

  423. 		my @init_db = ('init');
    424. 

  424. 		push @init_db, "--template=$_template" if defined $_template;
    425. 

  425. 		if (defined $_shared) {
    426. 

  426. 			if ($_shared =~ /[a-z]/) {
    427. 

  427. 				push @init_db, "--shared=$_shared";
    428. 

  428. 			} else {
    429. 

  429. 				push @init_db, "--shared";
    430. 

  430. 			}
    431. 

  431. 		}
    432. 

  432. 		command_noisy(@init_db);
    433. 

  433. 		$_repository = Git->repository(Repository => ".git");
    434. 

  434. 	}
    435. 

  435. 	my $set;
    436. 

  436. 	my $pfx = "svn-remote.$Git::SVN::default_repo_id";
    437. 

  437. 	foreach my $i (keys %icv) {
    438. 

  438. 		die "'$set' and '$i' cannot both be set\n" if $set;
    439. 

  439. 		next unless defined $icv{$i};
    440. 

  440. 		command_noisy('config', "$pfx.$i", $icv{$i});
    441. 

  441. 		$set = $i;
    442. 

  442. 	}
    443. 

  443. 	my $ignore_paths_regex = \$SVN::Git::Fetcher::_ignore_regex;
    444. 

  444. 	command_noisy('config', "$pfx.ignore-paths", $$ignore_paths_regex)
    445. 

  445. 		if defined $$ignore_paths_regex;
    446. 

  446. 	my $ignore_refs_regex = \$Git::SVN::Ra::_ignore_refs_regex;
    447. 

  447. 	command_noisy('config', "$pfx.ignore-refs", $$ignore_refs_regex)
    448. 

  448. 		if defined $$ignore_refs_regex;
    449. 

  449. 

  450. 	if (defined $SVN::Git::Fetcher::_preserve_empty_dirs) {
    451. 

  451. 		my $fname = \$SVN::Git::Fetcher::_placeholder_filename;
    452. 

  452. 		command_noisy('config', "$pfx.preserve-empty-dirs", 'true');
    453. 

  453. 		command_noisy('config', "$pfx.placeholder-filename", $$fname);
    454. 

  454. 	}
    455. 

  455. }
    456. 

  456. 

  457. sub init_subdir {
    458. 

  458. 	my $repo_path = shift or return;
    459. 

  459. 	mkpath([$repo_path]) unless -d $repo_path;
    460. 

  460. 	chdir $repo_path or die "Couldn't chdir to $repo_path: $!\n";
    461. 

  461. 	$ENV{GIT_DIR} = '.git';
    462. 

  462. 	$_repository = Git->repository(Repository => $ENV{GIT_DIR});
    463. 

  463. }
    464. 

  464. 

  465. sub cmd_clone {
    466. 

  466. 	my ($url, $path) = @_;
    467. 

  467. 	if (!defined $path &&
    468. 

  468. 	    (defined $_trunk || @_branches || @_tags ||
    469. 

  469. 	     defined $_stdlayout) &&
    470. 

  470. 	    $url !~ m#^[a-z\+]+://#) {
    471. 

  471. 		$path = $url;
    472. 

  472. 	}
    473. 

  473. 	$path = basename($url) if !defined $path || !length $path;
    474. 

  474. 	my $authors_absolute = $_authors ? File::Spec->rel2abs($_authors) : "";
    475. 

  475. 	cmd_init($url, $path);
    476. 

  476. 	command_oneline('config', 'svn.authorsfile', $authors_absolute)
    477. 

  477. 	    if $_authors;
    478. 

  478. 	Git::SVN::fetch_all($Git::SVN::default_repo_id);
    479. 

  479. }
    480. 

  480. 

  481. sub cmd_init {
    482. 

  482. 	if (defined $_stdlayout) {
    483. 

  483. 		$_trunk = 'trunk' if (!defined $_trunk);
    484. 

  484. 		@_tags = 'tags' if (! @_tags);
    485. 

  485. 		@_branches = 'branches' if (! @_branches);
    486. 

  486. 	}
    487. 

  487. 	if (defined $_trunk || @_branches || @_tags) {
    488. 

  488. 		return cmd_multi_init(@_);
    489. 

  489. 	}
    490. 

  490. 	my $url = shift or die "SVN repository location required ",
    491. 

  491. 	                       "as a command-line argument\n";
    492. 

  492. 	$url = canonicalize_url($url);
    493. 

  493. 	init_subdir(@_);
    494. 

  494. 	do_git_init_db();
    495. 

  495. 

  496. 	if ($Git::SVN::_minimize_url eq 'unset') {
    497. 

  497. 		$Git::SVN::_minimize_url = 0;
    498. 

  498. 	}
    499. 

  499. 

  500. 	Git::SVN->init($url);
    501. 

  501. }
    502. 

  502. 

  503. sub cmd_fetch {
    504. 

  504. 	if (grep /^\d+=./, @_) {
    505. 

  505. 		die "'<rev>=<commit>' fetch arguments are ",
    506. 

  506. 		    "no longer supported.\n";
    507. 

  507. 	}
    508. 

  508. 	my ($remote) = @_;
    509. 

  509. 	if (@_ > 1) {
    510. 

  510. 		die "Usage: $0 fetch [--all] [--parent] [svn-remote]\n";
    511. 

  511. 	}
    512. 

  512. 	$Git::SVN::no_reuse_existing = undef;
    513. 

  513. 	if ($_fetch_parent) {
    514. 

  514. 		my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
    515. 

  515. 		unless ($gs) {
    516. 

  516. 			die "Unable to determine upstream SVN information from ",
    517. 

  517. 			    "working tree history\n";
    518. 

  518. 		}
    519. 

  519. 	        # just fetch, don't checkout.
    520. 

  520. 		$_no_checkout = 'true';
    521. 

  521. 		$_fetch_all ? $gs->fetch_all : $gs->fetch;
    522. 

  522. 	} elsif ($_fetch_all) {
    523. 

  523. 		cmd_multi_fetch();
    524. 

  524. 	} else {
    525. 

  525. 		$remote ||= $Git::SVN::default_repo_id;
    526. 

  526. 		Git::SVN::fetch_all($remote, Git::SVN::read_all_remotes());
    527. 

  527. 	}
    528. 

  528. }
    529. 

  529. 

  530. sub cmd_set_tree {
    531. 

  531. 	my (@commits) = @_;
    532. 

  532. 	if ($_stdin || !@commits) {
    533. 

  533. 		print "Reading from stdin...\n";
    534. 

  534. 		@commits = ();
    535. 

  535. 		while (<STDIN>) {
    536. 

  536. 			if (/\b($sha1_short)\b/o) {
    537. 

  537. 				unshift @commits, $1;
    538. 

  538. 			}
    539. 

  539. 		}
    540. 

  540. 	}
    541. 

  541. 	my @revs;
    542. 

  542. 	foreach my $c (@commits) {
    543. 

  543. 		my @tmp = command('rev-parse',$c);
    544. 

  544. 		if (scalar @tmp == 1) {
    545. 

  545. 			push @revs, $tmp[0];
    546. 

  546. 		} elsif (scalar @tmp > 1) {
    547. 

  547. 			push @revs, reverse(command('rev-list',@tmp));
    548. 

  548. 		} else {
    549. 

  549. 			fatal "Failed to rev-parse $c";
    550. 

  550. 		}
    551. 

  551. 	}
    552. 

  552. 	my $gs = Git::SVN->new;
    553. 

  553. 	my ($r_last, $cmt_last) = $gs->last_rev_commit;
    554. 

  554. 	$gs->fetch;
    555. 

  555. 	if (defined $gs->{last_rev} && $r_last != $gs->{last_rev}) {
    556. 

  556. 		fatal "There are new revisions that were fetched ",
    557. 

  557. 		      "and need to be merged (or acknowledged) ",
    558. 

  558. 		      "before committing.\nlast rev: $r_last\n",
    559. 

  559. 		      " current: $gs->{last_rev}";
    560. 

  560. 	}
    561. 

  561. 	$gs->set_tree($_) foreach @revs;
    562. 

  562. 	print "Done committing ",scalar @revs," revisions to SVN\n";
    563. 

  563. 	unlink $gs->{index};
    564. 

  564. }
    565. 

  565. 

  566. sub split_merge_info_range {
    567. 

  567. 	my ($range) = @_;
    568. 

  568. 	if ($range =~ /(\d+)-(\d+)/) {
    569. 

  569. 		return (int($1), int($2));
    570. 

  570. 	} else {
    571. 

  571. 		return (int($range), int($range));
    572. 

  572. 	}
    573. 

  573. }
    574. 

  574. 

  575. sub combine_ranges {
    576. 

  576. 	my ($in) = @_;
    577. 

  577. 

  578. 	my @fnums = ();
    579. 

  579. 	my @arr = split(/,/, $in);
    580. 

  580. 	for my $element (@arr) {
    581. 

  581. 		my ($start, $end) = split_merge_info_range($element);
    582. 

  582. 		push @fnums, $start;
    583. 

  583. 	}
    584. 

  584. 

  585. 	my @sorted = @arr [ sort {
    586. 

  586. 		$fnums[$a] <=> $fnums[$b]
    587. 

  587. 	} 0..$#arr ];
    588. 

  588. 

  589. 	my @return = ();
    590. 

  590. 	my $last = -1;
    591. 

  591. 	my $first = -1;
    592. 

  592. 	for my $element (@sorted) {
    593. 

  593. 		my ($start, $end) = split_merge_info_range($element);
    594. 

  594. 

  595. 		if ($last == -1) {
    596. 

  596. 			$first = $start;
    597. 

  597. 			$last = $end;
    598. 

  598. 			next;
    599. 

  599. 		}
    600. 

  600. 		if ($start <= $last+1) {
    601. 

  601. 			if ($end > $last) {
    602. 

  602. 				$last = $end;
    603. 

  603. 			}
    604. 

  604. 			next;
    605. 

  605. 		}
    606. 

  606. 		if ($first == $last) {
    607. 

  607. 			push @return, "$first";
    608. 

  608. 		} else {
    609. 

  609. 			push @return, "$first-$last";
    610. 

  610. 		}
    611. 

  611. 		$first = $start;
    612. 

  612. 		$last = $end;
    613. 

  613. 	}
    614. 

  614. 

  615. 	if ($first != -1) {
    616. 

  616. 		if ($first == $last) {
    617. 

  617. 			push @return, "$first";
    618. 

  618. 		} else {
    619. 

  619. 			push @return, "$first-$last";
    620. 

  620. 		}
    621. 

  621. 	}
    622. 

  622. 

  623. 	return join(',', @return);
    624. 

  624. }
    625. 

  625. 

  626. sub merge_revs_into_hash {
    627. 

  627. 	my ($hash, $minfo) = @_;
    628. 

  628. 	my @lines = split(' ', $minfo);
    629. 

  629. 

  630. 	for my $line (@lines) {
    631. 

  631. 		my ($branchpath, $revs) = split(/:/, $line);
    632. 

  632. 

  633. 		if (exists($hash->{$branchpath})) {
    634. 

  634. 			# Merge the two revision sets
    635. 

  635. 			my $combined = "$hash->{$branchpath},$revs";
    636. 

  636. 			$hash->{$branchpath} = combine_ranges($combined);
    637. 

  637. 		} else {
    638. 

  638. 			# Just do range combining for consolidation
    639. 

  639. 			$hash->{$branchpath} = combine_ranges($revs);
    640. 

  640. 		}
    641. 

  641. 	}
    642. 

  642. }
    643. 

  643. 

  644. sub merge_merge_info {
    645. 

  645. 	my ($mergeinfo_one, $mergeinfo_two) = @_;
    646. 

  646. 	my %result_hash = ();
    647. 

  647. 

  648. 	merge_revs_into_hash(\%result_hash, $mergeinfo_one);
    649. 

  649. 	merge_revs_into_hash(\%result_hash, $mergeinfo_two);
    650. 

  650. 

  651. 	my $result = '';
    652. 

  652. 	# Sort below is for consistency's sake
    653. 

  653. 	for my $branchname (sort keys(%result_hash)) {
    654. 

  654. 		my $revlist = $result_hash{$branchname};
    655. 

  655. 		$result .= "$branchname:$revlist\n"
    656. 

  656. 	}
    657. 

  657. 	return $result;
    658. 

  658. }
    659. 

  659. 

  660. sub populate_merge_info {
    661. 

  661. 	my ($d, $gs, $uuid, $linear_refs, $rewritten_parent) = @_;
    662. 

  662. 

  663. 	my %parentshash;
    664. 

  664. 	read_commit_parents(\%parentshash, $d);
    665. 

  665. 	my @parents = @{$parentshash{$d}};
    666. 

  666. 	if ($#parents > 0) {
    667. 

  667. 		# Merge commit
    668. 

  668. 		my $all_parents_ok = 1;
    669. 

  669. 		my $aggregate_mergeinfo = '';
    670. 

  670. 		my $rooturl = $gs->repos_root;
    671. 

  671. 

  672. 		if (defined($rewritten_parent)) {
    673. 

  673. 			# Replace first parent with newly-rewritten version
    674. 

  674. 			shift @parents;
    675. 

  675. 			unshift @parents, $rewritten_parent;
    676. 

  676. 		}
    677. 

  677. 

  678. 		foreach my $parent (@parents) {
    679. 

  679. 			my ($branchurl, $svnrev, $paruuid) =
    680. 

  680. 				cmt_metadata($parent);
    681. 

  681. 

  682. 			unless (defined($svnrev)) {
    683. 

  683. 				# Should have been caught be preflight check
    684. 

  684. 				fatal "merge commit $d has ancestor $parent, but that change "
    685. 

  685.                      ."does not have git-svn metadata!";
    686. 

  686. 			}
    687. 

  687. 			unless ($branchurl =~ /^\Q$rooturl\E(.*)/) {
    688. 

  688. 				fatal "commit $parent git-svn metadata changed mid-run!";
    689. 

  689. 			}
    690. 

  690. 			my $branchpath = $1;
    691. 

  691. 

  692. 			my $ra = Git::SVN::Ra->new($branchurl);
    693. 

  693. 			my (undef, undef, $props) =
    694. 

  694. 				$ra->get_dir(canonicalize_path("."), $svnrev);
    695. 

  695. 			my $par_mergeinfo = $props->{'svn:mergeinfo'};
    696. 

  696. 			unless (defined $par_mergeinfo) {
    697. 

  697. 				$par_mergeinfo = '';
    698. 

  698. 			}
    699. 

  699. 			# Merge previous mergeinfo values
    700. 

  700. 			$aggregate_mergeinfo =
    701. 

  701. 				merge_merge_info($aggregate_mergeinfo,
    702. 

  702. 								 $par_mergeinfo, 0);
    703. 

  703. 

  704. 			next if $parent eq $parents[0]; # Skip first parent
    705. 

  705. 			# Add new changes being placed in tree by merge
    706. 

  706. 			my @cmd = (qw/rev-list --reverse/,
    707. 

  707. 					   $parent, qw/--not/);
    708. 

  708. 			foreach my $par (@parents) {
    709. 

  709. 				unless ($par eq $parent) {
    710. 

  710. 					push @cmd, $par;
    711. 

  711. 				}
    712. 

  712. 			}
    713. 

  713. 			my @revsin = ();
    714. 

  714. 			my ($revlist, $ctx) = command_output_pipe(@cmd);
    715. 

  715. 			while (<$revlist>) {
    716. 

  716. 				my $irev = $_;
    717. 

  717. 				chomp $irev;
    718. 

  718. 				my (undef, $csvnrev, undef) =
    719. 

  719. 					cmt_metadata($irev);
    720. 

  720. 				unless (defined $csvnrev) {
    721. 

  721. 					# A child is missing SVN annotations...
    722. 

  722. 					# this might be OK, or might not be.
    723. 

  723. 					warn "W:child $irev is merged into revision "
    724. 

  724. 						 ."$d but does not have git-svn metadata. "
    725. 

  725. 						 ."This means git-svn cannot determine the "
    726. 

  726. 						 ."svn revision numbers to place into the "
    727. 

  727. 						 ."svn:mergeinfo property. You must ensure "
    728. 

  728. 						 ."a branch is entirely committed to "
    729. 

  729. 						 ."SVN before merging it in order for "
    730. 

  730. 						 ."svn:mergeinfo population to function "
    731. 

  731. 						 ."properly";
    732. 

  732. 				}
    733. 

  733. 				push @revsin, $csvnrev;
    734. 

  734. 			}
    735. 

  735. 			command_close_pipe($revlist, $ctx);
    736. 

  736. 

  737. 			last unless $all_parents_ok;
    738. 

  738. 

  739. 			# We now have a list of all SVN revnos which are
    740. 

  740. 			# merged by this particular parent. Integrate them.
    741. 

  741. 			next if $#revsin == -1;
    742. 

  742. 			my $newmergeinfo = "$branchpath:" . join(',', @revsin);
    743. 

  743. 			$aggregate_mergeinfo =
    744. 

  744. 				merge_merge_info($aggregate_mergeinfo,
    745. 

  745. 								 $newmergeinfo, 1);
    746. 

  746. 		}
    747. 

  747. 		if ($all_parents_ok and $aggregate_mergeinfo) {
    748. 

  748. 			return $aggregate_mergeinfo;
    749. 

  749. 		}
    750. 

  750. 	}
    751. 

  751. 

  752. 	return undef;
    753. 

  753. }
    754. 

  754. 

  755. sub cmd_dcommit {
    756. 

  756. 	my $head = shift;
    757. 

  757. 	command_noisy(qw/update-index --refresh/);
    758. 

  758. 	git_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }
    759. 

  759. 		'Cannot dcommit with a dirty index.  Commit your changes first, '
    760. 

  760. 		. "or stash them with `git stash'.\n";
    761. 

  761. 	$head ||= 'HEAD';
    762. 

  762. 

  763. 	my $old_head;
    764. 

  764. 	if ($head ne 'HEAD') {
    765. 

  765. 		$old_head = eval {
    766. 

  766. 			command_oneline([qw/symbolic-ref -q HEAD/])
    767. 

  767. 		};
    768. 

  768. 		if ($old_head) {
    769. 

  769. 			$old_head =~ s{^refs/heads/}{};
    770. 

  770. 		} else {
    771. 

  771. 			$old_head = eval { command_oneline(qw/rev-parse HEAD/) };
    772. 

  772. 		}
    773. 

  773. 		command(['checkout', $head], STDERR => 0);
    774. 

  774. 	}
    775. 

  775. 

  776. 	my @refs;
    777. 

  777. 	my ($url, $rev, $uuid, $gs) = working_head_info('HEAD', \@refs);
    778. 

  778. 	unless ($gs) {
    779. 

  779. 		die "Unable to determine upstream SVN information from ",
    780. 

  780. 		    "$head history.\nPerhaps the repository is empty.";
    781. 

  781. 	}
    782. 

  782. 

  783. 	if (defined $_commit_url) {
    784. 

  784. 		$url = $_commit_url;
    785. 

  785. 	} else {
    786. 

  786. 		$url = eval { command_oneline('config', '--get',
    787. 

  787. 			      "svn-remote.$gs->{repo_id}.commiturl") };
    788. 

  788. 		if (!$url) {
    789. 

  789. 			$url = $gs->full_pushurl
    790. 

  790. 		}
    791. 

  791. 	}
    792. 

  792. 

  793. 	my $last_rev = $_revision if defined $_revision;
    794. 

  794. 	if ($url) {
    795. 

  795. 		print "Committing to $url ...\n";
    796. 

  796. 	}
    797. 

  797. 	my ($linear_refs, $parents) = linearize_history($gs, \@refs);
    798. 

  798. 	if ($_no_rebase && scalar(@$linear_refs) > 1) {
    799. 

  799. 		warn "Attempting to commit more than one change while ",
    800. 

  800. 		     "--no-rebase is enabled.\n",
    801. 

  801. 		     "If these changes depend on each other, re-running ",
    802. 

  802. 		     "without --no-rebase may be required."
    803. 

  803. 	}
    804. 

  804. 

  805. 	if (defined $_interactive){
    806. 

  806. 		my $ask_default = "y";
    807. 

  807. 		foreach my $d (@$linear_refs){
    808. 

  808. 			my ($fh, $ctx) = command_output_pipe(qw(show --summary), "$d");
    809. 

  809. 			while (<$fh>){
    810. 

  810. 				print $_;
    811. 

  811. 			}
    812. 

  812. 			command_close_pipe($fh, $ctx);
    813. 

  813. 			$_ = ask("Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): ",
    814. 

  814. 			         valid_re => qr/^(?:yes|y|no|n|quit|q|all|a)/i,
    815. 

  815. 			         default => $ask_default);
    816. 

  816. 			die "Commit this patch reply required" unless defined $_;
    817. 

  817. 			if (/^[nq]/i) {
    818. 

  818. 				exit(0);
    819. 

  819. 			} elsif (/^a/i) {
    820. 

  820. 				last;
    821. 

  821. 			}
    822. 

  822. 		}
    823. 

  823. 	}
    824. 

  824. 

  825. 	my $expect_url = $url;
    826. 

  826. 

  827. 	my $push_merge_info = eval {
    828. 

  828. 		command_oneline(qw/config --get svn.pushmergeinfo/)
    829. 

  829. 		};
    830. 

  830. 	if (not defined($push_merge_info)
    831. 

  831. 			or $push_merge_info eq "false"
    832. 

  832. 			or $push_merge_info eq "no"
    833. 

  833. 			or $push_merge_info eq "never") {
    834. 

  834. 		$push_merge_info = 0;
    835. 

  835. 	}
    836. 

  836. 

  837. 	unless (defined($_merge_info) || ! $push_merge_info) {
    838. 

  838. 		# Preflight check of changes to ensure no issues with mergeinfo
    839. 

  839. 		# This includes check for uncommitted-to-SVN parents
    840. 

  840. 		# (other than the first parent, which we will handle),
    841. 

  841. 		# information from different SVN repos, and paths
    842. 

  842. 		# which are not underneath this repository root.
    843. 

  843. 		my $rooturl = $gs->repos_root;
    844. 

  844. 		foreach my $d (@$linear_refs) {
    845. 

  845. 			my %parentshash;
    846. 

  846. 			read_commit_parents(\%parentshash, $d);
    847. 

  847. 			my @realparents = @{$parentshash{$d}};
    848. 

  848. 			if ($#realparents > 0) {
    849. 

  849. 				# Merge commit
    850. 

  850. 				shift @realparents; # Remove/ignore first parent
    851. 

  851. 				foreach my $parent (@realparents) {
    852. 

  852. 					my ($branchurl, $svnrev, $paruuid) = cmt_metadata($parent);
    853. 

  853. 					unless (defined $paruuid) {
    854. 

  854. 						# A parent is missing SVN annotations...
    855. 

  855. 						# abort the whole operation.
    856. 

  856. 						fatal "$parent is merged into revision $d, "
    857. 

  857. 							 ."but does not have git-svn metadata. "
    858. 

  858. 							 ."Either dcommit the branch or use a "
    859. 

  859. 							 ."local cherry-pick, FF merge, or rebase "
    860. 

  860. 							 ."instead of an explicit merge commit.";
    861. 

  861. 					}
    862. 

  862. 

  863. 					unless ($paruuid eq $uuid) {
    864. 

  864. 						# Parent has SVN metadata from different repository
    865. 

  865. 						fatal "merge parent $parent for change $d has "
    866. 

  866. 							 ."git-svn uuid $paruuid, while current change "
    867. 

  867. 							 ."has uuid $uuid!";
    868. 

  868. 					}
    869. 

  869. 

  870. 					unless ($branchurl =~ /^\Q$rooturl\E(.*)/) {
    871. 

  871. 						# This branch is very strange indeed.
    872. 

  872. 						fatal "merge parent $parent for $d is on branch "
    873. 

  873. 							 ."$branchurl, which is not under the "
    874. 

  874. 							 ."git-svn root $rooturl!";
    875. 

  875. 					}
    876. 

  876. 				}
    877. 

  877. 			}
    878. 

  878. 		}
    879. 

  879. 	}
    880. 

  880. 

  881. 	my $rewritten_parent;
    882. 

  882. 	Git::SVN::remove_username($expect_url);
    883. 

  883. 	if (defined($_merge_info)) {
    884. 

  884. 		$_merge_info =~ tr{ }{\n};
    885. 

  885. 	}
    886. 

  886. 	while (1) {
    887. 

  887. 		my $d = shift @$linear_refs or last;
    888. 

  888. 		unless (defined $last_rev) {
    889. 

  889. 			(undef, $last_rev, undef) = cmt_metadata("$d~1");
    890. 

  890. 			unless (defined $last_rev) {
    891. 

  891. 				fatal "Unable to extract revision information ",
    892. 

  892. 				      "from commit $d~1";
    893. 

  893. 			}
    894. 

  894. 		}
    895. 

  895. 		if ($_dry_run) {
    896. 

  896. 			print "diff-tree $d~1 $d\n";
    897. 

  897. 		} else {
    898. 

  898. 			my $cmt_rev;
    899. 

  899. 

  900. 			unless (defined($_merge_info) || ! $push_merge_info) {
    901. 

  901. 				$_merge_info = populate_merge_info($d, $gs,
    902. 

  902. 				                             $uuid,
    903. 

  903. 				                             $linear_refs,
    904. 

  904. 				                             $rewritten_parent);
    905. 

  905. 			}
    906. 

  906. 

  907. 			my %ed_opts = ( r => $last_rev,
    908. 

  908. 			                log => get_commit_entry($d)->{log},
    909. 

  909. 			                ra => Git::SVN::Ra->new($url),
    910. 

  910. 			                config => SVN::Core::config_get_config(
    911. 

  911. 			                        $Git::SVN::Ra::config_dir
    912. 

  912. 			                ),
    913. 

  913. 			                tree_a => "$d~1",
    914. 

  914. 			                tree_b => $d,
    915. 

  915. 			                editor_cb => sub {
    916. 

  916. 			                       print "Committed r$_[0]\n";
    917. 

  917. 			                       $cmt_rev = $_[0];
    918. 

  918. 			                },
    919. 

  919. 					mergeinfo => $_merge_info,
    920. 

  920. 			                svn_path => '');
    921. 

  921. 			if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
    922. 

  922. 				print "No changes\n$d~1 == $d\n";
    923. 

  923. 			} elsif ($parents->{$d} && @{$parents->{$d}}) {
    924. 

  924. 				$gs->{inject_parents_dcommit}->{$cmt_rev} =
    925. 

  925. 				                               $parents->{$d};
    926. 

  926. 			}
    927. 

  927. 			$_fetch_all ? $gs->fetch_all : $gs->fetch;
    928. 

  928. 			$last_rev = $cmt_rev;
    929. 

  929. 			next if $_no_rebase;
    930. 

  930. 

  931. 			# we always want to rebase against the current HEAD,
    932. 

  932. 			# not any head that was passed to us
    933. 

  933. 			my @diff = command('diff-tree', $d,
    934. 

  934. 			                   $gs->refname, '--');
    935. 

  935. 			my @finish;
    936. 

  936. 			if (@diff) {
    937. 

  937. 				@finish = rebase_cmd();
    938. 

  938. 				print STDERR "W: $d and ", $gs->refname,
    939. 

  939. 				             " differ, using @finish:\n",
    940. 

  940. 				             join("\n", @diff), "\n";
    941. 

  941. 			} else {
    942. 

  942. 				print "No changes between current HEAD and ",
    943. 

  943. 				      $gs->refname,
    944. 

  944. 				      "\nResetting to the latest ",
    945. 

  945. 				      $gs->refname, "\n";
    946. 

  946. 				@finish = qw/reset --mixed/;
    947. 

  947. 			}
    948. 

  948. 			command_noisy(@finish, $gs->refname);
    949. 

  949. 

  950. 			$rewritten_parent = command_oneline(qw/rev-parse HEAD/);
    951. 

  951. 

  952. 			if (@diff) {
    953. 

  953. 				@refs = ();
    954. 

  954. 				my ($url_, $rev_, $uuid_, $gs_) =
    955. 

  955. 				              working_head_info('HEAD', \@refs);
    956. 

  956. 				my ($linear_refs_, $parents_) =
    957. 

  957. 				              linearize_history($gs_, \@refs);
    958. 

  958. 				if (scalar(@$linear_refs) !=
    959. 

  959. 				    scalar(@$linear_refs_)) {
    960. 

  960. 					fatal "# of revisions changed ",
    961. 

  961. 					  "\nbefore:\n",
    962. 

  962. 					  join("\n", @$linear_refs),
    963. 

  963. 					  "\n\nafter:\n",
    964. 

  964. 					  join("\n", @$linear_refs_), "\n",
    965. 

  965. 					  'If you are attempting to commit ',
    966. 

  966. 					  "merges, try running:\n\t",
    967. 

  967. 					  'git rebase --interactive',
    968. 

  968. 					  '--preserve-merges ',
    969. 

  969. 					  $gs->refname,
    970. 

  970. 					  "\nBefore dcommitting";
    971. 

  971. 				}
    972. 

  972. 				if ($url_ ne $expect_url) {
    973. 

  973. 					if ($url_ eq $gs->metadata_url) {
    974. 

  974. 						print
    975. 

  975. 						  "Accepting rewritten URL:",
    976. 

  976. 						  " $url_\n";
    977. 

  977. 					} else {
    978. 

  978. 						fatal
    979. 

  979. 						  "URL mismatch after rebase:",
    980. 

  980. 						  " $url_ != $expect_url";
    981. 

  981. 					}
    982. 

  982. 				}
    983. 

  983. 				if ($uuid_ ne $uuid) {
    984. 

  984. 					fatal "uuid mismatch after rebase: ",
    985. 

  985. 					      "$uuid_ != $uuid";
    986. 

  986. 				}
    987. 

  987. 				# remap parents
    988. 

  988. 				my (%p, @l, $i);
    989. 

  989. 				for ($i = 0; $i < scalar @$linear_refs; $i++) {
    990. 

  990. 					my $new = $linear_refs_->[$i] or next;
    991. 

  991. 					$p{$new} =
    992. 

  992. 						$parents->{$linear_refs->[$i]};
    993. 

  993. 					push @l, $new;
    994. 

  994. 				}
    995. 

  995. 				$parents = \%p;
    996. 

  996. 				$linear_refs = \@l;
    997. 

  997. 			}
    998. 

  998. 		}
    999. 

  999. 	}
    1000. 

  1000. 

  1001. 	if ($old_head) {
    1002. 

  1002. 		my $new_head = command_oneline(qw/rev-parse HEAD/);
    1003. 

  1003. 		my $new_is_symbolic = eval {
    1004. 

  1004. 			command_oneline(qw/symbolic-ref -q HEAD/);
    1005. 

  1005. 		};
    1006. 

  1006. 		if ($new_is_symbolic) {
    1007. 

  1007. 			print "dcommitted the branch ", $head, "\n";
    1008. 

  1008. 		} else {
    1009. 

  1009. 			print "dcommitted on a detached HEAD because you gave ",
    1010. 

  1010. 			      "a revision argument.\n",
    1011. 

  1011. 			      "The rewritten commit is: ", $new_head, "\n";
    1012. 

  1012. 		}
    1013. 

  1013. 		command(['checkout', $old_head], STDERR => 0);
    1014. 

  1014. 	}
    1015. 

  1015. 

  1016. 	unlink $gs->{index};
    1017. 

  1017. }
    1018. 

  1018. 

  1019. sub cmd_branch {
    1020. 

  1020. 	my ($branch_name, $head) = @_;
    1021. 

  1021. 

  1022. 	unless (defined $branch_name && length $branch_name) {
    1023. 

  1023. 		die(($_tag ? "tag" : "branch") . " name required\n");
    1024. 

  1024. 	}
    1025. 

  1025. 	$head ||= 'HEAD';
    1026. 

  1026. 

  1027. 	my (undef, $rev, undef, $gs) = working_head_info($head);
    1028. 

  1028. 	my $src = $gs->full_pushurl;
    1029. 

  1029. 

  1030. 	my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
    1031. 

  1031. 	my $allglobs = $remote->{ $_tag ? 'tags' : 'branches' };
    1032. 

  1032. 	my $glob;
    1033. 

  1033. 	if ($#{$allglobs} == 0) {
    1034. 

  1034. 		$glob = $allglobs->[0];
    1035. 

  1035. 	} else {
    1036. 

  1036. 		unless(defined $_branch_dest) {
    1037. 

  1037. 			die "Multiple ",
    1038. 

  1038. 			    $_tag ? "tag" : "branch",
    1039. 

  1039. 			    " paths defined for Subversion repository.\n",
    1040. 

  1040. 		            "You must specify where you want to create the ",
    1041. 

  1041. 		            $_tag ? "tag" : "branch",
    1042. 

  1042. 		            " with the --destination argument.\n";
    1043. 

  1043. 		}
    1044. 

  1044. 		foreach my $g (@{$allglobs}) {
    1045. 

  1045. 			# SVN::Git::Editor could probably be moved to Git.pm..
    1046. 

  1046. 			my $re = SVN::Git::Editor::glob2pat($g->{path}->{left});
    1047. 

  1047. 			if ($_branch_dest =~ /$re/) {
    1048. 

  1048. 				$glob = $g;
    1049. 

  1049. 				last;
    1050. 

  1050. 			}
    1051. 

  1051. 		}
    1052. 

  1052. 		unless (defined $glob) {
    1053. 

  1053. 			my $dest_re = qr/\b\Q$_branch_dest\E\b/;
    1054. 

  1054. 			foreach my $g (@{$allglobs}) {
    1055. 

  1055. 				$g->{path}->{left} =~ /$dest_re/ or next;
    1056. 

  1056. 				if (defined $glob) {
    1057. 

  1057. 					die "Ambiguous destination: ",
    1058. 

  1058. 					    $_branch_dest, "\nmatches both '",
    1059. 

  1059. 					    $glob->{path}->{left}, "' and '",
    1060. 

  1060. 					    $g->{path}->{left}, "'\n";
    1061. 

  1061. 				}
    1062. 

  1062. 				$glob = $g;
    1063. 

  1063. 			}
    1064. 

  1064. 			unless (defined $glob) {
    1065. 

  1065. 				die "Unknown ",
    1066. 

  1066. 				    $_tag ? "tag" : "branch",
    1067. 

  1067. 				    " destination $_branch_dest\n";
    1068. 

  1068. 			}
    1069. 

  1069. 		}
    1070. 

  1070. 	}
    1071. 

  1071. 	my ($lft, $rgt) = @{ $glob->{path} }{qw/left right/};
    1072. 

  1072. 	my $url;
    1073. 

  1073. 	if (defined $_commit_url) {
    1074. 

  1074. 		$url = $_commit_url;
    1075. 

  1075. 	} else {
    1076. 

  1076. 		$url = eval { command_oneline('config', '--get',
    1077. 

  1077. 			"svn-remote.$gs->{repo_id}.commiturl") };
    1078. 

  1078. 		if (!$url) {
    1079. 

  1079. 			$url = $remote->{pushurl} || $remote->{url};
    1080. 

  1080. 		}
    1081. 

  1081. 	}
    1082. 

  1082. 	my $dst = join '/', $url, $lft, $branch_name, ($rgt || ());
    1083. 

  1083. 

  1084. 	if ($dst =~ /^https:/ && $src =~ /^http:/) {
    1085. 

  1085. 		$src=~s/^http:/https:/;
    1086. 

  1086. 	}
    1087. 

  1087. 

  1088. 	::_req_svn();
    1089. 

  1089. 

  1090. 	my $ctx = SVN::Client->new(
    1091. 

  1091. 		auth    => Git::SVN::Ra::_auth_providers(),
    1092. 

  1092. 		log_msg => sub {
    1093. 

  1093. 			${ $_[0] } = defined $_message
    1094. 

  1094. 				? $_message
    1095. 

  1095. 				: 'Create ' . ($_tag ? 'tag ' : 'branch ' )
    1096. 

  1096. 				. $branch_name;
    1097. 

  1097. 		},
    1098. 

  1098. 	);
    1099. 

  1099. 

  1100. 	eval {
    1101. 

  1101. 		$ctx->ls($dst, 'HEAD', 0);
    1102. 

  1102. 	} and die "branch ${branch_name} already exists\n";
    1103. 

  1103. 

  1104. 	print "Copying ${src} at r${rev} to ${dst}...\n";
    1105. 

  1105. 	$ctx->copy($src, $rev, $dst)
    1106. 

  1106. 		unless $_dry_run;
    1107. 

  1107. 

  1108. 	$gs->fetch_all;
    1109. 

  1109. }
    1110. 

  1110. 

  1111. sub cmd_find_rev {
    1112. 

  1112. 	my $revision_or_hash = shift or die "SVN or git revision required ",
    1113. 

  1113. 	                                    "as a command-line argument\n";
    1114. 

  1114. 	my $result;
    1115. 

  1115. 	if ($revision_or_hash =~ /^r\d+$/) {
    1116. 

  1116. 		my $head = shift;
    1117. 

  1117. 		$head ||= 'HEAD';
    1118. 

  1118. 		my @refs;
    1119. 

  1119. 		my (undef, undef, $uuid, $gs) = working_head_info($head, \@refs);
    1120. 

  1120. 		unless ($gs) {
    1121. 

  1121. 			die "Unable to determine upstream SVN information from ",
    1122. 

  1122. 			    "$head history\n";
    1123. 

  1123. 		}
    1124. 

  1124. 		my $desired_revision = substr($revision_or_hash, 1);
    1125. 

  1125. 		$result = $gs->rev_map_get($desired_revision, $uuid);
    1126. 

  1126. 	} else {
    1127. 

  1127. 		my (undef, $rev, undef) = cmt_metadata($revision_or_hash);
    1128. 

  1128. 		$result = $rev;
    1129. 

  1129. 	}
    1130. 

  1130. 	print "$result\n" if $result;
    1131. 

  1131. }
    1132. 

  1132. 

  1133. sub auto_create_empty_directories {
    1134. 

  1134. 	my ($gs) = @_;
    1135. 

  1135. 	my $var = eval { command_oneline('config', '--get', '--bool',
    1136. 

  1136. 					 "svn-remote.$gs->{repo_id}.automkdirs") };
    1137. 

  1137. 	# By default, create empty directories by consulting the unhandled log,
    1138. 

  1138. 	# but allow setting it to 'false' to skip it.
    1139. 

  1139. 	return !($var && $var eq 'false');
    1140. 

  1140. }
    1141. 

  1141. 

  1142. sub cmd_rebase {
    1143. 

  1143. 	command_noisy(qw/update-index --refresh/);
    1144. 

  1144. 	my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
    1145. 

  1145. 	unless ($gs) {
    1146. 

  1146. 		die "Unable to determine upstream SVN information from ",
    1147. 

  1147. 		    "working tree history\n";
    1148. 

  1148. 	}
    1149. 

  1149. 	if ($_dry_run) {
    1150. 

  1150. 		print "Remote Branch: " . $gs->refname . "\n";
    1151. 

  1151. 		print "SVN URL: " . $url . "\n";
    1152. 

  1152. 		return;
    1153. 

  1153. 	}
    1154. 

  1154. 	if (command(qw/diff-index HEAD --/)) {
    1155. 

  1155. 		print STDERR "Cannot rebase with uncommited changes:\n";
    1156. 

  1156. 		command_noisy('status');
    1157. 

  1157. 		exit 1;
    1158. 

  1158. 	}
    1159. 

  1159. 	unless ($_local) {
    1160. 

  1160. 		# rebase will checkout for us, so no need to do it explicitly
    1161. 

  1161. 		$_no_checkout = 'true';
    1162. 

  1162. 		$_fetch_all ? $gs->fetch_all : $gs->fetch;
    1163. 

  1163. 	}
    1164. 

  1164. 	command_noisy(rebase_cmd(), $gs->refname);
    1165. 

  1165. 	if (auto_create_empty_directories($gs)) {
    1166. 

  1166. 		$gs->mkemptydirs;
    1167. 

  1167. 	}
    1168. 

  1168. }
    1169. 

  1169. 

  1170. sub cmd_show_ignore {
    1171. 

  1171. 	my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
    1172. 

  1172. 	$gs ||= Git::SVN->new;
    1173. 

  1173. 	my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
    1174. 

  1174. 	$gs->prop_walk($gs->{path}, $r, sub {
    1175. 

  1175. 		my ($gs, $path, $props) = @_;
    1176. 

  1176. 		print STDOUT "\n# $path\n";
    1177. 

  1177. 		my $s = $props->{'svn:ignore'} or return;
    1178. 

  1178. 		$s =~ s/[\r\n]+/\n/g;
    1179. 

  1179. 		$s =~ s/^\n+//;
    1180. 

  1180. 		chomp $s;
    1181. 

  1181. 		$s =~ s#^#$path#gm;
    1182. 

  1182. 		print STDOUT "$s\n";
    1183. 

  1183. 	});
    1184. 

  1184. }
    1185. 

  1185. 

  1186. sub cmd_show_externals {
    1187. 

  1187. 	my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
    1188. 

  1188. 	$gs ||= Git::SVN->new;
    1189. 

  1189. 	my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
    1190. 

  1190. 	$gs->prop_walk($gs->{path}, $r, sub {
    1191. 

  1191. 		my ($gs, $path, $props) = @_;
    1192. 

  1192. 		print STDOUT "\n# $path\n";
    1193. 

  1193. 		my $s = $props->{'svn:externals'} or return;
    1194. 

  1194. 		$s =~ s/[\r\n]+/\n/g;
    1195. 

  1195. 		chomp $s;
    1196. 

  1196. 		$s =~ s#^#$path#gm;
    1197. 

  1197. 		print STDOUT "$s\n";
    1198. 

  1198. 	});
    1199. 

  1199. }
    1200. 

  1200. 

  1201. sub cmd_create_ignore {
    1202. 

  1202. 	my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
    1203. 

  1203. 	$gs ||= Git::SVN->new;
    1204. 

  1204. 	my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
    1205. 

  1205. 	$gs->prop_walk($gs->{path}, $r, sub {
    1206. 

  1206. 		my ($gs, $path, $props) = @_;
    1207. 

  1207. 		# $path is of the form /path/to/dir/
    1208. 

  1208. 		$path = '.' . $path;
    1209. 

  1209. 		# SVN can have attributes on empty directories,
    1210. 

  1210. 		# which git won't track
    1211. 

  1211. 		mkpath([$path]) unless -d $path;
    1212. 

  1212. 		my $ignore = $path . '.gitignore';
    1213. 

  1213. 		my $s = $props->{'svn:ignore'} or return;
    1214. 

  1214. 		open(GITIGNORE, '>', $ignore)
    1215. 

  1215. 		  or fatal("Failed to open `$ignore' for writing: $!");
    1216. 

  1216. 		$s =~ s/[\r\n]+/\n/g;
    1217. 

  1217. 		$s =~ s/^\n+//;
    1218. 

  1218. 		chomp $s;
    1219. 

  1219. 		# Prefix all patterns so that the ignore doesn't apply
    1220. 

  1220. 		# to sub-directories.
    1221. 

  1221. 		$s =~ s#^#/#gm;
    1222. 

  1222. 		print GITIGNORE "$s\n";
    1223. 

  1223. 		close(GITIGNORE)
    1224. 

  1224. 		  or fatal("Failed to close `$ignore': $!");
    1225. 

  1225. 		command_noisy('add', '-f', $ignore);
    1226. 

  1226. 	});
    1227. 

  1227. }
    1228. 

  1228. 

  1229. sub cmd_mkdirs {
    1230. 

  1230. 	my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
    1231. 

  1231. 	$gs ||= Git::SVN->new;
    1232. 

  1232. 	$gs->mkemptydirs($_revision);
    1233. 

  1233. }
    1234. 

  1234. 

  1235. sub canonicalize_path {
    1236. 

  1236. 	my ($path) = @_;
    1237. 

  1237. 	my $dot_slash_added = 0;
    1238. 

  1238. 	if (substr($path, 0, 1) ne "/") {
    1239. 

  1239. 		$path = "./" . $path;
    1240. 

  1240. 		$dot_slash_added = 1;
    1241. 

  1241. 	}
    1242. 

  1242. 	# File::Spec->canonpath doesn't collapse x/../y into y (for a
    1243. 

  1243. 	# good reason), so let's do this manually.
    1244. 

  1244. 	$path =~ s#/+#/#g;
    1245. 

  1245. 	$path =~ s#/\.(?:/|$)#/#g;
    1246. 

  1246. 	$path =~ s#/[^/]+/\.\.##g;
    1247. 

  1247. 	$path =~ s#/$##g;
    1248. 

  1248. 	$path =~ s#^\./## if $dot_slash_added;
    1249. 

  1249. 	$path =~ s#^/##;
    1250. 

  1250. 	$path =~ s#^\.$##;
    1251. 

  1251. 	return $path;
    1252. 

  1252. }
    1253. 

  1253. 

  1254. sub canonicalize_url {
    1255. 

  1255. 	my ($url) = @_;
    1256. 

  1256. 	$url =~ s#^([^:]+://[^/]*/)(.*)$#$1 . canonicalize_path($2)#e;
    1257. 

  1257. 	return $url;
    1258. 

  1258. }
    1259. 

  1259. 

  1260. # get_svnprops(PATH)
    1261. 

  1261. # ------------------
    1262. 

  1262. # Helper for cmd_propget and cmd_proplist below.
    1263. 

  1263. sub get_svnprops {
    1264. 

  1264. 	my $path = shift;
    1265. 

  1265. 	my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
    1266. 

  1266. 	$gs ||= Git::SVN->new;
    1267. 

  1267. 

  1268. 	# prefix THE PATH by the sub-directory from which the user
    1269. 

  1269. 	# invoked us.
    1270. 

  1270. 	$path = $cmd_dir_prefix . $path;
    1271. 

  1271. 	fatal("No such file or directory: $path") unless -e $path;
    1272. 

  1272. 	my $is_dir = -d $path ? 1 : 0;
    1273. 

  1273. 	$path = $gs->{path} . '/' . $path;
    1274. 

  1274. 

  1275. 	# canonicalize the path (otherwise libsvn will abort or fail to
    1276. 

  1276. 	# find the file)
    1277. 

  1277. 	$path = canonicalize_path($path);
    1278. 

  1278. 

  1279. 	my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
    1280. 

  1280. 	my $props;
    1281. 

  1281. 	if ($is_dir) {
    1282. 

  1282. 		(undef, undef, $props) = $gs->ra->get_dir($path, $r);
    1283. 

  1283. 	}
    1284. 

  1284. 	else {
    1285. 

  1285. 		(undef, $props) = $gs->ra->get_file($path, $r, undef);
    1286. 

  1286. 	}
    1287. 

  1287. 	return $props;
    1288. 

  1288. }
    1289. 

  1289. 

  1290. # cmd_propget (PROP, PATH)
    1291. 

  1291. # ------------------------
    1292. 

  1292. # Print the SVN property PROP for PATH.
    1293. 

  1293. sub cmd_propget {
    1294. 

  1294. 	my ($prop, $path) = @_;
    1295. 

  1295. 	$path = '.' if not defined $path;
    1296. 

  1296. 	usage(1) if not defined $prop;
    1297. 

  1297. 	my $props = get_svnprops($path);
    1298. 

  1298. 	if (not defined $props->{$prop}) {
    1299. 

  1299. 		fatal("`$path' does not have a `$prop' SVN property.");
    1300. 

  1300. 	}
    1301. 

  1301. 	print $props->{$prop} . "\n";
    1302. 

  1302. }
    1303. 

  1303. 

  1304. # cmd_proplist (PATH)
    1305. 

  1305. # -------------------
    1306. 

  1306. # Print the list of SVN properties for PATH.
    1307. 

  1307. sub cmd_proplist {
    1308. 

  1308. 	my $path = shift;
    1309. 

  1309. 	$path = '.' if not defined $path;
    1310. 

  1310. 	my $props = get_svnprops($path);
    1311. 

  1311. 	print "Properties on '$path':\n";
    1312. 

  1312. 	foreach (sort keys %{$props}) {
    1313. 

  1313. 		print "  $_\n";
    1314. 

  1314. 	}
    1315. 

  1315. }
    1316. 

  1316. 

  1317. sub cmd_multi_init {
    1318. 

  1318. 	my $url = shift;
    1319. 

  1319. 	unless (defined $_trunk || @_branches || @_tags) {
    1320. 

  1320. 		usage(1);
    1321. 

  1321. 	}
    1322. 

  1322. 

  1323. 	$_prefix = '' unless defined $_prefix;
    1324. 

  1324. 	if (defined $url) {
    1325. 

  1325. 		$url = canonicalize_url($url);
    1326. 

  1326. 		init_subdir(@_);
    1327. 

  1327. 	}
    1328. 

  1328. 	do_git_init_db();
    1329. 

  1329. 	if (defined $_trunk) {
    1330. 

  1330. 		$_trunk =~ s#^/+##;
    1331. 

  1331. 		my $trunk_ref = 'refs/remotes/' . $_prefix . 'trunk';
    1332. 

  1332. 		# try both old-style and new-style lookups:
    1333. 

  1333. 		my $gs_trunk = eval { Git::SVN->new($trunk_ref) };
    1334. 

  1334. 		unless ($gs_trunk) {
    1335. 

  1335. 			my ($trunk_url, $trunk_path) =
    1336. 

  1336. 			                      complete_svn_url($url, $_trunk);
    1337. 

  1337. 			$gs_trunk = Git::SVN->init($trunk_url, $trunk_path,
    1338. 

  1338. 						   undef, $trunk_ref);
    1339. 

  1339. 		}
    1340. 

  1340. 	}
    1341. 

  1341. 	return unless @_branches || @_tags;
    1342. 

  1342. 	my $ra = $url ? Git::SVN::Ra->new($url) : undef;
    1343. 

  1343. 	foreach my $path (@_branches) {
    1344. 

  1344. 		complete_url_ls_init($ra, $path, '--branches/-b', $_prefix);
    1345. 

  1345. 	}
    1346. 

  1346. 	foreach my $path (@_tags) {
    1347. 

  1347. 		complete_url_ls_init($ra, $path, '--tags/-t', $_prefix.'tags/');
    1348. 

  1348. 	}
    1349. 

  1349. }
    1350. 

  1350. 

  1351. sub cmd_multi_fetch {
    1352. 

  1352. 	$Git::SVN::no_reuse_existing = undef;
    1353. 

  1353. 	my $remotes = Git::SVN::read_all_remotes();
    1354. 

  1354. 	foreach my $repo_id (sort keys %$remotes) {
    1355. 

  1355. 		if ($remotes->{$repo_id}->{url}) {
    1356. 

  1356. 			Git::SVN::fetch_all($repo_id, $remotes);
    1357. 

  1357. 		}
    1358. 

  1358. 	}
    1359. 

  1359. }
    1360. 

  1360. 

  1361. # this command is special because it requires no metadata
    1362. 

  1362. sub cmd_commit_diff {
    1363. 

  1363. 	my ($ta, $tb, $url) = @_;
    1364. 

  1364. 	my $usage = "Usage: $0 commit-diff -r<revision> ".
    1365. 

  1365. 	            "<tree-ish> <tree-ish> [<URL>]";
    1366. 

  1366. 	fatal($usage) if (!defined $ta || !defined $tb);
    1367. 

  1367. 	my $svn_path = '';
    1368. 

  1368. 	if (!defined $url) {
    1369. 

  1369. 		my $gs = eval { Git::SVN->new };
    1370. 

  1370. 		if (!$gs) {
    1371. 

  1371. 			fatal("Needed URL or usable git-svn --id in ",
    1372. 

  1372. 			      "the command-line\n", $usage);
    1373. 

  1373. 		}
    1374. 

  1374. 		$url = $gs->{url};
    1375. 

  1375. 		$svn_path = $gs->{path};
    1376. 

  1376. 	}
    1377. 

  1377. 	unless (defined $_revision) {
    1378. 

  1378. 		fatal("-r|--revision is a required argument\n", $usage);
    1379. 

  1379. 	}
    1380. 

  1380. 	if (defined $_message && defined $_file) {
    1381. 

  1381. 		fatal("Both --message/-m and --file/-F specified ",
    1382. 

  1382. 		      "for the commit message.\n",
    1383. 

  1383. 		      "I have no idea what you mean");
    1384. 

  1384. 	}
    1385. 

  1385. 	if (defined $_file) {
    1386. 

  1386. 		$_message = file_to_s($_file);
    1387. 

  1387. 	} else {
    1388. 

  1388. 		$_message ||= get_commit_entry($tb)->{log};
    1389. 

  1389. 	}
    1390. 

  1390. 	my $ra ||= Git::SVN::Ra->new($url);
    1391. 

  1391. 	my $r = $_revision;
    1392. 

  1392. 	if ($r eq 'HEAD') {
    1393. 

  1393. 		$r = $ra->get_latest_revnum;
    1394. 

  1394. 	} elsif ($r !~ /^\d+$/) {
    1395. 

  1395. 		die "revision argument: $r not understood by git-svn\n";
    1396. 

  1396. 	}
    1397. 

  1397. 	my %ed_opts = ( r => $r,
    1398. 

  1398. 	                log => $_message,
    1399. 

  1399. 	                ra => $ra,
    1400. 

  1400. 	                tree_a => $ta,
    1401. 

  1401. 	                tree_b => $tb,
    1402. 

  1402. 	                editor_cb => sub { print "Committed r$_[0]\n" },
    1403. 

  1403. 	                svn_path => $svn_path );
    1404. 

  1404. 	if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
    1405. 

  1405. 		print "No changes\n$ta == $tb\n";
    1406. 

  1406. 	}
    1407. 

  1407. }
    1408. 

  1408. 

  1409. sub escape_uri_only {
    1410. 

  1410. 	my ($uri) = @_;
    1411. 

  1411. 	my @tmp;
    1412. 

  1412. 	foreach (split m{/}, $uri) {
    1413. 

  1413. 		s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
    1414. 

  1414. 		push @tmp, $_;
    1415. 

  1415. 	}
    1416. 

  1416. 	join('/', @tmp);
    1417. 

  1417. }
    1418. 

  1418. 

  1419. sub escape_url {
    1420. 

  1420. 	my ($url) = @_;
    1421. 

  1421. 	if ($url =~ m#^([^:]+)://([^/]*)(.*)$#) {
    1422. 

  1422. 		my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
    1423. 

  1423. 		$url = "$scheme://$domain$uri";
    1424. 

  1424. 	}
    1425. 

  1425. 	$url;
    1426. 

  1426. }
    1427. 

  1427. 

  1428. sub cmd_info {
    1429. 

  1429. 	my $path = canonicalize_path(defined($_[0]) ? $_[0] : ".");
    1430. 

  1430. 	my $fullpath = canonicalize_path($cmd_dir_prefix . $path);
    1431. 

  1431. 	if (exists $_[1]) {
    1432. 

  1432. 		die "Too many arguments specified\n";
    1433. 

  1433. 	}
    1434. 

  1434. 

  1435. 	my ($file_type, $diff_status) = find_file_type_and_diff_status($path);
    1436. 

  1436. 

  1437. 	if (!$file_type && !$diff_status) {
    1438. 

  1438. 		print STDERR "svn: '$path' is not under version control\n";
    1439. 

  1439. 		exit 1;
    1440. 

  1440. 	}
    1441. 

  1441. 

  1442. 	my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
    1443. 

  1443. 	unless ($gs) {
    1444. 

  1444. 		die "Unable to determine upstream SVN information from ",
    1445. 

  1445. 		    "working tree history\n";
    1446. 

  1446. 	}
    1447. 

  1447. 

  1448. 	# canonicalize_path() will return "" to make libsvn 1.5.x happy,
    1449. 

  1449. 	$path = "." if $path eq "";
    1450. 

  1450. 

  1451. 	my $full_url = $url . ($fullpath eq "" ? "" : "/$fullpath");
    1452. 

  1452. 

  1453. 	if ($_url) {
    1454. 

  1454. 		print escape_url($full_url), "\n";
    1455. 

  1455. 		return;
    1456. 

  1456. 	}
    1457. 

  1457. 

  1458. 	my $result = "Path: $path\n";
    1459. 

  1459. 	$result .= "Name: " . basename($path) . "\n" if $file_type ne "dir";
    1460. 

  1460. 	$result .= "URL: " . escape_url($full_url) . "\n";
    1461. 

  1461. 

  1462. 	eval {
    1463. 

  1463. 		my $repos_root = $gs->repos_root;
    1464. 

  1464. 		Git::SVN::remove_username($repos_root);
    1465. 

  1465. 		$result .= "Repository Root: " . escape_url($repos_root) . "\n";
    1466. 

  1466. 	};
    1467. 

  1467. 	if ($@) {
    1468. 

  1468. 		$result .= "Repository Root: (offline)\n";
    1469. 

  1469. 	}
    1470. 

  1470. 	::_req_svn();
    1471. 

  1471. 	$result .= "Repository UUID: $uuid\n" unless $diff_status eq "A" &&
    1472. 

  1472. 		($SVN::Core::VERSION le '1.5.4' || $file_type ne "dir");
    1473. 

  1473. 	$result .= "Revision: " . ($diff_status eq "A" ? 0 : $rev) . "\n";
    1474. 

  1474. 

  1475. 	$result .= "Node Kind: " .
    1476. 

  1476. 		   ($file_type eq "dir" ? "directory" : "file") . "\n";
    1477. 

  1477. 

  1478. 	my $schedule = $diff_status eq "A"
    1479. 

  1479. 		       ? "add"
    1480. 

  1480. 		       : ($diff_status eq "D" ? "delete" : "normal");
    1481. 

  1481. 	$result .= "Schedule: $schedule\n";
    1482. 

  1482. 

  1483. 	if ($diff_status eq "A") {
    1484. 

  1484. 		print $result, "\n";
    1485. 

  1485. 		return;
    1486. 

  1486. 	}
    1487. 

  1487. 

  1488. 	my ($lc_author, $lc_rev, $lc_date_utc);
    1489. 

  1489. 	my @args = Git::SVN::Log::git_svn_log_cmd($rev, $rev, "--", $fullpath);
    1490. 

  1490. 	my $log = command_output_pipe(@args);
    1491. 

  1491. 	my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
    1492. 

  1492. 	while (<$log>) {
    1493. 

  1493. 		if (/^${esc_color}author (.+) <[^>]+> (\d+) ([\-\+]?\d+)$/o) {
    1494. 

  1494. 			$lc_author = $1;
    1495. 

  1495. 			$lc_date_utc = Git::SVN::Log::parse_git_date($2, $3);
    1496. 

  1496. 		} elsif (/^${esc_color}    (git-svn-id:.+)$/o) {
    1497. 

  1497. 			(undef, $lc_rev, undef) = ::extract_metadata($1);
    1498. 

  1498. 		}
    1499. 

  1499. 	}
    1500. 

  1500. 	close $log;
    1501. 

  1501. 

  1502. 	Git::SVN::Log::set_local_timezone();
    1503. 

  1503. 

  1504. 	$result .= "Last Changed Author: $lc_author\n";
    1505. 

  1505. 	$result .= "Last Changed Rev: $lc_rev\n";
    1506. 

  1506. 	$result .= "Last Changed Date: " .
    1507. 

  1507. 		   Git::SVN::Log::format_svn_date($lc_date_utc) . "\n";
    1508. 

  1508. 

  1509. 	if ($file_type ne "dir") {
    1510. 

  1510. 		my $text_last_updated_date =
    1511. 

  1511. 		    ($diff_status eq "D" ? $lc_date_utc : (stat $path)[9]);
    1512. 

  1512. 		$result .=
    1513. 

  1513. 		    "Text Last Updated: " .
    1514. 

  1514. 		    Git::SVN::Log::format_svn_date($text_last_updated_date) .
    1515. 

  1515. 		    "\n";
    1516. 

  1516. 		my $checksum;
    1517. 

  1517. 		if ($diff_status eq "D") {
    1518. 

  1518. 			my ($fh, $ctx) =
    1519. 

  1519. 			    command_output_pipe(qw(cat-file blob), "HEAD:$path");
    1520. 

  1520. 			if ($file_type eq "link") {
    1521. 

  1521. 				my $file_name = <$fh>;
    1522. 

  1522. 				$checksum = md5sum("link $file_name");
    1523. 

  1523. 			} else {
    1524. 

  1524. 				$checksum = md5sum($fh);
    1525. 

  1525. 			}
    1526. 

  1526. 			command_close_pipe($fh, $ctx);
    1527. 

  1527. 		} elsif ($file_type eq "link") {
    1528. 

  1528. 			my $file_name =
    1529. 

  1529. 			    command(qw(cat-file blob), "HEAD:$path");
    1530. 

  1530. 			$checksum =
    1531. 

  1531. 			    md5sum("link " . $file_name);
    1532. 

  1532. 		} else {
    1533. 

  1533. 			open FILE, "<", $path or die $!;
    1534. 

  1534. 			$checksum = md5sum(\*FILE);
    1535. 

  1535. 			close FILE or die $!;
    1536. 

  1536. 		}
    1537. 

  1537. 		$result .= "Checksum: " . $checksum . "\n";
    1538. 

  1538. 	}
    1539. 

  1539. 

  1540. 	print $result, "\n";
    1541. 

  1541. }
    1542. 

  1542. 

  1543. sub cmd_reset {
    1544. 

  1544. 	my $target = shift || $_revision or die "SVN revision required\n";
    1545. 

  1545. 	$target = $1 if $target =~ /^r(\d+)$/;
    1546. 

  1546. 	$target =~ /^\d+$/ or die "Numeric SVN revision expected\n";
    1547. 

  1547. 	my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
    1548. 

  1548. 	unless ($gs) {
    1549. 

  1549. 		die "Unable to determine upstream SVN information from ".
    1550. 

  1550. 		    "history\n";
    1551. 

  1551. 	}
    1552. 

  1552. 	my ($r, $c) = $gs->find_rev_before($target, not $_fetch_parent);
    1553. 

  1553. 	die "Cannot find SVN revision $target\n" unless defined($c);
    1554. 

  1554. 	$gs->rev_map_set($r, $c, 'reset', $uuid);
    1555. 

  1555. 	print "r$r = $c ($gs->{ref_id})\n";
    1556. 

  1556. }
    1557. 

  1557. 

  1558. sub cmd_gc {
    1559. 

  1559. 	if (!$can_compress) {
    1560. 

  1560. 		warn "Compress::Zlib could not be found; unhandled.log " .
    1561. 

  1561. 		     "files will not be compressed.\n";
    1562. 

  1562. 	}
    1563. 

  1563. 	find({ wanted => \&gc_directory, no_chdir => 1}, "$ENV{GIT_DIR}/svn");
    1564. 

  1564. }
    1565. 

  1565. 

  1566. ########################### utility functions #########################
    1567. 

  1567. 

  1568. sub rebase_cmd {
    1569. 

  1569. 	my @cmd = qw/rebase/;
    1570. 

  1570. 	push @cmd, '-v' if $_verbose;
    1571. 

  1571. 	push @cmd, qw/--merge/ if $_merge;
    1572. 

  1572. 	push @cmd, "--strategy=$_strategy" if $_strategy;
    1573. 

  1573. 	@cmd;
    1574. 

  1574. }
    1575. 

  1575. 

  1576. sub post_fetch_checkout {
    1577. 

  1577. 	return if $_no_checkout;
    1578. 

  1578. 	my $gs = $Git::SVN::_head or return;
    1579. 

  1579. 	return if verify_ref('refs/heads/master^0');
    1580. 

  1580. 

  1581. 	# look for "trunk" ref if it exists
    1582. 

  1582. 	my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
    1583. 

  1583. 	my $fetch = $remote->{fetch};
    1584. 

  1584. 	if ($fetch) {
    1585. 

  1585. 		foreach my $p (keys %$fetch) {
    1586. 

  1586. 			basename($fetch->{$p}) eq 'trunk' or next;
    1587. 

  1587. 			$gs = Git::SVN->new($fetch->{$p}, $gs->{repo_id}, $p);
    1588. 

  1588. 			last;
    1589. 

  1589. 		}
    1590. 

  1590. 	}
    1591. 

  1591. 

  1592. 	my $valid_head = verify_ref('HEAD^0');
    1593. 

  1593. 	command_noisy(qw(update-ref refs/heads/master), $gs->refname);
    1594. 

  1594. 	return if ($valid_head || !verify_ref('HEAD^0'));
    1595. 

  1595. 

  1596. 	return if $ENV{GIT_DIR} !~ m#^(?:.*/)?\.git$#;
    1597. 

  1597. 	my $index = $ENV{GIT_INDEX_FILE} || "$ENV{GIT_DIR}/index";
    1598. 

  1598. 	return if -f $index;
    1599. 

  1599. 

  1600. 	return if command_oneline(qw/rev-parse --is-inside-work-tree/) eq 'false';
    1601. 

  1601. 	return if command_oneline(qw/rev-parse --is-inside-git-dir/) eq 'true';
    1602. 

  1602. 	command_noisy(qw/read-tree -m -u -v HEAD HEAD/);
    1603. 

  1603. 	print STDERR "Checked out HEAD:\n  ",
    1604. 

  1604. 	             $gs->full_url, " r", $gs->last_rev, "\n";
    1605. 

  1605. 	if (auto_create_empty_directories($gs)) {
    1606. 

  1606. 		$gs->mkemptydirs($gs->last_rev);
    1607. 

  1607. 	}
    1608. 

  1608. }
    1609. 

  1609. 

  1610. sub complete_svn_url {
    1611. 

  1611. 	my ($url, $path) = @_;
    1612. 

  1612. 	$path =~ s#/+$##;
    1613. 

  1613. 	if ($path !~ m#^[a-z\+]+://#) {
    1614. 

  1614. 		if (!defined $url || $url !~ m#^[a-z\+]+://#) {
    1615. 

  1615. 			fatal("E: '$path' is not a complete URL ",
    1616. 

  1616. 			      "and a separate URL is not specified");
    1617. 

  1617. 		}
    1618. 

  1618. 		return ($url, $path);
    1619. 

  1619. 	}
    1620. 

  1620. 	return ($path, '');
    1621. 

  1621. }
    1622. 

  1622. 

  1623. sub complete_url_ls_init {
    1624. 

  1624. 	my ($ra, $repo_path, $switch, $pfx) = @_;
    1625. 

  1625. 	unless ($repo_path) {
    1626. 

  1626. 		print STDERR "W: $switch not specified\n";
    1627. 

  1627. 		return;
    1628. 

  1628. 	}
    1629. 

  1629. 	$repo_path =~ s#/+$##;
    1630. 

  1630. 	if ($repo_path =~ m#^[a-z\+]+://#) {
    1631. 

  1631. 		$ra = Git::SVN::Ra->new($repo_path);
    1632. 

  1632. 		$repo_path = '';
    1633. 

  1633. 	} else {
    1634. 

  1634. 		$repo_path =~ s#^/+##;
    1635. 

  1635. 		unless ($ra) {
    1636. 

  1636. 			fatal("E: '$repo_path' is not a complete URL ",
    1637. 

  1637. 			      "and a separate URL is not specified");
    1638. 

  1638. 		}
    1639. 

  1639. 	}
    1640. 

  1640. 	my $url = $ra->{url};
    1641. 

  1641. 	my $gs = Git::SVN->init($url, undef, undef, undef, 1);
    1642. 

  1642. 	my $k = "svn-remote.$gs->{repo_id}.url";
    1643. 

  1643. 	my $orig_url = eval { command_oneline(qw/config --get/, $k) };
    1644. 

  1644. 	if ($orig_url && ($orig_url ne $gs->{url})) {
    1645. 

  1645. 		die "$k already set: $orig_url\n",
    1646. 

  1646. 		    "wanted to set to: $gs->{url}\n";
    1647. 

  1647. 	}
    1648. 

  1648. 	command_oneline('config', $k, $gs->{url}) unless $orig_url;
    1649. 

  1649. 	my $remote_path = "$gs->{path}/$repo_path";
    1650. 

  1650. 	$remote_path =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
    1651. 

  1651. 	$remote_path =~ s#/+#/#g;
    1652. 

  1652. 	$remote_path =~ s#^/##g;
    1653. 

  1653. 	$remote_path .= "/*" if $remote_path !~ /\*/;
    1654. 

  1654. 	my ($n) = ($switch =~ /^--(\w+)/);
    1655. 

  1655. 	if (length $pfx && $pfx !~ m#/$#) {
    1656. 

  1656. 		die "--prefix='$pfx' must have a trailing slash '/'\n";
    1657. 

  1657. 	}
    1658. 

  1658. 	command_noisy('config',
    1659. 

  1659. 		      '--add',
    1660. 

  1660. 	              "svn-remote.$gs->{repo_id}.$n",
    1661. 

  1661. 	              "$remote_path:refs/remotes/$pfx*" .
    1662. 

  1662. 	                ('/*' x (($remote_path =~ tr/*/*/) - 1)) );
    1663. 

  1663. }
    1664. 

  1664. 

  1665. sub verify_ref {
    1666. 

  1666. 	my ($ref) = @_;
    1667. 

  1667. 	eval { command_oneline([ 'rev-parse', '--verify', $ref ],
    1668. 

  1668. 	                       { STDERR => 0 }); };
    1669. 

  1669. }
    1670. 

  1670. 

  1671. sub get_tree_from_treeish {
    1672. 

  1672. 	my ($treeish) = @_;
    1673. 

  1673. 	# $treeish can be a symbolic ref, too:
    1674. 

  1674. 	my $type = command_oneline(qw/cat-file -t/, $treeish);
    1675. 

  1675. 	my $expected;
    1676. 

  1676. 	while ($type eq 'tag') {
    1677. 

  1677. 		($treeish, $type) = command(qw/cat-file tag/, $treeish);
    1678. 

  1678. 	}
    1679. 

  1679. 	if ($type eq 'commit') {
    1680. 

  1680. 		$expected = (grep /^tree /, command(qw/cat-file commit/,
    1681. 

  1681. 		                                    $treeish))[0];
    1682. 

  1682. 		($expected) = ($expected =~ /^tree ($sha1)$/o);
    1683. 

  1683. 		die "Unable to get tree from $treeish\n" unless $expected;
    1684. 

  1684. 	} elsif ($type eq 'tree') {
    1685. 

  1685. 		$expected = $treeish;
    1686. 

  1686. 	} else {
    1687. 

  1687. 		die "$treeish is a $type, expected tree, tag or commit\n";
    1688. 

  1688. 	}
    1689. 

  1689. 	return $expected;
    1690. 

  1690. }
    1691. 

  1691. 

  1692. sub get_commit_entry {
    1693. 

  1693. 	my ($treeish) = shift;
    1694. 

  1694. 	my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) );
    1695. 

  1695. 	my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
    1696. 

  1696. 	my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
    1697. 

  1697. 	open my $log_fh, '>', $commit_editmsg or croak $!;
    1698. 

  1698. 

  1699. 	my $type = command_oneline(qw/cat-file -t/, $treeish);
    1700. 

  1700. 	if ($type eq 'commit' || $type eq 'tag') {
    1701. 

  1701. 		my ($msg_fh, $ctx) = command_output_pipe('ca…
    1702.

Large files files are truncated, but you can click here to view the full file