Commit 638044da authored by laforge@chromium.org's avatar laforge@chromium.org

Fix condition where no author would be retrieved (revert on a branch for

something that was on trunk, svn info only knows about it when it's ref by trunk
url).

Also added an author override, useful for webkit merges or double reverts

Review URL: http://codereview.chromium.org/551137

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37024 0039d316-1c4b-4281-b951-d872f2087c98
parent d8a63787
......@@ -477,7 +477,12 @@ def main(options, args):
revertExportRevision(url, revision)
# Check the base url so we actually find the author who made the change
author = getAuthor(url, revision)
if options.auditor:
author = options.auditor
else:
author = getAuthor(url, revision)
if not author:
author = getAuthor(TRUNK_URL, revision)
filename = str(revision)+".txt"
out = open(filename,"w")
......@@ -532,6 +537,8 @@ if __name__ == "__main__":
help='Revision to revert')
option_parser.add_option('-w', '--workdir',
help='subdir to use for the revert')
option_parser.add_option('-a', '--auditor',
help='overrides the author for reviewer')
option_parser.add_option('', '--revertbot', action='store_true',
default=False)
option_parser.add_option('', '--revertbot-commit', action='store_true',
......@@ -547,4 +554,4 @@ if __name__ == "__main__":
option_parser.error("--merge requires a --branch")
sys.exit(1)
sys.exit(main(options, args))
sys.exit(main(options, args))
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment