[PATCH 1 of 2] Fix whitespace

Wesley J. Landaker wjl at icecavern.net
Fri Jul 13 13:05:22 CDT 2007


On Friday 13 July 2007 11:48:53 Wesley J. Landaker wrote:
> # HG changeset patch
> # User Wesley J. Landaker <wjl at icecavern.net>
> # Date 1184348464 21600
> # Node ID ea1a254b4a03c1c4a61b6bfb2a5ebbdeb27a17f8
> # Parent  28b23b9073a8652f95b87975f6648912dfec5f71
> Fix whitespace.

Whoa... whoops. 

The patch header was supposed to look like this. I am apparently not yet a 
master of mercurial queues. I've attached the patch which has the correct 
header.

Fix baseurl configuration, detection, and use in templates.

This patch fixes the current ad-hoc HTTPS detection for the current
{urlbase} template variable, and unifies it with the currently existing
[web]/baseurl configuration parameter.

We already have an existing, documented [web] setting called baseurl,
that is exactly what the heuristically created urlbase template setting
is trying to recreate. We should use this when it's set; when it's not
set, we use the same educated guessing as before.

Also, rename the {urlbase} template variable to {baseurl}, because this
matches the [web]/baseurl setting that currently exists for exactly
this kind of thing.

For backwards compatibility, {urlbase} still works, but it might be
better to just remove it, since the only place it is used in mercurial
is the RSS templates, and these have been updated in this patch as well.
The main concern would be external users with their own templates, so
I tried to err on the safe side, although it's also annoying to introduce
a backwards compatibility feature for something that was undocumented and
might cause future confusion if left there.

-- 
Wesley J. Landaker <wjl at icecavern.net> <xmpp:wjl at icecavern.net>
OpenPGP FP: 4135 2A3B 4726 ACC5 9094  0097 F0A9 8A4C 4CD6 E3D2
-------------- next part --------------
A non-text attachment was scrubbed...
Name: baseurl-template-fixes
Type: text/x-diff
Size: 5224 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20070713/360861c9/attachment.diff 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20070713/360861c9/attachment.pgp 


More information about the Mercurial-devel mailing list