From 5ebf1639abb387e2d98d1a0e2f2ebf649c53d21b Mon Sep 17 00:00:00 2001 From: "nsylvain@chromium.org" Date: Fri, 23 Oct 2009 22:33:47 +0000 Subject: [PATCH] Change the default workdir for drover. Review URL: http://codereview.chromium.org/330008 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@29965 0039d316-1c4b-4281-b951-d872f2087c98 --- drover.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drover.py b/drover.py index 5a32c7b57..937b0646a 100644 --- a/drover.py +++ b/drover.py @@ -343,13 +343,20 @@ def text_prompt(question, 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"): @@ -359,8 +366,6 @@ def main(options, args): 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: