[Openembedded-architecture] Consistent white-space indentation in metadata layers

Trevor Woerner twoerner at gmail.com
Thu May 4 13:05:48 UTC 2017


On Thu 2017-05-04 @ 01:31:26 PM, Martin Jansa wrote:
> On Thu, May 04, 2017 at 12:27:43AM +0100, Richard Purdie wrote:
> > On Wed, 2017-05-03 at 21:50 +0100, Phil Blundell wrote:
> > > I also agree that making this change to oe-core doesn't seem like it
> > > would be a dramatic upheaval.  There seem to be 302 .bb files and 75
> > > classes containing tabs in their shell fragments (which is a bit
> > > under half the total of each) and I can't see any reason why they
> > > couldn't be safely replaced in an automated way.  And it probably is
> > > true that oe-core has undergone more disruptive changes than this in
> > > the last five years without any severe consequences.  No doubt any
> > > reformatting of this kind would cause some short-term hassle for
> > > people backporting patches to older branches or maintaining their own
> > > patches on top of upstream oe-core, but both these activities are
> > > already fairly miserable occupations and I doubt this extra grief
> > > would really move the needle in terms of level of overall suffering.
> > >  And even if it did, they'd get over it.
> > 
> > Speaking as someone who has had to deal with this before, and handle
> > backports over various changes, I do believe the whitespace changes
> > will be more of a pain than normal due to the size of the codeblock
> > that changes, making it harder to isolate the 'real' differences.
> > 
> > I have done this for the python whitespace changes, things like the
> > getVar improvements and with others and I think the shell changes would
> > be by far the most disruptive.
> > 
> > It certainly can be done (as can most things), I've not felt a
> > particular need to put the stable maintainers through that pain though.
> > They do a pretty thankless task already without adding to the issues.
> 
> There is 179 commits in morty branch since morty was released
> (2a59d0fa7bda78927435603e3049ce373cf6a198..123962018251dfb1d6ca5aa5c0d02534007de3ab)
> git diff --stat shows:
>  181 files changed, 3869 insertions(+), 1104 deletions(-)
> 
> git diff --stat without modified .patch files:
>  115 files changed, 559 insertions(+), 394 deletions(-)
> 
> With only 184 tabs in unified diff (not counting modified .patch files)
> or 87 tabs in modified lines (with git diff -U0)
> 
> Lets see how many more changes will be merged to morty after pyro is released.
> Less then 1/5 of what was merged so far?
> e.g. with krogoth there was 338 changes in total since krogoth release and only
> 49 since morty release
> OE @ ~/openembedded-core $ git log --oneline 9838f8d077d16e52ad592879d65a9e8350b93075..origin/krogoth | wc -l
> 338
> OE @ ~/openembedded-core $ git log --oneline 0900fed3fb6eec62e9e25f6d03af934f9776d105..origin/krogoth | wc -l
> 49
> 
> Yes, it's not my decision to make, but there is no need to exaggerate how
> many conflicts will this cause for backports.

I too felt a need to look at backports as well because it keeps coming up.

My gut was telling me that after any release, there's a flurry of backports,
but after that it dwindles quickly. So I looked at the data. I calculated the
number of backports by doing a:

	$ git show-branch master origin/<branch>

and then taking the dates of each of the commits along that branch starting
from the last commit in common with the branch and master. All graphs have
been scaled to use the same time-span and commit count so they can be overlaid
and compared to one another easily.


                           danny commits post-release
          +      +       +      +       +      +       +      +       +
  120 +-+-++++-++++-++++-++++-++++-++++-+++-++++-++++-++++-++++-++++-+++-+++-+
        |                                                                  |
        |                                                                  |
  100 +-+                                                                  +-+
        |                                                                  |
   80 +-+                                                                  +-+
        |                                                                  |
        |                                                                  |
   60 +-+                                                                  +-+
        |     +                                                            |
        |     |                                                            |
   40 +-+     |                                                            +-+
        |     |                                                            |
   20 +-+  +  |                                                            +-+
        |  |  |                                                            |
        | +|++|                                                            |
    0 +-+-++++-++++-++++-++++-++++-++++-+++-++++-++++-++++-++++-++++-+++-+++-+
          +      +       +      +       +      +       +      +       +
      01/01/137/01/1301/01/147/01/1401/01/157/01/1501/01/167/01/1601/01/17
                                       Date

	total commits: 149
	date span: 2012-11-26 to 2013-07-23 -> 239 days

	2012-11-26 6
	2012-12-05 13
	2012-12-06 3
	2012-12-07 1
	2012-12-10 1
	2013-01-07 7
	2013-02-14 22
	2013-02-15 2
	2013-02-19 3
	2013-02-27 3
	2013-03-01 5
	2013-03-27 11
	2013-04-08 1
	2013-04-23 49
	2013-04-29 5
	2013-04-30 5
	2013-05-03 1
	2013-05-07 1
	2013-05-08 2
	2013-05-09 1
	2013-05-16 1
	2013-05-29 1
	2013-06-14 1
	2013-06-25 1
	2013-07-23 3


                           dylan commits post-release
          +      +       +      +       +      +       +      +       +
  120 +-+-++++-++++-++++-++++-++++-++++-+++-++++-++++-++++-++++-++++-+++-+++-+
        |                                                                  |
        |                                                                  |
  100 +-+                                                                  +-+
        |                                                                  |
   80 +-+                                                                  +-+
        |                                                                  |
        |                                                                  |
   60 +-+                                                                  +-+
        |                                                                  |
        |                                                                  |
   40 +-+      + + +                                                       +-+
        |      | | ||                                                      |
   20 +-+      | ||||                                                      +-+
        |      |+|++ +-                                                    |
        |      ||+     ++   ++++----+--                                    |
    0 +-+-++++-++++-++++-++++-++++-++++-+++-++++-++++-++++-++++-++++-+++-+++-+
          +      +       +      +       +      +       +      +       +
      01/01/137/01/1301/01/147/01/1401/01/157/01/1501/01/167/01/1601/01/17
                                       Date

	commits: 260
	date span: 2013-05-08 to 2015-05-29 -> 751 days

	2013-05-08 1
	2013-05-09 1
	2013-05-20 41
	2013-05-22 1
	2013-05-31 15
	2013-06-03 1
	2013-06-10 9
	2013-06-11 2
	2013-07-04 7
	2013-07-08 36
	2013-07-29 14
	2013-08-07 12
	2013-08-16 38
	2013-10-10 13
	2013-12-03 11
	2013-12-11 2
	2013-12-12 6
	2013-12-13 1
	2013-12-19 1
	2014-01-08 2
	2014-01-15 1
	2014-01-21 2
	2014-01-23 1
	2014-02-08 1
	2014-02-09 1
	2014-02-17 1
	2014-03-05 2
	2014-03-06 1
	2014-03-12 5
	2014-03-17 1
	2014-03-20 1
	2014-04-09 4
	2014-04-11 1
	2014-05-12 5
	2014-06-06 1
	2014-06-09 6
	2014-10-12 6
	2014-12-08 1
	2015-01-12 1
	2015-03-10 1
	2015-04-11 1
	2015-04-20 1
	2015-05-29 1

                            dora commits post-release
          +      +       +      +       +      +       +      +       +
  120 +-+-++++-++++-++++-++++-++++-++++-+++-++++-++++-++++-++++-++++-+++-+++-+
        |                                                                  |
        |                                                                  |
  100 +-+                                                                  +-+
        |                                                                  |
   80 +-+                                                                  +-+
        |               +                                                  |
        |               |                                                  |
   60 +-+               | +                                                +-+
        |               | |                                                |
        |               + |                                                |
   40 +-+               | |                                                +-+
        |               | |                                                |
   20 +-+               | |                                                +-+
        |              || |                                                |
        |              || |+ + ++  -++                                     |
    0 +-+-++++-++++-++++-++++-++++-++++-+++-++++-++++-++++-++++-++++-+++-+++-+
          +      +       +      +       +      +       +      +       +
      01/01/137/01/1301/01/147/01/1401/01/157/01/1501/01/167/01/1601/01/17
                                       Date

	commit count: 269
	date span: 2013-12-03 to 2014-11-25 -> 357

	2013-12-03 1
	2013-12-10 48
	2013-12-12 73
	2013-12-13 3
	2013-12-19 1
	2014-01-16 1
	2014-01-24 3
	2014-01-26 58
	2014-02-09 1
	2014-02-11 2
	2014-02-13 1
	2014-02-14 2
	2014-03-05 2
	2014-03-06 1
	2014-03-11 5
	2014-03-13 1
	2014-03-25 1
	2014-03-26 1
	2014-04-04 3
	2014-04-09 4
	2014-04-11 5
	2014-04-19 1
	2014-04-29 3
	2014-05-21 1
	2014-06-06 1
	2014-06-10 6
	2014-06-17 1
	2014-06-24 6
	2014-06-30 1
	2014-07-03 4
	2014-07-08 4
	2014-07-27 1
	2014-08-11 3
	2014-10-02 5
	2014-10-12 4
	2014-11-06 6
	2014-11-12 1
	2014-11-21 1
	2014-11-25 3

                           daisy commits post-release
          +      +       +      +       +      +       +      +       +
  120 +-+-++++-++++-++++-++++-++++-++++-+++-++++-++++-++++-++++-++++-+++-+++-+
        |                                                                  |
        |                                                                  |
  100 +-+                                                                  +-+
        |                                                                  |
   80 +-+                      +                                           +-+
        |                      |                                           |
        |                      |                                           |
   60 +-+                      |                                           +-+
        |                      |                                           |
        |                     ||                                           |
   40 +-+                     ||                                           +-+
        |                     ||                                           |
   20 +-+                     +|                                           +-+
        |                     ||    +                                      |
        |                     || ++ ++ -++   +                             |
    0 +-+-++++-++++-++++-++++-++++-++++-+++-++++-++++-++++-++++-++++-+++-+++-+
          +      +       +      +       +      +       +      +       +
      01/01/137/01/1301/01/147/01/1401/01/157/01/1501/01/167/01/1601/01/17
                                       Date

	commit count: 245
	date span: 2014-04-10 to 2016-04-11 -> 732 days

	2014-04-10 2
	2014-04-11 1
	2014-04-19 3
	2014-04-22 1
	2014-05-22 1
	2014-05-23 21
	2014-05-29 80
	2014-06-06 3
	2014-06-10 21
	2014-06-12 2
	2014-06-16 2
	2014-06-17 3
	2014-06-19 1
	2014-06-20 1
	2014-06-23 1
	2014-07-03 3
	2014-07-23 2
	2014-07-25 5
	2014-07-27 1
	2014-08-11 4
	2014-08-15 1
	2014-08-30 3
	2014-09-23 1
	2014-09-29 8
	2014-10-09 1
	2014-10-10 16
	2014-10-23 7
	2014-11-04 2
	2014-11-05 4
	2014-11-06 6
	2014-11-25 1
	2014-12-28 4
	2015-02-06 10
	2015-03-03 1
	2015-03-10 2
	2015-03-11 1
	2015-03-25 1
	2015-03-28 2
	2015-04-15 1
	2015-04-27 1
	2015-05-01 6
	2015-05-12 2
	2015-05-13 2
	2015-07-15 1
	2015-07-16 1
	2016-01-19 1
	2016-04-11 1

                           dizzy commits post-release
          +      +       +      +       +      +       +      +       +
  120 +-+-++++-++++-++++-++++-++++-++++-+++-++++-++++-++++-++++-++++-+++-+++-+
        |                               |                                  |
        |                               |                                  |
  100 +-+                               |                                  +-+
        |                               |                                  |
   80 +-+                               |                                  +-+
        |                               |                                  |
        |                               |                                  |
   60 +-+                               |                                  +-+
        |                              ||+                                 |
        |                              |||                                 |
   40 +-+                              |||                                 +-+
        |                              |||  +                              |
   20 +-+                              || | |   +       +                  +-+
        |                              |+ | |   | +   --|                  |
        |                             +|| | |   | |+--   |+----            |
    0 +-+-++++-++++-++++-++++-++++-++++-+++-++++-++++-++++-++++-++++-+++-+++-+
          +      +       +      +       +      +       +      +       +
      01/01/137/01/1301/01/147/01/1401/01/157/01/1501/01/167/01/1601/01/17
                                       Date

	commit count: 359
	date span: 2014-10-31 to 2016-07-11 -> 619 days

	2014-10-31 2
	2014-11-05 1
	2014-11-07 2
	2014-11-13 1
	2014-11-21 7
	2014-11-24 2
	2014-11-26 10
	2014-12-11 1
	2014-12-31 118
	2015-01-06 18
	2015-01-08 1
	2015-01-15 1
	2015-02-11 53
	2015-02-13 1
	2015-03-03 2
	2015-03-21 2
	2015-03-25 1
	2015-03-26 2
	2015-03-27 2
	2015-03-28 2
	2015-04-15 2
	2015-04-17 27
	2015-04-18 2
	2015-04-20 1
	2015-04-27 3
	2015-04-29 1
	2015-05-01 1
	2015-05-15 2
	2015-07-15 1
	2015-07-20 25
	2015-07-26 8
	2015-07-27 2
	2015-08-13 1
	2015-08-20 2
	2015-09-01 14
	2015-09-19 10
	2015-09-29 2
	2016-01-30 20
	2016-02-26 1
	2016-03-21 4
	2016-07-11 1

                            fido commits post-release
          +      +       +      +       +      +       +      +       +
  120 +-+-++++-++++-++++-++++-++++-++++-+++-++++-++++-++++-++++-++++-+++-+++-+
        |                                                                  |
        |                                                                  |
  100 +-+                                      +                           +-+
        |                                      |                           |
   80 +-+                                      |                           +-+
        |                                      |                           |
        |                                    + |                           |
   60 +-+                                    | |                           +-+
        |                                    | |                           |
        |                                    |||                           |
   40 +-+                                    |||                           +-+
        |                                    |||  +                        |
   20 +-+                                  + |||++||    +   +              +-+
        |                                  ||||||||+   +|| ||              |
        |                                  |++|||| |+++||+ ||              |
    0 +-+-++++-++++-++++-++++-++++-++++-+++-++++-++++-++++-++++-++++-+++-+++-+
          +      +       +      +       +      +       +      +       +
      01/01/137/01/1301/01/147/01/1401/01/157/01/1501/01/167/01/1601/01/17
                                       Date

	commit count: 425
	date span: 2015-03-25 to 2016-12-05 -> 621

	2015-03-25 2
	2015-03-31 21
	2015-04-02 5
	2015-04-15 1
	2015-04-20 2
	2015-04-27 4
	2015-05-15 70
	2015-05-29 2
	2015-06-11 1
	2015-06-28 96
	2015-06-29 1
	2015-07-08 19
	2015-07-15 2
	2015-07-27 1
	2015-08-09 24
	2015-08-12 1
	2015-08-13 1
	2015-09-01 33
	2015-09-18 14
	2015-09-19 2
	2015-09-29 2
	2015-10-23 5
	2015-11-05 8
	2015-11-19 2
	2015-11-20 5
	2015-12-08 6
	2015-12-16 1
	2015-12-18 1
	2015-12-23 1
	2016-01-07 1
	2016-01-11 1
	2016-01-15 16
	2016-01-20 1
	2016-02-07 21
	2016-02-16 4
	2016-02-18 2
	2016-02-29 18
	2016-03-03 1
	2016-03-11 1
	2016-03-12 1
	2016-03-13 1
	2016-05-06 19
	2016-05-11 2
	2016-05-12 2
	2016-12-05 1

                           jethro commits post-release
          +      +       +      +       +      +       +      +       +
  120 +-+-++++-++++-++++-++++-++++-++++-+++-++++-++++-++++-++++-++++-+++-+++-+
        |                                                                  |
        |                                                                  |
  100 +-+                                                                  +-+
        |                                                                  |
   80 +-+                                                                  +-+
        |                                                                  |
        |                                                                  |
   60 +-+                                                                  +-+
        |                                                                  |
        |                                                                  |
   40 +-+                                              +                   +-+
        |                                              |                   |
   20 +-+                                             ||       +  +        +-+
        |                                             +|+  +  | | |  +     |
        |                                              |||+|++| |||+ |     |
    0 +-+-++++-++++-++++-++++-++++-++++-+++-++++-++++-++++-++++-++++-+++-+++-+
          +      +       +      +       +      +       +      +       +
      01/01/137/01/1301/01/147/01/1401/01/157/01/1501/01/167/01/1601/01/17
                                       Date

	commit count: 303
	date span: 2015-12-08 to 2016-12-06 -> 364

	2015-12-08 15
	2015-12-27 40
	2016-01-11 1
	2016-01-13 13
	2016-01-14 2
	2016-01-15 21
	2016-01-17 2
	2016-01-20 2
	2016-01-21 3
	2016-01-30 18
	2016-02-01 13
	2016-02-02 9
	2016-02-03 2
	2016-02-04 1
	2016-02-05 2
	2016-02-07 12
	2016-02-18 2
	2016-02-21 5
	2016-02-24 1
	2016-03-03 9
	2016-03-11 1
	2016-03-15 5
	2016-03-20 3
	2016-04-11 18
	2016-05-09 6
	2016-05-10 5
	2016-05-11 1
	2016-05-14 5
	2016-05-17 4
	2016-05-22 1
	2016-05-23 2
	2016-05-24 1
	2016-06-03 1
	2016-07-27 23
	2016-09-02 3
	2016-09-23 20
	2016-09-27 1
	2016-10-06 15
	2016-11-03 1
	2016-12-06 14

                          krogoth commits post-release
          +      +       +      +       +      +       +      +       +
  120 +-+-++++-++++-++++-++++-++++-++++-+++-++++-++++-++++-++++-++++-+++-+++-+
        |                                                                  |
        |                                                                  |
  100 +-+                                                     +            +-+
        |                                                     |            |
   80 +-+                                                     |            +-+
        |                                                     |            |
        |                                                     |            |
   60 +-+                                                     |   +        +-+
        |                                                     ||  |        |
        |                                                     ||  |        |
   40 +-+                                                     ||  | +      +-+
        |                                                     ||  | |      |
   20 +-+                                                    +|| ||||      +-+
        |                                                    |||+||||      |
        |                                                    ||+ || |      |
    0 +-+-++++-++++-++++-++++-++++-++++-+++-++++-++++-++++-++++-++++-+++-+++-+
          +      +       +      +       +      +       +      +       +
      01/01/137/01/1301/01/147/01/1401/01/157/01/1501/01/167/01/1601/01/17
                                       Date

	commit count: 314
	date span: 2016-05-17 to 2017-03-21 -> 308

	2016-05-17 26
	2016-05-18 1
	2016-05-22 1
	2016-06-03 1
	2016-06-15 1
	2016-06-29 95
	2016-07-06 8
	2016-07-27 24
	2016-08-01 15
	2016-08-23 3
	2016-08-25 1
	2016-08-31 7
	2016-09-02 3
	2016-09-23 62
	2016-09-24 1
	2016-09-27 15
	2016-09-29 1
	2016-10-05 1
	2016-10-06 8
	2016-11-08 37
	2016-11-09 1
	2017-03-20 1
	2017-03-21 1

                           morty commits post-release
          +      +       +      +       +      +       +      +       +
  120 +-+-++++-++++-++++-++++-++++-++++-+++-++++-++++-++++-++++-++++-+++-+++-+
        |                                                             +    |
        |                                                             |    |
  100 +-+                                                             |    +-+
        |                                                            ||    |
   80 +-+                                                            ||    +-+
        |                                                            ||    |
        |                                                            ||    |
   60 +-+                                                           | |    +-+
        |                                                           | |    |
        |                                                           + |    |
   40 +-+                                                           | |    +-+
        |                                                           | |    |
   20 +-+                                                           | |    +-+
        |                                                          |  |    |
        |                                                          |  |+++ |
    0 +-+-++++-++++-++++-++++-++++-++++-+++-++++-++++-++++-++++-++++-+++-+++-+
          +      +       +      +       +      +       +      +       +
      01/01/137/01/1301/01/147/01/1401/01/157/01/1501/01/167/01/1601/01/17
                                       Date

	commit count: 181
	date span: 2016-10-26 to 2017-03-21 -> 146

	2016-10-26 2
	2016-11-16 47
	2017-01-11 109
	2017-01-12 2
	2017-02-03 5
	2017-02-08 7
	2017-03-14 7
	2017-03-20 1
	2017-03-21 1


For most releases, the vast majority of the backports are done within 2-4
months of the start of the release (jethro being the only exception with a
much flatter distribution).

My only goal is to try to provide more data.



More information about the Openembedded-architecture mailing list