gclient_utils.py - Issue 1905693002: Ensure files passed to the editor by RunEditor end in a new line

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

Issue 1905693002: Ensure files passed to the editor by RunEditor end in a new line (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master

Patch Set: Created 4 years, 8 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: gclient_utils.py

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

index 21c44c36a786bc5f9e6b84a3ccef0b9b2f5cc84a..9d1b9dfdd19b981172f19df83e360d12d935dfe6 100644

--- a/gclient_utils.py

+++ b/gclient_utils.py

@@ -1084,7 +1084,11 @@ def RunEditor(content, git, git_editor=None):

'!! Please remove \\r from your change description !!')

fileobj = os.fdopen(file_handle, 'w')

# Still remove \r if present.

- fileobj.write(re.sub('\r?\n', '\n', content))

+ content = re.sub('\r?\n', '\n', content)

+ # Some editors complain when the file doesn't end in \n.

+ if not content.endswith('\n'):

+ content += '\n'

+ fileobj.write(content)

fileobj.close()

try:

« no previous file with comments | « no previous file | no next file » | no next file with comments »