Allow move_source_file.py and sort-headers.py to work on blink.

tools/git/move_source_file.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Moves C++ files to a new location, updating any include paths that point
 to them, and re-ordering headers as needed.  If multiple source files are
 specified, the destination must be a directory.  Updates include guards in
 moved header files.  Assumes Chromium coding style.
 
@@ skipping 54 matching lines @@
   return to_path
 
 
 def MoveFile(from_path, to_path):
   """Performs a git mv command to move a file from |from_path| to |to_path|.
   """
   if not os.system('git mv %s %s' % (from_path, to_path)) == 0:
     raise Exception('Fatal: Failed to run git mv command.')
 
 
-def UpdatePostMove(from_path, to_path):
+def UpdatePostMove(from_path, to_path, in_blink):
   """Given a file that has moved from |from_path| to |to_path|,
   updates the moved file's include guard to match the new path and
   updates all references to the file in other source files. Also tries
   to update references in .gyp(i) files using a heuristic.
   """
   # Include paths always use forward slashes.
   from_path = from_path.replace('\\', '/')
   to_path = to_path.replace('\\', '/')
 
   if os.path.splitext(from_path)[1] in ['.h', '.hh']:
     UpdateIncludeGuard(from_path, to_path)
 
+    from_include_path = from_path
+    to_include_path = to_path
+    if in_blink:
+      def UpdateIncludePathForBlink(path):

[Matt Giuca, 2015/07/07 05:20:52]

This should be moved to the top level. (Only make a nested function if you need
to close over local variables.)

Maybe add a docstring as well to explain why.

[benwells, 2015/07/13 05:46:31]

Done.

+        for prefix in ['public/', 'Source/']:

[Matt Giuca, 2015/07/07 05:20:52]

Use tuple not list ("(,)" not "[,]").

(Semantically equivalent, tuple is more efficient and should be preferred for
any read-only list.)

[benwells, 2015/07/13 05:46:31]

Done.

+          if path.startswith(prefix):
+            return path[len(prefix):]

[Matt Giuca, 2015/07/07 05:20:52]

nit: Blank line after return.

[benwells, 2015/07/13 05:46:31]

Done.

+        return path
+      from_include_path = UpdateIncludePathForBlink(from_include_path)
+      to_include_path = UpdateIncludePathForBlink(to_include_path)
+
     # Update include/import references.
     files_with_changed_includes = mffr.MultiFileFindReplace(
-        r'(#(include|import)\s*["<])%s([>"])' % re.escape(from_path),
-        r'\1%s\3' % to_path,
+        r'(#(include|import)\s*["<])%s([>"])' % re.escape(from_include_path),
+        r'\1%s\3' % to_include_path,
         ['*.cc', '*.h', '*.m', '*.mm', '*.cpp'])
 
     # Reorder headers in files that changed.
     for changed_file in files_with_changed_includes:
       def AlwaysConfirm(a, b): return True
-      sort_headers.FixFileWithConfirmFunction(changed_file, AlwaysConfirm, True)
+      sort_headers.FixFileWithConfirmFunction(changed_file, AlwaysConfirm, True,
+                                              in_blink)
 
   # Update comments; only supports // comments, which are primarily
   # used in our code.
   #
   # This work takes a bit of time. If this script starts feeling too
   # slow, one good way to speed it up is to make the comment handling
   # optional under a flag.
   mffr.MultiFileFindReplace(
       r'(//.*)%s' % re.escape(from_path),
       r'\1%s' % to_path,
@@ skipping 80 matching lines @@
            'include guard manually. (%s)' % new_path)
 
   with open(new_path, 'w') as f:
     f.write(new_contents)
 
 def main():
   if not os.path.isdir('.git'):
     print 'Fatal: You must run from the root of a git checkout.'
     return 1
 
+  in_blink = os.getcwd().endswith("third_party/WebKit")

[Matt Giuca, 2015/07/07 05:20:52]

I'm concerned this will break when the repos merge. (But maybe it's unavoidable
that something like this will break.)

[benwells, 2015/07/13 05:46:31]

Yep, it will break. I think it is unavoidable now, but will be easy to fix.

+
   parser = optparse.OptionParser(usage='%prog FROM_PATH... TO_PATH')
   parser.add_option('--already_moved', action='store_true',
                     dest='already_moved',
                     help='Causes the script to skip moving the file.')
   parser.add_option('--no_error_for_non_source_file', action='store_false',
                     default='True',
                     dest='error_for_non_source_file',
                     help='Causes the script to simply print a warning on '
                     'encountering a non-source file rather than raising an '
                     'error.')
@@ skipping 12 matching lines @@
     parser.print_help()
     return 1
 
   for from_path in from_paths:
     if not opts.error_for_non_source_file and not IsHandledFile(from_path):
       print '%s does not appear to be a source file, skipping' % (from_path)
       continue
     to_path = MakeDestinationPath(from_path, orig_to_path)
     if not opts.already_moved:
       MoveFile(from_path, to_path)
-    UpdatePostMove(from_path, to_path)
+    UpdatePostMove(from_path, to_path, in_blink)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())