Changeset 46742 in webkit


Ignore:
Timestamp:
Aug 3, 2009 6:29:29 PM (15 years ago)
Author:
pkasting@chromium.org
Message:

2009-08-03 Peter Kasting <​pkasting@google.com>

Reviewed by David Kilzer.

​https://bugs.webkit.org/show_bug.cgi?id=27323
Handle any kind of line endings in svn-apply and svn-unapply, instead
of assuming LF.

  • Scripts/svn-apply:
  • Scripts/svn-unapply:
Location:
trunk/WebKitTools
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKitTools/ChangeLog

    r46739 r46742  
     12009-08-03  Peter Kasting  <pkasting@google.com>
     2
     3        Reviewed by David Kilzer.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=27323
     6        Handle any kind of line endings in svn-apply and svn-unapply, instead
     7        of assuming LF.
     8
     9        * Scripts/svn-apply:
     10        * Scripts/svn-unapply:
     11
    1122009-08-03  Adam Barth  <abarth@webkit.org>
    213

  • trunk/WebKitTools/Scripts/svn-apply

    r46156 r46742  
    448448        my $normalizedFullPath = File::Spec->catdir(File::Spec->splitdir($fullPath));
    449449        while (<SVN>) {
    450             chomp;
     450            # Input may use a different EOL sequence than $/, so avoid chomp.
     451            $_ =~ s/[\r\n]+$//g;
    451452            my $normalizedStatPath = File::Spec->catdir(File::Spec->splitdir(substr($_, 7)));
    452453            if ($normalizedFullPath eq $normalizedStatPath) {

  • trunk/WebKitTools/Scripts/svn-unapply

    r39852 r46742  
    9595    }
    9696    $_ = &$filter($_) if $filter;
    97     if (/^Index: (.*)/) {
     97    if (/^Index: (.+)/) {
    9898        $indexPath = $1;
    9999        if ($patch) {
    … …  
    221221    return if !$patch;
    222222
    223     unless ($patch =~ m|^Index: ([^\n]+)|) {
     223    unless ($patch =~ m|^Index: ([^\r\n]+)|) {
    224224        my $separator = '-' x 67;
    225225        warn "Failed to find 'Index:' in:\n$separator\n$patch\n$separator\n";
    … …  
    331331        my $normalizedFullPath = File::Spec->catdir(File::Spec->splitdir($fullPath));
    332332        while (<SVN>) {
    333             chomp;
     333            # Input may use a different EOL sequence than $/, so avoid chomp.
     334            $_ =~ s/[\r\n]+$//g;
    334335            my $normalizedStatPath = File::Spec->catdir(File::Spec->splitdir(substr($_, 7)));
    335336            if ($normalizedFullPath eq $normalizedStatPath) {
Note: See TracChangeset for help on using the changeset viewer.