comparison mercurial/commands.py @ 8312:b87a50b7125c

separate import lines from mercurial and general python modules
author Simon Heimberg <simohe@besonet.ch>
date Tue, 28 Apr 2009 17:40:46 +0200
parents 824ed0e35480
children b695392491e7
comparison
equal deleted inserted replaced
8311:e0eb03bfa5af 8312:b87a50b7125c
6 # GNU General Public License version 2, incorporated herein by reference. 6 # GNU General Public License version 2, incorporated herein by reference.
7 7
8 from node import hex, nullid, nullrev, short 8 from node import hex, nullid, nullrev, short
9 from lock import release 9 from lock import release
10 from i18n import _, gettext 10 from i18n import _, gettext
11 import os, re, sys, textwrap, subprocess 11 import os, re, sys, textwrap, subprocess, difflib, time
12 import hg, util, revlog, bundlerepo, extensions, copies, context, error 12 import hg, util, revlog, bundlerepo, extensions, copies, context, error
13 import difflib, patch, time, help, mdiff, tempfile, url, encoding 13 import patch, help, mdiff, tempfile, url, encoding
14 import archival, changegroup, cmdutil, hgweb.server, sshserver, hbisect 14 import archival, changegroup, cmdutil, sshserver, hbisect
15 from hgweb import server
15 import merge as merge_ 16 import merge as merge_
16 17
17 # Commands start here, listed alphabetically 18 # Commands start here, listed alphabetically
18 19
19 def add(ui, repo, *pats, **opts): 20 def add(ui, repo, *pats, **opts):
2696 " (.hg not found)")) 2697 " (.hg not found)"))
2697 2698
2698 class service: 2699 class service:
2699 def init(self): 2700 def init(self):
2700 util.set_signal_handler() 2701 util.set_signal_handler()
2701 self.httpd = hgweb.server.create_server(baseui, repo) 2702 self.httpd = server.create_server(baseui, repo)
2702 2703
2703 if not ui.verbose: return 2704 if not ui.verbose: return
2704 2705
2705 if self.httpd.prefix: 2706 if self.httpd.prefix:
2706 prefix = self.httpd.prefix.strip('/') + '/' 2707 prefix = self.httpd.prefix.strip('/') + '/'