[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 7f2cbe2671917541d442180a7b6df65a874bc487
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 5 21:54:05 2009 +0000

    2009-12-05  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            update-webkit should call git svn rebase and resolve-ChangeLogs -f
            https://bugs.webkit.org/show_bug.cgi?id=27162
    
            Teach update-webkit about Git.  I didn't add the call to
            resolve-ChangeLogs -f because sometimes that script goes bananas.  We
            can iterate from here, however.
    
            * Scripts/update-webkit:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51728 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a8c7c41..3d6151a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-05  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        update-webkit should call git svn rebase and resolve-ChangeLogs -f
+        https://bugs.webkit.org/show_bug.cgi?id=27162
+
+        Teach update-webkit about Git.  I didn't add the call to
+        resolve-ChangeLogs -f because sometimes that script goes bananas.  We
+        can iterate from here, however.
+
+        * Scripts/update-webkit:
+
 2009-12-04  Yael Aharon  <yael.aharon at nokia.com>
 
         Unreviewed build fix.
diff --git a/WebKitTools/Scripts/update-webkit b/WebKitTools/Scripts/update-webkit
index b503004..2ed9aa4 100755
--- a/WebKitTools/Scripts/update-webkit
+++ b/WebKitTools/Scripts/update-webkit
@@ -39,6 +39,7 @@ use VCSUtils;
 use webkitdirs;
 
 sub runSvnUpdate();
+sub runGitUpdate();
 
 # Handle options
 my $quiet = '';
@@ -46,6 +47,9 @@ my $showHelp;
 
 determineIsChromium();
 
+my $isGit = isGit();
+my $isSVN = isSVN();
+
 my $getOptionsResult = GetOptions(
     'h|help'  => \$showHelp,
     'q|quiet' => \$quiet,
@@ -69,12 +73,14 @@ push @svnOptions, qw(--accept postpone) if isSVNVersion16OrNewer();
 
 chdirWebKit();
 print "Updating OpenSource\n" unless $quiet;
-runSvnUpdate();
+runSvnUpdate() if $isSVN;
+runGitUpdate() if $isGit;
 
 if (-d "../Internal") {
     chdir("../Internal");
     print "Updating Internal\n" unless $quiet;
-    runSvnUpdate();
+    runSvnUpdate() if $isSVN;
+    runGitUpdate() if $isGit;
 } elsif (isChromium()) {
     system("perl", "WebKitTools/Scripts/update-webkit-chromium") == 0 or die $!;
 } elsif (isAppleWinWebKit()) {
@@ -104,3 +110,8 @@ sub runSvnUpdate()
             or die "Could not open resolve-ChangeLogs script: $!.\n";
     }
 }
+
+sub runGitUpdate()
+{
+    system("git", "svn", "rebase") == 0 or die;
+}

-- 
WebKit Debian packaging