Commit dc276cba authored by dpranke@chromium.org's avatar dpranke@chromium.org

minor cleanup w/ chases's feedback from CL 6665018.

http://codereview.chromium.org/6665018/

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@78098 0039d316-1c4b-4281-b951-d872f2087c98
parent 4ea24734
...@@ -741,10 +741,10 @@ def RunHook(committing, upstream_branch, rietveld_server, tbr, may_prompt): ...@@ -741,10 +741,10 @@ def RunHook(committing, upstream_branch, rietveld_server, tbr, may_prompt):
root = RunCommand(['git', 'rev-parse', '--show-cdup']).strip() root = RunCommand(['git', 'rev-parse', '--show-cdup']).strip()
if not root: if not root:
root = "." root = '.'
absroot = os.path.abspath(root) absroot = os.path.abspath(root)
if not root: if not root:
raise Exception("Could not get root directory.") raise Exception('Could not get root directory.')
# We use the sha1 of HEAD as a name of this change. # We use the sha1 of HEAD as a name of this change.
name = RunCommand(['git', 'rev-parse', 'HEAD']).strip() name = RunCommand(['git', 'rev-parse', 'HEAD']).strip()
...@@ -760,7 +760,7 @@ def RunHook(committing, upstream_branch, rietveld_server, tbr, may_prompt): ...@@ -760,7 +760,7 @@ def RunHook(committing, upstream_branch, rietveld_server, tbr, may_prompt):
# up to the branch point, as git cl upload will prefill the description # up to the branch point, as git cl upload will prefill the description
# with these log messages. # with these log messages.
description = RunCommand(['git', 'log', '--pretty=format:%s%n%n%b', description = RunCommand(['git', 'log', '--pretty=format:%s%n%n%b',
'%s...' % (upstream_branch)]).strip() '%s...' % (upstream_branch)]).strip()
change = presubmit_support.GitChange(name, description, absroot, files, change = presubmit_support.GitChange(name, description, absroot, files,
issue, patchset) issue, patchset)
...@@ -770,7 +770,7 @@ def RunHook(committing, upstream_branch, rietveld_server, tbr, may_prompt): ...@@ -770,7 +770,7 @@ def RunHook(committing, upstream_branch, rietveld_server, tbr, may_prompt):
files = [f.LocalPath() for f in change.AffectedFiles()] files = [f.LocalPath() for f in change.AffectedFiles()]
watchers = watchlist.GetWatchersForPaths(files) watchers = watchlist.GetWatchersForPaths(files)
RunCommand(['git', 'config', '--replace-all', RunCommand(['git', 'config', '--replace-all',
'rietveld.extracc', ','.join(watchers)]) 'rietveld.extracc', ','.join(watchers)])
output = StringIO.StringIO() output = StringIO.StringIO()
should_continue = presubmit_support.DoPresubmitChecks(change, committing, should_continue = presubmit_support.DoPresubmitChecks(change, committing,
......
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