testing_support/patches_data.py - Issue 10962038: Fix applying git diff with new file mode 644 on a svn checkout.

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: testing_support/patches_data.py

Issue 10962038: Fix applying git diff with new file mode 644 on a svn checkout. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 8 years, 3 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: testing_support/patches_data.py

diff --git a/testing_support/patches_data.py b/testing_support/patches_data.py

index 3134a98a26ca5d3a13167719ca5cb2bef1aeaafd..1acd83265f2aaf64a82570ce7e8593685cbe667b 100644

--- a/testing_support/patches_data.py

+++ b/testing_support/patches_data.py

@@ -292,6 +292,16 @@ class GIT(object):

'old mode 100644\n'

'new mode 100755\n')

+ NEW_NOT_EXECUTABLE = (

+ 'diff --git a/build/android/ant/create.js b/build/android/ant/create.js\n'

+ 'new file mode 100644\n'

+ 'index 0000000000000000000..542a89e978feada38dd\n'

+ '--- /dev/null\n'

+ '+++ b/build/android/ant/create.js\n'

+ '@@ -0,0 +1,1 @@\n'

+ )

FOUR_HUNKS = (

'Index: presubmit_support.py\n'

'diff --git a/presubmit_support.py b/presubmit_support.py\n'

« no previous file with comments | « patch.py ('k') | tests/patch_test.py » ('j') | no next file with comments »