Fix the patch application sorting.

patch.py

 # coding=utf8
 # 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.
 """Utility functions to handle patches."""
 
 import posixpath
 import os
 import re
 
@@ skipping 485 matching lines @@
   def __init__(self, patches):
     for p in patches:
       assert isinstance(p, FilePatchBase)
 
     def key(p):
       """Sort by ordering of application.
 
       File move are first.
       Deletes are last.
       """
-      if p.source_filename:
-        return (p.is_delete, p.source_filename_utf8, p.filename_utf8)
-      else:
-        # tuple are always greater than string, abuse that fact.
-        return (p.is_delete, (p.filename_utf8,), p.filename_utf8)
+      # The bool is necessary because None < 'string' but the reverse is needed.
+      return (
+          p.is_delete,
+          # False is before True, so files *with* a source file will be first.
+          not bool(p.source_filename),
+          p.source_filename_utf8,
+          p.filename_utf8)
 
     self.patches = sorted(patches, key=key)
 
   def set_relpath(self, relpath):
     """Used to offset the patch into a subdirectory."""
     for patch in self.patches:
       patch.set_relpath(relpath)
 
   def __iter__(self):
     for patch in self.patches:
       yield patch
 
   def __getitem__(self, key):
     return self.patches[key]
 
   @property
   def filenames(self):
     return [p.filename for p in self.patches]