[PATCH 1 of 2] Fix hgwebdir after 9858477ed74cce9dc8f4069f9453a1bda0e13ba1 broke it

[Eric Hopper]

On Wed, Aug 08, 2007 at 11:00:39PM +0200, Benoit Boissinot wrote:
> On Mon, Aug 06, 2007 at 10:22:39PM -0700, Eric M. Hopper wrote:
> > On Mon, 2007-08-06 at 23:43 +0200, Benoit Boissinot wrote:
> > > On 8/6/07, Eric Hopper <hopper at omnifarious.org> wrote:
> > > > 2 files changed, 24 insertions(+), 8 deletions(-)
> > > > mercurial/commands.py     |    2 +-
> > > > mercurial/hgweb/server.py |   30 +++++++++++++++++++++++-------
> > > >
> > > >
> > > Why not use this simpler patch ?
> > 
> > Because in most cases the config entries you really want are in the
> > webdir config even when you have a repo available.  You basically want
> > the repo to override the webdir settings if it has any config entries
> > that would.
> > 
> > So, unless there's a way to combine the config entries from two ui
> > instances in a clean way, this is what I choose.
> 
> I'm pretty sure that 
> 
> repo.ui.config(section, var, ui.config(section, var, default))
> is equivalent to
> repo.ui.config(section, var, default)
> since the repo.ui object inherits the options from the global ui
> object.

Oh.  *sigh* I should've tested that myself.  I'll submit a new patch
that kills all that extra obfuscation sometime soon.

Thanks,
-- 
"It does me no injury for my neighbor to say there are twenty gods or no God.
It neither picks my pocket nor breaks my leg."  --- Thomas Jefferson
"Go to Heaven for the climate, Hell for the company."  -- Mark Twain
-- Eric Hopper (http://www.omnifarious.org/~hopper) --
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20070808/074949da/attachment.pgp