PageRenderTime 68ms CodeModel.GetById 23ms RepoModel.GetById 0ms app.codeStats 1ms

/bin/git-folder/git-svn.perl

https://bitbucket.org/kendfinger/crostools
Perl | 6687 lines | 5903 code | 466 blank | 318 comment | 830 complexity | e41ed81be863730aea65d52339e95ffb 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}) {
    26. 

  26. 	if (exists $ENV{GIT_SSH}) {
    27. 

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

  28. 		if ($^O eq 'msys') {
    29. 

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

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

  31. 		}
    32. 

  32. 	}
    33. 

  33. }
    34. 

  34. 

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

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

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

  38. 

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

  40. sub _req_svn {
    41. 

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

  42. 	require SVN::Ra;
    43. 

  43. 	require SVN::Delta;
    44. 

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

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

  46. 	}
    47. 

  47. }
    48. 

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

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

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

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

  52. use Carp qw/croak/;
    53. 

  53. use Digest::MD5;
    54. 

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

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

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

  57. use File::Spec;
    58. 

  58. use File::Find;
    59. 

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

  60. use IPC::Open3;
    61. 

  61. use Git;
    62. 

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

  63. 

  64. BEGIN {
    65. 

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

  66. 	no strict 'refs';
    67. 

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

  68. 	            command_input_pipe command_close_pipe
    69. 

  69. 	            command_bidi_pipe command_close_bidi_pipe/) {
    70. 

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

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

  72. 			__PACKAGE__) {
    73. 

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

  74. 		}
    75. 

  75. 	}
    76. 

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

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

  78. }
    79. 

  79. 

  80. my ($SVN);
    81. 

  81. 

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

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

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

  85. 	$_message, $_file, $_branch_dest,
    86. 

  86. 	$_template, $_shared,
    87. 

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

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

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

  90. 	$_git_format, $_commit_url, $_tag, $_merge_info);
    91. 

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

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

  93. $_q ||= 0;
    94. 

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

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

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

  97.                     'ignore-paths=s' => \$SVN::Git::Fetcher::_ignore_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. 			%cmt_opts, %fc_opts } ],
    167. 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  188. 			     } ],
    189. 

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

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

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

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

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

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

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

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

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

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

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

  200. 			} ],
    201. 

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

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

  203. 			} ],
    204. 

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

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

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

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

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

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

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

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

  212. 			 %remote_opts } ],
    213. 

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

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

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

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

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

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

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

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

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

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

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

  224. 			} ],
    225. 

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

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

  227. 			{} ],
    228. 

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

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

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

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

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

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

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

  235. 			  %fc_opts } ],
    236. 

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

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

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

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

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

  241. 			%cmt_opts } ],
    242. 

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

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

  244. 		     on the current branch",
    245. 

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

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

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

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

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

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

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

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

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

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

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

  256. 		{} ],
    257. 

  257. );
    258. 

  258. 

  259. my $cmd;
    260. 

  260. for (my $i = 0; $i < @ARGV; $i++) {
    261. 

  261. 	if (defined $cmd{$ARGV[$i]}) {
    262. 

  262. 		$cmd = $ARGV[$i];
    263. 

  263. 		splice @ARGV, $i, 1;
    264. 

  264. 		last;
    265. 

  265. 	} elsif ($ARGV[$i] eq 'help') {
    266. 

  266. 		$cmd = $ARGV[$i+1];
    267. 

  267. 		usage(0);
    268. 

  268. 	}
    269. 

  269. };
    270. 

  270. 

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

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

  273. 	unless (-d $ENV{GIT_DIR}) {
    274. 

  274. 		if ($git_dir_user_set) {
    275. 

  275. 			die "GIT_DIR=$ENV{GIT_DIR} explicitly set, ",
    276. 

  276. 			    "but it is not a directory\n";
    277. 

  277. 		}
    278. 

  278. 		my $git_dir = delete $ENV{GIT_DIR};
    279. 

  279. 		my $cdup = undef;
    280. 

  280. 		git_cmd_try {
    281. 

  281. 			$cdup = command_oneline(qw/rev-parse --show-cdup/);
    282. 

  282. 			$git_dir = '.' unless ($cdup);
    283. 

  283. 			chomp $cdup if ($cdup);
    284. 

  284. 			$cdup = "." unless ($cdup && length $cdup);
    285. 

  285. 		} "Already at toplevel, but $git_dir not found\n";
    286. 

  286. 		chdir $cdup or die "Unable to chdir up to '$cdup'\n";
    287. 

  287. 		unless (-d $git_dir) {
    288. 

  288. 			die "$git_dir still not found after going to ",
    289. 

  289. 			    "'$cdup'\n";
    290. 

  290. 		}
    291. 

  291. 		$ENV{GIT_DIR} = $git_dir;
    292. 

  292. 	}
    293. 

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

  294. }
    295. 

  295. 

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

  297. 

  298. read_git_config(\%opts);
    299. 

  299. if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) {
    300. 

  300. 	Getopt::Long::Configure('pass_through');
    301. 

  301. }
    302. 

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

  303.                     'minimize-connections' => \$Git::SVN::Migration::_minimize,
    304. 

  304.                     'id|i=s' => \$Git::SVN::default_ref_id,
    305. 

  305.                     'svn-remote|remote|R=s' => sub {
    306. 

  306.                        $Git::SVN::no_reuse_existing = 1;
    307. 

  307.                        $Git::SVN::default_repo_id = $_[1] });
    308. 

  308. exit 1 if (!$rv && $cmd && $cmd ne 'log');
    309. 

  309. 

  310. usage(0) if $_help;
    311. 

  311. version() if $_version;
    312. 

  312. usage(1) unless defined $cmd;
    313. 

  313. load_authors() if $_authors;
    314. 

  314. if (defined $_authors_prog) {
    315. 

  315. 	$_authors_prog = "'" . File::Spec->rel2abs($_authors_prog) . "'";
    316. 

  316. }
    317. 

  317. 

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

  319. 	Git::SVN::Migration::migration_check();
    320. 

  320. }
    321. 

  321. Git::SVN::init_vars();
    322. 

  322. eval {
    323. 

  323. 	Git::SVN::verify_remotes_sanity();
    324. 

  324. 	$cmd{$cmd}->[0]->(@ARGV);
    325. 

  325. };
    326. 

  326. fatal $@ if $@;
    327. 

  327. post_fetch_checkout();
    328. 

  328. exit 0;
    329. 

  329. 

  330. ####################### primary functions ######################
    331. 

  331. sub usage {
    332. 

  332. 	my $exit = shift || 0;
    333. 

  333. 	my $fd = $exit ? \*STDERR : \*STDOUT;
    334. 

  334. 	print $fd <<"";
    335. 

  335. git-svn - bidirectional operations between a single Subversion tree and git
    336. 

  336. Usage: git svn <command> [options] [arguments]\n
    337. 

  337. 

  338. 	print $fd "Available commands:\n" unless $cmd;
    339. 

  339. 

  340. 	foreach (sort keys %cmd) {
    341. 

  341. 		next if $cmd && $cmd ne $_;
    342. 

  342. 		next if /^multi-/; # don't show deprecated commands
    343. 

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

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

  345. 			# mixed-case options are for .git/config only
    346. 

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

  347. 			# prints out arguments as they should be passed:
    348. 

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

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

  350. 							"--$_" : "-$_" }
    351. 

  351. 						split /\|/,$_)," $x\n";
    352. 

  352. 		}
    353. 

  353. 	}
    354. 

  354. 	print $fd <<"";
    355. 

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

  356. arbitrary identifier if you're tracking multiple SVN branches/repositories in
    357. 

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

  358. information.
    359. 

  359. 

  360. 	exit $exit;
    361. 

  361. }
    362. 

  362. 

  363. sub version {
    364. 

  364. 	::_req_svn();
    365. 

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

  366. 	exit 0;
    367. 

  367. }
    368. 

  368. 

  369. sub do_git_init_db {
    370. 

  370. 	unless (-d $ENV{GIT_DIR}) {
    371. 

  371. 		my @init_db = ('init');
    372. 

  372. 		push @init_db, "--template=$_template" if defined $_template;
    373. 

  373. 		if (defined $_shared) {
    374. 

  374. 			if ($_shared =~ /[a-z]/) {
    375. 

  375. 				push @init_db, "--shared=$_shared";
    376. 

  376. 			} else {
    377. 

  377. 				push @init_db, "--shared";
    378. 

  378. 			}
    379. 

  379. 		}
    380. 

  380. 		command_noisy(@init_db);
    381. 

  381. 		$_repository = Git->repository(Repository => ".git");
    382. 

  382. 	}
    383. 

  383. 	my $set;
    384. 

  384. 	my $pfx = "svn-remote.$Git::SVN::default_repo_id";
    385. 

  385. 	foreach my $i (keys %icv) {
    386. 

  386. 		die "'$set' and '$i' cannot both be set\n" if $set;
    387. 

  387. 		next unless defined $icv{$i};
    388. 

  388. 		command_noisy('config', "$pfx.$i", $icv{$i});
    389. 

  389. 		$set = $i;
    390. 

  390. 	}
    391. 

  391. 	my $ignore_regex = \$SVN::Git::Fetcher::_ignore_regex;
    392. 

  392. 	command_noisy('config', "$pfx.ignore-paths", $$ignore_regex)
    393. 

  393. 		if defined $$ignore_regex;
    394. 

  394. 

  395. 	if (defined $SVN::Git::Fetcher::_preserve_empty_dirs) {
    396. 

  396. 		my $fname = \$SVN::Git::Fetcher::_placeholder_filename;
    397. 

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

  398. 		command_noisy('config', "$pfx.placeholder-filename", $$fname);
    399. 

  399. 	}
    400. 

  400. }
    401. 

  401. 

  402. sub init_subdir {
    403. 

  403. 	my $repo_path = shift or return;
    404. 

  404. 	mkpath([$repo_path]) unless -d $repo_path;
    405. 

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

  406. 	$ENV{GIT_DIR} = '.git';
    407. 

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

  408. }
    409. 

  409. 

  410. sub cmd_clone {
    411. 

  411. 	my ($url, $path) = @_;
    412. 

  412. 	if (!defined $path &&
    413. 

  413. 	    (defined $_trunk || @_branches || @_tags ||
    414. 

  414. 	     defined $_stdlayout) &&
    415. 

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

  416. 		$path = $url;
    417. 

  417. 	}
    418. 

  418. 	$path = basename($url) if !defined $path || !length $path;
    419. 

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

  420. 	cmd_init($url, $path);
    421. 

  421. 	command_oneline('config', 'svn.authorsfile', $authors_absolute)
    422. 

  422. 	    if $_authors;
    423. 

  423. 	Git::SVN::fetch_all($Git::SVN::default_repo_id);
    424. 

  424. }
    425. 

  425. 

  426. sub cmd_init {
    427. 

  427. 	if (defined $_stdlayout) {
    428. 

  428. 		$_trunk = 'trunk' if (!defined $_trunk);
    429. 

  429. 		@_tags = 'tags' if (! @_tags);
    430. 

  430. 		@_branches = 'branches' if (! @_branches);
    431. 

  431. 	}
    432. 

  432. 	if (defined $_trunk || @_branches || @_tags) {
    433. 

  433. 		return cmd_multi_init(@_);
    434. 

  434. 	}
    435. 

  435. 	my $url = shift or die "SVN repository location required ",
    436. 

  436. 	                       "as a command-line argument\n";
    437. 

  437. 	$url = canonicalize_url($url);
    438. 

  438. 	init_subdir(@_);
    439. 

  439. 	do_git_init_db();
    440. 

  440. 

  441. 	if ($Git::SVN::_minimize_url eq 'unset') {
    442. 

  442. 		$Git::SVN::_minimize_url = 0;
    443. 

  443. 	}
    444. 

  444. 

  445. 	Git::SVN->init($url);
    446. 

  446. }
    447. 

  447. 

  448. sub cmd_fetch {
    449. 

  449. 	if (grep /^\d+=./, @_) {
    450. 

  450. 		die "'<rev>=<commit>' fetch arguments are ",
    451. 

  451. 		    "no longer supported.\n";
    452. 

  452. 	}
    453. 

  453. 	my ($remote) = @_;
    454. 

  454. 	if (@_ > 1) {
    455. 

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

  456. 	}
    457. 

  457. 	$Git::SVN::no_reuse_existing = undef;
    458. 

  458. 	if ($_fetch_parent) {
    459. 

  459. 		my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
    460. 

  460. 		unless ($gs) {
    461. 

  461. 			die "Unable to determine upstream SVN information from ",
    462. 

  462. 			    "working tree history\n";
    463. 

  463. 		}
    464. 

  464. 	        # just fetch, don't checkout.
    465. 

  465. 		$_no_checkout = 'true';
    466. 

  466. 		$_fetch_all ? $gs->fetch_all : $gs->fetch;
    467. 

  467. 	} elsif ($_fetch_all) {
    468. 

  468. 		cmd_multi_fetch();
    469. 

  469. 	} else {
    470. 

  470. 		$remote ||= $Git::SVN::default_repo_id;
    471. 

  471. 		Git::SVN::fetch_all($remote, Git::SVN::read_all_remotes());
    472. 

  472. 	}
    473. 

  473. }
    474. 

  474. 

  475. sub cmd_set_tree {
    476. 

  476. 	my (@commits) = @_;
    477. 

  477. 	if ($_stdin || !@commits) {
    478. 

  478. 		print "Reading from stdin...\n";
    479. 

  479. 		@commits = ();
    480. 

  480. 		while (<STDIN>) {
    481. 

  481. 			if (/\b($sha1_short)\b/o) {
    482. 

  482. 				unshift @commits, $1;
    483. 

  483. 			}
    484. 

  484. 		}
    485. 

  485. 	}
    486. 

  486. 	my @revs;
    487. 

  487. 	foreach my $c (@commits) {
    488. 

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

  489. 		if (scalar @tmp == 1) {
    490. 

  490. 			push @revs, $tmp[0];
    491. 

  491. 		} elsif (scalar @tmp > 1) {
    492. 

  492. 			push @revs, reverse(command('rev-list',@tmp));
    493. 

  493. 		} else {
    494. 

  494. 			fatal "Failed to rev-parse $c";
    495. 

  495. 		}
    496. 

  496. 	}
    497. 

  497. 	my $gs = Git::SVN->new;
    498. 

  498. 	my ($r_last, $cmt_last) = $gs->last_rev_commit;
    499. 

  499. 	$gs->fetch;
    500. 

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

  501. 		fatal "There are new revisions that were fetched ",
    502. 

  502. 		      "and need to be merged (or acknowledged) ",
    503. 

  503. 		      "before committing.\nlast rev: $r_last\n",
    504. 

  504. 		      " current: $gs->{last_rev}";
    505. 

  505. 	}
    506. 

  506. 	$gs->set_tree($_) foreach @revs;
    507. 

  507. 	print "Done committing ",scalar @revs," revisions to SVN\n";
    508. 

  508. 	unlink $gs->{index};
    509. 

  509. }
    510. 

  510. 

  511. sub split_merge_info_range {
    512. 

  512. 	my ($range) = @_;
    513. 

  513. 	if ($range =~ /(\d+)-(\d+)/) {
    514. 

  514. 		return (int($1), int($2));
    515. 

  515. 	} else {
    516. 

  516. 		return (int($range), int($range));
    517. 

  517. 	}
    518. 

  518. }
    519. 

  519. 

  520. sub combine_ranges {
    521. 

  521. 	my ($in) = @_;
    522. 

  522. 

  523. 	my @fnums = ();
    524. 

  524. 	my @arr = split(/,/, $in);
    525. 

  525. 	for my $element (@arr) {
    526. 

  526. 		my ($start, $end) = split_merge_info_range($element);
    527. 

  527. 		push @fnums, $start;
    528. 

  528. 	}
    529. 

  529. 

  530. 	my @sorted = @arr [ sort {
    531. 

  531. 		$fnums[$a] <=> $fnums[$b]
    532. 

  532. 	} 0..$#arr ];
    533. 

  533. 

  534. 	my @return = ();
    535. 

  535. 	my $last = -1;
    536. 

  536. 	my $first = -1;
    537. 

  537. 	for my $element (@sorted) {
    538. 

  538. 		my ($start, $end) = split_merge_info_range($element);
    539. 

  539. 

  540. 		if ($last == -1) {
    541. 

  541. 			$first = $start;
    542. 

  542. 			$last = $end;
    543. 

  543. 			next;
    544. 

  544. 		}
    545. 

  545. 		if ($start <= $last+1) {
    546. 

  546. 			if ($end > $last) {
    547. 

  547. 				$last = $end;
    548. 

  548. 			}
    549. 

  549. 			next;
    550. 

  550. 		}
    551. 

  551. 		if ($first == $last) {
    552. 

  552. 			push @return, "$first";
    553. 

  553. 		} else {
    554. 

  554. 			push @return, "$first-$last";
    555. 

  555. 		}
    556. 

  556. 		$first = $start;
    557. 

  557. 		$last = $end;
    558. 

  558. 	}
    559. 

  559. 

  560. 	if ($first != -1) {
    561. 

  561. 		if ($first == $last) {
    562. 

  562. 			push @return, "$first";
    563. 

  563. 		} else {
    564. 

  564. 			push @return, "$first-$last";
    565. 

  565. 		}
    566. 

  566. 	}
    567. 

  567. 

  568. 	return join(',', @return);
    569. 

  569. }
    570. 

  570. 

  571. sub merge_revs_into_hash {
    572. 

  572. 	my ($hash, $minfo) = @_;
    573. 

  573. 	my @lines = split(' ', $minfo);
    574. 

  574. 

  575. 	for my $line (@lines) {
    576. 

  576. 		my ($branchpath, $revs) = split(/:/, $line);
    577. 

  577. 

  578. 		if (exists($hash->{$branchpath})) {
    579. 

  579. 			# Merge the two revision sets
    580. 

  580. 			my $combined = "$hash->{$branchpath},$revs";
    581. 

  581. 			$hash->{$branchpath} = combine_ranges($combined);
    582. 

  582. 		} else {
    583. 

  583. 			# Just do range combining for consolidation
    584. 

  584. 			$hash->{$branchpath} = combine_ranges($revs);
    585. 

  585. 		}
    586. 

  586. 	}
    587. 

  587. }
    588. 

  588. 

  589. sub merge_merge_info {
    590. 

  590. 	my ($mergeinfo_one, $mergeinfo_two) = @_;
    591. 

  591. 	my %result_hash = ();
    592. 

  592. 

  593. 	merge_revs_into_hash(\%result_hash, $mergeinfo_one);
    594. 

  594. 	merge_revs_into_hash(\%result_hash, $mergeinfo_two);
    595. 

  595. 

  596. 	my $result = '';
    597. 

  597. 	# Sort below is for consistency's sake
    598. 

  598. 	for my $branchname (sort keys(%result_hash)) {
    599. 

  599. 		my $revlist = $result_hash{$branchname};
    600. 

  600. 		$result .= "$branchname:$revlist\n"
    601. 

  601. 	}
    602. 

  602. 	return $result;
    603. 

  603. }
    604. 

  604. 

  605. sub populate_merge_info {
    606. 

  606. 	my ($d, $gs, $uuid, $linear_refs, $rewritten_parent) = @_;
    607. 

  607. 

  608. 	my %parentshash;
    609. 

  609. 	read_commit_parents(\%parentshash, $d);
    610. 

  610. 	my @parents = @{$parentshash{$d}};
    611. 

  611. 	if ($#parents > 0) {
    612. 

  612. 		# Merge commit
    613. 

  613. 		my $all_parents_ok = 1;
    614. 

  614. 		my $aggregate_mergeinfo = '';
    615. 

  615. 		my $rooturl = $gs->repos_root;
    616. 

  616. 

  617. 		if (defined($rewritten_parent)) {
    618. 

  618. 			# Replace first parent with newly-rewritten version
    619. 

  619. 			shift @parents;
    620. 

  620. 			unshift @parents, $rewritten_parent;
    621. 

  621. 		}
    622. 

  622. 

  623. 		foreach my $parent (@parents) {
    624. 

  624. 			my ($branchurl, $svnrev, $paruuid) =
    625. 

  625. 				cmt_metadata($parent);
    626. 

  626. 

  627. 			unless (defined($svnrev)) {
    628. 

  628. 				# Should have been caught be preflight check
    629. 

  629. 				fatal "merge commit $d has ancestor $parent, but that change "
    630. 

  630.                      ."does not have git-svn metadata!";
    631. 

  631. 			}
    632. 

  632. 			unless ($branchurl =~ /^$rooturl(.*)/) {
    633. 

  633. 				fatal "commit $parent git-svn metadata changed mid-run!";
    634. 

  634. 			}
    635. 

  635. 			my $branchpath = $1;
    636. 

  636. 

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

  638. 			my (undef, undef, $props) =
    639. 

  639. 				$ra->get_dir(canonicalize_path("."), $svnrev);
    640. 

  640. 			my $par_mergeinfo = $props->{'svn:mergeinfo'};
    641. 

  641. 			unless (defined $par_mergeinfo) {
    642. 

  642. 				$par_mergeinfo = '';
    643. 

  643. 			}
    644. 

  644. 			# Merge previous mergeinfo values
    645. 

  645. 			$aggregate_mergeinfo =
    646. 

  646. 				merge_merge_info($aggregate_mergeinfo,
    647. 

  647. 								 $par_mergeinfo, 0);
    648. 

  648. 

  649. 			next if $parent eq $parents[0]; # Skip first parent
    650. 

  650. 			# Add new changes being placed in tree by merge
    651. 

  651. 			my @cmd = (qw/rev-list --reverse/,
    652. 

  652. 					   $parent, qw/--not/);
    653. 

  653. 			foreach my $par (@parents) {
    654. 

  654. 				unless ($par eq $parent) {
    655. 

  655. 					push @cmd, $par;
    656. 

  656. 				}
    657. 

  657. 			}
    658. 

  658. 			my @revsin = ();
    659. 

  659. 			my ($revlist, $ctx) = command_output_pipe(@cmd);
    660. 

  660. 			while (<$revlist>) {
    661. 

  661. 				my $irev = $_;
    662. 

  662. 				chomp $irev;
    663. 

  663. 				my (undef, $csvnrev, undef) =
    664. 

  664. 					cmt_metadata($irev);
    665. 

  665. 				unless (defined $csvnrev) {
    666. 

  666. 					# A child is missing SVN annotations...
    667. 

  667. 					# this might be OK, or might not be.
    668. 

  668. 					warn "W:child $irev is merged into revision "
    669. 

  669. 						 ."$d but does not have git-svn metadata. "
    670. 

  670. 						 ."This means git-svn cannot determine the "
    671. 

  671. 						 ."svn revision numbers to place into the "
    672. 

  672. 						 ."svn:mergeinfo property. You must ensure "
    673. 

  673. 						 ."a branch is entirely committed to "
    674. 

  674. 						 ."SVN before merging it in order for "
    675. 

  675. 						 ."svn:mergeinfo population to function "
    676. 

  676. 						 ."properly";
    677. 

  677. 				}
    678. 

  678. 				push @revsin, $csvnrev;
    679. 

  679. 			}
    680. 

  680. 			command_close_pipe($revlist, $ctx);
    681. 

  681. 

  682. 			last unless $all_parents_ok;
    683. 

  683. 

  684. 			# We now have a list of all SVN revnos which are
    685. 

  685. 			# merged by this particular parent. Integrate them.
    686. 

  686. 			next if $#revsin == -1;
    687. 

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

  688. 			$aggregate_mergeinfo =
    689. 

  689. 				merge_merge_info($aggregate_mergeinfo,
    690. 

  690. 								 $newmergeinfo, 1);
    691. 

  691. 		}
    692. 

  692. 		if ($all_parents_ok and $aggregate_mergeinfo) {
    693. 

  693. 			return $aggregate_mergeinfo;
    694. 

  694. 		}
    695. 

  695. 	}
    696. 

  696. 

  697. 	return undef;
    698. 

  698. }
    699. 

  699. 

  700. sub cmd_dcommit {
    701. 

  701. 	my $head = shift;
    702. 

  702. 	command_noisy(qw/update-index --refresh/);
    703. 

  703. 	git_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }
    704. 

  704. 		'Cannot dcommit with a dirty index.  Commit your changes first, '
    705. 

  705. 		. "or stash them with `git stash'.\n";
    706. 

  706. 	$head ||= 'HEAD';
    707. 

  707. 

  708. 	my $old_head;
    709. 

  709. 	if ($head ne 'HEAD') {
    710. 

  710. 		$old_head = eval {
    711. 

  711. 			command_oneline([qw/symbolic-ref -q HEAD/])
    712. 

  712. 		};
    713. 

  713. 		if ($old_head) {
    714. 

  714. 			$old_head =~ s{^refs/heads/}{};
    715. 

  715. 		} else {
    716. 

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

  717. 		}
    718. 

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

  719. 	}
    720. 

  720. 

  721. 	my @refs;
    722. 

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

  723. 	unless ($gs) {
    724. 

  724. 		die "Unable to determine upstream SVN information from ",
    725. 

  725. 		    "$head history.\nPerhaps the repository is empty.";
    726. 

  726. 	}
    727. 

  727. 

  728. 	if (defined $_commit_url) {
    729. 

  729. 		$url = $_commit_url;
    730. 

  730. 	} else {
    731. 

  731. 		$url = eval { command_oneline('config', '--get',
    732. 

  732. 			      "svn-remote.$gs->{repo_id}.commiturl") };
    733. 

  733. 		if (!$url) {
    734. 

  734. 			$url = $gs->full_pushurl
    735. 

  735. 		}
    736. 

  736. 	}
    737. 

  737. 

  738. 	my $last_rev = $_revision if defined $_revision;
    739. 

  739. 	if ($url) {
    740. 

  740. 		print "Committing to $url ...\n";
    741. 

  741. 	}
    742. 

  742. 	my ($linear_refs, $parents) = linearize_history($gs, \@refs);
    743. 

  743. 	if ($_no_rebase && scalar(@$linear_refs) > 1) {
    744. 

  744. 		warn "Attempting to commit more than one change while ",
    745. 

  745. 		     "--no-rebase is enabled.\n",
    746. 

  746. 		     "If these changes depend on each other, re-running ",
    747. 

  747. 		     "without --no-rebase may be required."
    748. 

  748. 	}
    749. 

  749. 	my $expect_url = $url;
    750. 

  750. 

  751. 	my $push_merge_info = eval {
    752. 

  752. 		command_oneline(qw/config --get svn.pushmergeinfo/)
    753. 

  753. 		};
    754. 

  754. 	if (not defined($push_merge_info)
    755. 

  755. 			or $push_merge_info eq "false"
    756. 

  756. 			or $push_merge_info eq "no"
    757. 

  757. 			or $push_merge_info eq "never") {
    758. 

  758. 		$push_merge_info = 0;
    759. 

  759. 	}
    760. 

  760. 

  761. 	unless (defined($_merge_info) || ! $push_merge_info) {
    762. 

  762. 		# Preflight check of changes to ensure no issues with mergeinfo
    763. 

  763. 		# This includes check for uncommitted-to-SVN parents
    764. 

  764. 		# (other than the first parent, which we will handle),
    765. 

  765. 		# information from different SVN repos, and paths
    766. 

  766. 		# which are not underneath this repository root.
    767. 

  767. 		my $rooturl = $gs->repos_root;
    768. 

  768. 		foreach my $d (@$linear_refs) {
    769. 

  769. 			my %parentshash;
    770. 

  770. 			read_commit_parents(\%parentshash, $d);
    771. 

  771. 			my @realparents = @{$parentshash{$d}};
    772. 

  772. 			if ($#realparents > 0) {
    773. 

  773. 				# Merge commit
    774. 

  774. 				shift @realparents; # Remove/ignore first parent
    775. 

  775. 				foreach my $parent (@realparents) {
    776. 

  776. 					my ($branchurl, $svnrev, $paruuid) = cmt_metadata($parent);
    777. 

  777. 					unless (defined $paruuid) {
    778. 

  778. 						# A parent is missing SVN annotations...
    779. 

  779. 						# abort the whole operation.
    780. 

  780. 						fatal "$parent is merged into revision $d, "
    781. 

  781. 							 ."but does not have git-svn metadata. "
    782. 

  782. 							 ."Either dcommit the branch or use a "
    783. 

  783. 							 ."local cherry-pick, FF merge, or rebase "
    784. 

  784. 							 ."instead of an explicit merge commit.";
    785. 

  785. 					}
    786. 

  786. 

  787. 					unless ($paruuid eq $uuid) {
    788. 

  788. 						# Parent has SVN metadata from different repository
    789. 

  789. 						fatal "merge parent $parent for change $d has "
    790. 

  790. 							 ."git-svn uuid $paruuid, while current change "
    791. 

  791. 							 ."has uuid $uuid!";
    792. 

  792. 					}
    793. 

  793. 

  794. 					unless ($branchurl =~ /^$rooturl(.*)/) {
    795. 

  795. 						# This branch is very strange indeed.
    796. 

  796. 						fatal "merge parent $parent for $d is on branch "
    797. 

  797. 							 ."$branchurl, which is not under the "
    798. 

  798. 							 ."git-svn root $rooturl!";
    799. 

  799. 					}
    800. 

  800. 				}
    801. 

  801. 			}
    802. 

  802. 		}
    803. 

  803. 	}
    804. 

  804. 

  805. 	my $rewritten_parent;
    806. 

  806. 	Git::SVN::remove_username($expect_url);
    807. 

  807. 	if (defined($_merge_info)) {
    808. 

  808. 		$_merge_info =~ tr{ }{\n};
    809. 

  809. 	}
    810. 

  810. 	while (1) {
    811. 

  811. 		my $d = shift @$linear_refs or last;
    812. 

  812. 		unless (defined $last_rev) {
    813. 

  813. 			(undef, $last_rev, undef) = cmt_metadata("$d~1");
    814. 

  814. 			unless (defined $last_rev) {
    815. 

  815. 				fatal "Unable to extract revision information ",
    816. 

  816. 				      "from commit $d~1";
    817. 

  817. 			}
    818. 

  818. 		}
    819. 

  819. 		if ($_dry_run) {
    820. 

  820. 			print "diff-tree $d~1 $d\n";
    821. 

  821. 		} else {
    822. 

  822. 			my $cmt_rev;
    823. 

  823. 

  824. 			unless (defined($_merge_info) || ! $push_merge_info) {
    825. 

  825. 				$_merge_info = populate_merge_info($d, $gs,
    826. 

  826. 				                             $uuid,
    827. 

  827. 				                             $linear_refs,
    828. 

  828. 				                             $rewritten_parent);
    829. 

  829. 			}
    830. 

  830. 

  831. 			my %ed_opts = ( r => $last_rev,
    832. 

  832. 			                log => get_commit_entry($d)->{log},
    833. 

  833. 			                ra => Git::SVN::Ra->new($url),
    834. 

  834. 			                config => SVN::Core::config_get_config(
    835. 

  835. 			                        $Git::SVN::Ra::config_dir
    836. 

  836. 			                ),
    837. 

  837. 			                tree_a => "$d~1",
    838. 

  838. 			                tree_b => $d,
    839. 

  839. 			                editor_cb => sub {
    840. 

  840. 			                       print "Committed r$_[0]\n";
    841. 

  841. 			                       $cmt_rev = $_[0];
    842. 

  842. 			                },
    843. 

  843. 					mergeinfo => $_merge_info,
    844. 

  844. 			                svn_path => '');
    845. 

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

  846. 				print "No changes\n$d~1 == $d\n";
    847. 

  847. 			} elsif ($parents->{$d} && @{$parents->{$d}}) {
    848. 

  848. 				$gs->{inject_parents_dcommit}->{$cmt_rev} =
    849. 

  849. 				                               $parents->{$d};
    850. 

  850. 			}
    851. 

  851. 			$_fetch_all ? $gs->fetch_all : $gs->fetch;
    852. 

  852. 			$last_rev = $cmt_rev;
    853. 

  853. 			next if $_no_rebase;
    854. 

  854. 

  855. 			# we always want to rebase against the current HEAD,
    856. 

  856. 			# not any head that was passed to us
    857. 

  857. 			my @diff = command('diff-tree', $d,
    858. 

  858. 			                   $gs->refname, '--');
    859. 

  859. 			my @finish;
    860. 

  860. 			if (@diff) {
    861. 

  861. 				@finish = rebase_cmd();
    862. 

  862. 				print STDERR "W: $d and ", $gs->refname,
    863. 

  863. 				             " differ, using @finish:\n",
    864. 

  864. 				             join("\n", @diff), "\n";
    865. 

  865. 			} else {
    866. 

  866. 				print "No changes between current HEAD and ",
    867. 

  867. 				      $gs->refname,
    868. 

  868. 				      "\nResetting to the latest ",
    869. 

  869. 				      $gs->refname, "\n";
    870. 

  870. 				@finish = qw/reset --mixed/;
    871. 

  871. 			}
    872. 

  872. 			command_noisy(@finish, $gs->refname);
    873. 

  873. 

  874. 			$rewritten_parent = command_oneline(qw/rev-parse HEAD/);
    875. 

  875. 

  876. 			if (@diff) {
    877. 

  877. 				@refs = ();
    878. 

  878. 				my ($url_, $rev_, $uuid_, $gs_) =
    879. 

  879. 				              working_head_info('HEAD', \@refs);
    880. 

  880. 				my ($linear_refs_, $parents_) =
    881. 

  881. 				              linearize_history($gs_, \@refs);
    882. 

  882. 				if (scalar(@$linear_refs) !=
    883. 

  883. 				    scalar(@$linear_refs_)) {
    884. 

  884. 					fatal "# of revisions changed ",
    885. 

  885. 					  "\nbefore:\n",
    886. 

  886. 					  join("\n", @$linear_refs),
    887. 

  887. 					  "\n\nafter:\n",
    888. 

  888. 					  join("\n", @$linear_refs_), "\n",
    889. 

  889. 					  'If you are attempting to commit ',
    890. 

  890. 					  "merges, try running:\n\t",
    891. 

  891. 					  'git rebase --interactive',
    892. 

  892. 					  '--preserve-merges ',
    893. 

  893. 					  $gs->refname,
    894. 

  894. 					  "\nBefore dcommitting";
    895. 

  895. 				}
    896. 

  896. 				if ($url_ ne $expect_url) {
    897. 

  897. 					if ($url_ eq $gs->metadata_url) {
    898. 

  898. 						print
    899. 

  899. 						  "Accepting rewritten URL:",
    900. 

  900. 						  " $url_\n";
    901. 

  901. 					} else {
    902. 

  902. 						fatal
    903. 

  903. 						  "URL mismatch after rebase:",
    904. 

  904. 						  " $url_ != $expect_url";
    905. 

  905. 					}
    906. 

  906. 				}
    907. 

  907. 				if ($uuid_ ne $uuid) {
    908. 

  908. 					fatal "uuid mismatch after rebase: ",
    909. 

  909. 					      "$uuid_ != $uuid";
    910. 

  910. 				}
    911. 

  911. 				# remap parents
    912. 

  912. 				my (%p, @l, $i);
    913. 

  913. 				for ($i = 0; $i < scalar @$linear_refs; $i++) {
    914. 

  914. 					my $new = $linear_refs_->[$i] or next;
    915. 

  915. 					$p{$new} =
    916. 

  916. 						$parents->{$linear_refs->[$i]};
    917. 

  917. 					push @l, $new;
    918. 

  918. 				}
    919. 

  919. 				$parents = \%p;
    920. 

  920. 				$linear_refs = \@l;
    921. 

  921. 			}
    922. 

  922. 		}
    923. 

  923. 	}
    924. 

  924. 

  925. 	if ($old_head) {
    926. 

  926. 		my $new_head = command_oneline(qw/rev-parse HEAD/);
    927. 

  927. 		my $new_is_symbolic = eval {
    928. 

  928. 			command_oneline(qw/symbolic-ref -q HEAD/);
    929. 

  929. 		};
    930. 

  930. 		if ($new_is_symbolic) {
    931. 

  931. 			print "dcommitted the branch ", $head, "\n";
    932. 

  932. 		} else {
    933. 

  933. 			print "dcommitted on a detached HEAD because you gave ",
    934. 

  934. 			      "a revision argument.\n",
    935. 

  935. 			      "The rewritten commit is: ", $new_head, "\n";
    936. 

  936. 		}
    937. 

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

  938. 	}
    939. 

  939. 

  940. 	unlink $gs->{index};
    941. 

  941. }
    942. 

  942. 

  943. sub cmd_branch {
    944. 

  944. 	my ($branch_name, $head) = @_;
    945. 

  945. 

  946. 	unless (defined $branch_name && length $branch_name) {
    947. 

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

  948. 	}
    949. 

  949. 	$head ||= 'HEAD';
    950. 

  950. 

  951. 	my (undef, $rev, undef, $gs) = working_head_info($head);
    952. 

  952. 	my $src = $gs->full_pushurl;
    953. 

  953. 

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

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

  956. 	my $glob;
    957. 

  957. 	if ($#{$allglobs} == 0) {
    958. 

  958. 		$glob = $allglobs->[0];
    959. 

  959. 	} else {
    960. 

  960. 		unless(defined $_branch_dest) {
    961. 

  961. 			die "Multiple ",
    962. 

  962. 			    $_tag ? "tag" : "branch",
    963. 

  963. 			    " paths defined for Subversion repository.\n",
    964. 

  964. 		            "You must specify where you want to create the ",
    965. 

  965. 		            $_tag ? "tag" : "branch",
    966. 

  966. 		            " with the --destination argument.\n";
    967. 

  967. 		}
    968. 

  968. 		foreach my $g (@{$allglobs}) {
    969. 

  969. 			# SVN::Git::Editor could probably be moved to Git.pm..
    970. 

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

  971. 			if ($_branch_dest =~ /$re/) {
    972. 

  972. 				$glob = $g;
    973. 

  973. 				last;
    974. 

  974. 			}
    975. 

  975. 		}
    976. 

  976. 		unless (defined $glob) {
    977. 

  977. 			my $dest_re = qr/\b\Q$_branch_dest\E\b/;
    978. 

  978. 			foreach my $g (@{$allglobs}) {
    979. 

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

  980. 				if (defined $glob) {
    981. 

  981. 					die "Ambiguous destination: ",
    982. 

  982. 					    $_branch_dest, "\nmatches both '",
    983. 

  983. 					    $glob->{path}->{left}, "' and '",
    984. 

  984. 					    $g->{path}->{left}, "'\n";
    985. 

  985. 				}
    986. 

  986. 				$glob = $g;
    987. 

  987. 			}
    988. 

  988. 			unless (defined $glob) {
    989. 

  989. 				die "Unknown ",
    990. 

  990. 				    $_tag ? "tag" : "branch",
    991. 

  991. 				    " destination $_branch_dest\n";
    992. 

  992. 			}
    993. 

  993. 		}
    994. 

  994. 	}
    995. 

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

  996. 	my $url;
    997. 

  997. 	if (defined $_commit_url) {
    998. 

  998. 		$url = $_commit_url;
    999. 

  999. 	} else {
    1000. 

  1000. 		$url = eval { command_oneline('config', '--get',
    1001. 

  1001. 			"svn-remote.$gs->{repo_id}.commiturl") };
    1002. 

  1002. 		if (!$url) {
    1003. 

  1003. 			$url = $remote->{pushurl} || $remote->{url};
    1004. 

  1004. 		}
    1005. 

  1005. 	}
    1006. 

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

  1007. 

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

  1009. 		$src=~s/^http:/https:/;
    1010. 

  1010. 	}
    1011. 

  1011. 

  1012. 	::_req_svn();
    1013. 

  1013. 

  1014. 	my $ctx = SVN::Client->new(
    1015. 

  1015. 		auth    => Git::SVN::Ra::_auth_providers(),
    1016. 

  1016. 		log_msg => sub {
    1017. 

  1017. 			${ $_[0] } = defined $_message
    1018. 

  1018. 				? $_message
    1019. 

  1019. 				: 'Create ' . ($_tag ? 'tag ' : 'branch ' )
    1020. 

  1020. 				. $branch_name;
    1021. 

  1021. 		},
    1022. 

  1022. 	);
    1023. 

  1023. 

  1024. 	eval {
    1025. 

  1025. 		$ctx->ls($dst, 'HEAD', 0);
    1026. 

  1026. 	} and die "branch ${branch_name} already exists\n";
    1027. 

  1027. 

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

  1029. 	$ctx->copy($src, $rev, $dst)
    1030. 

  1030. 		unless $_dry_run;
    1031. 

  1031. 

  1032. 	$gs->fetch_all;
    1033. 

  1033. }
    1034. 

  1034. 

  1035. sub cmd_find_rev {
    1036. 

  1036. 	my $revision_or_hash = shift or die "SVN or git revision required ",
    1037. 

  1037. 	                                    "as a command-line argument\n";
    1038. 

  1038. 	my $result;
    1039. 

  1039. 	if ($revision_or_hash =~ /^r\d+$/) {
    1040. 

  1040. 		my $head = shift;
    1041. 

  1041. 		$head ||= 'HEAD';
    1042. 

  1042. 		my @refs;
    1043. 

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

  1044. 		unless ($gs) {
    1045. 

  1045. 			die "Unable to determine upstream SVN information from ",
    1046. 

  1046. 			    "$head history\n";
    1047. 

  1047. 		}
    1048. 

  1048. 		my $desired_revision = substr($revision_or_hash, 1);
    1049. 

  1049. 		$result = $gs->rev_map_get($desired_revision, $uuid);
    1050. 

  1050. 	} else {
    1051. 

  1051. 		my (undef, $rev, undef) = cmt_metadata($revision_or_hash);
    1052. 

  1052. 		$result = $rev;
    1053. 

  1053. 	}
    1054. 

  1054. 	print "$result\n" if $result;
    1055. 

  1055. }
    1056. 

  1056. 

  1057. sub auto_create_empty_directories {
    1058. 

  1058. 	my ($gs) = @_;
    1059. 

  1059. 	my $var = eval { command_oneline('config', '--get', '--bool',
    1060. 

  1060. 					 "svn-remote.$gs->{repo_id}.automkdirs") };
    1061. 

  1061. 	# By default, create empty directories by consulting the unhandled log,
    1062. 

  1062. 	# but allow setting it to 'false' to skip it.
    1063. 

  1063. 	return !($var && $var eq 'false');
    1064. 

  1064. }
    1065. 

  1065. 

  1066. sub cmd_rebase {
    1067. 

  1067. 	command_noisy(qw/update-index --refresh/);
    1068. 

  1068. 	my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
    1069. 

  1069. 	unless ($gs) {
    1070. 

  1070. 		die "Unable to determine upstream SVN information from ",
    1071. 

  1071. 		    "working tree history\n";
    1072. 

  1072. 	}
    1073. 

  1073. 	if ($_dry_run) {
    1074. 

  1074. 		print "Remote Branch: " . $gs->refname . "\n";
    1075. 

  1075. 		print "SVN URL: " . $url . "\n";
    1076. 

  1076. 		return;
    1077. 

  1077. 	}
    1078. 

  1078. 	if (command(qw/diff-index HEAD --/)) {
    1079. 

  1079. 		print STDERR "Cannot rebase with uncommited changes:\n";
    1080. 

  1080. 		command_noisy('status');
    1081. 

  1081. 		exit 1;
    1082. 

  1082. 	}
    1083. 

  1083. 	unless ($_local) {
    1084. 

  1084. 		# rebase will checkout for us, so no need to do it explicitly
    1085. 

  1085. 		$_no_checkout = 'true';
    1086. 

  1086. 		$_fetch_all ? $gs->fetch_all : $gs->fetch;
    1087. 

  1087. 	}
    1088. 

  1088. 	command_noisy(rebase_cmd(), $gs->refname);
    1089. 

  1089. 	if (auto_create_empty_directories($gs)) {
    1090. 

  1090. 		$gs->mkemptydirs;
    1091. 

  1091. 	}
    1092. 

  1092. }
    1093. 

  1093. 

  1094. sub cmd_show_ignore {
    1095. 

  1095. 	my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
    1096. 

  1096. 	$gs ||= Git::SVN->new;
    1097. 

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

  1098. 	$gs->prop_walk($gs->{path}, $r, sub {
    1099. 

  1099. 		my ($gs, $path, $props) = @_;
    1100. 

  1100. 		print STDOUT "\n# $path\n";
    1101. 

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

  1102. 		$s =~ s/[\r\n]+/\n/g;
    1103. 

  1103. 		$s =~ s/^\n+//;
    1104. 

  1104. 		chomp $s;
    1105. 

  1105. 		$s =~ s#^#$path#gm;
    1106. 

  1106. 		print STDOUT "$s\n";
    1107. 

  1107. 	});
    1108. 

  1108. }
    1109. 

  1109. 

  1110. sub cmd_show_externals {
    1111. 

  1111. 	my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
    1112. 

  1112. 	$gs ||= Git::SVN->new;
    1113. 

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

  1114. 	$gs->prop_walk($gs->{path}, $r, sub {
    1115. 

  1115. 		my ($gs, $path, $props) = @_;
    1116. 

  1116. 		print STDOUT "\n# $path\n";
    1117. 

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

  1118. 		$s =~ s/[\r\n]+/\n/g;
    1119. 

  1119. 		chomp $s;
    1120. 

  1120. 		$s =~ s#^#$path#gm;
    1121. 

  1121. 		print STDOUT "$s\n";
    1122. 

  1122. 	});
    1123. 

  1123. }
    1124. 

  1124. 

  1125. sub cmd_create_ignore {
    1126. 

  1126. 	my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
    1127. 

  1127. 	$gs ||= Git::SVN->new;
    1128. 

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

  1129. 	$gs->prop_walk($gs->{path}, $r, sub {
    1130. 

  1130. 		my ($gs, $path, $props) = @_;
    1131. 

  1131. 		# $path is of the form /path/to/dir/
    1132. 

  1132. 		$path = '.' . $path;
    1133. 

  1133. 		# SVN can have attributes on empty directories,
    1134. 

  1134. 		# which git won't track
    1135. 

  1135. 		mkpath([$path]) unless -d $path;
    1136. 

  1136. 		my $ignore = $path . '.gitignore';
    1137. 

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

  1138. 		open(GITIGNORE, '>', $ignore)
    1139. 

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

  1140. 		$s =~ s/[\r\n]+/\n/g;
    1141. 

  1141. 		$s =~ s/^\n+//;
    1142. 

  1142. 		chomp $s;
    1143. 

  1143. 		# Prefix all patterns so that the ignore doesn't apply
    1144. 

  1144. 		# to sub-directories.
    1145. 

  1145. 		$s =~ s#^#/#gm;
    1146. 

  1146. 		print GITIGNORE "$s\n";
    1147. 

  1147. 		close(GITIGNORE)
    1148. 

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

  1149. 		command_noisy('add', '-f', $ignore);
    1150. 

  1150. 	});
    1151. 

  1151. }
    1152. 

  1152. 

  1153. sub cmd_mkdirs {
    1154. 

  1154. 	my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
    1155. 

  1155. 	$gs ||= Git::SVN->new;
    1156. 

  1156. 	$gs->mkemptydirs($_revision);
    1157. 

  1157. }
    1158. 

  1158. 

  1159. sub canonicalize_path {
    1160. 

  1160. 	my ($path) = @_;
    1161. 

  1161. 	my $dot_slash_added = 0;
    1162. 

  1162. 	if (substr($path, 0, 1) ne "/") {
    1163. 

  1163. 		$path = "./" . $path;
    1164. 

  1164. 		$dot_slash_added = 1;
    1165. 

  1165. 	}
    1166. 

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

  1167. 	# good reason), so let's do this manually.
    1168. 

  1168. 	$path =~ s#/+#/#g;
    1169. 

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

  1170. 	$path =~ s#/[^/]+/\.\.##g;
    1171. 

  1171. 	$path =~ s#/$##g;
    1172. 

  1172. 	$path =~ s#^\./## if $dot_slash_added;
    1173. 

  1173. 	$path =~ s#^/##;
    1174. 

  1174. 	$path =~ s#^\.$##;
    1175. 

  1175. 	return $path;
    1176. 

  1176. }
    1177. 

  1177. 

  1178. sub canonicalize_url {
    1179. 

  1179. 	my ($url) = @_;
    1180. 

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

  1181. 	return $url;
    1182. 

  1182. }
    1183. 

  1183. 

  1184. # get_svnprops(PATH)
    1185. 

  1185. # ------------------
    1186. 

  1186. # Helper for cmd_propget and cmd_proplist below.
    1187. 

  1187. sub get_svnprops {
    1188. 

  1188. 	my $path = shift;
    1189. 

  1189. 	my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
    1190. 

  1190. 	$gs ||= Git::SVN->new;
    1191. 

  1191. 

  1192. 	# prefix THE PATH by the sub-directory from which the user
    1193. 

  1193. 	# invoked us.
    1194. 

  1194. 	$path = $cmd_dir_prefix . $path;
    1195. 

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

  1196. 	my $is_dir = -d $path ? 1 : 0;
    1197. 

  1197. 	$path = $gs->{path} . '/' . $path;
    1198. 

  1198. 

  1199. 	# canonicalize the path (otherwise libsvn will abort or fail to
    1200. 

  1200. 	# find the file)
    1201. 

  1201. 	$path = canonicalize_path($path);
    1202. 

  1202. 

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

  1204. 	my $props;
    1205. 

  1205. 	if ($is_dir) {
    1206. 

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

  1207. 	}
    1208. 

  1208. 	else {
    1209. 

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

  1210. 	}
    1211. 

  1211. 	return $props;
    1212. 

  1212. }
    1213. 

  1213. 

  1214. # cmd_propget (PROP, PATH)
    1215. 

  1215. # ------------------------
    1216. 

  1216. # Print the SVN property PROP for PATH.
    1217. 

  1217. sub cmd_propget {
    1218. 

  1218. 	my ($prop, $path) = @_;
    1219. 

  1219. 	$path = '.' if not defined $path;
    1220. 

  1220. 	usage(1) if not defined $prop;
    1221. 

  1221. 	my $props = get_svnprops($path);
    1222. 

  1222. 	if (not defined $props->{$prop}) {
    1223. 

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

  1224. 	}
    1225. 

  1225. 	print $props->{$prop} . "\n";
    1226. 

  1226. }
    1227. 

  1227. 

  1228. # cmd_proplist (PATH)
    1229. 

  1229. # -------------------
    1230. 

  1230. # Print the list of SVN properties for PATH.
    1231. 

  1231. sub cmd_proplist {
    1232. 

  1232. 	my $path = shift;
    1233. 

  1233. 	$path = '.' if not defined $path;
    1234. 

  1234. 	my $props = get_svnprops($path);
    1235. 

  1235. 	print "Properties on '$path':\n";
    1236. 

  1236. 	foreach (sort keys %{$props}) {
    1237. 

  1237. 		print "  $_\n";
    1238. 

  1238. 	}
    1239. 

  1239. }
    1240. 

  1240. 

  1241. sub cmd_multi_init {
    1242. 

  1242. 	my $url = shift;
    1243. 

  1243. 	unless (defined $_trunk || @_branches || @_tags) {
    1244. 

  1244. 		usage(1);
    1245. 

  1245. 	}
    1246. 

  1246. 

  1247. 	$_prefix = '' unless defined $_prefix;
    1248. 

  1248. 	if (defined $url) {
    1249. 

  1249. 		$url = canonicalize_url($url);
    1250. 

  1250. 		init_subdir(@_);
    1251. 

  1251. 	}
    1252. 

  1252. 	do_git_init_db();
    1253. 

  1253. 	if (defined $_trunk) {
    1254. 

  1254. 		$_trunk =~ s#^/+##;
    1255. 

  1255. 		my $trunk_ref = 'refs/remotes/' . $_prefix . 'trunk';
    1256. 

  1256. 		# try both old-style and new-style lookups:
    1257. 

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

  1258. 		unless ($gs_trunk) {
    1259. 

  1259. 			my ($trunk_url, $trunk_path) =
    1260. 

  1260. 			                      complete_svn_url($url, $_trunk);
    1261. 

  1261. 			$gs_trunk = Git::SVN->init($trunk_url, $trunk_path,
    1262. 

  1262. 						   undef, $trunk_ref);
    1263. 

  1263. 		}
    1264. 

  1264. 	}
    1265. 

  1265. 	return unless @_branches || @_tags;
    1266. 

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

  1267. 	foreach my $path (@_branches) {
    1268. 

  1268. 		complete_url_ls_init($ra, $path, '--branches/-b', $_prefix);
    1269. 

  1269. 	}
    1270. 

  1270. 	foreach my $path (@_tags) {
    1271. 

  1271. 		complete_url_ls_init($ra, $path, '--tags/-t', $_prefix.'tags/');
    1272. 

  1272. 	}
    1273. 

  1273. }
    1274. 

  1274. 

  1275. sub cmd_multi_fetch {
    1276. 

  1276. 	$Git::SVN::no_reuse_existing = undef;
    1277. 

  1277. 	my $remotes = Git::SVN::read_all_remotes();
    1278. 

  1278. 	foreach my $repo_id (sort keys %$remotes) {
    1279. 

  1279. 		if ($remotes->{$repo_id}->{url}) {
    1280. 

  1280. 			Git::SVN::fetch_all($repo_id, $remotes);
    1281. 

  1281. 		}
    1282. 

  1282. 	}
    1283. 

  1283. }
    1284. 

  1284. 

  1285. # this command is special because it requires no metadata
    1286. 

  1286. sub cmd_commit_diff {
    1287. 

  1287. 	my ($ta, $tb, $url) = @_;
    1288. 

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

  1289. 	            "<tree-ish> <tree-ish> [<URL>]";
    1290. 

  1290. 	fatal($usage) if (!defined $ta || !defined $tb);
    1291. 

  1291. 	my $svn_path = '';
    1292. 

  1292. 	if (!defined $url) {
    1293. 

  1293. 		my $gs = eval { Git::SVN->new };
    1294. 

  1294. 		if (!$gs) {
    1295. 

  1295. 			fatal("Needed URL or usable git-svn --id in ",
    1296. 

  1296. 			      "the command-line\n", $usage);
    1297. 

  1297. 		}
    1298. 

  1298. 		$url = $gs->{url};
    1299. 

  1299. 		$svn_path = $gs->{path};
    1300. 

  1300. 	}
    1301. 

  1301. 	unless (defined $_revision) {
    1302. 

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

  1303. 	}
    1304. 

  1304. 	if (defined $_message && defined $_file) {
    1305. 

  1305. 		fatal("Both --message/-m and --file/-F specified ",
    1306. 

  1306. 		      "for the commit message.\n",
    1307. 

  1307. 		      "I have no idea what you mean");
    1308. 

  1308. 	}
    1309. 

  1309. 	if (defined $_file) {
    1310. 

  1310. 		$_message = file_to_s($_file);
    1311. 

  1311. 	} else {
    1312. 

  1312. 		$_message ||= get_commit_entry($tb)->{log};
    1313. 

  1313. 	}
    1314. 

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

  1315. 	my $r = $_revision;
    1316. 

  1316. 	if ($r eq 'HEAD') {
    1317. 

  1317. 		$r = $ra->get_latest_revnum;
    1318. 

  1318. 	} elsif ($r !~ /^\d+$/) {
    1319. 

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

  1320. 	}
    1321. 

  1321. 	my %ed_opts = ( r => $r,
    1322. 

  1322. 	                log => $_message,
    1323. 

  1323. 	                ra => $ra,
    1324. 

  1324. 	                tree_a => $ta,
    1325. 

  1325. 	                tree_b => $tb,
    1326. 

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

  1327. 	                svn_path => $svn_path );
    1328. 

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

  1329. 		print "No changes\n$ta == $tb\n";
    1330. 

  1330. 	}
    1331. 

  1331. }
    1332. 

  1332. 

  1333. sub escape_uri_only {
    1334. 

  1334. 	my ($uri) = @_;
    1335. 

  1335. 	my @tmp;
    1336. 

  1336. 	foreach (split m{/}, $uri) {
    1337. 

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

  1338. 		push @tmp, $_;
    1339. 

  1339. 	}
    1340. 

  1340. 	join('/', @tmp);
    1341. 

  1341. }
    1342. 

  1342. 

  1343. sub escape_url {
    1344. 

  1344. 	my ($url) = @_;
    1345. 

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

  1346. 		my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
    1347. 

  1347. 		$url = "$scheme://$domain$uri";
    1348. 

  1348. 	}
    1349. 

  1349. 	$url;
    1350. 

  1350. }
    1351. 

  1351. 

  1352. sub cmd_info {
    1353. 

  1353. 	my $path = canonicalize_path(defined($_[0]) ? $_[0] : ".");
    1354. 

  1354. 	my $fullpath = canonicalize_path($cmd_dir_prefix . $path);
    1355. 

  1355. 	if (exists $_[1]) {
    1356. 

  1356. 		die "Too many arguments specified\n";
    1357. 

  1357. 	}
    1358. 

  1358. 

  1359. 	my ($file_type, $diff_status) = find_file_type_and_diff_status($path);
    1360. 

  1360. 

  1361. 	if (!$file_type && !$diff_status) {
    1362. 

  1362. 		print STDERR "svn: '$path' is not under version control\n";
    1363. 

  1363. 		exit 1;
    1364. 

  1364. 	}
    1365. 

  1365. 

  1366. 	my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
    1367. 

  1367. 	unless ($gs) {
    1368. 

  1368. 		die "Unable to determine upstream SVN information from ",
    1369. 

  1369. 		    "working tree history\n";
    1370. 

  1370. 	}
    1371. 

  1371. 

  1372. 	# canonicalize_path() will return "" to make libsvn 1.5.x happy,
    1373. 

  1373. 	$path = "." if $path eq "";
    1374. 

  1374. 

  1375. 	my $full_url = $url . ($fullpath eq "" ? "" : "/$fullpath");
    1376. 

  1376. 

  1377. 	if ($_url) {
    1378. 

  1378. 		print escape_url($full_url), "\n";
    1379. 

  1379. 		return;
    1380. 

  1380. 	}
    1381. 

  1381. 

  1382. 	my $result = "Path: $path\n";
    1383. 

  1383. 	$result .= "Name: " . basename($path) . "\n" if $file_type ne "dir";
    1384. 

  1384. 	$result .= "URL: " . escape_url($full_url) . "\n";
    1385. 

  1385. 

  1386. 	eval {
    1387. 

  1387. 		my $repos_root = $gs->repos_root;
    1388. 

  1388. 		Git::SVN::remove_username($repos_root);
    1389. 

  1389. 		$result .= "Repository Root: " . escape_url($repos_root) . "\n";
    1390. 

  1390. 	};
    1391. 

  1391. 	if ($@) {
    1392. 

  1392. 		$result .= "Repository Root: (offline)\n";
    1393. 

  1393. 	}
    1394. 

  1394. 	::_req_svn();
    1395. 

  1395. 	$result .= "Repository UUID: $uuid\n" unless $diff_status eq "A" &&
    1396. 

  1396. 		($SVN::Core::VERSION le '1.5.4' || $file_type ne "dir");
    1397. 

  1397. 	$result .= "Revision: " . ($diff_status eq "A" ? 0 : $rev) . "\n";
    1398. 

  1398. 

  1399. 	$result .= "Node Kind: " .
    1400. 

  1400. 		   ($file_type eq "dir" ? "directory" : "file") . "\n";
    1401. 

  1401. 

  1402. 	my $schedule = $diff_status eq "A"
    1403. 

  1403. 		       ? "add"
    1404. 

  1404. 		       : ($diff_status eq "D" ? "delete" : "normal");
    1405. 

  1405. 	$result .= "Schedule: $schedule\n";
    1406. 

  1406. 

  1407. 	if ($diff_status eq "A") {
    1408. 

  1408. 		print $result, "\n";
    1409. 

  1409. 		return;
    1410. 

  1410. 	}
    1411. 

  1411. 

  1412. 	my ($lc_author, $lc_rev, $lc_date_utc);
    1413. 

  1413. 	my @args = Git::SVN::Log::git_svn_log_cmd($rev, $rev, "--", $fullpath);
    1414. 

  1414. 	my $log = command_output_pipe(@args);
    1415. 

  1415. 	my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
    1416. 

  1416. 	while (<$log>) {
    1417. 

  1417. 		if (/^${esc_color}author (.+) <[^>]+> (\d+) ([\-\+]?\d+)$/o) {
    1418. 

  1418. 			$lc_author = $1;
    1419. 

  1419. 			$lc_date_utc = Git::SVN::Log::parse_git_date($2, $3);
    1420. 

  1420. 		} elsif (/^${esc_color}    (git-svn-id:.+)$/o) {
    1421. 

  1421. 			(undef, $lc_rev, undef) = ::extract_metadata($1);
    1422. 

  1422. 		}
    1423. 

  1423. 	}
    1424. 

  1424. 	close $log;
    1425. 

  1425. 

  1426. 	Git::SVN::Log::set_local_timezone();
    1427. 

  1427. 

  1428. 	$result .= "Last Changed Author: $lc_author\n";
    1429. 

  1429. 	$result .= "Last Changed Rev: $lc_rev\n";
    1430. 

  1430. 	$result .= "Last Changed Date: " .
    1431. 

  1431. 		   Git::SVN::Log::format_svn_date($lc_date_utc) . "\n";
    1432. 

  1432. 

  1433. 	if ($file_type ne "dir") {
    1434. 

  1434. 		my $text_last_updated_date =
    1435. 

  1435. 		    ($diff_status eq "D" ? $lc_date_utc : (stat $path)[9]);
    1436. 

  1436. 		$result .=
    1437. 

  1437. 		    "Text Last Updated: " .
    1438. 

  1438. 		    Git::SVN::Log::format_svn_date($text_last_updated_date) .
    1439. 

  1439. 		    "\n";
    1440. 

  1440. 		my $checksum;
    1441. 

  1441. 		if ($diff_status eq "D") {
    1442. 

  1442. 			my ($fh, $ctx) =
    1443. 

  1443. 			    command_output_pipe(qw(cat-file blob), "HEAD:$path");
    1444. 

  1444. 			if ($file_type eq "link") {
    1445. 

  1445. 				my $file_name = <$fh>;
    1446. 

  1446. 				$checksum = md5sum("link $file_name");
    1447. 

  1447. 			} else {
    1448. 

  1448. 				$checksum = md5sum($fh);
    1449. 

  1449. 			}
    1450. 

  1450. 			command_close_pipe($fh, $ctx);
    1451. 

  1451. 		} elsif ($file_type eq "link") {
    1452. 

  1452. 			my $file_name =
    1453. 

  1453. 			    command(qw(cat-file blob), "HEAD:$path");
    1454. 

  1454. 			$checksum =
    1455. 

  1455. 			    md5sum("link " . $file_name);
    1456. 

  1456. 		} else {
    1457. 

  1457. 			open FILE, "<", $path or die $!;
    1458. 

  1458. 			$checksum = md5sum(\*FILE);
    1459. 

  1459. 			close FILE or die $!;
    1460. 

  1460. 		}
    1461. 

  1461. 		$result .= "Checksum: " . $checksum . "\n";
    1462. 

  1462. 	}
    1463. 

  1463. 

  1464. 	print $result, "\n";
    1465. 

  1465. }
    1466. 

  1466. 

  1467. sub cmd_reset {
    1468. 

  1468. 	my $target = shift || $_revision or die "SVN revision required\n";
    1469. 

  1469. 	$target = $1 if $target =~ /^r(\d+)$/;
    1470. 

  1470. 	$target =~ /^\d+$/ or die "Numeric SVN revision expected\n";
    1471. 

  1471. 	my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
    1472. 

  1472. 	unless ($gs) {
    1473. 

  1473. 		die "Unable to determine upstream SVN information from ".
    1474. 

  1474. 		    "history\n";
    1475. 

  1475. 	}
    1476. 

  1476. 	my ($r, $c) = $gs->find_rev_before($target, not $_fetch_parent);
    1477. 

  1477. 	die "Cannot find SVN revision $target\n" unless defined($c);
    1478. 

  1478. 	$gs->rev_map_set($r, $c, 'reset', $uuid);
    1479. 

  1479. 	print "r$r = $c ($gs->{ref_id})\n";
    1480. 

  1480. }
    1481. 

  1481. 

  1482. sub cmd_gc {
    1483. 

  1483. 	if (!$can_compress) {
    1484. 

  1484. 		warn "Compress::Zlib could not be found; unhandled.log " .
    1485. 

  1485. 		     "files will not be compressed.\n";
    1486. 

  1486. 	}
    1487. 

  1487. 	find({ wanted => \&gc_directory, no_chdir => 1}, "$ENV{GIT_DIR}/svn");
    1488. 

  1488. }
    1489. 

  1489. 

  1490. ########################### utility functions #########################
    1491. 

  1491. 

  1492. sub rebase_cmd {
    1493. 

  1493. 	my @cmd = qw/rebase/;
    1494. 

  1494. 	push @cmd, '-v' if $_verbose;
    1495. 

  1495. 	push @cmd, qw/--merge/ if $_merge;
    1496. 

  1496. 	push @cmd, "--strategy=$_strategy" if $_strategy;
    1497. 

  1497. 	@cmd;
    1498. 

  1498. }
    1499. 

  1499. 

  1500. sub post_fetch_checkout {
    1501. 

  1501. 	return if $_no_checkout;
    1502. 

  1502. 	my $gs = $Git::SVN::_head or return;
    1503. 

  1503. 	return if verify_ref('refs/heads/master^0');
    1504. 

  1504. 

  1505. 	# look for "trunk" ref if it exists
    1506. 

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

  1507. 	my $fetch = $remote->{fetch};
    1508. 

  1508. 	if ($fetch) {
    1509. 

  1509. 		foreach my $p (keys %$fetch) {
    1510. 

  1510. 			basename($fetch->{$p}) eq 'trunk' or next;
    1511. 

  1511. 			$gs = Git::SVN->new($fetch->{$p}, $gs->{repo_id}, $p);
    1512. 

  1512. 			last;
    1513. 

  1513. 		}
    1514. 

  1514. 	}
    1515. 

  1515. 

  1516. 	my $valid_head = verify_ref('HEAD^0');
    1517. 

  1517. 	command_noisy(qw(update-ref refs/heads/master), $gs->refname);
    1518. 

  1518. 	return if ($valid_head || !verify_ref('HEAD^0'));
    1519. 

  1519. 

  1520. 	return if $ENV{GIT_DIR} !~ m#^(?:.*/)?\.git$#;
    1521. 

  1521. 	my $index = $ENV{GIT_INDEX_FILE} || "$ENV{GIT_DIR}/index";
    1522. 

  1522. 	return if -f $index;
    1523. 

  1523. 

  1524. 	return if command_oneline(qw/rev-parse --is-inside-work-tree/) eq 'false';
    1525. 

  1525. 	return if command_oneline(qw/rev-parse --is-inside-git-dir/) eq 'true';
    1526. 

  1526. 	command_noisy(qw/read-tree -m -u -v HEAD HEAD/);
    1527. 

  1527. 	print STDERR "Checked out HEAD:\n  ",
    1528. 

  1528. 	             $gs->full_url, " r", $gs->last_rev, "\n";
    1529. 

  1529. 	if (auto_create_empty_directories($gs)) {
    1530. 

  1530. 		$gs->mkemptydirs($gs->last_rev);
    1531. 

  1531. 	}
    1532. 

  1532. }
    1533. 

  1533. 

  1534. sub complete_svn_url {
    1535. 

  1535. 	my ($url, $path) = @_;
    1536. 

  1536. 	$path =~ s#/+$##;
    1537. 

  1537. 	if ($path !~ m#^[a-z\+]+://#) {
    1538. 

  1538. 		if (!defined $url || $url !~ m#^[a-z\+]+://#) {
    1539. 

  1539. 			fatal("E: '$path' is not a complete URL ",
    1540. 

  1540. 			      "and a separate URL is not specified");
    1541. 

  1541. 		}
    1542. 

  1542. 		return ($url, $path);
    1543. 

  1543. 	}
    1544. 

  1544. 	return ($path, '');
    1545. 

  1545. }
    1546. 

  1546. 

  1547. sub complete_url_ls_init {
    1548. 

  1548. 	my ($ra, $repo_path, $switch, $pfx) = @_;
    1549. 

  1549. 	unless ($repo_path) {
    1550. 

  1550. 		print STDERR "W: $switch not specified\n";
    1551. 

  1551. 		return;
    1552. 

  1552. 	}
    1553. 

  1553. 	$repo_path =~ s#/+$##;
    1554. 

  1554. 	if ($repo_path =~ m#^[a-z\+]+://#) {
    1555. 

  1555. 		$ra = Git::SVN::Ra->new($repo_path);
    1556. 

  1556. 		$repo_path = '';
    1557. 

  1557. 	} else {
    1558. 

  1558. 		$repo_path =~ s#^/+##;
    1559. 

  1559. 		unless ($ra) {
    1560. 

  1560. 			fatal("E: '$repo_path' is not a complete URL ",
    1561. 

  1561. 			      "and a separate URL is not specified");
    1562. 

  1562. 		}
    1563. 

  1563. 	}
    1564. 

  1564. 	my $url = $ra->{url};
    1565. 

  1565. 	my $gs = Git::SVN->init($url, undef, undef, undef, 1);
    1566. 

  1566. 	my $k = "svn-remote.$gs->{repo_id}.url";
    1567. 

  1567. 	my $orig_url = eval { command_oneline(qw/config --get/, $k) };
    1568. 

  1568. 	if ($orig_url && ($orig_url ne $gs->{url})) {
    1569. 

  1569. 		die "$k already set: $orig_url\n",
    1570. 

  1570. 		    "wanted to set to: $gs->{url}\n";
    1571. 

  1571. 	}
    1572. 

  1572. 	command_oneline('config', $k, $gs->{url}) unless $orig_url;
    1573. 

  1573. 	my $remote_path = "$gs->{path}/$repo_path";
    1574. 

  1574. 	$remote_path =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
    1575. 

  1575. 	$remote_path =~ s#/+#/#g;
    1576. 

  1576. 	$remote_path =~ s#^/##g;
    1577. 

  1577. 	$remote_path .= "/*" if $remote_path !~ /\*/;
    1578. 

  1578. 	my ($n) = ($switch =~ /^--(\w+)/);
    1579. 

  1579. 	if (length $pfx && $pfx !~ m#/$#) {
    1580. 

  1580. 		die "--prefix='$pfx' must have a trailing slash '/'\n";
    1581. 

  1581. 	}
    1582. 

  1582. 	command_noisy('config',
    1583. 

  1583. 		      '--add',
    1584. 

  1584. 	              "svn-remote.$gs->{repo_id}.$n",
    1585. 

  1585. 	              "$remote_path:refs/remotes/$pfx*" .
    1586. 

  1586. 	                ('/*' x (($remote_path =~ tr/*/*/) - 1)) );
    1587. 

  1587. }
    1588. 

  1588. 

  1589. sub verify_ref {
    1590. 

  1590. 	my ($ref) = @_;
    1591. 

  1591. 	eval { command_oneline([ 'rev-parse', '--verify', $ref ],
    1592. 

  1592. 	                       { STDERR => 0 }); };
    1593. 

  1593. }
    1594. 

  1594. 

  1595. sub get_tree_from_treeish {
    1596. 

  1596. 	my ($treeish) = @_;
    1597. 

  1597. 	# $treeish can be a symbolic ref, too:
    1598. 

  1598. 	my $type = command_oneline(qw/cat-file -t/, $treeish);
    1599. 

  1599. 	my $expected;
    1600. 

  1600. 	while ($type eq 'tag') {
    1601. 

  1601. 		($treeish, $type) = command(qw/cat-file tag/, $treeish);
    1602. 

  1602. 	}
    1603. 

  1603. 	if ($type eq 'commit') {
    1604. 

  1604. 		$expected = (grep /^tree /, command(qw/cat-file commit/,
    1605. 

  1605. 		                                    $treeish))[0];
    1606. 

  1606. 		($expected) = ($expected =~ /^tree ($sha1)$/o);
    1607. 

  1607. 		die "Unable to get tree from $treeish\n" unless $expected;
    1608. 

  1608. 	} elsif ($type eq 'tree') {
    1609. 

  1609. 		$expected = $treeish;
    1610. 

  1610. 	} else {
    1611. 

  1611. 		die "$treeish is a $type, expected tree, tag or commit\n";
    1612. 

  1612. 	}
    1613. 

  1613. 	return $expected;
    1614. 

  1614. }
    1615. 

  1615. 

  1616. sub get_commit_entry {
    1617. 

  1617. 	my ($treeish) = shift;
    1618. 

  1618. 	my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) );
    1619. 

  1619. 	my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
    1620. 

  1620. 	my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
    1621. 

  1621. 	open my $log_fh, '>', $commit_editmsg or croak $!;
    1622. 

  1622. 

  1623. 	my $type = command_oneline(qw/cat-file -t/, $treeish);
    1624. 

  1624. 	if ($type eq 'commit' || $type eq 'tag') {
    1625. 

  1625. 		my ($msg_fh, $ctx) = command_output_pipe('cat-file',
    1626. 

  1626. 		                                         $type, $treeish);
    1627. 

  1627. 		my $in_msg = 0;
    1628. 

  1628. 		my $author;
    1629. 

  1629. 		my $saw_from = 0;
    1630. 

  1630. 		my $msgbuf = "";
    1631. 

  1631. 		while (<$msg_fh>) {
    1632. 

  1632. 			if (!$in_msg) {
    1633. 

  1633. 				$in_msg = 1 if (/^\s*$/);
    1634. 

  1634. 				$author = $1 if (/^author (.*>)/);
    1635. 

  1635. 			} elsif (/^git-svn-id: /) {
    1636. 

  1636. 				# skip this for now, we regenerate the
    1637. 

  1637. 				# correct one on re-fetch anyways
    1638. 

  1638. 				# TODO: set *:merge properties or like...
    1639. 

  1639. 			} else {
    1640. 

  1640. 				if (/^From:/ || /^Signed-off-by:/) {
    1641. 

  1641. 					$saw_from = 1;
    1642. 

  1642. 				}
    1643. 

  1643. 				$msgbuf .= $_;
    1644. 

  1644. 			}
    1645. 

  1645. 		}
    1646. 

  1646. 		$msgbuf =~ s/\s+$//s;
    1647. 

  1647. 		if ($Git::SVN::_add_author_from && defined($author)
    1648. 

  1648. 		    && !$saw_from) {
    1649. 

  1649. 			$msgbuf .= "\n\nFrom: $author";
    1650. 

  1650. 		}
    1651. 

  1651. 		print $log_fh $msgbuf or croak $!;
    1652. 

  1652. 		command_close_pipe($msg_fh, $ctx);
    1653. 

  1653. 	}
    1654. 

  1654. 	close $log_fh or croak $!;
    1655. 

  1655. 

  1656. 	if ($_edit || ($type eq 'tree')) {
    1657. 

  1657. 		chomp(my $editor = command_oneline(qw(var GIT_EDITOR)));
    1658. 

  1658. 		system('sh', '-c', $editor.' "$@"', $editor, $commit_editmsg);
    1659. 

  1659. 	}
    1660. 

  1660. 	rename $commit_editmsg, $commit_msg or croak $!;
    1661. 

  1661. 	{
    1662. 

  1662. 		require Encode;
    1663. 

  1663. 		# SVN requires messages to be UTF-8 when entering the repo
    1664. 

  1664. 		local $/;
    1665. 

  1665. 		open $log_fh, '<', $commit_msg or croak $!;
    1666. 

  1666. 		binmode $log_fh;
    1667. 

  1667. 		chomp($log_entry{log} = <$log_fh>);
    1668. 

  1668. 

  1669. 		my $enc = Git::config('i18n.commitencoding') || 'UTF-8';
    1670. 

  1670. 		my $msg = $log_entry{log};
    1671. 

  1671. 

  1672. 		eval { $msg = Encode::decode($enc, $msg, 1) };
    1673. 

  1673. 		if ($@) {
    1674. 

  1674. 			die "Could not decode as $enc:\n", $msg,
    1675. 

  1675. 			    "\nPerhaps you need to set i18n.commitencoding\n";
    1676. 

  1676. 		}
    1677. 

  1677. 

  1678. 		eval { $msg = Encode::encode('UTF-8', $msg, 1) };
    1679. 

  1679. 		die "Could not encode as UTF-8:\n$msg\n" if $@;
    1680. 

  1680. 

  1681. 		$log_entry{log} = $msg;
    1682. 

  1682. 

  1683. 		close $log_fh or croak $!;
    1684. 

  1684. 	}
    1685. 

  1685. 	unlink $commit_msg;
    1686. 

  1686. 	\%log_entry;
    1687. 

  1687. }
    1688. 

  1688. 

  1689. sub s_to_file {
    1690. 

  1690. 	my ($str, $file, $mode) = @_;
    1691. 

  1691. 	open my $fd,'>',$file or croak $!;
    1692. 

  1692. 	print $fd $str,"\n" or croak $!;
    1693. 

  1693. 	close $fd or croak $!;
    1694. 

  1694. 	chmod ($mode &~ umask, $file) if (defined $mode);
    1695. 

  1695. }
    1696. 

  1696. 

  1697. sub file_to_s {
    1698. 

  1698. 	my $file = shift;
    1699. 

  1699. 	open my $fd,'<',$file or croak "$!: file: $fi…
    1700.

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