* Scripts/cvs-apply: Fixed merge option to work better when not all directories

        are controlled by cvs, or when changes cross multiple repositories.
        * Scripts/update-webkit: Don't print messages if the "quiet" flag is set.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@10762 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e32164b27c42acc654ec68d6a0e78e79cde3c626..7bda61fbdb6257b2b6bc0ce4f654e7cd194ba30d 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-06  Darin Adler  <darin@apple.com>
+
+        * Scripts/cvs-apply: Fixed merge option to work better when not all directories
+        are controlled by cvs, or when changes cross multiple repositories.
+        * Scripts/update-webkit: Don't print messages if the "quiet" flag is set.
+
 2005-10-03  Eric Seidel  <eseidel@apple.com>
 
         Reviewed by mjs.

diff --git a/WebKitTools/Scripts/cvs-apply b/WebKitTools/Scripts/cvs-apply
index f3839225be80f605116c39204d0ca39c4988ccaf..6825666eff902d08277660fb46a27793fae917bb 100755 (executable)
--- a/WebKitTools/Scripts/cvs-apply
+++ b/WebKitTools/Scripts/cvs-apply
@@ -86,7 +86,11 @@ push @patches, $patch if $patch;
 if ($merge) {
     for my $file (sort keys %versions) {
         print "Getting version $versions{$file} of $file\n";
-        system "cvs update -r $versions{$file} $file";
+        $file =~ m|^(([^/\n]*/)+)([^/\n]+)$| or die;
+        my ($prefix, $base) = ($1, $3);
+        chdir $prefix;
+        system "cvs update -r $versions{$file} $base";
+        chdir $startDir;
     }
 }
 

diff --git a/WebKitTools/Scripts/update-webkit b/WebKitTools/Scripts/update-webkit
index d608aadd65687ffe84a24e79ed6dd039adfee636..89cddea4d3d62f566a09325d6cac3b12d91746b1 100755 (executable)
--- a/WebKitTools/Scripts/update-webkit
+++ b/WebKitTools/Scripts/update-webkit
@@ -55,11 +55,11 @@ push @sources, "LayoutTests" if $includeTests;
 push @sources, "SVGSupport" if -d "SVGSupport";
 
 # Check out all the sources.
-print "CVS root is $root\n";
+print "CVS root is $root\n" unless $quiet;
 
 my $directories = join ", ", @sources;
 $directories =~ s/, ([^,]+)$/, and $1/;
-print "Updating $directories\n";
+print "Updating $directories\n" unless $quiet;
 
 open CVS, "cvs $cvsoptions -d '$root' co -P @sources |" or die;
 while (<CVS>) {