Bug 38047 – svn-apply: suppress misleading "error: pathspec ..." message when adding binary file

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Chris Jerdonek]

See here for an example of the misleading "error: pathspec" message:

https://bugs.webkit.org/show_bug.cgi?id=37044#c12

To solve this, console output should be suppressed in this method of svn-apply:

sub scmKnowsOfFile($)
{
    my ($path) = @_;
    if (isSVN()) {
    ...
    } elsif (isGit()) {
        `git ls-files --error-unmatch -- $path`; <-- Suppress console output.
        my $exitCode = $? >> 8;
        return $exitCode == 0;
    }
}

[Chris Jerdonek]

Created attachment 55475 [details]
Proposed patch

[Chris Jerdonek]

Created attachment 55476 [details]
Proposed patch

Corrected ChangeLog.

[Chris Jerdonek]

Created attachment 55477 [details]
Proposed patch 3

Fixed a code comment: STDOUT -> STDERR.

[Daniel Bates]

Comment on attachment 55477 [details]
Proposed patch 3

We should add a comment to reference the Perldocs about this.

> +sub callSilently($@) {
> +    my ($func, @args) = @_;
> +
> +    open(OLDERR, ">&STDERR");
> +    close(STDERR);
> +    my @returnValue = &$func(@args);
> +    open(STDERR, ">&OLDERR");
> +    close(OLDERR); # FIXME: Is this necessary?
> +
> +    return @returnValue;
> +}
> +

We should probably change this to use exitStatus. We can do this in another patch, but then we should add a FIXME comment.

> +sub gitKnowsOfFile($)
> +{
> +    my $path = shift;
> +
> +    `git ls-files --error-unmatch -- $path`;
> +    my $exitCode = $? >> 8;
> +    return $exitCode == 0;
> +}

r=me.

[Chris Jerdonek]

Committed:

http://trac.webkit.org/changeset/59043