Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.6, 0.7, and 0.7.1

serve: add support for hgwebdir.conf mode

Changeset c24ab75271cf…

Parent c08cec467669…

by Steve Borho

Changes to one file · Browse files at c24ab75271cf Showing diff from parent c08cec467669 Diff from another changeset...

Change 1 of 6 Show Entire File hggtk/​serve.py Stacked
 
32
33
34
35
 
36
37
38
 
50
51
52
 
53
54
55
 
129
130
131
132
 
 
 
 
133
134
135
 
229
230
231
232
233
 
 
 
 
 
 
234
235
236
 
346
347
348
349
350
 
 
351
352
353
 
358
359
360
361
 
 
 
 
362
 
32
33
34
 
35
36
37
38
 
50
51
52
53
54
55
56
 
130
131
132
 
133
134
135
136
137
138
139
 
233
234
235
 
 
236
237
238
239
240
241
242
243
244
 
354
355
356
 
 
357
358
359
360
361
 
366
367
368
 
369
370
371
372
373
@@ -32,7 +32,7 @@
 gservice = None  class ServeDialog(gtk.Window):   """ Dialog to run web server""" - def __init__(self, cwd='', root=''): + def __init__(self, cwd='', root='', webdir_conf=''):   """ Initialize the Dialog """   gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)   @@ -50,6 +50,7 @@
    self._url = None   self._root = root + self._webdirconf = webdir_conf   if cwd:   os.chdir(cwd)   @@ -129,7 +130,10 @@
  self.defport = repo.ui.config('web', 'port') or '8000'   self.webname = repo.ui.config('web', 'name') or \   os.path.basename(self._root) - self.set_title("hg serve - " + self.webname) + if self._webdirconf: + self.set_title("hg serve %s - %s" % (self._webdirconf, self.webname)) + else: + self.set_title("hg serve - " + self.webname)     def _toolbutton(self, stock, label, handler, menu=None, userdata=None):   if menu: @@ -229,8 +233,12 @@
  global gservice   gservice = None   - args = [self._root, self._queue, 'serve', '--name', self.webname, - '--port', str(port)] + args = [self._root, self._queue, 'serve', '--port', str(port)] + if self._webdirconf: + args.append('--webdir-conf=' + self._webdirconf) + else: + args.append('--name') + args.append(self.webname)   thread = threading.Thread(target=hglib.hgcmd_toq, args=args)   thread.start()   @@ -346,8 +354,8 @@
  _('hg serve [OPTION]...'))}     -def run(cwd='', root='', **opts): - dialog = ServeDialog(cwd, root) +def run(cwd='', root='', webdir_conf='', **opts): + dialog = ServeDialog(cwd, root, webdir_conf)   dialog.show_all()   gtk.gdk.threads_init()   gtk.gdk.threads_enter() @@ -358,5 +366,8 @@
  import sys   opts = {}   opts['cwd'] = os.getcwd() - opts['root'] = len(sys.argv) > 1 and sys.argv[1] or '' + if len(sys.argv) == 2 and sys.argv[1].endswith('.conf'): + opts['webdir_conf'] = sys.argv[1] + else: + opts['root'] = len(sys.argv) > 1 and sys.argv[1] or ''   run(**opts)