Support UTF-8 messages in git cl upload 🪟

Bug: 1240760
Change-Id: Ib64cd9c9b8c901105f6317bd74b889daa457e4de
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3101520
Reviewed-by: Gavin Mak <gavinmak@google.com>
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
changes/20/3101520/3
sokcevic 4 years ago committed by LUCI CQ
parent 0559ae7145
commit 071528093f

@ -1097,13 +1097,13 @@ def RunEditor(content, git, git_editor=None):
if '\r' in content:
print(
'!! Please remove \\r from your change description !!', file=sys.stderr)
fileobj = os.fdopen(file_handle, 'w')
fileobj = os.fdopen(file_handle, 'wb')
# Still remove \r if present.
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.write(content.encode('utf-8'))
fileobj.close()
try:

@ -164,8 +164,8 @@ def DieWithError(message, change_desc=None):
def SaveDescriptionBackup(change_desc):
backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
print('\nsaving CL description to %s\n' % backup_path)
with open(backup_path, 'w') as backup_file:
backup_file.write(change_desc.description)
with open(backup_path, 'wb') as backup_file:
backup_file.write(change_desc.description.encode('utf-8'))
def GetNoGitPagerEnv():

Loading…
Cancel
Save