Have drover ask for additional reviewers if its reverting a change made by the user

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 optparse
 import os
 import re
 import string
 import sys
 import urllib2
+import urlparse
 
 import breakpad  # pylint: disable=W0611
 
 import gclient_utils
 import subprocess2
 
 USAGE = """
 WARNING: Please use this tool in an empty directory
 (or at least one that you don't mind clobbering.)
 
@@ skipping 392 matching lines @@
   # Not all of the platforms have the same branch. Prompt the user and return
   # the greatest (by value) branch on success.
   if prompt("Not all platforms have the same branch number, "
             "continue with branch %s?" % branch):
     return branch
 
   # User cancelled.
   return None
 
 
+def getSVNAuthInfo(folder=None):
+  """Fetches SVN authorization information in the subversion auth folder and
+  returns it as a dictionary of dictionaries."""
+  if not folder:
+    if sys.platform == 'win32':
+      folder = '%%APPDATA%\\Subversion\\auth'
+    else:
+      folder = '~/.subversion/auth'
+  folder = os.path.expandvars(os.path.expanduser(folder))
+  svn_simple_folder = os.path.join(folder, 'svn.simple')
+  results = {}
+  try:
+    for auth_file in os.listdir(svn_simple_folder):
+      # Read the SVN auth file, convert it into a dictionary, and store it.
+      results[auth_file] = dict(re.findall(r'K [0-9]+\n(.*)\nV [0-9]+\n(.*)\n', 
+          open(os.path.join(svn_simple_folder, auth_file)).read()))
+  except Exception as _:
+    pass
+  return results
+
+
+def getCurrentSVNUsers(url):
+  """Tries to fetch the current SVN in the current checkout by scanning the
+  SVN authorization folder for a match with the current SVN URL."""
+  netloc = urlparse.urlparse(url)[1]
+  auth_infos = getSVNAuthInfo()
+  results = []
+  for _, auth_info in auth_infos.iteritems():
+    if ('svn:realmstring' in auth_info 
+        and netloc in auth_info['svn:realmstring']):
+      username = auth_info['username']
+      results.append(username)
+      if 'google.com' in username:
+        results.append(username.replace('google.com', 'chromium.org'))
+  return results
+
+
 def prompt(question):
   while True:
     print question + " [y|n]:",
     answer = sys.stdin.readline()
     if answer.lower().startswith('n'):
       return False
     elif answer.lower().startswith('y'):
       return True
 
 
@@ skipping 96 matching lines @@
     revertExportRevision(url, revision)
 
   # Check the base url so we actually find the author who made the change
   if options.auditor:
     author = options.auditor
   else:
     author = getAuthor(url, revision)
     if not author:
       author = getAuthor(TRUNK_URL, revision)
 
+  # Check that the author of the CL is different than the user making
+  # the revert.  If they're the same, then we'll want to prompt the user
+  # for a different reviewer to TBR.
+  current_users = getCurrentSVNUsers(BASE_URL)
+  is_self_revert = options.revert and author in current_users
+
   filename = str(revision)+".txt"
   out = open(filename,"w")
-  out.write(action +" " + str(revision) + " - ")
-  out.write(getRevisionLog(url, revision))
+  out.write(action +" " + str(revision) + "\n")
+  for line in getRevisionLog(url, revision).splitlines():
+    out.write('> %s\n' % line)
   if (author):
     out.write("\nTBR=" + author)
   out.close()
 
   change_cmd = 'change ' + str(revision) + " " + filename
   if options.revertbot:
     if sys.platform == 'win32':
       os.environ['SVN_EDITOR'] = 'cmd.exe /c exit'
     else:
       os.environ['SVN_EDITOR'] = 'true'
   runGcl(change_cmd)
   os.unlink(filename)
 
   if options.local:
     return 0
 
   print author
   print revision
   print ("gcl upload " + str(revision) +
          " --send_mail --no_presubmit --reviewers=" + author)
 
   if options.revertbot or prompt("Would you like to upload?"):
-    if PROMPT_FOR_AUTHOR:
+    if PROMPT_FOR_AUTHOR or is_self_revert:
       author = text_prompt("Enter new author or press enter to accept default",
                            author)
     if options.revertbot and options.revertbot_reviewers:
       author += ","
       author += options.revertbot_reviewers
     gclUpload(revision, author)
   else:
     print "Deleting the changelist."
     print "gcl delete " + str(revision)
     runGcl("delete " + str(revision))
@@ skipping 51 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())