checkout.py - Issue 264823003: Add black/whitelisting to apply_issue

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

Issue 264823003: Add black/whitelisting to apply_issue (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Updated assert message 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:

Index: checkout.py

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

index 022076c402218ea329ea0832969aa4eba955eef0..06b2d3b0f13e2784643d021cf977be5e568b3641 100644

--- a/checkout.py

+++ b/checkout.py

@@ -726,7 +726,9 @@ class GitCheckout(CheckoutBase):

['diff', base_ref, '--ignore-submodules',

'--name-only']).splitlines(False)

assert sorted(patches.filenames) == sorted(found_files), (

- sorted(patches.filenames), sorted(found_files))

+ 'Found extra %s locally, %s not patched' % (

+ sorted(set(found_files) - set(patches.filenames)),

+ sorted(set(patches.filenames) - set(found_files))))

def commit(self, commit_message, user):

"""Commits, updates the commit message and pushes."""

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