Script to do webkit merges!

Review URL: http://codereview.chromium.org/10672

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5426 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 171 insertions, 0 deletions

diff --git a/webkit/tools/merge/merge.py b/webkit/tools/merge/merge.py
new file mode 100755
index 0000000..1639ba4
--- /dev/null
+++ b/webkit/tools/merge/merge.py
@@ -0,0 +1,152 @@
+#!/bin/env python
+# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""Does a webkit merge to tip of tree WebKit or a revision 
+specified on the command line. Looks at trunk/src/WEBKIT_MERGE_REVISION
+to find the repository and revision to merge from.
+
+Example usage:
+  merge.py
+  merge.py --new_revision 12345
+  merge.py --diff3_cmd myfancydiffcommand.exe
+
+"""
+
+import optparse
+import subprocess
+import xml.dom.minidom
+
+import google.path_utils
+
+class Merger(object):
+  """ Does svn merges. """
+  
+  def __init__(self, repository, webkit_root, old_revision, 
+      new_revision, is_dry_run, diff3_cmd=None):
+    """
+    Args:
+      repository: the repository that we are merging to/from.
+      webkit_root: path to third_party/WebKit directory in which to run svn
+          commands.
+      old_revision: the revision we are currently merged to.
+      new_revision: the revision we are merging to.
+      is_dry_run: whether to actually make changes or just print intended
+          changes.
+      diff3_cmd: the tool for doing 3-way diffs.
+    """
+    self._repository = repository
+    self._webkit_root = webkit_root
+    self._old_revision = old_revision
+    self._new_revision = new_revision
+    self._is_dry_run = is_dry_run
+    self._diff3_cmd = diff3_cmd
+
+  def MergeDirectory(self, directory):
+    """ Merges the given directory in the repository into the same directory
+    in the working copy.
+    """
+    command = ["svn", "merge", "--accept", "edit", "-r", 
+        "%s:%s" % (self._old_revision, self._new_revision), 
+        "%s/%s" % (self._repository, directory), directory]
+    if self._diff3_cmd is not None:
+      command.append("--diff3-cmd")
+      command.append(self._diff3_cmd)
+    print ' '.join(command)
+    if not self._is_dry_run:
+      #TODO(ojan): Check return code here.
+      subprocess.call(command, cwd=self._webkit_root, shell=True)
+
+def GetCurrentRepositoryAndRevision(webkit_merge_revision_path):
+  """ Gets the repository and revision we're currently merged to according to
+  the WEBKIT_MERGE_REVISION file checked in.
+  
+  Args:
+    webkit_merge_revision_path: path to WEBKIT_MERGE_REVISION file.
+  """
+  file = open(webkit_merge_revision_path)
+  contents = file.read().strip()
+  split_contents = contents.split("@")
+  return {'repository': split_contents[0], 'old_revision': split_contents[1]}
+
+def GetTipOfTreeRevision(repository):
+  """ Gets the tip-of-tree revision for the repository. 
+  """
+  info = subprocess.Popen(["svn", "info", "--xml", repository], shell=True, 
+      stdout=subprocess.PIPE).communicate()[0]
+  dom = xml.dom.minidom.parseString(info)
+  return dom.getElementsByTagName('entry')[0].getAttribute('revision')
+
+def UpdateWebKitMergeRevision(webkit_merge_revision_path, repository, 
+    new_revision, is_dry_run):
+  """ Updates the checked in WEBKIT_MERGE_REVISION file with the repository
+  and revision we just merged to.
+  
+  Args:
+    webkit_merge_revision_path: path to WEBKIT_MERGE_REVISION file.
+    repository: repository we've merged to.
+    new_revision: revision we've merged to.
+    is_dry_run: whether to update the file or just print out the update that
+        would be done.
+  """
+  new_merge_revision = "%s@%s" % (repository, new_revision)
+  if is_dry_run:
+    print "%s=%s" % (webkit_merge_revision_path, new_merge_revision)
+  else:
+    file = open(webkit_merge_revision_path, "w")
+    #TODO(ojan): Check that the write suceeded.
+    file.write(new_merge_revision)
+
+def main(options, args):
+  """ Does the merge and updates WEBKIT_MERGE_REVISION.
+  
+  Args:
+    options: a dictionary of commandline arguments.
+    args: currently unused.
+  """
+  #TODO(ojan): Check return code here.
+  sync_command = ["gclient", "sync"]
+  if options.dry_run:
+    print ' '.join(sync_command)
+  else:
+    subprocess.call(sync_command, shell=True)
+
+  webkit_merge_revision_path = google.path_utils.FindUpward(
+      google.path_utils.ScriptDir(), 'WEBKIT_MERGE_REVISION')
+
+  repository_and_revision = GetCurrentRepositoryAndRevision(
+      webkit_merge_revision_path)
+  repository = repository_and_revision['repository']
+  old_revision = repository_and_revision['old_revision']
+  
+  if options.new_revision:
+    new_revision = options.new_revision
+  else:
+    new_revision = GetTipOfTreeRevision(repository)
+
+  webkit_root = google.path_utils.FindUpward(google.path_utils.ScriptDir(),
+      'third_party', 'WebKit')
+
+  merger = Merger(repository, webkit_root, old_revision, new_revision, 
+      options.dry_run, options.diff3_cmd)
+  merger.MergeDirectory("JavaScriptCore")
+  merger.MergeDirectory("WebCore")
+  merger.MergeDirectory("WebKit")
+  merger.MergeDirectory("WebKitLibraries")
+  
+  UpdateWebKitMergeRevision(webkit_merge_revision_path, repository,
+      new_revision, options.dry_run)
+
+if '__main__' == __name__:
+  option_parser = optparse.OptionParser()
+  option_parser.add_option("", "--diff3-cmd", default=None,
+                           help="Optional. Path to 3-way diff tool.")
+  option_parser.add_option("", "--new-revision", default=None,
+                           help="Optional. Revision to merge to. Tip of tree "
+                                "revision will be used if omitted.")
+  option_parser.add_option("", "--dry-run", action="store_true", default=False,
+                           help="Print out actions the merge would take, but"
+                                "don't actually do them.")
+  options, args = option_parser.parse_args()
+  main(options, args)
diff --git a/webkit/tools/merge/merge.sh b/webkit/tools/merge/merge.sh
new file mode 100755
index 0000000..b2026d6
--- /dev/null
+++ b/webkit/tools/merge/merge.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+exec_dir=$(dirname $0)
+
+if [ "$OSTYPE" = "cygwin" ]; then
+  system_root=`cygpath "$SYSTEMROOT"`
+  PATH="/usr/bin:$system_root/system32:$system_root:$system_root/system32/WBEM"
+  export PATH
+  PYTHON_PROG="$exec_dir/../../../third_party/python_24/python.exe"
+else
+  PYTHON_PROG=python
+  # When not using the included python, we don't get automatic site.py paths.
+  # Specifically, run_webkit_tests needs the paths in:
+  # third_party/python_24/Lib/site-packages/google.pth
+  PYTHONPATH="$(readlink -f ${exec_dir}/../../../tools/python):$PYTHONPATH"
+  export PYTHONPATH
+fi
+
+"$PYTHON_PROG" "$exec_dir/merge.py" "$@"