comparison mercurial/commands.py @ 8870:c3e4d3c1d48b

serve: obey the --encoding option
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Sun, 21 Jun 2009 16:27:07 +0200
parents cad6370a15cb
children 20a25042fadc
comparison
equal deleted inserted replaced
8869:d244ee52ac30 8870:c3e4d3c1d48b
2719 s = sshserver.sshserver(ui, repo) 2719 s = sshserver.sshserver(ui, repo)
2720 s.serve_forever() 2720 s.serve_forever()
2721 2721
2722 baseui = repo and repo.baseui or ui 2722 baseui = repo and repo.baseui or ui
2723 optlist = ("name templates style address port prefix ipv6" 2723 optlist = ("name templates style address port prefix ipv6"
2724 " accesslog errorlog webdir_conf certificate") 2724 " accesslog errorlog webdir_conf certificate encoding")
2725 for o in optlist.split(): 2725 for o in optlist.split():
2726 if opts[o]: 2726 if opts.get(o, None):
2727 baseui.setconfig("web", o, str(opts[o])) 2727 baseui.setconfig("web", o, str(opts[o]))
2728 if (repo is not None) and (repo.ui != baseui): 2728 if (repo is not None) and (repo.ui != baseui):
2729 repo.ui.setconfig("web", o, str(opts[o])) 2729 repo.ui.setconfig("web", o, str(opts[o]))
2730 2730
2731 if repo is None and not ui.config("web", "webdir_conf"): 2731 if repo is None and not ui.config("web", "webdir_conf"):