On Windows, find all modified files after a WebKit merge and force them...

webkit/tools/merge/merge.py

 #!/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-tool kdiff3
 
 """
 
 import optparse
 import os
 import re
 import subprocess
+import sys
 import xml.dom.minidom
 
 import google.path_utils
 
 class Merger(object):
   """ Does svn merges. """
 
   DIFF3_WRAPPER_PATH = os.path.join('..', '..', 'webkit', 'tools', 'merge',
       'diff3-wrapper.bat')
 
@@ skipping 30 matching lines @@
       command.append("--diff3-cmd")
       command.append(self.DIFF3_WRAPPER_PATH)
       command.append("-x")
       command.append("--use-%s" % self._diff3_tool)
     print ' '.join(command)
     if not self._is_dry_run:
       returncode = subprocess.call(command, cwd=self._webkit_root, shell=True)
       if returncode != 0:
         raise "Are you sure you're running SVN 1.5?  svn --version to check"
 
+    # On Windows, find modified files and force them to LF. We trust dos2unix
+    # not to change binary files.
+    if sys.platform == 'win32':
+      command = [self._svn, "status", "--xml", directory]
+      print ' '.join(command)
+      info = subprocess.Popen(command, cwd=self._webkit_root, shell=True,
+                              stdout=subprocess.PIPE).communicate()[0]
+      dom = xml.dom.minidom.parseString(info)
+      for entry in dom.getElementsByTagName("entry"):
+        file_path = entry.getAttribute("path")
+        type = os.path.splitext(file_path)[-1]
+        status = (entry.getElementsByTagName('wc-status')[0]
+                       .getAttribute('item'))
+        # TODO(pamg): Is this the same in non-English svn?
+        if status == "modified":
+          command = ["dos2unix.exe", file_path]
+          if self._is_dry_run:
+            print ' '.join(command)
+          else:
+            subprocess.call('dos2unix.exe %s' % file_path,

[ojan, 2009/02/12 02:21:00]

shouldn't this be using 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.
   """
   contents = open(webkit_merge_revision_path).read().strip()
   split_contents = contents.split("@")
   return {'repository': split_contents[0], 'old_revision': split_contents[1]}
@@ skipping 92 matching lines @@
                            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.")
   option_parser.add_option("", "--svn", default="svn",
                            help="Path to svn executable, if it's not in your "
                                 "PATH.")
   options, args = option_parser.parse_args()
   main(options, args)