Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

serve: fix to re-enable --webdir-conf option

This is a remaining fix of 670fe4b733e0.

Changeset 9b97d73f9a86…

Parent da8ee2d02077…

by Yuki KODAMA

Changes to one file · Browse files at 9b97d73f9a86 Showing diff from parent da8ee2d02077 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​serve.py Stacked
 
18
19
20
21
 
22
23
24
 
311
312
313
314
 
 
 
 
315
316
317
 
18
19
20
 
21
22
23
24
 
311
312
313
 
314
315
316
317
318
319
320
@@ -18,7 +18,7 @@
 import time    from mercurial import hg, ui, commands, cmdutil, util, error -from mercurial.hgweb import server, hgweb_mod +from mercurial.hgweb import server, hgweb_mod, hgwebdir_mod    from tortoisehg.util.i18n import _  from tortoisehg.util import hglib, paths @@ -311,7 +311,10 @@
  baseui.setconfig("web", o, str(opts[o]))   if repoui:   repoui.setconfig("web", o, str(opts[o])) - app = hgweb_mod.hgweb(hg.repository(repo.ui, repo.root)) + if opts.get('webdir_conf'): + app = hgwebdir_mod.hgwebdir(opts['webdir_conf'], repo.ui) + else: + app = hgweb_mod.hgweb(hg.repository(repo.ui, repo.root))   self.httpd = server.create_server(ui, app)   except socket.error, inst:   raise util.Abort(_('cannot start server: ') + inst.args[1])