From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 9B0FE7803CF for ; Fri, 3 Nov 2023 14:41:44 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=PDLI8MnyOgli5uNER0uqWbNQOUTOv5s0QF25CmTJyBY=; c=relaxed/simple; d=groups.io; h=Feedback-ID:Message-ID:Date:MIME-Version:User-Agent:Subject:To:References:Cc:From:In-Reply-To:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1699022503; v=1; b=xICbBsfAWDMl0ZAm+jedTEBqBzOanCfDGj9M+7vnhkXnvhxze8TikaYXiS4utgN0SHTrYUXa 9CoLySU83ols1AumwYZw2DwRtJkjpmREICeN4dsE9g7I6z0UTD1hsXhgNWh3XlZqrTOHxgcpyP4 NIcUUuxjTc0hBDJrU6yHe9yY= X-Received: by 127.0.0.2 with SMTP id WpClYY7687511xOtYqXHAtgf; Fri, 03 Nov 2023 07:41:43 -0700 X-Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by mx.groups.io with SMTP id smtpd.web10.53894.1699022502471464855 for ; Fri, 03 Nov 2023 07:41:42 -0700 X-Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id A84655C008C; Fri, 3 Nov 2023 10:41:39 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Fri, 03 Nov 2023 10:41:39 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedruddtkedgieeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvfhevhfgjtgfgsehtjeertddtvdejnecuhfhrohhmpeftvggs vggttggrucevrhgrnhcuoehrvggsvggttggrsegsshguihhordgtohhmqeenucggtffrrg htthgvrhhnpeefheeuvdetleevvdeuiefgfeejleehjefhvddvffefuedvheevtdefueeh hfeljeenucffohhmrghinhepvghnughsfihithhhrdhshhenucevlhhushhtvghrufhiii gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehrvggsvggttggrsegsshguihhordgt ohhm X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 3 Nov 2023 10:41:37 -0400 (EDT) Message-ID: <3ac69a14-90fe-4358-9f36-207b63a25f42@bsdio.com> Date: Fri, 3 Nov 2023 08:41:35 -0600 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [edk2-devel] [PATCH 1/1] BaseTools: Update PatchCheck.py to allow whitespace issues in .rtf files To: Liming Gao References: <20231102002052.17494-1-rebecca@bsdio.com> Cc: devel@edk2.groups.io, Bob Feng , Yuwei Chen From: "Rebecca Cran" In-Reply-To: <20231102002052.17494-1-rebecca@bsdio.com> Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@bsdio.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: WEeuRpte4aKUTVD1Ff63tKgKx7686176AA= Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=xICbBsfA; dmarc=none; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Liming, could you review this please? It's blocking another patch from=20 being committed. --=20 Rebecca On 11/1/2023 6:20 PM, Rebecca Cran wrote: > Allow .rtf files created by applications such as Notepad to be committed > as-is without further manual editing by skipping the requirements for > CRLF, no tabs and no trailing whitespace. > > Signed-off-by: Rebecca Cran > --- > BaseTools/Scripts/PatchCheck.py | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchChe= ck.py > index 900226f18fe5..7f372d40b570 100755 > --- a/BaseTools/Scripts/PatchCheck.py > +++ b/BaseTools/Scripts/PatchCheck.py > @@ -363,6 +363,9 @@ class GitDiffCheck: > self.is_newfile =3D False > self.force_crlf =3D True > self.force_notabs =3D True > + if self.filename.endswith('.rtf'): > + self.force_crlf =3D False > + self.force_notabs =3D False > if self.filename.endswith('.sh') or \ > self.filename.startswith('BaseTools/BinWrappers/Pos= ixLike/') or \ > self.filename.startswith('BaseTools/BinPipWrappers/= PosixLike/') or \ > @@ -416,7 +419,7 @@ class GitDiffCheck: > self.format_error("didn't find diff hunk marker (@@= )") > self.line_num +=3D 1 > elif self.state =3D=3D PATCH: > - if self.binary: > + if self.binary or self.filename.endswith(".rtf"): > pass > elif line.startswith('-'): > pass -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#110629): https://edk2.groups.io/g/devel/message/110629 Mute This Topic: https://groups.io/mt/102332684/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-