[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
abarth at webkit.org
abarth at webkit.org
Thu Apr 8 00:21:34 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 4ae63d01dfe658f9f4cb009d8ef0193007ae22f7
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Dec 5 21:54:39 2009 +0000
2009-12-05 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
Move update-webkit into BuildSteps
https://bugs.webkit.org/show_bug.cgi?id=32181
We need to move update-webkit out of SCM.py because SCM isn't supposed to know
that WebKit exists. The proper place for the knowledge of the existence of
update-webkit is in WebKitPort because some ports have specialized update
scripts (analogous to build-webkit).
* Scripts/modules/buildsteps.py:
* Scripts/modules/commands/download.py:
* Scripts/modules/landingsequence.py:
* Scripts/modules/scm.py:
* Scripts/modules/webkitport.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51729 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3d6151a..1fba09b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,24 @@
Reviewed by Eric Seidel.
+ Move update-webkit into BuildSteps
+ https://bugs.webkit.org/show_bug.cgi?id=32181
+
+ We need to move update-webkit out of SCM.py because SCM isn't supposed to know
+ that WebKit exists. The proper place for the knowledge of the existence of
+ update-webkit is in WebKitPort because some ports have specialized update
+ scripts (analogous to build-webkit).
+
+ * Scripts/modules/buildsteps.py:
+ * Scripts/modules/commands/download.py:
+ * Scripts/modules/landingsequence.py:
+ * Scripts/modules/scm.py:
+ * Scripts/modules/webkitport.py:
+
+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
diff --git a/WebKitTools/Scripts/modules/buildsteps.py b/WebKitTools/Scripts/modules/buildsteps.py
index d796b3a..c566401 100644
--- a/WebKitTools/Scripts/modules/buildsteps.py
+++ b/WebKitTools/Scripts/modules/buildsteps.py
@@ -76,6 +76,10 @@ class BuildSteps:
if options.clean:
scm.ensure_clean_working_directory(force_clean=options.force_clean)
+ def update(self, port=WebKitPort):
+ log("Updating working directory")
+ run_and_throw_if_fail(port.update_webkit_command())
+
def run_tests(self, launch_safari, fail_fast=False, quiet=False, port=WebKitPort):
args = port.run_webkit_tests_command()
if not launch_safari:
diff --git a/WebKitTools/Scripts/modules/commands/download.py b/WebKitTools/Scripts/modules/commands/download.py
index a45632c..483219a 100644
--- a/WebKitTools/Scripts/modules/commands/download.py
+++ b/WebKitTools/Scripts/modules/commands/download.py
@@ -109,7 +109,7 @@ class WebKitApplyingScripts:
def setup_for_patch_apply(tool, options):
tool.steps.clean_working_directory(tool.scm(), options, allow_local_commits=True)
if options.update:
- tool.scm().update_webkit()
+ tool.steps.update()
@staticmethod
def apply_patches_with_options(scm, patches, options):
@@ -386,7 +386,7 @@ class Rollout(Command):
log("Failed to parse bug number from diff. No bugs will be updated/reopened after the rollout.")
tool.steps.clean_working_directory(tool.scm(), options)
- tool.scm().update_webkit()
+ tool.steps.update()
tool.scm().apply_reverse_diff(revision)
self._create_changelogs_for_revert(tool, revision)
diff --git a/WebKitTools/Scripts/modules/landingsequence.py b/WebKitTools/Scripts/modules/landingsequence.py
index ecb231e..b7bed2b 100644
--- a/WebKitTools/Scripts/modules/landingsequence.py
+++ b/WebKitTools/Scripts/modules/landingsequence.py
@@ -77,7 +77,7 @@ class LandingSequence:
self._tool.steps.clean_working_directory(self._tool.scm(), self._options)
def update(self):
- self._tool.scm().update_webkit()
+ self._tool.steps.update()
def apply_patch(self):
log("Processing patch %s from bug %s." % (self._patch["id"], self._patch["bug_id"]))
diff --git a/WebKitTools/Scripts/modules/scm.py b/WebKitTools/Scripts/modules/scm.py
index beb32df..d0db984 100644
--- a/WebKitTools/Scripts/modules/scm.py
+++ b/WebKitTools/Scripts/modules/scm.py
@@ -251,9 +251,6 @@ class SCM:
def clean_working_directory(self):
raise NotImplementedError, "subclasses must implement"
- def update_webkit(self):
- raise NotImplementedError, "subclasses must implement"
-
def status_command(self):
raise NotImplementedError, "subclasses must implement"
@@ -362,9 +359,6 @@ class SVN(SCM):
def clean_working_directory(self):
self.run_command(['svn', 'revert', '-R', '.'])
- def update_webkit(self):
- self.run_command(self.script_path("update-webkit"))
-
def status_command(self):
return ['svn', 'status']
@@ -458,11 +452,6 @@ class Git(SCM):
if self.rebase_in_progress():
self.run_command(['git', 'rebase', '--abort'])
- def update_webkit(self):
- # FIXME: Call update-webkit once https://bugs.webkit.org/show_bug.cgi?id=27162 is fixed.
- log("Updating working directory")
- self.run_command(['git', 'svn', 'rebase'])
-
def status_command(self):
return ['git', 'status']
diff --git a/WebKitTools/Scripts/modules/webkitport.py b/WebKitTools/Scripts/modules/webkitport.py
index a524bc6..022088c 100644
--- a/WebKitTools/Scripts/modules/webkitport.py
+++ b/WebKitTools/Scripts/modules/webkitport.py
@@ -62,13 +62,17 @@ class WebKitPort():
raise NotImplementedError, "subclasses must implement"
@classmethod
- def run_webkit_tests_command(cls):
- return [cls.script_path("run-webkit-tests")]
+ def update_webkit_command(cls):
+ return [cls.script_path("update-webkit")]
@classmethod
def build_webkit_command(cls):
return [cls.script_path("build-webkit")]
+ @classmethod
+ def run_webkit_tests_command(cls):
+ return [cls.script_path("run-webkit-tests")]
+
class MacPort(WebKitPort):
@classmethod
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list