Changeset 51728 in webkit

Timestamp:

Dec 5, 2009 1:54:05 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2009-12-05 Adam Barth <​abarth@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:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/update-webkit (modified) (4 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-12-05  Adam Barth  <abarth@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@nokia.com>
 

trunk/WebKitTools/Scripts/update-webkit

@@ -40 +40 @@
 
 sub runSvnUpdate();
+sub runGitUpdate();
 
 # Handle options
@@ -46 +47 @@
 
 determineIsChromium();
+
+my $isGit = isGit();
+my $isSVN = isSVN();
 
 my $getOptionsResult = GetOptions(
@@ -70 +74 @@
 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 $!;
@@ -105 +111 @@
     }
 }
+
+sub runGitUpdate()
+{
+    system("git", "svn", "rebase") == 0 or die;
+}