[webkit-changes] cvs commit: WebKitTools/Scripts cvs-create-patch

[Alexey]

ap          05/12/21 23:39:45

  Modified:    .        ChangeLog
               Scripts  cvs-create-patch
  Log:
          Reviewed by Darin Adler.
  
          - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=5846
            cvs-create-patch --include produces incorrect paths
  
          * Scripts/cvs-create-patch: Handle newly-added directories using chdir.
  
  Revision  Changes    Path
  1.133     +9 -0      WebKitTools/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKitTools/ChangeLog,v
  retrieving revision 1.132
  retrieving revision 1.133
  diff -u -r1.132 -r1.133
  --- ChangeLog	19 Dec 2005 21:03:53 -0000	1.132
  +++ ChangeLog	22 Dec 2005 07:39:44 -0000	1.133
  @@ -1,3 +1,12 @@
  +2005-12-20  Alexey Proskuryakov  <ap at nypop.com>
  +
  +        Reviewed by Darin Adler.
  +
  +        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=5846
  +          cvs-create-patch --include produces incorrect paths
  +
  +        * Scripts/cvs-create-patch: Handle newly-added directories using chdir.
  +
   2005-12-19  Eric Seidel  <eseidel at apple.com>
   
           Reviewed by darin.
  
  
  
  1.10      +10 -4     WebKitTools/Scripts/cvs-create-patch
  
  Index: cvs-create-patch
  ===================================================================
  RCS file: /cvs/root/WebKitTools/Scripts/cvs-create-patch,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- cvs-create-patch	28 Nov 2005 06:21:21 -0000	1.9
  +++ cvs-create-patch	22 Dec 2005 07:39:45 -0000	1.10
  @@ -2,6 +2,7 @@
   
   # Copyright (C) 2005 Apple Computer, Inc.  All rights reserved.
   # Copyright (C) 2005 Ben La Monica <ben.lamonica at gmail.com> All rights reserved.
  +# Copyright (C) 2005 Alexey Proskuryakov <ap at nypop.com> All rights reserved.
   #
   # Redistribution and use in source and binary forms, with or without
   # modification, are permitted provided that the following conditions
  @@ -177,9 +178,15 @@
       for my $file (@files) {
           next if $file eq "." || $file eq "..";
           if (-d "$dir/$file") {
  -            addNewDirectory($indexPath, "$dir/$file");
  +            my $oldDir = getcwd();
  +            chdir $dir;
  +            addNewDirectory($indexPath, "$file");
  +            chdir $oldDir;
           } else {
  -            addNewFile("$indexPath", "$dir/$file");
  +            my $oldDir = getcwd();
  +            chdir $dir;
  +            addNewFile($indexPath, "$file");
  +            chdir $oldDir;
           }
       }
   }
  @@ -203,8 +210,7 @@
           return;
       }
   
  -    $indexPath =~ s|[^/]+$|| if defined $indexPath;
  -    $indexPath .= $newFile;
  +    $indexPath .= "/" . $newFile;
   
       #get rid of the first 2 lines
       shift @fileContents;