From: "Michael D Kinney" <michael.d.kinney@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"mikuback@linux.microsoft.com" <mikuback@linux.microsoft.com>,
"Kinney, Michael D" <michael.d.kinney@intel.com>
Cc: "Gao, Liming" <gaoliming@byosoft.com.cn>,
Sean Brogan <sean.brogan@microsoft.com>,
Bret Barkelew <Bret.Barkelew@microsoft.com>
Subject: Re: [edk2-devel] [PATCH v1 1/4] .pytool/Plugin/UncrustifyCheck: Update func to return absolute paths
Date: Tue, 22 Mar 2022 16:12:27 +0000 [thread overview]
Message-ID: <SA2PR11MB4938C7CB6AEA73B97482FEDED2179@SA2PR11MB4938.namprd11.prod.outlook.com> (raw)
In-Reply-To: <SA2PR11MB4938F5AF97AADA798A4160FBD2179@SA2PR11MB4938.namprd11.prod.outlook.com>
Hi Michael,
I meant to ask. Is there a reason you are not normalizing the
file paths os.path.normpath() before performing the path comparison?
I am concerned that a mix of '/', '\' and '..' in YAML file may
not detect what is supposed to be a matching path.
Perhaps this is a topic that applies to IgnoreFiles feature for
all plugins and can be addressed in a separate patch.
Mike
> -----Original Message-----
> From: Kinney, Michael D <michael.d.kinney@intel.com>
> Sent: Tuesday, March 22, 2022 9:07 AM
> To: devel@edk2.groups.io; mikuback@linux.microsoft.com; Kinney, Michael D <michael.d.kinney@intel.com>
> Cc: Gao, Liming <gaoliming@byosoft.com.cn>; Sean Brogan <sean.brogan@microsoft.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>
> Subject: RE: [edk2-devel] [PATCH v1 1/4] .pytool/Plugin/UncrustifyCheck: Update func to return absolute paths
>
> Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
>
> Mike
>
> > -----Original Message-----
> > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael Kubacki
> > Sent: Monday, March 21, 2022 6:58 PM
> > To: devel@edk2.groups.io
> > Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Sean Brogan
> > <sean.brogan@microsoft.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>
> > Subject: [edk2-devel] [PATCH v1 1/4] .pytool/Plugin/UncrustifyCheck: Update func to return absolute paths
> >
> > From: Michael Kubacki <michael.kubacki@microsoft.com>
> >
> > Currently, UncrustifyCheck._get_git_ignored_paths() is documented to
> > return a list of absolute file paths but it currently returns a list
> > of relative file paths.
> >
> > This change updates the function to return a list of absolute file
> > paths. The result is later compared to the list of absolute file
> > paths for files to run against Uncrustify.
> >
> > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > Cc: Sean Brogan <sean.brogan@microsoft.com>
> > Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> > Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> > ---
> > .pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py | 6 +++++-
> > 1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
> > index 82db7a5a438b..dc133fecc4b2 100644
> > --- a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
> > +++ b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
> > @@ -292,7 +292,11 @@ class UncrustifyCheck(ICiBuildPlugin):
> > f"An error occurred reading git ignore settings. This will prevent Uncrustify from running against the
> expected
> > set of files.")
> >
> > # Note: This will potentially be a large list, but at least sorted
> > - return outstream_buffer.getvalue().strip().splitlines()
> > + rel_paths = outstream_buffer.getvalue().strip().splitlines()
> > + abs_paths = []
> > + for path in rel_paths:
> > + abs_paths.append(os.path.join(self._abs_workspace_path, path))
> > + return abs_paths
> >
> > def _get_git_submodule_paths(self) -> List[str]:
> > """
> > --
> > 2.28.0.windows.1
> >
> >
> >
> > -=-=-=-=-=-=
> > Groups.io Links: You receive all messages sent to this group.
> > View/Reply Online (#87810): https://edk2.groups.io/g/devel/message/87810
> > Mute This Topic: https://groups.io/mt/89944182/1643496
> > Group Owner: devel+owner@edk2.groups.io
> > Unsubscribe: https://edk2.groups.io/g/devel/unsub [michael.d.kinney@intel.com]
> > -=-=-=-=-=-=
> >
next prev parent reply other threads:[~2022-03-22 16:12 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-22 1:58 [PATCH v1 0/4] UncrustifyCheck Ignore Support Michael Kubacki
2022-03-22 1:58 ` [PATCH v1 1/4] .pytool/Plugin/UncrustifyCheck: Update func to return absolute paths Michael Kubacki
2022-03-22 16:07 ` [edk2-devel] " Michael D Kinney
2022-03-22 16:12 ` Michael D Kinney [this message]
2022-04-01 16:22 ` Michael Kubacki
2022-03-22 1:58 ` [PATCH v1 2/4] .pytool/Plugin/UncrustifyCheck: Add ignore file support Michael Kubacki
2022-03-22 16:14 ` Michael D Kinney
2022-04-01 16:07 ` [edk2-devel] " Michael Kubacki
2022-04-01 16:50 ` Michael D Kinney
2022-04-01 17:45 ` Sean
2022-04-03 17:32 ` Michael D Kinney
2022-03-22 1:58 ` [PATCH v1 3/4] OvmfPkg: Revert Uncrustify formatting in VbeShim.h files Michael Kubacki
2022-03-22 6:34 ` Laszlo Ersek
2022-03-22 8:45 ` [edk2-devel] " Gerd Hoffmann
2022-03-22 1:58 ` [PATCH v1 4/4] OvmfPkg: Do not check VbeShim.h formatting with Uncrustify Michael Kubacki
2022-03-22 6:35 ` Laszlo Ersek
2022-03-22 8:46 ` [edk2-devel] " Gerd Hoffmann
2022-03-22 16:14 ` [PATCH v1 0/4] UncrustifyCheck Ignore Support Michael D Kinney
2022-04-01 16:04 ` [edk2-devel] " Michael Kubacki
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=SA2PR11MB4938C7CB6AEA73B97482FEDED2179@SA2PR11MB4938.namprd11.prod.outlook.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