Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1146)

Unified Diff: git_cl_hooks.py

Issue 3591017: git_cl_hooks: get cl fields vi git_cl accessors instead of using backquote (Closed)
Patch Set: Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: git_cl_hooks.py
diff --git a/git_cl_hooks.py b/git_cl_hooks.py
index 059f52e26c6a79f14ba8c05e1df5cb6f70cb8935..4519e422e37393751267b7b2b7d9ef830b505280 100644
--- a/git_cl_hooks.py
+++ b/git_cl_hooks.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Copyright (c) 2010 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.
@@ -9,21 +9,27 @@ import sys
import breakpad
+from git_cl_repo import git_cl
+from git_cl_repo import upload
+
import presubmit_support
import scm
import watchlists
+# Really ugly hack to quiet upload.py
+upload.verbosity = 0
+
def Backquote(cmd, cwd=None):
"""Like running `cmd` in a shell script."""
return subprocess.Popen(cmd,
cwd=cwd,
stdout=subprocess.PIPE).communicate()[0].strip()
-def BackquoteAsInteger(cmd, cwd=None):
- """Like Backquote, but returns either an int or None."""
+def ConvertToInteger(input):
+ """Convert a string to integer, but returns either an int or None."""
try:
- return int(Backquote(cmd, cwd))
- except ValueError:
+ return int(input)
+ except TypeError, ValueError:
return None
@@ -43,10 +49,11 @@ class ChangeOptions:
# We use the sha1 of HEAD as a name of this change.
name = Backquote(['git', 'rev-parse', 'HEAD'])
files = scm.GIT.CaptureStatus([root], upstream_branch)
- issue = BackquoteAsInteger(['git', 'cl', 'status', '--field=id'])
- patchset = BackquoteAsInteger(['git', 'cl', 'status', '--field=patch'])
+ cl = git_cl.Changelist()
+ issue = ConvertToInteger(cl.GetIssue())
+ patchset = ConvertToInteger(cl.GetPatchset())
if issue:
- description = Backquote(['git', 'cl', 'status', '--field=desc'])
+ description = cl.GetDescription()
else:
# If the change was never uploaded, use the log messages of all commits
# up to the branch point, as git cl upload will prefill the description
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698