From: "Nate DeSimone" <nathaniel.l.desimone@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"philmd@redhat.com" <philmd@redhat.com>
Cc: "Feng, Bob C" <bob.c.feng@intel.com>,
"Gao, Liming" <liming.gao@intel.com>,
Leif Lindholm <leif.lindholm@linaro.org>
Subject: Re: [edk2-devel] [PATCH] BaseTools/Scripts: Add sendemail.transferEncoding to SetupGit.py
Date: Thu, 2 Jan 2020 16:52:11 +0000 [thread overview]
Message-ID: <02A34F284D1DA44BB705E61F7180EF0AB5C8555E@ORSMSX114.amr.corp.intel.com> (raw)
In-Reply-To: <c009b2c1-35ab-7572-226b-1701328cd0ac@redhat.com>
[-- Attachment #1.1.1: Type: text/plain, Size: 7376 bytes --]
Hi Philippe,
I usually try to avoid HTML emails, but the Beyond Compare view makes much more sense:
[cid:image001.png@01D5C149.776AF7D0]
TL:DR, yes you are right. The only change of substance is {'section': 'sendemail', 'option': 'transferEncoding', 'value': '8bit'}, the rest is just fixing columns to align like they did before my change.
I was able to apply my own patch as transmitted by groups.io. For your convenience, I have also attached my patch to this email.
Thanks,
Nate
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Philippe Mathieu-Daudé
Sent: Wednesday, December 18, 2019 10:11 AM
To: devel@edk2.groups.io; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <liming.gao@intel.com>; Leif Lindholm <leif.lindholm@linaro.org>
Subject: Re: [edk2-devel] [PATCH] BaseTools/Scripts: Add sendemail.transferEncoding to SetupGit.py
Hi Nate,
On 12/18/19 4:01 AM, Nate DeSimone wrote:
> Any chance I could get a code review on this?
>
> Thanks,
> Nate
>
> -----Original Message-----
> From: devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>> On Behalf Of Nate
> DeSimone
> Sent: Friday, December 6, 2019 10:15 AM
> To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>
> Cc: Feng, Bob C <bob.c.feng@intel.com<mailto:bob.c.feng@intel.com>>; Gao, Liming
> <liming.gao@intel.com<mailto:liming.gao@intel.com>>; Leif Lindholm <leif.lindholm@linaro.org<mailto:leif.lindholm@linaro.org>>
> Subject: [edk2-devel] [PATCH] BaseTools/Scripts: Add
> sendemail.transferEncoding to SetupGit.py
>
> If git finds a '\r' character in the message, then it converts the entire message content into Quoted-Printable encoding. It appears that when groups.io converts the QP encoding back to text format, the '\r' characters somehow become '\n'. To workaround this, the SetupGit.py script will now explicitly set the sendemail.transferEncoding git config option to '8bit'
>
> Cc: Bob Feng <bob.c.feng@intel.com<mailto:bob.c.feng@intel.com>>
> Cc: Liming Gao <liming.gao@intel.com<mailto:liming.gao@intel.com>>
> Cc: Leif Lindholm <leif.lindholm@linaro.org<mailto:leif.lindholm@linaro.org>>
> Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com<mailto:nathaniel.l.desimone@intel.com>>
> ---
> BaseTools/Scripts/SetupGit.py | 38 ++++++++++++++++++-----------------
> 1 file changed, 20 insertions(+), 18 deletions(-)
>
> diff --git a/BaseTools/Scripts/SetupGit.py
> b/BaseTools/Scripts/SetupGit.py index 3d39d3b35f..514f1c4d42 100644
> --- a/BaseTools/Scripts/SetupGit.py
> +++ b/BaseTools/Scripts/SetupGit.py
> @@ -2,6 +2,7 @@
> # Set up the git configuration for contributing to TianoCore
> projects # # Copyright (c) 2019, Linaro Ltd. All rights
> reserved.<BR>
> +# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -53,29 +54,30
> @@ MIN_GIT_VERSION = (1, 9, 0)
>
> # Set of options to be set identically for all repositories OPTIONS = [
> - {'section': 'am', 'option': 'keepcr', 'value': True},
> - {'section': 'am', 'option': 'signoff', 'value': True},
> - {'section': 'cherry-pick', 'option': 'signoff', 'value': True},
> - {'section': 'color', 'option': 'diff', 'value': True},
> - {'section': 'color', 'option': 'grep', 'value': 'auto'},
> - {'section': 'commit', 'option': 'signoff', 'value': True},
> - {'section': 'core', 'option': 'abbrev', 'value': 12},
> + {'section': 'am', 'option': 'keepcr', 'value': True},
> + {'section': 'am', 'option': 'signoff', 'value': True},
> + {'section': 'cherry-pick', 'option': 'signoff', 'value': True},
> + {'section': 'color', 'option': 'diff', 'value': True},
> + {'section': 'color', 'option': 'grep', 'value': 'auto'},
> + {'section': 'commit', 'option': 'signoff', 'value': True},
> + {'section': 'core', 'option': 'abbrev', 'value': 12},
> {'section': 'core', 'option': 'attributesFile',
> 'value': os.path.join(CONFDIR, 'gitattributes').replace('\\', '/')},
> - {'section': 'core', 'option': 'whitespace', 'value': 'cr-at-eol'},
> - {'section': 'diff', 'option': 'algorithm', 'value': 'patience'},
> + {'section': 'core', 'option': 'whitespace', 'value': 'cr-at-eol'},
> + {'section': 'diff', 'option': 'algorithm', 'value': 'patience'},
> {'section': 'diff', 'option': 'orderFile',
> 'value': os.path.join(CONFDIR, 'diff.order').replace('\\', '/')},
> - {'section': 'diff', 'option': 'renames', 'value': 'copies'},
> - {'section': 'diff', 'option': 'statGraphWidth', 'value': '20'},
> - {'section': 'diff "ini"', 'option': 'xfuncname',
> + {'section': 'diff', 'option': 'renames', 'value': 'copies'},
> + {'section': 'diff', 'option': 'statGraphWidth', 'value': '20'},
> + {'section': 'diff "ini"', 'option': 'xfuncname',
> 'value': '^\\\\[[A-Za-z0-9_., ]+]'},
> - {'section': 'format', 'option': 'coverLetter', 'value': True},
> - {'section': 'format', 'option': 'numbered', 'value': True},
> - {'section': 'format', 'option': 'signoff', 'value': False},
> - {'section': 'notes', 'option': 'rewriteRef', 'value': 'refs/notes/commits'},
> - {'section': 'sendemail', 'option': 'chainreplyto', 'value': False},
> - {'section': 'sendemail', 'option': 'thread', 'value': True},
> + {'section': 'format', 'option': 'coverLetter', 'value': True},
> + {'section': 'format', 'option': 'numbered', 'value': True},
> + {'section': 'format', 'option': 'signoff', 'value': False},
> + {'section': 'notes', 'option': 'rewriteRef', 'value': 'refs/notes/commits'},
> + {'section': 'sendemail', 'option': 'chainreplyto', 'value': False},
> + {'section': 'sendemail', 'option': 'thread', 'value': True},
> + {'section': 'sendemail', 'option': 'transferEncoding', 'value': '8bit'},
Unfortunately I never received the original patch.
I downloaded it from
https://www.redhat.com/archives/edk2-devel-archive/2019-December/msg00720.html
but I get an error when applying:
**** malformed patch at line 12: - {'section': 'am',
'option': 'signoff', 'value': True},
Due to space/tab? changes, your patch is very hard to review (I wanted to look at it with 'git-diff --word-diff=color'. If I missed anything, you simply added:
+ {'section': 'sendemail', 'option': 'transferEncoding', 'value':
'8bit'},
Is that right?
> ]
>
>
> --
> 2.24.0.windows.2
>
>
>
>
>
>
>
[-- Attachment #1.1.2: Type: text/html, Size: 19320 bytes --]
[-- Attachment #1.2: image001.png --]
[-- Type: image/png, Size: 97681 bytes --]
[-- Attachment #2: 0001-BaseTools-Scripts-Add-sendemail.transferEncoding-to-.patch --]
[-- Type: application/octet-stream, Size: 4793 bytes --]
From 827367ebe1d5a093037da024ac4e8f81db8e1549 Mon Sep 17 00:00:00 2001
From: Nate DeSimone <nathaniel.l.desimone@intel.com>
Date: Fri, 6 Dec 2019 09:58:41 -0800
Subject: [PATCH] BaseTools/Scripts: Add sendemail.transferEncoding to SetupGit.py
If git finds a '\r' character in the message, then it
converts the entire message content into Quoted-Printable
encoding. It appears that when groups.io converts the QP
encoding back to text format, the '\r' characters somehow
become '\n'. To workaround this, the SetupGit.py script
will now explicitly set the sendemail.transferEncoding git
config option to '8bit'
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
BaseTools/Scripts/SetupGit.py | 38 ++++++++++++++++++-----------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/BaseTools/Scripts/SetupGit.py b/BaseTools/Scripts/SetupGit.py
index 3d39d3b35f..514f1c4d42 100644
--- a/BaseTools/Scripts/SetupGit.py
+++ b/BaseTools/Scripts/SetupGit.py
@@ -2,6 +2,7 @@
# Set up the git configuration for contributing to TianoCore projects
#
# Copyright (c) 2019, Linaro Ltd. All rights reserved.<BR>
+# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
@@ -53,29 +54,30 @@ MIN_GIT_VERSION = (1, 9, 0)
# Set of options to be set identically for all repositories
OPTIONS = [
- {'section': 'am', 'option': 'keepcr', 'value': True},
- {'section': 'am', 'option': 'signoff', 'value': True},
- {'section': 'cherry-pick', 'option': 'signoff', 'value': True},
- {'section': 'color', 'option': 'diff', 'value': True},
- {'section': 'color', 'option': 'grep', 'value': 'auto'},
- {'section': 'commit', 'option': 'signoff', 'value': True},
- {'section': 'core', 'option': 'abbrev', 'value': 12},
+ {'section': 'am', 'option': 'keepcr', 'value': True},
+ {'section': 'am', 'option': 'signoff', 'value': True},
+ {'section': 'cherry-pick', 'option': 'signoff', 'value': True},
+ {'section': 'color', 'option': 'diff', 'value': True},
+ {'section': 'color', 'option': 'grep', 'value': 'auto'},
+ {'section': 'commit', 'option': 'signoff', 'value': True},
+ {'section': 'core', 'option': 'abbrev', 'value': 12},
{'section': 'core', 'option': 'attributesFile',
'value': os.path.join(CONFDIR, 'gitattributes').replace('\\', '/')},
- {'section': 'core', 'option': 'whitespace', 'value': 'cr-at-eol'},
- {'section': 'diff', 'option': 'algorithm', 'value': 'patience'},
+ {'section': 'core', 'option': 'whitespace', 'value': 'cr-at-eol'},
+ {'section': 'diff', 'option': 'algorithm', 'value': 'patience'},
{'section': 'diff', 'option': 'orderFile',
'value': os.path.join(CONFDIR, 'diff.order').replace('\\', '/')},
- {'section': 'diff', 'option': 'renames', 'value': 'copies'},
- {'section': 'diff', 'option': 'statGraphWidth', 'value': '20'},
- {'section': 'diff "ini"', 'option': 'xfuncname',
+ {'section': 'diff', 'option': 'renames', 'value': 'copies'},
+ {'section': 'diff', 'option': 'statGraphWidth', 'value': '20'},
+ {'section': 'diff "ini"', 'option': 'xfuncname',
'value': '^\\\\[[A-Za-z0-9_., ]+]'},
- {'section': 'format', 'option': 'coverLetter', 'value': True},
- {'section': 'format', 'option': 'numbered', 'value': True},
- {'section': 'format', 'option': 'signoff', 'value': False},
- {'section': 'notes', 'option': 'rewriteRef', 'value': 'refs/notes/commits'},
- {'section': 'sendemail', 'option': 'chainreplyto', 'value': False},
- {'section': 'sendemail', 'option': 'thread', 'value': True},
+ {'section': 'format', 'option': 'coverLetter', 'value': True},
+ {'section': 'format', 'option': 'numbered', 'value': True},
+ {'section': 'format', 'option': 'signoff', 'value': False},
+ {'section': 'notes', 'option': 'rewriteRef', 'value': 'refs/notes/commits'},
+ {'section': 'sendemail', 'option': 'chainreplyto', 'value': False},
+ {'section': 'sendemail', 'option': 'thread', 'value': True},
+ {'section': 'sendemail', 'option': 'transferEncoding', 'value': '8bit'},
]
--
2.24.0.windows.2
prev parent reply other threads:[~2020-01-02 16:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <15DDDAE6FE3C410D.8264@groups.io>
2019-12-18 3:01 ` [edk2-devel] [PATCH] BaseTools/Scripts: Add sendemail.transferEncoding to SetupGit.py Nate DeSimone
2019-12-18 6:08 ` Bob Feng
2019-12-18 18:11 ` Philippe Mathieu-Daudé
2019-12-20 7:39 ` Bob Feng
2020-01-02 16:52 ` Nate DeSimone [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=02A34F284D1DA44BB705E61F7180EF0AB5C8555E@ORSMSX114.amr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox