[webkit-changes] cvs commit: WebKitTools/Scripts cvs-apply update-webkit

[Darin]

darin       05/10/06 08:44:59

  Modified:    .        ChangeLog
               Scripts  cvs-apply update-webkit
  Log:
          * 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.
  
  Revision  Changes    Path
  1.112     +6 -0      WebKitTools/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKitTools/ChangeLog,v
  retrieving revision 1.111
  retrieving revision 1.112
  diff -u -r1.111 -r1.112
  --- ChangeLog	4 Oct 2005 06:13:34 -0000	1.111
  +++ ChangeLog	6 Oct 2005 15:44:59 -0000	1.112
  @@ -1,3 +1,9 @@
  +2005-10-06  Darin Adler  <darin at 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 at apple.com>
   
           Reviewed by mjs.
  
  
  
  1.7       +5 -1      WebKitTools/Scripts/cvs-apply
  
  Index: cvs-apply
  ===================================================================
  RCS file: /cvs/root/WebKitTools/Scripts/cvs-apply,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- cvs-apply	31 Aug 2005 06:12:14 -0000	1.6
  +++ cvs-apply	6 Oct 2005 15:44:59 -0000	1.7
  @@ -86,7 +86,11 @@
   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;
       }
   }
   
  
  
  
  1.10      +2 -2      WebKitTools/Scripts/update-webkit
  
  Index: update-webkit
  ===================================================================
  RCS file: /cvs/root/WebKitTools/Scripts/update-webkit,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- update-webkit	30 Sep 2005 21:44:42 -0000	1.9
  +++ update-webkit	6 Oct 2005 15:44:59 -0000	1.10
  @@ -55,11 +55,11 @@
   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>) {