scm.py - Issue 11262057: git_cl sanity checks

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: scm.py

Issue 11262057: git_cl sanity checks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Use explicit calls to merge-base in diff commands Created 8 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:

Index: scm.py

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

index 367a1cd29940d506a5ba51c11afae2c85ef73fd3..51c38d8609e80fbfa2dc5359de2ad1ae9f0e287e 100644

--- a/scm.py

+++ b/scm.py

@@ -112,7 +112,8 @@ class GIT(object):

upstream_branch = GIT.GetUpstreamBranch(cwd)

if upstream_branch is None:

raise gclient_utils.Error('Cannot determine upstream branch')

- command = ['diff', '--name-status', '-r', '%s...' % upstream_branch]

+ upstream_branch += '...'

M-A Ruel 2012/10/28 20:53:02 A quick "git gs CaptureStatus" tells me this will

Isaac (away) 2012/10/28 21:16:42 I wanted to make this change to avoid an extra mer

+ command = ['diff', '--name-status', '-r', upstream_branch]

if not files:

pass

elif isinstance(files, basestring):

« git_cl.py ('K') | « git_cl.py ('k') | no next file » | no next file with comments »