Modified: trunk/Tools/ChangeLog (111622 => 111623)
--- trunk/Tools/ChangeLog 2012-03-22 00:05:25 UTC (rev 111622)
+++ trunk/Tools/ChangeLog 2012-03-22 00:20:38 UTC (rev 111623)
@@ -1,3 +1,18 @@
+2012-03-21 Adam Barth <[email protected]>
+
+ WebKit should have some scripts to smooth interactions with GitHub
+ https://bugs.webkit.org/show_bug.cgi?id=81842
+
+ Reviewed by Eric Seidel.
+
+ These scripts support the workflow in
+ https://trac.webkit.org/wiki/UsingGitHub by automating the
+ configuration and syncing operations needed for a GitHub fork of WebKit
+ to track the main WebKit repository.
+
+ * Scripts/configure-github-as-upstream: Added.
+ * Scripts/sync-master-with-upstream: Added.
+
2012-03-21 Dirk Pranke <[email protected]>
WTR - log the pid of a crashing WebProcess
Added: trunk/Tools/Scripts/configure-github-as-upstream (0 => 111623)
--- trunk/Tools/Scripts/configure-github-as-upstream (rev 0)
+++ trunk/Tools/Scripts/configure-github-as-upstream 2012-03-22 00:20:38 UTC (rev 111623)
@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+
+# Copyright 2012 Google, Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# This script is intended to support the GitHub workflow described here:
+# https://trac.webkit.org/wiki/UsingGitHub
+#
+# This script adds WebKit's "root" repository on GitHub as a remote named
+# "upstream". You can use sync-master-with-upstream to keep your master
+# branch in sync with WebKit's "root" repository.
+
+import subprocess
+
+exit(subprocess.call(["git", "remote", "add", "upstream", "git://github.com/WebKit/webkit.git"]))
Property changes on: trunk/Tools/Scripts/configure-github-as-upstream
___________________________________________________________________
Added: trunk/Tools/Scripts/sync-master-with-upstream (0 => 111623)
--- trunk/Tools/Scripts/sync-master-with-upstream (rev 0)
+++ trunk/Tools/Scripts/sync-master-with-upstream 2012-03-22 00:20:38 UTC (rev 111623)
@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+
+# Copyright 2012 Google, Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# This script is intended to support the GitHub workflow described here:
+# https://trac.webkit.org/wiki/UsingGitHub
+#
+# This script fetches the latest changes from upstream, merges them into the
+# local master branch, and pushes those changes to the master branch in origin.
+#
+# Running this script periodically will keep your fork of WebKit on GitHub in
+# sync with the "root" WebKit repository in upstream, assuming you've run
+# configure-github-as-upstream
+
+import subprocess
+
+def run(args, error_message = None):
+ if subprocess.call(args) != 0:
+ if error_message:
+ print error_message
+ exit(1)
+
+run(["git", "fetch", "upstream"], "Have you run configure-github-as-upstream to configure an upstream repository?")
+run(["git", "merge", "upstream/master", "master"], "Have you made changes to your master branch?")
+run(["git", "push", "origin", "master"])
Property changes on: trunk/Tools/Scripts/sync-master-with-upstream
___________________________________________________________________
