Add --extra_patchlevel flag to apply_issue.py

apply_issue.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.
 
 """Applies an issue from Rietveld.
 """
 import getpass
 import json
 import logging
@@ skipping 74 matching lines @@
   parser.add_option('-f', '--force', action='store_true',
                     help='Really run apply_issue, even if .update.flag '
                          'is detected.')
   parser.add_option('-b', '--base_ref', help='DEPRECATED do not use.')
   parser.add_option('--whitelist', action='append', default=[],
                     help='Patch only specified file(s).')
   parser.add_option('--blacklist', action='append', default=[],
                     help='Don\'t patch specified file(s).')
   parser.add_option('-d', '--ignore_deps', action='store_true',
                     help='Don\'t run gclient sync on DEPS changes.')
+  parser.add_option('--extra_patchlevel', type='int',
+                    help='Number of directories the patch level number should '
+                         'be incremented (useful for patches from repos with '
+                         'different directory hierarchies).')
 
   auth.add_auth_options(parser)
   return parser
 
 
 def main():
   # TODO(pgervais,tandrii): split this func, it's still too long.
   sys.stdout = Unbuffered(sys.stdout)
   parser = _get_arg_parser()
   options, args = parser.parse_args()
@@ skipping 143 matching lines @@
           issue_to_apply, patchset_to_apply)
       return RETURN_CODE_INFRA_FAILURE
     if options.whitelist:
       patchset.patches = [patch for patch in patchset.patches
                           if patch.filename in options.whitelist]
     if options.blacklist:
       patchset.patches = [patch for patch in patchset.patches
                           if patch.filename not in options.blacklist]
     for patch in patchset.patches:
       print(patch)
+      if options.extra_patchlevel:
+        patch.patchlevel += options.extra_patchlevel
     full_dir = os.path.abspath(options.root_dir)
     scm_type = scm.determine_scm(full_dir)
     if scm_type == 'svn':
       scm_obj = checkout.SvnCheckout(full_dir, None, None, None, None)
     elif scm_type == 'git':
       scm_obj = checkout.GitCheckout(full_dir, None, None, None, None)
     elif scm_type == None:
       scm_obj = checkout.RawCheckout(full_dir, None, None)
     else:
       parser.error('Couldn\'t determine the scm')
@@ skipping 48 matching lines @@
   return RETURN_CODE_OK
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   try:
     sys.exit(main())
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(RETURN_CODE_OTHER_FAILURE)