Re: [Patch V2] BaseTools: Fixed the build fail issue for cases

[Leif Lindholm <leif.lindholm@linaro.org>]

On Mon, Dec 10, 2018 at 02:36:59PM +0000, Gao, Liming wrote:
> Leif:
>   So, you don't think to need highlight which commit causes the
>   regression issue in the commit message. I suggest to put this
>   information into BZ description instead of commit message.

Oh, I absolutely want the commit hash in the message.
And ideally in a longer form, like Linux requires:
12-characters of hash followed by the subject of the faulty commit
inside (""). But the format is just a question of taste, the
information is what is important.

If I happen to lose internet connection, I still want to be able to
see which previous commit is being fixed by a patch.

But it shouldn't come in the form:
V2:
...
V1:
...

It should just form part of a coherent commit message.
The development history of a patch is not interesting to the master
branch of the repository.

Regards,

Leif


> Thanks
> Liming
> > -----Original Message-----
> > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Leif Lindholm
> > Sent: Monday, December 10, 2018 8:30 PM
> > To: Feng, Bob C <bob.c.feng@intel.com>
> > Cc: edk2-devel@lists.01.org; Gao, Liming <liming.gao@intel.com>
> > Subject: Re: [edk2] [Patch V2] BaseTools: Fixed the build fail issue for cases
> > 
> > Hi Bob,
> > 
> > On Mon, Dec 10, 2018 at 09:16:58AM +0800, BobCF wrote:
> > > From: "Feng, Bob C" <bob.c.feng@intel.com>
> > >
> > > V2:
> > 
> > Patch version information does not belong in the commit message.
> > It belongs in a cover letter, or if a cover letter is not used, you
> > can put these details below the --- line. This way it gets filtered
> > out by git.
> > 
> > The patch commit message should end up being a description of what the
> > patch is and does, not the development process that got us there.
> > 
> > Regards,
> > 
> > Leif
> > 
> > > update the commit log. This issue is introduced by
> > > the commit 72a1d77694d51914c0dd6aa97dbfa58634b0a4a5
> > >
> > > V1:
> > > https://bugzilla.tianocore.org/show_bug.cgi?id=1386
> > > 1. There is no Pcd value assignment in Dsc file
> > > 2. There are duplicate Pcd filed assignment
> > >
> > > Contributed-under: TianoCore Contribution Agreement 1.1
> > > Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> > > Cc: Liming Gao <liming.gao@intel.com>
> > > ---
> > >  BaseTools/Source/Python/Workspace/BuildClassObject.py | 2 +-
> > >  BaseTools/Source/Python/Workspace/MetaFileParser.py   | 2 +-
> > >  2 files changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/Source/Python/Workspace/BuildClassObject.py
> > > index 008eee1a16..d02232b546 100644
> > > --- a/BaseTools/Source/Python/Workspace/BuildClassObject.py
> > > +++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py
> > > @@ -289,11 +289,11 @@ class StructurePcd(PcdClassObject):
> > >          if DefaultStoreName not in self.SkuOverrideValues[SkuName]:
> > >              self.SkuOverrideValues[SkuName][DefaultStoreName] = OrderedDict()
> > >          if DimensionAttr not in self.SkuOverrideValues[SkuName][DefaultStoreName]:
> > >              self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionAttr] = collections.OrderedDict()
> > >          if FieldName in self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionAttr]:
> > > -            del self.SkuOverrideValues[SkuName][DefaultStoreName][FieldName][DimensionAttr]
> > > +            del self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionAttr][FieldName]
> > >          self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionAttr][FieldName] = [Value.strip(), FileName, LineNo]
> > >          return self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionAttr][FieldName]
> > >
> > >      def SetPcdMode (self, PcdMode):
> > >          self.PcdMode = PcdMode
> > > diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py
> > > index 4bd52619a9..eaedba0c12 100644
> > > --- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
> > > +++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
> > > @@ -1201,11 +1201,11 @@ class DscParser(MetaFileParser):
> > >              else:
> > >                  self._ValueList = None
> > >                  return
> > >          TokenList = GetSplitValueList(self._CurrentLine, TAB_VALUE_SPLIT, 1)
> > >          self._CurrentPcdName = TokenList[0]
> > > -        if TokenList[1].strip().startswith("{CODE"):
> > > +        if len(TokenList) == 2 and TokenList[1].strip().startswith("{CODE"):
> > >              self._PcdDataTypeCODE = True
> > >              self._PcdCodeValue = TokenList[1].strip()
> > >
> > >          if self._PcdDataTypeCODE:
> > >              if self._CurrentLine.endswith(")}"):
> > > --
> > > 2.19.1.windows.1
> > >
> > > _______________________________________________
> > > edk2-devel mailing list
> > > edk2-devel@lists.01.org
> > > https://lists.01.org/mailman/listinfo/edk2-devel
> > _______________________________________________
> > edk2-devel mailing list
> > edk2-devel@lists.01.org
> > https://lists.01.org/mailman/listinfo/edk2-devel