Add a new --workdir param to specify the subdir to use

drover.py

 # Copyright (c) 2009 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.
 
 import optparse
 import os
 import re
 import subprocess
 import sys
 import webbrowser
@@ skipping 348 matching lines @@
     if FILE_PATTERN:
       file_pattern_ = FILE_PATTERN   
 
   revision = options.revert or options.merge
 
   if options.revert and options.branch:
     url = BRANCH_URL.replace("$branch", options.branch) 
   else:
     url = TRUNK_URL
 
-  working = DEFAULT_WORKING
+  working =  options.workdir or DEFAULT_WORKING

[M-A Ruel, 2009/10/23 19:45:50]

2 whitespaces.

 
   command = 'svn log ' + url + " -r "+str(revision) + " -v"
   os.system(command)
 
   if not (options.revertbot or prompt("Is this the correct revision?")):
     sys.exit(0)
 
   if (os.path.exists(working)):
     if not (options.revertbot or SKIP_CHECK_WORKING or
         prompt("Working directory: '%s' already exists, clobber?" % working)):
@@ skipping 68 matching lines @@
     sys.exit(0)
 
 if __name__ == "__main__":
   option_parser = optparse.OptionParser(usage=USAGE % {"app": sys.argv[0]})
   option_parser.add_option('-m', '--merge', type="int",
                            help='Revision to merge from trunk to branch')
   option_parser.add_option('-b', '--branch',
                            help='Branch to revert or merge from')
   option_parser.add_option('-r', '--revert', type="int",
                            help='Revision to revert')
+  option_parser.add_option('-w', '--workdir',
+                           help='subdir to use for the revert')
   option_parser.add_option('', '--revertbot', action='store_true',
                            default=False)
   option_parser.add_option('', '--revertbot-commit', action='store_true',
                            default=False)
   option_parser.add_option('', '--revertbot-reviewers')
   options, args = option_parser.parse_args()
 
   if not options.merge and not options.revert:
     option_parser.error("You need at least --merge or --revert")
     sys.exit(1)
 
   if options.merge and not options.branch:
     option_parser.error("--merge requires a --branch")
     sys.exit(1)
 
   sys.exit(main(options, args))