Add --extra_patchlevel flag to apply_issue.py

apply_issue.py

Index: apply_issue.py
diff --git a/apply_issue.py b/apply_issue.py
index b0d9176316fc2b8470ed4a57a5a3c1f998517821..3aa81c02c3069c1fe59707faf2ebbb38c4ce40f2 100755
--- a/apply_issue.py
+++ b/apply_issue.py
@@ -92,6 +92,10 @@ def _get_arg_parser():
                     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 hierarchys).')

[tandrii(chromium), 2016/05/17 07:10:38]

nit: s/hierarchys/hierarchies

[kjellander_chromium, 2016/05/17 07:12:30]

Done.

 
   auth.add_auth_options(parser)
   return parser
@@ -255,6 +259,8 @@ def main():
                           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':