Merge lp:~loggerhead-team/loggerhead/loggerhead-plugin into lp:loggerhead

Proposed by Jonathan Lange
Status: Merged
Approved by: Martin Albisetti
Approved revision: 265
Merged at revision: not available
Proposed branch: lp:~loggerhead-team/loggerhead/loggerhead-plugin
Merge into: lp:loggerhead
To merge this branch: bzr merge lp:~loggerhead-team/loggerhead/loggerhead-plugin
Reviewer Review Type Date Requested Status
Martin Albisetti Approve
Review via email: mp+3095@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

mbp says:

I did a little of work picking up from mwh's branch so that loggerhead
will work as a plugin. It's in
<https://code.edge.launchpad.net/~loggerhead-team/loggerhead/loggerhead-plugin>.
 If you do

 bzr branch https://code.edge.launchpad.net/~loggerhead-team/loggerhead/loggerhead-plugin
\
    ~/.bazaar/plugins/loggerhead

then the 'bzr serve' command will get a new --http option, which will
run up a loggerhead viewer on branches under the current directory.
jml and beuno have a separate patch that lets loggerhead act as a bzr
server, and the combination should be pretty nice.

Revision history for this message
Martin Albisetti (beuno) wrote :

As discussed in RL, but for the benefit of the audience, I'm ok to merge this as experimental with 2 changes:

1. <poolie> beuno: if __name__ == 'bzrlib.plugins.loggerhead':
2. Make the default port 8080 (and change the help text)

You're now a loggerhead developer, so you can merge directly into trunk :)

review: Approve
Revision history for this message
Martin Albisetti (beuno) wrote :

Jono, interested in merging this, or want me to?

Revision history for this message
Martin Albisetti (beuno) wrote :

Just need the two fixes above, and I'll merge. Ping me when it's ready to merge.
Thanks :)

Revision history for this message
Martin Pool (mbp) wrote :

These are now done so I'll merge it.

Subscribers

People subscribed via source and target branches