Merge lp:~jameinel/launchpad/use_loggerhead_trunk into lp:launchpad

[John A Meinel]

Use lp:loggerhead for deployment, switch to revno 431.

This updates the sourcecode dependency, so that we will use loggerhead's trunk branch rather than the old ~launchpad-pqm/loggerhead/devel branch. It also updates it to use the current trunk revision (431).

I'm proposing it this way, because it sounded like how Robert wanted the transition to happen. Make loggerhead trunk stable, start using it as the deployment source.

Changes vs current deployed revision:

423) Merged pqm into trunk

424) HEAD requests don't render the template. Saves a small amount of time for HEAD requests, mostly makes them conform to HTTP rules, of not sending body content for a HEAD request.

425) Code cleanup, drop bzr compatibility code for bzr <=1.16.

426) Testing infrastructure code

427) Fix the test suite

428) Debian compatibility, when bzrlib.util.configobj is not present, because we use the system-wide installation of configobj. Shouldn't matter for deployment.

429) Updated CSS to make Loggerhead conform to Launchpad's style. Fairly large UI change, but seems to have been approved by all the right people.

430) Stop supporting pure "json" in favor of requiring "simplejson". We had buggy support for just "json". Rather than trying to fix it, just remove support for it. Should not effect the deployed version.

431) Use a special favicon when browsing "between" branches. Should also not affect deployed loggerhead. Because deployed version doesn't let you go to, eg http://bazaar.launchpad.net/~bzr-pqm/bzr/ and see the list of branches. (Versus standalone version which would.)

Overall, this seems reasonable to get us running from trunk, with a few bug fixes, and prepares the way as we start landing more updates to the loggerhead codebase.

[Robert Collins (lifeless)]

On Fri, Mar 4, 2011 at 2:03 AM, John A Meinel <email address hidden> wrote:
> I'm proposing it this way, because it sounded like how Robert wanted the transition to happen. Make loggerhead trunk stable, start using it as the deployment source.

I want us to eliminate the delta and start using whatever loggerhead
itself recommends users use. Either we should run releases (and every
change to trunk that we want should be released immediately), or we
should run trunk. So, in short, this is fine.

There is one more change we need to make before landing this branch:
we should get pqm setup for trunk (its already setup for launchpad's
pqm branch, so should be very easy to do).

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 3/3/2011 8:04 PM, Robert Collins wrote:
> On Fri, Mar 4, 2011 at 2:03 AM, John A Meinel <email address hidden> wrote:
>> I'm proposing it this way, because it sounded like how Robert wanted the transition to happen. Make loggerhead trunk stable, start using it as the deployment source.
>
> I want us to eliminate the delta and start using whatever loggerhead
> itself recommends users use. Either we should run releases (and every
> change to trunk that we want should be released immediately), or we
> should run trunk. So, in short, this is fine.
>
> There is one more change we need to make before landing this branch:
> we should get pqm setup for trunk (its already setup for launchpad's
> pqm branch, so should be very easy to do).

So what steps does it actually take to get that working?

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1v6icACgkQJdeBCYSNAANXiQCff4v3UZo/cT6l8pntze8BeYbs
HjsAn0jBY7pRCUgnkFDe332QmvP0jPrU
=+oDl
-----END PGP SIGNATURE-----

[Robert Collins (lifeless)]

Should be just an RT + changing the series branch to be one maintained
by pqm, but we probably need to get the current config for the lp
branch, assess any changes, then do the switcheroo. I'll coordinate
this on Monday if you like.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 3/3/2011 8:44 PM, Robert Collins wrote:
> Should be just an RT + changing the series branch to be one maintained
> by pqm, but we probably need to get the current config for the lp
> branch, assess any changes, then do the switcheroo. I'll coordinate
> this on Monday if you like.

That would be great. Thanks.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1yFO8ACgkQJdeBCYSNAAPVTACfSO7PTHxrinqrwy45r5MsdpR9
g+0AnjIx5/PhQ0idhESdrhxe4HEwR08Z
=YLIr
-----END PGP SIGNATURE-----

[Jonathan Lange (jml)]

<jam> can somebody land https://code.launchpad.net/~jameinel/launchpad/use_loggerhead_trunk/+merge/52062
 At least, lifeless said on IRC, "Just land the branch" because loggerhead's pqm didn't actually run the test suite
 so we didn't bother setting it up again yet
 jam james_w
<jml> jam: sure thing.

review: Approve

=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2011-02-25 10:39:53 +0000
+++ utilities/sourcedeps.conf	2011-03-03 13:03:19 +0000
@@ -6,7 +6,7 @@
 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=432
 dulwich lp:~launchpad-pqm/dulwich/devel;revno=424
 difftacular lp:difftacular;revno=6
-loggerhead lp:~launchpad-pqm/loggerhead/devel;revno=178
+loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=431
 lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=23
 mailman lp:~launchpad-pqm/mailman/2.1;revno=976
 old_xmlplus lp:~launchpad-pqm/dtdparser/trunk;revno=4