Merge lp:~j/loggerhead/loggerhead-add_url-prefix_to_serve-branches into lp:loggerhead

[j^]

[j^ (j)]

since all branches served via serve-branches are available, i want to advertise them,
this patch adds an option --url-prefix that works like url_prefix in loggerhead.conf

[lp:~j/loggerhead/loggerhead-add_url-prefix_to_serve-branches]

403. By j^ on 2010-03-03

use object() as default

404. By j^ on 2010-03-03

make that None

[Martin Pool (mbp)]

This seems reasonable to me, but I'd like to be more clear on just what the impact is. Can we add an example to the manual perhaps?

[Matt Nordhoff (mnordhoff)]

A couple of quick comments:

9 + served_url = self._config.get_option('url_prefix') + name

I think it would be nice to run this through paste.request.resolve_relative_url() somewhere along the line.

11 + served_url = None

Changing served_url's default from loggerhead.apps.branch._DEFAULT to None will break things.

40 + help="All branches will be advertised to be available from this prefix")

This line's too long -- needs to be wrapped.

45 === modified file 'serve-branches.1'

Wow, you remembered the man page. I had forgotten it existed. \o/

review: Needs Fixing

[Kevin Jadin (marcspitz)]

I have been able to adapt this patch to loggerhead 1.18.
I am not that good in merging and all that stuff.

Can someone more experienced than I am please follow the request that Matt Nordhoff made in order to merge the diff into loggerhead's trunk?

It shouldn't take that long to edit 4 lines of code just to enjoy this feature..
Thanks

PS : for this to work, I also had to add:
--url-prefix=$url_prefix in /etc/init.d/loggerhead
url_preview=http://mysite/url
to make this work, maybe this should also be edited in sources, but I don't know where..

[Kevin Jadin (marcspitz)]

of course: url_preview=http://mysite/url in /etc/serve-branches.conf

Unmerged revisions

404. By j^ on 2010-03-03

make that None

403. By j^ on 2010-03-03

use object() as default

402. By j^ on 2010-03-03

add option to advertice all branches served by serve-branches to be available from given prefix (inline with loggeread.conf url_prefix option)

=== modified file 'loggerhead/apps/transport.py'
--- loggerhead/apps/transport.py	2009-11-26 03:20:53 +0000
+++ loggerhead/apps/transport.py	2010-03-03 17:33:15 +0000
@@ -54,6 +54,10 @@
         else:
             name = self.name
             is_root = False
+        if self._config.get_option('url_prefix'):
+            served_url = self._config.get_option('url_prefix') + name
+        else:
+            served_url = None
         branch_app = BranchWSGIApp(
             branch,
             name,
@@ -61,6 +65,7 @@
             self.root.graph_cache,
             is_root=is_root,
             use_cdn=self._config.get_option('use_cdn'),
+            served_url=served_url
             )
         return branch_app.app
 
 
=== modified file 'loggerhead/config.py'
--- loggerhead/config.py	2009-11-23 22:45:46 +0000
+++ loggerhead/config.py	2010-03-03 17:33:15 +0000
@@ -36,6 +36,7 @@
         use_cdn=False,
         sql_dir=None,
         allow_writes=False,
+        url_prefix=None,
         )
     parser.add_option("--user-dirs", action="store_true",
                       help="Serve user directories as ~user.")
@@ -69,6 +70,8 @@
                       help="The directory to place the SQL cache in")
     parser.add_option("--allow-writes", action="store_true",
                       help="Allow writing to the Bazaar server.")
+    parser.add_option('--url-prefix', dest='url_prefix',
+                      help="All branches will be advertised to be available from this prefix")
     return parser
 
 
 
=== modified file 'serve-branches.1'
--- serve-branches.1	2008-09-10 23:12:59 +0000
+++ serve-branches.1	2010-03-03 17:33:15 +0000
@@ -38,6 +38,9 @@
 .TP
 \fB\-\-version\fR
 Print the software version and exit.
+.TP
+\fB\-\-url-prefix\fR
+All branches will be advertised to be available from this prefix.
 .SH "LICENSE"
 GNU GPLv2 or later.
 .SH "SEE ALSO"