Show 87 quoted lines
> On Dec 8, 2014, at 1:36 PM, Eric Wong <normalperson@yhbt.net> wrote:
>
> Alfred Perlstein <alfred@freebsd.org> wrote:
>> Appearing here:
>> http://marc.info/?l=git&m=125259772625008&w=2
>
> Probably better to use a mid URL here, too
>
> http://mid.gmane.org/1927112650.1281253084529659.JavaMail.root@klofta.sjsoft.com
>
> such a long URL, though...
>
>> --- a/perl/Git/SVN/Editor.pm
>> +++ b/perl/Git/SVN/Editor.pm
>> @@ -288,6 +288,44 @@ sub apply_autoprops {
>> }
>> }
>>
>> +sub check_attr {
>> + my ($attr,$path) = @_;
>> + my $fh = command_output_pipe("check-attr", $attr, "--", $path);
>> + return undef if (!$fh);
>> +
>> + my $val = <$fh>;
>> + close $fh;
>> + if ($val) { $val =~ s/^[^:]*:\s*[^:]*:\s*(.*)\s*$/$1/; }
>> + return $val;
>> +}
>
> I just noticed command_output_pipe didn't use a corresponding
> command_close_pipe to check for errors, but command_oneline is even
> better. I'll squash the following:
>
> --- a/perl/Git/SVN/Editor.pm
> +++ b/perl/Git/SVN/Editor.pm
> @@ -290,11 +290,7 @@ sub apply_autoprops {
>
> sub check_attr {
> my ($attr,$path) = @_;
> - my $fh = command_output_pipe("check-attr", $attr, "--", $path);
> - return undef if (!$fh);
> -
> - my $val = <$fh>;
> - close $fh;
> + my $val = command_oneline("check-attr", $attr, "--", $path);
> if ($val) { $val =~ s/^[^:]*:\s*[^:]*:\s*(.*)\s*$/$1/; }
> return $val;
> }
>
> In your test, "local" isn't portable, unfortunately, but tests seem to
> work fine without local so I've removed them:
>
> --- a/t/t9148-git-svn-propset.sh
> +++ b/t/t9148-git-svn-propset.sh
> @@ -29,10 +29,9 @@ test_expect_success 'fetch revisions from svn' '
> git svn fetch
> '
>
> -set_props()
> -{
> - local subdir="$1"
> - local file="$2"
> +set_props () {
> + subdir="$1"
> + file="$2"
> shift;shift;
> (cd "$subdir" &&
> while [ $# -gt 0 ] ; do
> @@ -43,10 +42,9 @@ set_props()
> git commit -m "testing propset" "$file")
> }
>
> -confirm_props()
> -{
> - local subdir="$1"
> - local file="$2"
> +confirm_props () {
> + subdir="$1"
> + file="$2"
> shift;shift;
> (set -e ; cd "svn_project/$subdir" &&
> while [ $# -gt 0 ] ; do
>
> Unless there's other improvements we missed, I'll push out your v3 with
> my changes squashed in for Junio to pull in a day or two. Thank you
> again for working on this!
>