Automatically sort headers in files affected by move_source_file.py

tools/sort-headers.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.
 
 """Given a filename as an argument, sort the #include/#imports in that file.
 
 Shows a diff and prompts for confirmation before doing the deed.
 Works great with tools/git/for-all-touched-files.py.
 """
@@ skipping 63 matching lines @@
       while IsInclude(line):
         headerblock.append(line)
         line = infile.next()
       for header in sorted(headerblock, key=IncludeCompareKey):
         outfile.write(header)
       # Intentionally fall through, to write the line that caused
       # the above while loop to exit.
     outfile.write(line)
 
 
-def DiffAndConfirm(filename, should_confirm):
-  """Shows a diff of what the tool would change the file named
-  filename to.  Shows a confirmation prompt if should_confirm is true.
-  Saves the resulting file if should_confirm is false or the user
-  answers Y to the confirmation prompt.
+def FixFileWithConfirmFunction(filename, confirm_function):
+  """Creates a fixed version of the file, invokes |confirm_function|
+  to decide whether to use the new file, and cleans up.
+
+  |confirm_function| takes two parameters, the original filename and
+  the fixed-up filename, and returns True to use the fixed-up file,
+  false to not use it.
   """
   fixfilename = filename + '.new'
   infile = open(filename, 'r')
   outfile = open(fixfilename, 'w')
   SortHeader(infile, outfile)
   infile.close()
   outfile.close()  # Important so the below diff gets the updated contents.
 
   try:
-    diff = os.system('diff -u %s %s' % (filename, fixfilename))
-    if diff >> 8 == 0:  # Check exit code.
-      print '%s: no change' % filename
-      return
-
-    if not should_confirm or YesNo('Use new file (y/N)?'):
+    if confirm_function(filename, fixfilename):
       os.rename(fixfilename, filename)
   finally:
     try:
       os.remove(fixfilename)
     except OSError:
       # If the file isn't there, we don't care.
       pass
 
 
+def DiffAndConfirm(filename, should_confirm):
+  """Shows a diff of what the tool would change the file named
+  filename to.  Shows a confirmation prompt if should_confirm is true.
+  Saves the resulting file if should_confirm is false or the user
+  answers Y to the confirmation prompt.
+  """
+  def ConfirmFunction(filename, fixfilename):
+    diff = os.system('diff -u %s %s' % (filename, fixfilename))
+    if diff >> 8 == 0:  # Check exit code.
+      print '%s: no change' % filename
+      return False
+
+    return (not should_confirm or YesNo('Use new file (y/N)?'))
+
+  FixFileWithConfirmFunction(filename, ConfirmFunction)
+
+
 def main():
   parser = optparse.OptionParser(usage='%prog filename1 filename2 ...')
   parser.add_option('-f', '--force', action='store_false', default=True,
                     dest='should_confirm',
                     help='Turn off confirmation prompt.')
   opts, filenames = parser.parse_args()
 
   if len(filenames) < 1:
     parser.print_help()
     return 1
 
   for filename in filenames:
     DiffAndConfirm(filename, opts.should_confirm)
 
 
 if __name__ == '__main__':
   sys.exit(main())