Commit e8d2ddc5 authored by mitz@apple.com's avatar mitz@apple.com

Fix “Undefined subroutine” errors in svn-*apply by moving the removeEOL subroutine

from the two scripts that define it but don’t use it to the script that uses it but doesn’t
define it.

Reviewed by Mark Rowe.

* Scripts/VCSUtils.pm:
* Scripts/svn-apply:
* Scripts/svn-unapply:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50318 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 2ab72106
2009-10-29 Dan Bernstein <mitz@apple.com>
Reviewed by Mark Rowe.
Fix Undefined subroutine errors in svn-*apply by moving the removeEOL subroutine
from the two scripts that define it but dont use it to the script that uses it but doesnt
define it.
* Scripts/VCSUtils.pm:
* Scripts/svn-apply:
* Scripts/svn-unapply:
2009-10-29 Xan Lopez <xlopez@igalia.com>
Reviewed by Gustavo Noronha.
......
......@@ -298,6 +298,14 @@ sub canonicalizePath($)
return ($#dirs >= 0) ? File::Spec->catdir(@dirs) : ".";
}
sub removeEOL($)
{
my ($line) = @_;
$line =~ s/[\r\n]+$//g;
return $line;
}
sub svnStatus($)
{
my ($fullPath) = @_;
......
......@@ -79,7 +79,6 @@ sub isDirectoryEmptyForRemoval($);
sub patch($);
sub removeDirectoriesIfNeeded();
sub setChangeLogDateAndReviewer($$);
sub removeEOL($);
# These should be replaced by an scm class/module:
sub scmKnowsOfFile($);
......@@ -378,14 +377,6 @@ sub setChangeLogDateAndReviewer($$)
return $patch;
}
sub removeEOL($)
{
my ($line) = @_;
$line =~ s/[\r\n]+$//g;
return $line;
}
# This could be made into a more general "status" call, except svn and git
# have different ideas about "moving" files which might get confusing.
sub scmWillDeleteFile($)
......
......@@ -73,7 +73,6 @@ use VCSUtils;
sub checksum($);
sub patch($);
sub revertDirectories();
sub removeEOL($);
sub unapplyPatch($$;$);
sub unsetChangeLogDate($$);
......@@ -259,14 +258,6 @@ sub revertDirectories()
}
}
sub removeEOL($)
{
my ($line) = @_;
$line =~ s/[\r\n]+$//g;
return $line;
}
sub unapplyPatch($$;$)
{
my ($patch, $fullPath, $options) = @_;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment