Use git apply for applying patch files (issue #1825)

tools/patcher.py

@@ -7,36 +7,44 @@ from optparse import OptionParser
 import os
 import sys
 from file_util import *
-from patch_util import *
-
+from git_util import git_apply_patch_file
 
 # Cannot be loaded as a module.
 if __name__ != "__main__":
   sys.stdout.write('This file cannot be loaded as a module!')
   sys.exit()
 
+# The CEF root directory is the parent directory of _this_ script.
+cef_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
+cef_patch_dir = os.path.join(cef_dir, 'patch')
+src_dir = os.path.abspath(os.path.join(cef_dir, os.pardir))
 
-def normalize_dir(dir):
-  ''' Normalize the directory value. '''
-  dir = dir.replace('\\', '/')
-  if dir[-1] != '/':
-    dir += '/'
-  return dir
+def write_note(type, note):
+  separator = '-' * 79 + '\n'
+  sys.stdout.write(separator)
+  sys.stdout.write('!!!! %s: %s\n' % (type, note))
+  sys.stdout.write(separator)
 
-def patch_file(patch_file, patch_dir):
-  ''' Apply a single patch file in a single directory. '''
-  if not os.path.isfile(patch_file):
-    raise Exception('Patch file %s does not exist.' % patch_file)
+def apply_patch_file(patch_file, patch_dir):
+  ''' Apply a specific patch file in optional patch directory. '''
+  patch_path = os.path.join(cef_patch_dir, 'patches', patch_file + '.patch')
 
-  sys.stdout.write('Reading patch file %s\n' % patch_file)
-  patchObj = from_file(patch_file)
-  patchObj.apply(normalize_dir(patch_dir))
+  if patch_dir is None or len(patch_dir) == 0:
+    patch_dir = src_dir
+  else:
+    if not os.path.isabs(patch_dir):
+      # Apply patch relative to the Chromium 'src' directory.
+      patch_dir = os.path.join(src_dir, patch_dir)
+    patch_dir = os.path.abspath(patch_dir)
 
-def patch_config(config_file):
+  result = git_apply_patch_file(patch_path, patch_dir)
+  if result == 'fail':
+    write_note('ERROR', 'This patch failed to apply. Your build will not be correct.')
+  return result
+
+def apply_patch_config():
   ''' Apply patch files based on a configuration file. '''
-  # Normalize the patch directory value.
-  patchdir = normalize_dir(os.path.dirname(os.path.abspath(config_file)))
-
+  config_file = os.path.join(cef_patch_dir, 'patch.cfg')
   if not os.path.isfile(config_file):
     raise Exception('Patch config file %s does not exist.' % config_file)
 
@@ -45,24 +53,33 @@ def patch_config(config_file):
   execfile(config_file, scope)
   patches = scope["patches"]
 
+  results = {'apply': 0, 'skip': 0, 'fail': 0}
+
   for patch in patches:
-    file = patchdir+'patches/'+patch['name']+'.patch'
+    patch_file = patch['name']
     dopatch = True
 
     if 'condition' in patch:
       # Check that the environment variable is set.
       if patch['condition'] not in os.environ:
-        sys.stdout.write('Skipping patch file %s\n' % file)
+        sys.stdout.write('\nSkipping patch file %s\n' % patch_file)
         dopatch = False
 
     if dopatch:
-      patch_file(file, patch['path'])
-      if 'note' in patch:
-        separator = '-' * 79 + '\n'
-        sys.stdout.write(separator)
-        sys.stdout.write('NOTE: %s\n' % patch['note'])
-        sys.stdout.write(separator)
+      result = apply_patch_file(patch_file, patch['path'] if 'path' in patch else None)
+      results[result] += 1
 
+      if 'note' in patch:
+        write_note('NOTE', patch['note'])
+    else:
+      results['skip'] += 1
+
+  sys.stdout.write('\n%d patches total (%d applied, %d skipped, %d failed)\n' % \
+      (len(patches), results['apply'], results['skip'], results['fail']))
+
+  if results['fail'] > 0:
+    sys.stdout.write('\n')
+    write_note('ERROR', '%d patches failed to apply. Your build will not be correct.' % results['fail'])
 
 # Parse command-line options.
 disc = """
@@ -70,18 +87,13 @@ This utility applies patch files.
 """
 
 parser = OptionParser(description=disc)
-parser.add_option('--patch-config', dest='patchconfig', metavar='DIR',
-                  help='patch configuration file')
 parser.add_option('--patch-file', dest='patchfile', metavar='FILE',
                   help='patch source file')
 parser.add_option('--patch-dir', dest='patchdir', metavar='DIR',
                   help='patch target directory')
 (options, args) = parser.parse_args()
 
-if not options.patchconfig is None:
-  patch_config(options.patchconfig)
-elif not options.patchfile is None and not options.patchdir is None:
-  patch_file(options.patchfile, options.patchdir)
+if not options.patchfile is None:
+  apply_patch_file(options.patchfile, options.patchdir)
 else:
-  parser.print_help(sys.stdout)
-  sys.exit()
+  apply_patch_config()