{"thread":{"id":"10982","subject":"[PATCH] git-svn: Remove unnecessary Git::SVN::Util package","startedAt":"2007-11-22T19:18:00Z","lastAt":"2007-11-29T08:01:26Z","messageCount":2,"participants":["David D. Kilzer","Eric Wong"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"60699","messageId":"1195759080-20132-1-git-send-email-ddkilzer@kilzer.net","threadId":"10982","inReplyTo":"2CB65B86-3BEF-46C2-86F8-EFAB2AE6D353@develooper.com","subject":"[PATCH] git-svn: Remove unnecessary Git::SVN::Util package","fromName":"David D. Kilzer","fromEmail":"ddkilzer@kilzer.net","sentAt":"2007-11-22T19:18:00Z","receivedAt":"2007-11-22T19:18:00Z","isPatch":true,"sender":{"key":"ddkilzer@kilzer.net","avatar":"https://avatars.githubusercontent.com/u/263571?v=4"},"body":"Digest::MD5 is loaded regardless of the package in which it's\ndeclared, so move its 'use' statement and the md5sum() function\ninto the main package.\n\nSigned-off-by: David D. Kilzer \n---\n\nAsk Bjørn Hansen wrote:\n> On Nov 21, 2007, at 11:57, David D. Kilzer wrote:\n> > Created new Git::SVN::Util package with an md5sum() function. A\n> > new package was created so that Digest::MD5 did not have to be\n> > loaded in the main package.\n> Huh? It's all in the same file anyway, so what difference does it\n> make?\n\nNone!\n\n git-svn.perl | 23 +++++++++--------------\n 1 files changed, 9 insertions(+), 14 deletions(-)\n\ndiff --git a/git-svn.perl b/git-svn.perl\nindex 62801c8..17d3020 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -35,6 +35,7 @@ push @Git::SVN::Ra::ISA, 'SVN::Ra';\n push @SVN::Git::Editor::ISA, 'SVN::Delta::Editor';\n push @SVN::Git::Fetcher::ISA, 'SVN::Delta::Editor';\n use Carp qw/croak/;\n+use Digest::MD5;\n use IO::File qw//;\n use File::Basename qw/dirname basename/;\n use File::Path qw/mkpath/;\n@@ -48,8 +49,7 @@ BEGIN {\n \tforeach (qw/command command_oneline command_noisy command_output_pipe\n \t command_input_pipe command_close_pipe/) {\n \t\tfor my $package ( qw(SVN::Git::Editor SVN::Git::Fetcher\n-\t\t\tGit::SVN::Migration Git::SVN::Log Git::SVN\n-\t\t\tGit::SVN::Util),\n+\t\t\tGit::SVN::Migration Git::SVN::Log Git::SVN),\n \t\t\t__PACKAGE__) {\n \t\t\t*{\"${package}::$_\"} = \\&{\"Git::$_\"};\n \t\t}\n@@ -835,19 +835,19 @@ sub cmd_info {\n \t\t\t command_output_pipe(qw(cat-file blob), \"HEAD:$path\");\n \t\t\tif ($file_type eq \"link\") {\n \t\t\t\tmy $file_name = <$fh>;\n-\t\t\t\t$checksum = Git::SVN::Util::md5sum(\"link $file_name\");\n+\t\t\t\t$checksum = md5sum(\"link $file_name\");\n \t\t\t} else {\n-\t\t\t\t$checksum = Git::SVN::Util::md5sum($fh);\n+\t\t\t\t$checksum = md5sum($fh);\n \t\t\t}\n \t\t\tcommand_close_pipe($fh, $ctx);\n \t\t} elsif ($file_type eq \"link\") {\n \t\t\tmy $file_name =\n \t\t\t command(qw(cat-file blob), \"HEAD:$path\");\n \t\t\t$checksum =\n-\t\t\t Git::SVN::Util::md5sum(\"link \" . $file_name);\n+\t\t\t md5sum(\"link \" . $file_name);\n \t\t} else {\n \t\t\topen FILE, \"<\", $path or die $!;\n-\t\t\t$checksum = Git::SVN::Util::md5sum(\\*FILE);\n+\t\t\t$checksum = md5sum(\\*FILE);\n \t\t\tclose FILE or die $!;\n \t\t}\n \t\t$result .= \"Checksum: \" . $checksum . \"\\n\";\n@@ -1187,11 +1187,6 @@ sub find_file_type_and_diff_status {\n \treturn (\"file\", $diff_status);\n }\n \n-package Git::SVN::Util;\n-use strict;\n-use warnings;\n-use Digest::MD5;\n-\n sub md5sum {\n \tmy $arg = shift;\n \tmy $ref = ref $arg;\n@@ -2926,7 +2921,7 @@ sub apply_textdelta {\n \n \t\tif (defined $exp) {\n \t\t\tseek $base, 0, 0 or croak $!;\n-\t\t\tmy $got = Git::SVN::Util::md5sum($base);\n+\t\t\tmy $got = ::md5sum($base);\n \t\t\tdie \"Checksum mismatch: $fb->{path} $fb->{blob}\\n\",\n \t\t\t \"expected: $exp\\n\",\n \t\t\t \" got: $got\\n\" if ($got ne $exp);\n@@ -2945,7 +2940,7 @@ sub close_file {\n \tif (my $fh = $fb->{fh}) {\n \t\tif (defined $exp) {\n \t\t\tseek($fh, 0, 0) or croak $!;\n-\t\t\tmy $got = Git::SVN::Util::md5sum($fh);\n+\t\t\tmy $got = ::md5sum($fh);\n \t\t\tif ($got ne $exp) {\n \t\t\t\tdie \"Checksum mismatch: $path\\n\",\n \t\t\t\t \"expected: $exp\\n got: $got\\n\";\n@@ -3300,7 +3295,7 @@ sub chg_file {\n \t$fh->flush == 0 or croak $!;\n \tseek $fh, 0, 0 or croak $!;\n \n-\tmy $exp = Git::SVN::Util::md5sum($fh);\n+\tmy $exp = ::md5sum($fh);\n \tseek $fh, 0, 0 or croak $!;\n \n \tmy $pool = SVN::Pool->new;\n-- \n1.5.3.4\n"},{"id":"61376","messageId":"20071129080126.GD32277@soma","threadId":"10982","inReplyTo":"1195759080-20132-1-git-send-email-ddkilzer@kilzer.net","subject":"Re: [PATCH] git-svn: Remove unnecessary Git::SVN::Util package","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2007-11-29T08:01:26Z","receivedAt":"2007-11-29T08:01:26Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"\"David D. Kilzer\" wrote:\n> Digest::MD5 is loaded regardless of the package in which it's\n> declared, so move its 'use' statement and the md5sum() function\n> into the main package.\n> \n> Signed-off-by: David D. Kilzer \n\nAcked-by: Eric Wong \n\n> ---\n> \n> Ask Bjørn Hansen wrote:\n> > On Nov 21, 2007, at 11:57, David D. Kilzer wrote:\n> > > Created new Git::SVN::Util package with an md5sum() function. A\n> > > new package was created so that Digest::MD5 did not have to be\n> > > loaded in the main package.\n> > Huh? It's all in the same file anyway, so what difference does it\n> > make?\n> \n> None!\n\nI have floated the idea of splitting git-svn into several files to make\nit easier to maintain and navigate. However, I'm not looking foward to\ndoing a install system for that...\n\nMaybe it'll just cat all the files together during build and\nstill install as one file... *shrug*\n\n> git-svn.perl | 23 +++++++++--------------\n> 1 files changed, 9 insertions(+), 14 deletions(-)\n> \n> diff --git a/git-svn.perl b/git-svn.perl\n> index 62801c8..17d3020 100755\n> --- a/git-svn.perl\n> +++ b/git-svn.perl\n> @@ -35,6 +35,7 @@ push @Git::SVN::Ra::ISA, 'SVN::Ra';\n> push @SVN::Git::Editor::ISA, 'SVN::Delta::Editor';\n> push @SVN::Git::Fetcher::ISA, 'SVN::Delta::Editor';\n> use Carp qw/croak/;\n> +use Digest::MD5;\n> use IO::File qw//;\n> use File::Basename qw/dirname basename/;\n> use File::Path qw/mkpath/;\n> @@ -48,8 +49,7 @@ BEGIN {\n> \tforeach (qw/command command_oneline command_noisy command_output_pipe\n> \t command_input_pipe command_close_pipe/) {\n> \t\tfor my $package ( qw(SVN::Git::Editor SVN::Git::Fetcher\n> -\t\t\tGit::SVN::Migration Git::SVN::Log Git::SVN\n> -\t\t\tGit::SVN::Util),\n> +\t\t\tGit::SVN::Migration Git::SVN::Log Git::SVN),\n> \t\t\t__PACKAGE__) {\n> \t\t\t*{\"${package}::$_\"} = \\&{\"Git::$_\"};\n> \t\t}\n> @@ -835,19 +835,19 @@ sub cmd_info {\n> \t\t\t command_output_pipe(qw(cat-file blob), \"HEAD:$path\");\n> \t\t\tif ($file_type eq \"link\") {\n> \t\t\t\tmy $file_name = <$fh>;\n> -\t\t\t\t$checksum = Git::SVN::Util::md5sum(\"link $file_name\");\n> +\t\t\t\t$checksum = md5sum(\"link $file_name\");\n> \t\t\t} else {\n> -\t\t\t\t$checksum = Git::SVN::Util::md5sum($fh);\n> +\t\t\t\t$checksum = md5sum($fh);\n> \t\t\t}\n> \t\t\tcommand_close_pipe($fh, $ctx);\n> \t\t} elsif ($file_type eq \"link\") {\n> \t\t\tmy $file_name =\n> \t\t\t command(qw(cat-file blob), \"HEAD:$path\");\n> \t\t\t$checksum =\n> -\t\t\t Git::SVN::Util::md5sum(\"link \" . $file_name);\n> +\t\t\t md5sum(\"link \" . $file_name);\n> \t\t} else {\n> \t\t\topen FILE, \"<\", $path or die $!;\n> -\t\t\t$checksum = Git::SVN::Util::md5sum(\\*FILE);\n> +\t\t\t$checksum = md5sum(\\*FILE);\n> \t\t\tclose FILE or die $!;\n> \t\t}\n> \t\t$result .= \"Checksum: \" . $checksum . \"\\n\";\n> @@ -1187,11 +1187,6 @@ sub find_file_type_and_diff_status {\n> \treturn (\"file\", $diff_status);\n> }\n> \n> -package Git::SVN::Util;\n> -use strict;\n> -use warnings;\n> -use Digest::MD5;\n> -\n> sub md5sum {\n> \tmy $arg = shift;\n> \tmy $ref = ref $arg;\n> @@ -2926,7 +2921,7 @@ sub apply_textdelta {\n> \n> \t\tif (defined $exp) {\n> \t\t\tseek $base, 0, 0 or croak $!;\n> -\t\t\tmy $got = Git::SVN::Util::md5sum($base);\n> +\t\t\tmy $got = ::md5sum($base);\n> \t\t\tdie \"Checksum mismatch: $fb->{path} $fb->{blob}\\n\",\n> \t\t\t \"expected: $exp\\n\",\n> \t\t\t \" got: $got\\n\" if ($got ne $exp);\n> @@ -2945,7 +2940,7 @@ sub close_file {\n> \tif (my $fh = $fb->{fh}) {\n> \t\tif (defined $exp) {\n> \t\t\tseek($fh, 0, 0) or croak $!;\n> -\t\t\tmy $got = Git::SVN::Util::md5sum($fh);\n> +\t\t\tmy $got = ::md5sum($fh);\n> \t\t\tif ($got ne $exp) {\n> \t\t\t\tdie \"Checksum mismatch: $path\\n\",\n> \t\t\t\t \"expected: $exp\\n got: $got\\n\";\n> @@ -3300,7 +3295,7 @@ sub chg_file {\n> \t$fh->flush == 0 or croak $!;\n> \tseek $fh, 0, 0 or croak $!;\n> \n> -\tmy $exp = Git::SVN::Util::md5sum($fh);\n> +\tmy $exp = ::md5sum($fh);\n> \tseek $fh, 0, 0 or croak $!;\n> \n> \tmy $pool = SVN::Pool->new;\n> -- \n> 1.5.3.4\n> \n> -\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at http://vger.kernel.org/majordomo-info.html\n\n-- \nEric Wong\n"}]}