Misc improvements to drover

drover.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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 datetime
 import optparse
 import os
 import re
 import string
@@ skipping 497 matching lines @@
   if options.branch:
     DEFAULT_WORKING += ("_" + options.branch)
 
   if not isMinimumSVNVersion(1, 5):
     print "You need to use at least SVN version 1.5.x"
     return 1
 
   # Override the default properties if there is a drover.properties file.
   global file_pattern_
   if os.path.exists("drover.properties"):
+    print 'Using options from %s' % os.path.join(
+        os.getcwd(), 'drover.properties')
     FILE_PATTERN = file_pattern_
     f = open("drover.properties")
     exec(f)
     f.close()
     if FILE_PATTERN:
       file_pattern_ = FILE_PATTERN
 
   if options.revert and options.branch:
     print 'Note: --branch is usually not needed for reverts.'
     url = BRANCH_URL.replace("$branch", options.branch)
   elif options.merge and options.sbranch:
     url = BRANCH_URL.replace("$branch", options.sbranch)
   elif options.revert:
     url = options.url or BASE_URL
     file_pattern_ = r"[ ]+([MADUC])[ ]+((/.*)/(.*))"
   else:
     url = TRUNK_URL
 
   working = options.workdir or DEFAULT_WORKING
 
   if options.local:
     working = os.getcwd()
     if not inCheckoutRoot(working):
       print "'%s' appears not to be the root of a working copy" % working
       return 1
     if (isSVNDirty() and not
         prompt("Working copy contains uncommitted files. Continue?")):
       return 1
 
-  if options.revert and not options.no_alt_urls:
+  if options.revert and not options.no_alt_urls and not options.url:
     for cur_url in [url] + REVERT_ALT_URLS:
       try:
         commit_date_str = getSVNInfo(
             cur_url, options.revert).get('Last Changed Date', 'x').split()[0]
         commit_date = datetime.datetime.strptime(commit_date_str, '%Y-%m-%d')
-        if (datetime.datetime.now() - commit_date).days < 120:
+        if (datetime.datetime.now() - commit_date).days < 180:
           if cur_url != url:
             print 'Guessing svn repo: %s.' % cur_url,
             print 'Use --no-alt-urls to disable heuristic.'
             url = cur_url
           break
       except ValueError:
         pass
   command = 'svn log ' + url + " -r "+str(revision) + " -v"
   os.system(command)
 
@@ skipping 149 matching lines @@
 
   if options.branch and options.milestone:
     option_parser.error("--branch cannot be used with --milestone")
     return 1
 
   return drover(options, args)
 
 
 if __name__ == "__main__":
   sys.exit(main())