git_cl_hooks.py - Issue 399009: Reapply 32057, 32058, 32059, 32062 and fixes problems introduced by these changes.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: git_cl_hooks.py

Issue 399009: Reapply 32057, 32058, 32059, 32062 and fixes problems introduced by these changes. (Closed)

Patch Set: Created 11 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: git_cl_hooks.py

diff --git a/git_cl_hooks.py b/git_cl_hooks.py

index 5203096f544f6bfde174223ef60a957a939eb7eb..c63cbe268c8e9af5a8210dcb8aff3d2fee4944f3 100644

--- a/git_cl_hooks.py

+++ b/git_cl_hooks.py

@@ -7,9 +7,8 @@ import re

import subprocess

import sys

-# Imported from depot_tools.

-import gclient_scm

import presubmit_support

+import scm

def Backquote(cmd, cwd=None):

"""Like running `cmd` in a shell script."""

@@ -35,7 +34,7 @@ class ChangeOptions:

raise Exception("Could not parse log message: %s" % log)

name = m.group(1)

description = m.group(2)

- files = gclient_scm.CaptureGitStatus([root], upstream_branch)

+ files = scm.GIT.CaptureStatus([root], upstream_branch)

issue = Backquote(['git', 'cl', 'status', '--field=id'])

patchset = None

self.change = presubmit_support.GitChange(name, description, root, files,

« no previous file with comments | « gclient_utils.py ('k') | presubmit_support.py » ('j') | no next file with comments »