comparison mercurial/commands.py @ 5970:f25070ecf334

hgweb: fixes to make hg serve prefix handling more robust
author Michele Cella <michele.cella@gmail.com>
date Tue, 22 Jan 2008 22:13:29 +0100
parents e7f1be4bf40a
children a445388aa554
comparison
equal deleted inserted replaced
5969:821fc5c0656c 5970:f25070ecf334
2416 except socket.error, inst: 2416 except socket.error, inst:
2417 raise util.Abort(_('cannot start server: ') + inst.args[1]) 2417 raise util.Abort(_('cannot start server: ') + inst.args[1])
2418 2418
2419 if not ui.verbose: return 2419 if not ui.verbose: return
2420 2420
2421 if self.httpd.prefix:
2422 prefix = self.httpd.prefix.strip('/') + '/'
2423 else:
2424 prefix = ''
2425
2421 if self.httpd.port != 80: 2426 if self.httpd.port != 80:
2422 ui.status(_('listening at http://%s:%d/\n') % 2427 ui.status(_('listening at http://%s:%d/%s\n') %
2423 (self.httpd.addr, self.httpd.port)) 2428 (self.httpd.addr, self.httpd.port, prefix))
2424 else: 2429 else:
2425 ui.status(_('listening at http://%s/\n') % self.httpd.addr) 2430 ui.status(_('listening at http://%s/%s\n') %
2431 (self.httpd.addr, prefix))
2426 2432
2427 def run(self): 2433 def run(self):
2428 self.httpd.serve_forever() 2434 self.httpd.serve_forever()
2429 2435
2430 service = service() 2436 service = service()