Complete apply_issue.py.

apply_issue.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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 logging
 import optparse
+import os
 import sys
 
 import breakpad  # pylint: disable=W0611
+
+import checkout
 import fix_encoding
 import rietveld
+import scm
 
 
 def main():
   parser = optparse.OptionParser(description=sys.modules[__name__].__doc__)
   parser.add_option(
       '-v', '--verbose', action='count', help='Prints debugging infos')
   parser.add_option(
       '-i', '--issue', type='int', help='Rietveld issue number')
   parser.add_option(
       '-p', '--patchset', type='int', help='Rietveld issue\'s patchset number')
   parser.add_option(
       '-r',
       '--root_dir',
-      action='store',
+      default=os.getcwd(),
       help='Root directory to apply the patch')
   parser.add_option(
       '-s',
       '--server',
-      action='store',
       default='http://codereview.chromium.org',
       help='Rietveld server')
   options, args = parser.parse_args()
   LOG_FORMAT = '%(levelname)s %(filename)s(%(lineno)d): %(message)s'
   if not options.verbose:
     logging.basicConfig(level=logging.WARNING, format=LOG_FORMAT)
   elif options.verbose == 1:
     logging.basicConfig(level=logging.INFO, format=LOG_FORMAT)
   elif options.verbose > 1:
     logging.basicConfig(level=logging.DEBUG, format=LOG_FORMAT)
   if args:
     parser.error('Extra argument(s) "%s" not understood' % ' '.join(args))
   if not options.issue:
     parser.error('Require --issue')
 
   obj = rietveld.Rietveld(options.server, None, None)
 
   if not options.patchset:
     options.patchset = obj.get_issue_properties(
         options.issue, False)['patchsets'][-1]
     logging.info('Using patchset %d' % options.patchset)
-  obj.get_patch(options.issue, options.patchset)
+  # Download the patch.
+  patchset = obj.get_patch(options.issue, options.patchset)
+
+  scm_type = scm.determine_scm(options.root_dir)

[Dirk Pranke, 2011/05/02 20:32:05]

Nit ... seems like this block could be turned into a factory function that
returned an object directly, and that such a function would be generally useful.

+  if scm_type == 'svn':
+    scm_obj = checkout.SvnCheckout(options.root_dir, None, None, None, None)
+  elif scm_type == 'git':
+    scm_obj = checkout.GitCheckoutBase(options.root_dir, None, None)
+  elif scm_type == None:
+    scm_obj = checkout.RawCheckout(options.root_dir, None)
+  else:
+    parser.error('Couldn\'t determine the scm')
+
+  # Apply the patch.
+  scm_obj.apply_patch(patchset)
   return 0
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(main())