tests/checkout_test.py - Issue 280063003: Re-land of have apply_patch.py/checkout.py stage git patches instead of committing them

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: tests/checkout_test.py

Issue 280063003: Re-land of have apply_patch.py/checkout.py stage git patches instead of committing them (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Re-add deprecated flags Created 6 years, 7 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

Index: tests/checkout_test.py

diff --git a/tests/checkout_test.py b/tests/checkout_test.py

index e36aac8877644b2551fa550bfdcaa2faca03635c..d07f15ac7a80e0827d134a1843535c73b8d8bd2d 100755

--- a/tests/checkout_test.py

+++ b/tests/checkout_test.py

@@ -423,7 +423,7 @@ class GitBaseTest(BaseTest):

for k, v in self.FAKE_REPOS.git_hashes[

self.FAKE_REPOS.TEST_GIT_REPO][1][1].iteritems():

assert k not in tree

- tree[k] = v

+ tree[k] = v

if modified:

content_lines = tree['chrome/file.cc'].splitlines(True)

@@ -470,7 +470,7 @@ class GitCheckout(GitBaseTest):

co = self._get_co(None)

self._check_move(co)

out = subprocess2.check_output(

- ['git', 'diff', 'HEAD~', '--name-status'], cwd=co.project_path)

+ ['git', 'diff', '--staged', '--name-status'], cwd=co.project_path)

out = sorted(out.splitlines())

expected = sorted(

[

« no previous file with comments | « checkout.py ('k') | no next file » | no next file with comments »