[gentoo-catalyst] Recent changes to my rewite branch

[gentoo-catalyst] Recent changes to my rewite branch

[Brian Dolbec]

[-- Attachment #1: Type: text/plain, Size: 2282 bytes --]

I've attached a short log of the more recent changes I've made to my
rewite branch.  This includes rebasing the broken seed stage update
commit with dwfreed's patch which fixes the binpkgs not being
created/used in stage1.

There are a few trivial commits with some of the more notable ones
being:

Creating and using a new AutoResume class for handling all file
operations involving the "autoresume" feature.  This keeps the code
logic in one place, easy to maintain and change.  It also removes a
great deal of duplicated "if ..." checks and code which follows.

Another removes a bunch of duplicated code in the ClearBase class.

I have also started using snakeoil's lib functions for version
generation in the live git checkouts.  As well as some other of it's
osutils.

I've updated my rewrite with the other changes to master since I did
started the rewrite branch.  Some commits were just cherry-picked
across, some needed minor editing to suit.  A few needed the changes
needed to be applied manually to the newer code.

Since I did a bunch of rebasing to my original batch of commits, you
will need to:

"git pull --force whatever-you-named-my-remote rewrite"

or for a new clone:

git clone --branch rewrite http://dev.gentoo.org/~dolsen/catalyst/


As of the last commit cd733bf2bfc04659372984fe88415d18e5eb2991
everything has been working according to my testing (up to stage3
tested)

Please run your tests on it to see if I've missed anything.

I'll work on refactoring the compression/decompression code soon which
will be another larger change.  It should be just a matter of
adding/removing some defaults/config options to add new capabilities.
There should be no need for further code changes when it is done.  Time
will tell of course...

There are too many commits/changes to spam this list with.  For those
that wish to review them individually, I suggest using dev-vcs/gitg
which is a very nice gtk frontend to git.  It is great for reviewing
commits/changes for any of the branches.  It also has the ability to let
you hand pick individual changes from a displayed diff for generating
commits.

Once there is a rewrite branch in the main repo, you will be able to
view changes in gitweb without the need to download them.
-- 
Brian Dolbec <dolsen@gentoo.org>

[-- Attachment #2: latest-changes.log --]
[-- Type: text/x-log, Size: 6836 bytes --]

commit cd733bf2bfc04659372984fe88415d18e5eb2991
Author: Brian Dolbec <dolsen@gentoo.org>
Date:   Sat Jun 1 00:31:59 2013 -0700

    Rename local unpack var to _unpack
    
    The method name was unpack, so rename the local var to _unpack to help avoid confusion.

commit 40026be7f7b48619ffbdd18acc5ab08c0c0c7b71
Author: Brian Dolbec <dolsen@gentoo.org>
Date:   Fri May 31 23:33:15 2013 -0700

    Fix a long line.

commit 2ec37cbac531392baae0609cb129fe9574c2e737
Author: Brian Dolbec <dolsen@gentoo.org>
Date:   Fri May 31 23:32:49 2013 -0700

    Remove some dead code

commit 0fb8f41fe2a79a794f7ee8d2473c9dd6792f7404
Author: Brian Dolbec <dolsen@gentoo.org>
Date:   Fri May 31 23:28:19 2013 -0700

    Fix some paths/normpath usage.  Use pjoin to join paths.

commit 554badf2dbb618a0a88b3735d1451e1d90478671
Author: Brian Dolbec <dolsen@gentoo.org>
Date:   Fri May 31 23:23:46 2013 -0700

    Create AutoResume class to handle all file creation, deletion...
    
    Create catalyst/base/resume.py.
    Migrate all auto_resume operations to using the new class.

commit 81c82475769e80afd870c032ae159295788180a0
Author: Brian Dolbec <dolsen@gentoo.org>
Date:   Fri May 31 23:24:46 2013 -0700

    Refactor ClearBase code to remove code duplication.

commit d82b2f644d31c58cfd8c26f453bdd8c768c8c493
Author: Brian Dolbec <dolsen@gentoo.org>
Date:   Fri May 31 09:11:30 2013 -0700

    Initial creation of fileops.py
    
    Migrate to using ensure_dirs()

commit 11c476d2a2cc987e7be35536c63bca0f497737b7
Author: Brian Dolbec <dolsen@gentoo.org>
Date:   Thu May 30 21:11:45 2013 -0700

    fix version for newer snakeoil

commit 76abe0851e7d57aef3c0412ee1b63da3fdad1f34
Author: Brian Dolbec <dolsen@gentoo.org>
Date:   Thu May 30 12:34:06 2013 -0700

    Migrate version to use snakeoil's format_version() to append git commit info.
    
    This will make tagging releases easy as well as providing better debug info while running live versions of the software.

commit 8270d576d3436c662743c6a5b04cd2637265440b
Author: W. Trevor King <wking@tremily.us>
Date:   Fri Mar 1 00:57:39 2013 -0500

    kmerge.sh: Fix line wrapping typo from 9ceebbf
    
    In 9ceebbf (kmerge.sh: Make /var/tmp/${clst_kname}.config optional,
    2013-02-09), I added a KERNCACHE check to a `[` test, wrapping the two
    clauses in the test to avoid a very long line.  Unfortunately,
    newlines do not appear to be legal in this position.  For example:
    
      $ if [ -n "a" -a
      > -n "b" ]; then echo "c"; fi
      bash: [: missing `]'
      bash: -n: command not found
    
    This commit fixes the error by explicitly wrapping the line with a
    backslash.
    
    Reviewed-by: Matt Turner <mattst88@gmail.com>

commit 8e15e6e41a14ed7eb86f106aced5db6fa361a84f
Author: W. Trevor King <wking@tremily.us>
Date:   Sat Feb 9 15:40:32 2013 -0500

    files/.gitignore: Ignore $(DOCS) and $(DOC_SIDE_EFFECTS)
    
    These are generated by the Makefile from sources in doc/.
    
    Reviewed-by: Matt Turner <mattst88@gmail.com>

commit e0579eb82d3ae4ebc090f2dd0d74d0200a7bf0b7
Author: W. Trevor King <wking@tremily.us>
Date:   Sat Feb 9 15:40:31 2013 -0500

    Makefile: Add DOCS for building files/HOWTO.html
    
    The rules are more general though; any new *.txt file in doc/ that
    doesn't match *.?.txt or one of the explicitly-listed *.generated.txt
    files will be automatically built and distributed.
    
    The generated `files/docbook-xsl.css` is a side effect of the xhtml
    target.
    
    Reviewed-by: Matt Turner <mattst88@gmail.com>

commit 62e39be7861e641cc8714f6e7de5fe39a98e9708
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
Date:   Wed Apr 24 11:27:13 2013 +0000

    Drop addpatches from the livecd-stage2 example spec as well.

commit 9b61a7fcef85973e508a47c8632ee7cdb1954ff6
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
Date:   Wed Apr 24 11:23:50 2013 +0000

    Drop addpatches from the stage4 example spec.

commit 86a0dd9f6c83effa3a3dc85095ccb7514eafcd6f
Author: Brian Dolbec <dolsen@gentoo.org>
Date:   Mon May 27 17:18:43 2013 -0700

    Make the use of preserved_libs optional by setting the options variable.
    
    Ported from commits:
     462348d88b3a5fa783f322c64131025581ecc220
     f6ad384914a00099eea2a0f66232728c479ec628
     in the master branch.
    AUTHOR: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> (Sun 14 Apr 2013 08:22:34 PM PDT)

commit fe87cd94fafda5c9424ba43b785faf0d79674bb2
Author: Raúl Porcel <armin76@gentoo.org>
Date:   Sat Apr 6 17:07:00 2013 +0000

    Add support for m68k
    
    port commit for the rewrite branch.
    Brian Dolbec <dolsen@gentoo.org>

commit 516e9108941e4b8992d7379aef1095139d476b33
Author: W. Trevor King <wking@tremily.us>
Date:   Sun Mar 3 11:53:18 2013 -0500

    livecdfs-update.sh: Escape ampersands in STARTX sed expression
    
    From sed(1):
    
      s/regexp/replacement/
        Attempt to match regexp against the pattern space.  If successful,
        replace that portion matched with replacement.  The replacement
        may contain the special character & to refer to that portion of
        the pattern space which matched, and the special escapes \1
        through \9 to refer to the corresponding matching sub-expressions
        in the regexp.
    
    This means that the old expression (with unescaped ampersands) lead
    to:
    
      source /etc/profile ##STARTX##STARTX su - ${first_user} -c startx
    
    when we want:
    
      source /etc/profile && su - ${first_user} -c startx
    
    with ${first_user} expanded in both cases.
    
    Reviewed-by: Matt Turner <mattst88@gmail.com>

commit 55ff8fb453139ac4ae12f52309ef3696440f3f70
Author: W. Trevor King <wking@tremily.us>
Date:   Sat Feb 9 15:40:30 2013 -0500

    doc/HOWTO: First pass at a gentle Catalyst introduction
    
    Reviewed-by: Matt Turner <mattst88@gmail.com>

commit e91c762581a594ecc7471ee41b87ab93e34ac5fb
Author: Ben Kohler <bkohler@gmail.com>
Date:   Tue Mar 5 17:08:07 2013 -0800

    create-iso.sh: add usb boot via isohybrid
    
    Add an isohybrid call to create-iso.sh for isolinux targets so the resulting
    images are usb/hdd bootable.

commit 37a6b6e5be8ca41edde0eef6f10c01c583453902
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
Date:   Mon Mar 4 03:13:11 2013 +0000

    Fix bugs 407051 and 458536 by using FEATURES="preserve-libs" on the unmerge step of livecd-stage2 target.

commit b560587cc496f9f004de58603b5dfe2d6268e663
Author: Brian Dolbec <dolsen@gentoo.org>
Date:   Mon May 27 16:34:33 2013 -0700

    update version to identify the rewite-git code is being run

commit 2f8bb61b37ec32843ccf4600dbb6f4e5ec62d11f
Author: Brian Dolbec <dolsen@gentoo.org>
Date:   Mon May 27 16:08:16 2013 -0700

    fix indent.

Re: [gentoo-catalyst] Recent changes to my rewite branch

[W. Trevor King]

[-- Attachment #1: Type: text/plain, Size: 900 bytes --]

On Sat, Jun 01, 2013 at 12:48:13PM -0700, Brian Dolbec wrote:
> I've updated my rewrite with the other changes to master since I did
> started the rewrite branch.  Some commits were just cherry-picked
> across, some needed minor editing to suit.

In other projects I'm involved in, the preferred approach is to rebase
the feature branch onto the current master.  The problem with cherry
picking master advances onto your feature branch is that anyone else
with feature branches based on the current master will have to rebase
*their* feature branches to keep up with your branch.  If the person
proposing the changes does the rebasing, that's only a single branch
that has to be rebased, which scales better ;).

Cheers,
Trevor

-- 
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [gentoo-catalyst] Recent changes to my rewite branch

[Brian Dolbec]

On Sat, 2013-06-01 at 16:35 -0400, W. Trevor King wrote:
> On Sat, Jun 01, 2013 at 12:48:13PM -0700, Brian Dolbec wrote:
> > I've updated my rewrite with the other changes to master since I did
> > started the rewrite branch.  Some commits were just cherry-picked
> > across, some needed minor editing to suit.
> 
> In other projects I'm involved in, the preferred approach is to rebase
> the feature branch onto the current master.  The problem with cherry
> picking master advances onto your feature branch is that anyone else
> with feature branches based on the current master will have to rebase
> *their* feature branches to keep up with your branch.  If the person
> proposing the changes does the rebasing, that's only a single branch
> that has to be rebased, which scales better ;).
> 
> Cheers,
> Trevor
> 

I didn't realize that.  I can throw <some> blame towards Jorge who asked
me to update my branch with the master additions.

Well they weren't that tough, so I should be able to redo it.  But my
rewrite is more than just a feature.  I am restructuring the entire code
base.  And the more my branch diverges the harder it gets to constantly
rebase...

It's stuff like this that I hate working in side branches :/  while
development continues in the master.  At some point, the decision has to
be made to switch development, just maintain the old with needed bug
fixes in a renamed side branch.  Port the bug fixes that still apply to
the new development branch.
-- 
Brian Dolbec <dolsen@gentoo.org>

Re: [gentoo-catalyst] Recent changes to my rewite branch

[W. Trevor King]

[-- Attachment #1: Type: text/plain, Size: 686 bytes --]

On Sat, Jun 01, 2013 at 04:15:24PM -0700, Brian Dolbec wrote:
> It's stuff like this that I hate working in side branches :/  while
> development continues in the master.  At some point, the decision has to
> be made to switch development, just maintain the old with needed bug
> fixes in a renamed side branch.

I agree that maintaining a patch series is a pain, but I think the
solution is to get your changes merged into master.  What's the point
of creating a dead-end branch in either direction?

Cheers,
Trevor

-- 
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]