Change the default workdir for drover.

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 325 matching lines @@
       answer = None 
 
 def text_prompt(question, default):
   print question + " [" + default + "]:"
   answer = sys.stdin.readline()
   if answer.strip() == "":
     return default
   return answer
 
 def main(options, args):
+  revision = options.revert or options.merge
+
+  # Initialize some variables used below. They can be overwritten by
+  # the drover.properties file.
   BASE_URL = "svn://chrome-svn/chrome"
   TRUNK_URL = BASE_URL + "/trunk/src"
   BRANCH_URL = BASE_URL + "/branches/$branch/src"
-  DEFAULT_WORKING = "working"
   SKIP_CHECK_WORKING = True
   PROMPT_FOR_AUTHOR = False
 
+  DEFAULT_WORKING = "drover_" + str(revision)
+  if options.branch:
+    DEFAULT_WORKING += ("_" + options.branch)
+
   # Override the default properties if there is a drover.properties file.
   global file_pattern_
   if os.path.exists("drover.properties"):
     file = open("drover.properties")
     exec(file)
     file.close()
     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 = options.workdir or DEFAULT_WORKING
 
   command = 'svn log ' + url + " -r "+str(revision) + " -v"
   os.system(command)
 
@@ skipping 92 matching lines @@
 
   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))