removed unused imports

contrib/perf.py

@@ -1,131 +1,130 b''
 # perf.py - performance test routines
 
-from mercurial.i18n import _
 from mercurial import cmdutil, match, commands
 import time, os, sys
 
 def timer(func):
     results = []
     begin = time.time()
     count = 0
     while 1:
         ostart = os.times()
         cstart = time.time()
         r = func()
         cstop = time.time()
         ostop = os.times()
         count += 1
         a, b = ostart, ostop
         results.append((cstop - cstart, b[0] - a[0], b[1]-a[1]))
         if cstop - begin > 3 and count >= 100:
             break
         if cstop - begin > 10 and count >= 3:
             break
     if r:
         sys.stderr.write("! result: %s\n" % r)
     m = min(results)
     sys.stderr.write("! wall %f comb %f user %f sys %f (best of %d)\n"
                      % (m[0], m[1] + m[2], m[1], m[2], count))
 
 def perfwalk(ui, repo, *pats):
     try:
         m = cmdutil.match(repo, pats, {})
         timer(lambda: len(list(repo.dirstate.walk(m, True, False))))
     except:
         try:
             m = cmdutil.match(repo, pats, {})
             timer(lambda: len([b for a,b,c in repo.dirstate.statwalk([], m)]))
         except:
             timer(lambda: len(list(cmdutil.walk(repo, pats, {}))))
 
 def perfstatus(ui, repo, *pats):
     #m = match.always(repo.root, repo.getcwd())
     #timer(lambda: sum(map(len, repo.dirstate.status(m, False, False, False))))
     timer(lambda: sum(map(len, repo.status())))
 
 def perfheads(ui, repo):
     timer(lambda: len(repo.changelog.heads()))
 
 def perftags(ui, repo):
     import mercurial.changelog, mercurial.manifest
     def t():
         repo.changelog = mercurial.changelog.changelog(repo.sopener)
         repo.manifest = mercurial.manifest.manifest(repo.sopener)
         repo.tagscache = None
         return len(repo.tags())
     timer(t)
 
 def perfdirstate(ui, repo):
     "a" in repo.dirstate
     def d():
         repo.dirstate.invalidate()
         "a" in repo.dirstate
     timer(d)
 
 def perfdirstatedirs(ui, repo):
     "a" in repo.dirstate
     def d():
         "a" in repo.dirstate._dirs
         del repo.dirstate._dirs
     timer(d)
 
 def perfmanifest(ui, repo):
     def d():
         t = repo.manifest.tip()
         m = repo.manifest.read(t)
         repo.manifest.mapcache = None
         repo.manifest._cache = None
     timer(d)
 
 def perfindex(ui, repo):
     import mercurial.changelog
     def d():
         t = repo.changelog.tip()
         repo.changelog = mercurial.changelog.changelog(repo.sopener)
         repo.changelog._loadindexmap()
     timer(d)
 
 def perfstartup(ui, repo):
     cmd = sys.argv[0]
     def d():
         os.system("HGRCPATH= %s version -q > /dev/null" % cmd)
     timer(d)
 
 def perfparents(ui, repo):
     nl = [repo.changelog.node(i) for i in xrange(1000)]
     def d():
         for n in nl:
             repo.changelog.parents(n)
     timer(d)
 
 def perflookup(ui, repo, rev):
     timer(lambda: len(repo.lookup(rev)))
 
 def perflog(ui, repo):
     ui.pushbuffer()
     timer(lambda: commands.log(ui, repo, rev=[], date='', user=''))
     ui.popbuffer()
 
 def perftemplating(ui, repo):
     ui.pushbuffer()
     timer(lambda: commands.log(ui, repo, rev=[], date='', user='',
                                template='{date|shortdate} [{rev}:{node|short}]'
                                ' {author|person}: {desc|firstline}\n'))
     ui.popbuffer()
 
 cmdtable = {
     'perflookup': (perflookup, []),
     'perfparents': (perfparents, []),
     'perfstartup': (perfstartup, []),
     'perfstatus': (perfstatus, []),
     'perfwalk': (perfwalk, []),
     'perfmanifest': (perfmanifest, []),
     'perfindex': (perfindex, []),
     'perfheads': (perfheads, []),
     'perftags': (perftags, []),
     'perfdirstate': (perfdirstate, []),
     'perfdirstatedirs': (perfdirstate, []),
     'perflog': (perflog, []),
     'perftemplating': (perftemplating, []),
 }
 

hgext/convert/common.py

@@ -1,368 +1,368 b''
 # common.py - common code for the convert extension
 #
 #  Copyright 2005-2009 Matt Mackall <[e-mail]> and others
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2, incorporated herein by reference.
 
 import base64, errno
 import os
 import cPickle as pickle
-from mercurial import util, strutil
+from mercurial import util
 from mercurial.i18n import _
 
 def encodeargs(args):
     def encodearg(s):
         lines = base64.encodestring(s)
         lines = [l.splitlines()[0] for l in lines]
         return ''.join(lines)
 
     s = pickle.dumps(args)
     return encodearg(s)
 
 def decodeargs(s):
     s = base64.decodestring(s)
     return pickle.loads(s)
 
 class MissingTool(Exception): pass
 
 def checktool(exe, name=None, abort=True):
     name = name or exe
     if not util.find_exe(exe):
         exc = abort and util.Abort or MissingTool
         raise exc(_('cannot find required "%s" tool') % name)
 
 class NoRepo(Exception): pass
 
 SKIPREV = 'SKIP'
 
 class commit(object):
     def __init__(self, author, date, desc, parents, branch=None, rev=None,
                  extra={}):
         self.author = author or 'unknown'
         self.date = date or '0 0'
         self.desc = desc
         self.parents = parents
         self.branch = branch
         self.rev = rev
         self.extra = extra
 
 class converter_source(object):
     """Conversion source interface"""
 
     def __init__(self, ui, path=None, rev=None):
         """Initialize conversion source (or raise NoRepo("message")
         exception if path is not a valid repository)"""
         self.ui = ui
         self.path = path
         self.rev = rev
 
         self.encoding = 'utf-8'
 
     def before(self):
         pass
 
     def after(self):
         pass
 
     def setrevmap(self, revmap):
         """set the map of already-converted revisions"""
         pass
 
     def getheads(self):
         """Return a list of this repository's heads"""
         raise NotImplementedError()
 
     def getfile(self, name, rev):
         """Return file contents as a string. rev is the identifier returned
         by a previous call to getchanges(). Raise IOError to indicate that
         name was deleted in rev.
         """
         raise NotImplementedError()
 
     def getmode(self, name, rev):
         """Return file mode, eg. '', 'x', or 'l'. rev is the identifier
         returned by a previous call to getchanges().
         """
         raise NotImplementedError()
 
     def getchanges(self, version):
         """Returns a tuple of (files, copies).
 
         files is a sorted list of (filename, id) tuples for all files
         changed between version and its first parent returned by
         getcommit(). id is the source revision id of the file.
 
         copies is a dictionary of dest: source
         """
         raise NotImplementedError()
 
     def getcommit(self, version):
         """Return the commit object for version"""
         raise NotImplementedError()
 
     def gettags(self):
         """Return the tags as a dictionary of name: revision"""
         raise NotImplementedError()
 
     def recode(self, s, encoding=None):
         if not encoding:
             encoding = self.encoding or 'utf-8'
 
         if isinstance(s, unicode):
             return s.encode("utf-8")
         try:
             return s.decode(encoding).encode("utf-8")
         except:
             try:
                 return s.decode("latin-1").encode("utf-8")
             except:
                 return s.decode(encoding, "replace").encode("utf-8")
 
     def getchangedfiles(self, rev, i):
         """Return the files changed by rev compared to parent[i].
 
         i is an index selecting one of the parents of rev.  The return
         value should be the list of files that are different in rev and
         this parent.
 
         If rev has no parents, i is None.
 
         This function is only needed to support --filemap
         """
         raise NotImplementedError()
 
     def converted(self, rev, sinkrev):
         '''Notify the source that a revision has been converted.'''
         pass
 
 
 class converter_sink(object):
     """Conversion sink (target) interface"""
 
     def __init__(self, ui, path):
         """Initialize conversion sink (or raise NoRepo("message")
         exception if path is not a valid repository)
 
         created is a list of paths to remove if a fatal error occurs
         later"""
         self.ui = ui
         self.path = path
         self.created = []
 
     def getheads(self):
         """Return a list of this repository's heads"""
         raise NotImplementedError()
 
     def revmapfile(self):
         """Path to a file that will contain lines
         source_rev_id sink_rev_id
         mapping equivalent revision identifiers for each system."""
         raise NotImplementedError()
 
     def authorfile(self):
         """Path to a file that will contain lines
         srcauthor=dstauthor
         mapping equivalent authors identifiers for each system."""
         return None
 
     def putcommit(self, files, copies, parents, commit, source):
         """Create a revision with all changed files listed in 'files'
         and having listed parents. 'commit' is a commit object containing
         at a minimum the author, date, and message for this changeset.
         'files' is a list of (path, version) tuples, 'copies'is a dictionary
         mapping destinations to sources, and 'source' is the source repository.
         Only getfile() and getmode() should be called on 'source'.
 
         Note that the sink repository is not told to update itself to
         a particular revision (or even what that revision would be)
         before it receives the file data.
         """
         raise NotImplementedError()
 
     def puttags(self, tags):
         """Put tags into sink.
         tags: {tagname: sink_rev_id, ...}"""
         raise NotImplementedError()
 
     def setbranch(self, branch, pbranches):
         """Set the current branch name. Called before the first putcommit
         on the branch.
         branch: branch name for subsequent commits
         pbranches: (converted parent revision, parent branch) tuples"""
         pass
 
     def setfilemapmode(self, active):
         """Tell the destination that we're using a filemap
 
         Some converter_sources (svn in particular) can claim that a file
         was changed in a revision, even if there was no change.  This method
         tells the destination that we're using a filemap and that it should
         filter empty revisions.
         """
         pass
 
     def before(self):
         pass
 
     def after(self):
         pass
 
 
 class commandline(object):
     def __init__(self, ui, command):
         self.ui = ui
         self.command = command
 
     def prerun(self):
         pass
 
     def postrun(self):
         pass
 
     def _cmdline(self, cmd, *args, **kwargs):
         cmdline = [self.command, cmd] + list(args)
         for k, v in kwargs.iteritems():
             if len(k) == 1:
                 cmdline.append('-' + k)
             else:
                 cmdline.append('--' + k.replace('_', '-'))
             try:
                 if len(k) == 1:
                     cmdline.append('' + v)
                 else:
                     cmdline[-1] += '=' + v
             except TypeError:
                 pass
         cmdline = [util.shellquote(arg) for arg in cmdline]
         if not self.ui.debugflag:
             cmdline += ['2>', util.nulldev]
         cmdline += ['<', util.nulldev]
         cmdline = ' '.join(cmdline)
         return cmdline
 
     def _run(self, cmd, *args, **kwargs):
         cmdline = self._cmdline(cmd, *args, **kwargs)
         self.ui.debug(_('running: %s\n') % (cmdline,))
         self.prerun()
         try:
             return util.popen(cmdline)
         finally:
             self.postrun()
 
     def run(self, cmd, *args, **kwargs):
         fp = self._run(cmd, *args, **kwargs)
         output = fp.read()
         self.ui.debug(output)
         return output, fp.close()
 
     def runlines(self, cmd, *args, **kwargs):
         fp = self._run(cmd, *args, **kwargs)
         output = fp.readlines()
         self.ui.debug(''.join(output))
         return output, fp.close()
 
     def checkexit(self, status, output=''):
         if status:
             if output:
                 self.ui.warn(_('%s error:\n') % self.command)
                 self.ui.warn(output)
             msg = util.explain_exit(status)[0]
             raise util.Abort(_('%s %s') % (self.command, msg))
 
     def run0(self, cmd, *args, **kwargs):
         output, status = self.run(cmd, *args, **kwargs)
         self.checkexit(status, output)
         return output
 
     def runlines0(self, cmd, *args, **kwargs):
         output, status = self.runlines(cmd, *args, **kwargs)
         self.checkexit(status, ''.join(output))
         return output
 
     def getargmax(self):
         if '_argmax' in self.__dict__:
             return self._argmax
 
         # POSIX requires at least 4096 bytes for ARG_MAX
         self._argmax = 4096
         try:
             self._argmax = os.sysconf("SC_ARG_MAX")
         except:
             pass
 
         # Windows shells impose their own limits on command line length,
         # down to 2047 bytes for cmd.exe under Windows NT/2k and 2500 bytes
         # for older 4nt.exe. See http://support.microsoft.com/kb/830473 for
         # details about cmd.exe limitations.
 
         # Since ARG_MAX is for command line _and_ environment, lower our limit
         # (and make happy Windows shells while doing this).
 
         self._argmax = self._argmax/2 - 1
         return self._argmax
 
     def limit_arglist(self, arglist, cmd, *args, **kwargs):
         limit = self.getargmax() - len(self._cmdline(cmd, *args, **kwargs))
         bytes = 0
         fl = []
         for fn in arglist:
             b = len(fn) + 3
             if bytes + b < limit or len(fl) == 0:
                 fl.append(fn)
                 bytes += b
             else:
                 yield fl
                 fl = [fn]
                 bytes = b
         if fl:
             yield fl
 
     def xargs(self, arglist, cmd, *args, **kwargs):
         for l in self.limit_arglist(arglist, cmd, *args, **kwargs):
             self.run0(cmd, *(list(args) + l), **kwargs)
 
 class mapfile(dict):
     def __init__(self, ui, path):
         super(mapfile, self).__init__()
         self.ui = ui
         self.path = path
         self.fp = None
         self.order = []
         self._read()
 
     def _read(self):
         if not self.path:
             return
         try:
             fp = open(self.path, 'r')
         except IOError, err:
             if err.errno != errno.ENOENT:
                 raise
             return
         for i, line in enumerate(fp):
             try:
                 key, value = line[:-1].rsplit(' ', 1)
             except ValueError:
                 raise util.Abort(_('syntax error in %s(%d): key/value pair expected')
                                  % (self.path, i+1))
             if key not in self:
                 self.order.append(key)
             super(mapfile, self).__setitem__(key, value)
         fp.close()
 
     def __setitem__(self, key, value):
         if self.fp is None:
             try:
                 self.fp = open(self.path, 'a')
             except IOError, err:
                 raise util.Abort(_('could not open map file %r: %s') %
                                  (self.path, err.strerror))
         self.fp.write('%s %s\n' % (key, value))
         self.fp.flush()
         super(mapfile, self).__setitem__(key, value)
 
     def close(self):
         if self.fp:
             self.fp.close()
             self.fp = None

hgext/inotify/__init__.py

@@ -1,110 +1,110 b''
 # __init__.py - inotify-based status acceleration for Linux
 #
 # Copyright 2006, 2007, 2008 Bryan O'Sullivan <[e-mail]>
 # Copyright 2007, 2008 Brendan Cully <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2, incorporated herein by reference.
 
 '''inotify-based status acceleration for Linux systems
 '''
 
 # todo: socket permissions
 
 from mercurial.i18n import _
 from mercurial import cmdutil, util
-import os, server
+import server
 from weakref import proxy
 from client import client, QueryFailed
 
 def serve(ui, repo, **opts):
     '''start an inotify server for this repository'''
     timeout = opts.get('timeout')
     if timeout:
         timeout = float(timeout) * 1e3
 
     class service:
         def init(self):
             try:
                 self.master = server.master(ui, repo, timeout)
             except server.AlreadyStartedException, inst:
                 raise util.Abort(str(inst))
 
         def run(self):
             try:
                 self.master.run()
             finally:
                 self.master.shutdown()
 
     service = service()
     cmdutil.service(opts, initfn=service.init, runfn=service.run)
 
 def debuginotify(ui, repo, **opts):
     '''debugging information for inotify extension
 
     Prints the list of directories being watched by the inotify server.
     '''
     cli = client(ui, repo)
     response = cli.debugquery()
 
     ui.write(_('directories being watched:\n'))
     for path in response:
         ui.write(('  %s/\n') % path)
 
 def reposetup(ui, repo):
     if not hasattr(repo, 'dirstate'):
         return
 
     # XXX: weakref until hg stops relying on __del__
     repo = proxy(repo)
 
     class inotifydirstate(repo.dirstate.__class__):
 
         # We'll set this to false after an unsuccessful attempt so that
         # next calls of status() within the same instance don't try again
         # to start an inotify server if it won't start.
         _inotifyon = True
 
         def status(self, match, ignored, clean, unknown=True):
             files = match.files()
             if '.' in files:
                 files = []
             if self._inotifyon and not ignored:
                 cli = client(ui, repo)
                 try:
                     result = cli.statusquery(files, match, False,
                                             clean, unknown)
                 except QueryFailed, instr:
                     ui.debug(str(instr))
                     # don't retry within the same hg instance
                     inotifydirstate._inotifyon = False
                     pass
                 else:
                     if ui.config('inotify', 'debug'):
                         r2 = super(inotifydirstate, self).status(
                             match, False, clean, unknown)
                         for c,a,b in zip('LMARDUIC', result, r2):
                             for f in a:
                                 if f not in b:
                                     ui.warn('*** inotify: %s +%s\n' % (c, f))
                             for f in b:
                                 if f not in a:
                                     ui.warn('*** inotify: %s -%s\n' % (c, f))
                         result = r2
                     return result
             return super(inotifydirstate, self).status(
                 match, ignored, clean, unknown)
 
     repo.dirstate.__class__ = inotifydirstate
 
 cmdtable = {
     'debuginotify':
         (debuginotify, [], ('hg debuginotify')),
     '^inserve':
         (serve,
          [('d', 'daemon', None, _('run server in background')),
           ('', 'daemon-pipefds', '', _('used internally by daemon mode')),
           ('t', 'idle-timeout', '', _('minutes to sit idle before exiting')),
           ('', 'pid-file', '', _('name of file to write process ID to'))],
          _('hg inserve [OPT]...')),
     }

mercurial/ui.py

@@ -1,346 +1,346 b''
 # ui.py - user interface bits for mercurial
 #
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
-import errno, getpass, os, re, socket, sys, tempfile, traceback
+import errno, getpass, os, socket, sys, tempfile, traceback
 import config, util, error
 
 _booleans = {'1': True, 'yes': True, 'true': True, 'on': True,
              '0': False, 'no': False, 'false': False, 'off': False}
 
 class ui(object):
     def __init__(self, src=None):
         self._buffers = []
         self.quiet = self.verbose = self.debugflag = self._traceback = False
         self._reportuntrusted = True
         self._ocfg = config.config() # overlay
         self._tcfg = config.config() # trusted
         self._ucfg = config.config() # untrusted
         self._trustusers = set()
         self._trustgroups = set()
 
         if src:
             self._tcfg = src._tcfg.copy()
             self._ucfg = src._ucfg.copy()
             self._ocfg = src._ocfg.copy()
             self._trustusers = src._trustusers.copy()
             self._trustgroups = src._trustgroups.copy()
             self.fixconfig()
         else:
             # we always trust global config files
             for f in util.rcpath():
                 self.readconfig(f, trust=True)
 
     def copy(self):
         return self.__class__(self)
 
     def _is_trusted(self, fp, f):
         st = util.fstat(fp)
         if util.isowner(fp, st):
             return True
 
         tusers, tgroups = self._trustusers, self._trustgroups
         if '*' in tusers or '*' in tgroups:
             return True
 
         user = util.username(st.st_uid)
         group = util.groupname(st.st_gid)
         if user in tusers or group in tgroups or user == util.username():
             return True
 
         if self._reportuntrusted:
             self.warn(_('Not trusting file %s from untrusted '
                         'user %s, group %s\n') % (f, user, group))
         return False
 
     def readconfig(self, filename, root=None, trust=False,
                    sections=None, remap=None):
         try:
             fp = open(filename)
         except IOError:
             if not sections: # ignore unless we were looking for something
                 return
             raise
 
         cfg = config.config()
         trusted = sections or trust or self._is_trusted(fp, filename)
 
         try:
             cfg.read(filename, fp, sections=sections, remap=remap)
         except error.ConfigError, inst:
             if trusted:
                 raise
             self.warn(_("Ignored: %s\n") % str(inst))
 
         if trusted:
             self._tcfg.update(cfg)
             self._tcfg.update(self._ocfg)
         self._ucfg.update(cfg)
         self._ucfg.update(self._ocfg)
 
         if root is None:
             root = os.path.expanduser('~')
         self.fixconfig(root=root)
 
     def fixconfig(self, root=None):
         # translate paths relative to root (or home) into absolute paths
         root = root or os.getcwd()
         for c in self._tcfg, self._ucfg, self._ocfg:
             for n, p in c.items('paths'):
                 if p and "://" not in p and not os.path.isabs(p):
                     c.set("paths", n, os.path.normpath(os.path.join(root, p)))
 
         # update ui options
         self.debugflag = self.configbool('ui', 'debug')
         self.verbose = self.debugflag or self.configbool('ui', 'verbose')
         self.quiet = not self.debugflag and self.configbool('ui', 'quiet')
         if self.verbose and self.quiet:
             self.quiet = self.verbose = False
         self._reportuntrusted = self.configbool("ui", "report_untrusted", True)
         self._traceback = self.configbool('ui', 'traceback', False)
 
         # update trust information
         self._trustusers.update(self.configlist('trusted', 'users'))
         self._trustgroups.update(self.configlist('trusted', 'groups'))
 
     def setconfig(self, section, name, value):
         for cfg in (self._ocfg, self._tcfg, self._ucfg):
             cfg.set(section, name, value)
         self.fixconfig()
 
     def _data(self, untrusted):
         return untrusted and self._ucfg or self._tcfg
 
     def configsource(self, section, name, untrusted=False):
         return self._data(untrusted).source(section, name) or 'none'
 
     def config(self, section, name, default=None, untrusted=False):
         value = self._data(untrusted).get(section, name, default)
         if self.debugflag and not untrusted and self._reportuntrusted:
             uvalue = self._ucfg.get(section, name)
             if uvalue is not None and uvalue != value:
                 self.debug(_("ignoring untrusted configuration option "
                              "%s.%s = %s\n") % (section, name, uvalue))
         return value
 
     def configbool(self, section, name, default=False, untrusted=False):
         v = self.config(section, name, None, untrusted)
         if v is None:
             return default
         if v.lower() not in _booleans:
             raise error.ConfigError(_("%s.%s not a boolean ('%s')")
                                     % (section, name, v))
         return _booleans[v.lower()]
 
     def configlist(self, section, name, default=None, untrusted=False):
         """Return a list of comma/space separated strings"""
         result = self.config(section, name, untrusted=untrusted)
         if result is None:
             result = default or []
         if isinstance(result, basestring):
             result = result.replace(",", " ").split()
         return result
 
     def has_section(self, section, untrusted=False):
         '''tell whether section exists in config.'''
         return section in self._data(untrusted)
 
     def configitems(self, section, untrusted=False):
         items = self._data(untrusted).items(section)
         if self.debugflag and not untrusted and self._reportuntrusted:
             for k, v in self._ucfg.items(section):
                 if self._tcfg.get(section, k) != v:
                     self.debug(_("ignoring untrusted configuration option "
                                 "%s.%s = %s\n") % (section, k, v))
         return items
 
     def walkconfig(self, untrusted=False):
         cfg = self._data(untrusted)
         for section in cfg.sections():
             for name, value in self.configitems(section, untrusted):
                 yield section, name, str(value).replace('\n', '\\n')
 
     def username(self):
         """Return default username to be used in commits.
 
         Searched in this order: $HGUSER, [ui] section of hgrcs, $EMAIL
         and stop searching if one of these is set.
         If not found and ui.askusername is True, ask the user, else use
         ($LOGNAME or $USER or $LNAME or $USERNAME) + "@full.hostname".
         """
         user = os.environ.get("HGUSER")
         if user is None:
             user = self.config("ui", "username")
         if user is None:
             user = os.environ.get("EMAIL")
         if user is None and self.configbool("ui", "askusername"):
             user = self.prompt(_("enter a commit username:"), default=None)
         if user is None:
             try:
                 user = '%s@%s' % (util.getuser(), socket.getfqdn())
                 self.warn(_("No username found, using '%s' instead\n") % user)
             except KeyError:
                 pass
         if not user:
             raise util.Abort(_("Please specify a username."))
         if "\n" in user:
             raise util.Abort(_("username %s contains a newline\n") % repr(user))
         return user
 
     def shortuser(self, user):
         """Return a short representation of a user name or email address."""
         if not self.verbose: user = util.shortuser(user)
         return user
 
     def _path(self, loc):
         p = self.config('paths', loc)
         if p and '%%' in p:
             self.warn('(deprecated \'%%\' in path %s=%s from %s)\n' %
                     (loc, p, self.configsource('paths', loc)))
             p = p.replace('%%', '%')
         return p
 
     def expandpath(self, loc, default=None):
         """Return repository location relative to cwd or from [paths]"""
         if "://" in loc or os.path.isdir(os.path.join(loc, '.hg')):
             return loc
 
         path = self._path(loc)
         if not path and default is not None:
             path = self._path(default)
         return path or loc
 
     def pushbuffer(self):
         self._buffers.append([])
 
     def popbuffer(self):
         return "".join(self._buffers.pop())
 
     def write(self, *args):
         if self._buffers:
             self._buffers[-1].extend([str(a) for a in args])
         else:
             for a in args:
                 sys.stdout.write(str(a))
 
     def write_err(self, *args):
         try:
             if not sys.stdout.closed: sys.stdout.flush()
             for a in args:
                 sys.stderr.write(str(a))
             # stderr may be buffered under win32 when redirected to files,
             # including stdout.
             if not sys.stderr.closed: sys.stderr.flush()
         except IOError, inst:
             if inst.errno != errno.EPIPE:
                 raise
 
     def flush(self):
         try: sys.stdout.flush()
         except: pass
         try: sys.stderr.flush()
         except: pass
 
     def interactive(self):
         i = self.configbool("ui", "interactive", None)
         if i is None:
             return sys.stdin.isatty()
         return i
 
     def _readline(self, prompt=''):
         if sys.stdin.isatty():
             try:
                 # magically add command line editing support, where
                 # available
                 import readline
                 # force demandimport to really load the module
                 readline.read_history_file
                 # windows sometimes raises something other than ImportError
             except Exception:
                 pass
         line = raw_input(prompt)
         # When stdin is in binary mode on Windows, it can cause
         # raw_input() to emit an extra trailing carriage return
         if os.linesep == '\r\n' and line and line[-1] == '\r':
             line = line[:-1]
         return line
 
     def prompt(self, msg, choices=None, default="y"):
         """Prompt user with msg, read response, and ensure it matches
         one of the provided choices. choices is a sequence of acceptable
         responses with the format: ('&None', 'E&xec', 'Sym&link')
         No sequence implies no response checking. Responses are case
         insensitive. If ui is not interactive, the default is returned.
         """
         if not self.interactive():
             self.note(msg, ' ', default, "\n")
             return default
         while True:
             try:
                 r = self._readline(msg + ' ')
                 if not r:
                     return default
                 if not choices:
                     return r
                 resps = [s[s.index('&')+1].lower() for s in choices]
                 if r.lower() in resps:
                     return r.lower()
                 else:
                     self.write(_("unrecognized response\n"))
             except EOFError:
                 raise util.Abort(_('response expected'))
 
     def getpass(self, prompt=None, default=None):
         if not self.interactive(): return default
         try:
             return getpass.getpass(prompt or _('password: '))
         except EOFError:
             raise util.Abort(_('response expected'))
     def status(self, *msg):
         if not self.quiet: self.write(*msg)
     def warn(self, *msg):
         self.write_err(*msg)
     def note(self, *msg):
         if self.verbose: self.write(*msg)
     def debug(self, *msg):
         if self.debugflag: self.write(*msg)
     def edit(self, text, user):
         (fd, name) = tempfile.mkstemp(prefix="hg-editor-", suffix=".txt",
                                       text=True)
         try:
             f = os.fdopen(fd, "w")
             f.write(text)
             f.close()
 
             editor = self.geteditor()
 
             util.system("%s \"%s\"" % (editor, name),
                         environ={'HGUSER': user},
                         onerr=util.Abort, errprefix=_("edit failed"))
 
             f = open(name)
             t = f.read()
             f.close()
         finally:
             os.unlink(name)
 
         return t
 
     def traceback(self):
         '''print exception traceback if traceback printing enabled.
         only to call in exception handler. returns true if traceback
         printed.'''
         if self._traceback:
             traceback.print_exc()
         return self._traceback
 
     def geteditor(self):
         '''return editor to use'''
         return (os.environ.get("HGEDITOR") or
                 self.config("ui", "editor") or
                 os.environ.get("VISUAL") or
                 os.environ.get("EDITOR", "vi"))

mercurial/win32.py

@@ -1,279 +1,278 b''
 # win32.py - utility functions that use win32 API
 #
 # Copyright 2005-2009 Matt Mackall <[e-mail]> and others
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2, incorporated herein by reference.
 
 """Utility functions that use win32 API.
 
 Mark Hammond's win32all package allows better functionality on
 Windows. This module overrides definitions in util.py. If not
 available, import of this module will fail, and generic code will be
 used.
 """
 
 import win32api
 
 import errno, os, sys, pywintypes, win32con, win32file, win32process
-import cStringIO, winerror
+import winerror
 import osutil, encoding
-import util
 from win32com.shell import shell,shellcon
 
 class WinError(Exception):
     winerror_map = {
         winerror.ERROR_ACCESS_DENIED: errno.EACCES,
         winerror.ERROR_ACCOUNT_DISABLED: errno.EACCES,
         winerror.ERROR_ACCOUNT_RESTRICTION: errno.EACCES,
         winerror.ERROR_ALREADY_ASSIGNED: errno.EBUSY,
         winerror.ERROR_ALREADY_EXISTS: errno.EEXIST,
         winerror.ERROR_ARITHMETIC_OVERFLOW: errno.ERANGE,
         winerror.ERROR_BAD_COMMAND: errno.EIO,
         winerror.ERROR_BAD_DEVICE: errno.ENODEV,
         winerror.ERROR_BAD_DRIVER_LEVEL: errno.ENXIO,
         winerror.ERROR_BAD_EXE_FORMAT: errno.ENOEXEC,
         winerror.ERROR_BAD_FORMAT: errno.ENOEXEC,
         winerror.ERROR_BAD_LENGTH: errno.EINVAL,
         winerror.ERROR_BAD_PATHNAME: errno.ENOENT,
         winerror.ERROR_BAD_PIPE: errno.EPIPE,
         winerror.ERROR_BAD_UNIT: errno.ENODEV,
         winerror.ERROR_BAD_USERNAME: errno.EINVAL,
         winerror.ERROR_BROKEN_PIPE: errno.EPIPE,
         winerror.ERROR_BUFFER_OVERFLOW: errno.ENAMETOOLONG,
         winerror.ERROR_BUSY: errno.EBUSY,
         winerror.ERROR_BUSY_DRIVE: errno.EBUSY,
         winerror.ERROR_CALL_NOT_IMPLEMENTED: errno.ENOSYS,
         winerror.ERROR_CANNOT_MAKE: errno.EACCES,
         winerror.ERROR_CANTOPEN: errno.EIO,
         winerror.ERROR_CANTREAD: errno.EIO,
         winerror.ERROR_CANTWRITE: errno.EIO,
         winerror.ERROR_CRC: errno.EIO,
         winerror.ERROR_CURRENT_DIRECTORY: errno.EACCES,
         winerror.ERROR_DEVICE_IN_USE: errno.EBUSY,
         winerror.ERROR_DEV_NOT_EXIST: errno.ENODEV,
         winerror.ERROR_DIRECTORY: errno.EINVAL,
         winerror.ERROR_DIR_NOT_EMPTY: errno.ENOTEMPTY,
         winerror.ERROR_DISK_CHANGE: errno.EIO,
         winerror.ERROR_DISK_FULL: errno.ENOSPC,
         winerror.ERROR_DRIVE_LOCKED: errno.EBUSY,
         winerror.ERROR_ENVVAR_NOT_FOUND: errno.EINVAL,
         winerror.ERROR_EXE_MARKED_INVALID: errno.ENOEXEC,
         winerror.ERROR_FILENAME_EXCED_RANGE: errno.ENAMETOOLONG,
         winerror.ERROR_FILE_EXISTS: errno.EEXIST,
         winerror.ERROR_FILE_INVALID: errno.ENODEV,
         winerror.ERROR_FILE_NOT_FOUND: errno.ENOENT,
         winerror.ERROR_GEN_FAILURE: errno.EIO,
         winerror.ERROR_HANDLE_DISK_FULL: errno.ENOSPC,
         winerror.ERROR_INSUFFICIENT_BUFFER: errno.ENOMEM,
         winerror.ERROR_INVALID_ACCESS: errno.EACCES,
         winerror.ERROR_INVALID_ADDRESS: errno.EFAULT,
         winerror.ERROR_INVALID_BLOCK: errno.EFAULT,
         winerror.ERROR_INVALID_DATA: errno.EINVAL,
         winerror.ERROR_INVALID_DRIVE: errno.ENODEV,
         winerror.ERROR_INVALID_EXE_SIGNATURE: errno.ENOEXEC,
         winerror.ERROR_INVALID_FLAGS: errno.EINVAL,
         winerror.ERROR_INVALID_FUNCTION: errno.ENOSYS,
         winerror.ERROR_INVALID_HANDLE: errno.EBADF,
         winerror.ERROR_INVALID_LOGON_HOURS: errno.EACCES,
         winerror.ERROR_INVALID_NAME: errno.EINVAL,
         winerror.ERROR_INVALID_OWNER: errno.EINVAL,
         winerror.ERROR_INVALID_PARAMETER: errno.EINVAL,
         winerror.ERROR_INVALID_PASSWORD: errno.EPERM,
         winerror.ERROR_INVALID_PRIMARY_GROUP: errno.EINVAL,
         winerror.ERROR_INVALID_SIGNAL_NUMBER: errno.EINVAL,
         winerror.ERROR_INVALID_TARGET_HANDLE: errno.EIO,
         winerror.ERROR_INVALID_WORKSTATION: errno.EACCES,
         winerror.ERROR_IO_DEVICE: errno.EIO,
         winerror.ERROR_IO_INCOMPLETE: errno.EINTR,
         winerror.ERROR_LOCKED: errno.EBUSY,
         winerror.ERROR_LOCK_VIOLATION: errno.EACCES,
         winerror.ERROR_LOGON_FAILURE: errno.EACCES,
         winerror.ERROR_MAPPED_ALIGNMENT: errno.EINVAL,
         winerror.ERROR_META_EXPANSION_TOO_LONG: errno.E2BIG,
         winerror.ERROR_MORE_DATA: errno.EPIPE,
         winerror.ERROR_NEGATIVE_SEEK: errno.ESPIPE,
         winerror.ERROR_NOACCESS: errno.EFAULT,
         winerror.ERROR_NONE_MAPPED: errno.EINVAL,
         winerror.ERROR_NOT_ENOUGH_MEMORY: errno.ENOMEM,
         winerror.ERROR_NOT_READY: errno.EAGAIN,
         winerror.ERROR_NOT_SAME_DEVICE: errno.EXDEV,
         winerror.ERROR_NO_DATA: errno.EPIPE,
         winerror.ERROR_NO_MORE_SEARCH_HANDLES: errno.EIO,
         winerror.ERROR_NO_PROC_SLOTS: errno.EAGAIN,
         winerror.ERROR_NO_SUCH_PRIVILEGE: errno.EACCES,
         winerror.ERROR_OPEN_FAILED: errno.EIO,
         winerror.ERROR_OPEN_FILES: errno.EBUSY,
         winerror.ERROR_OPERATION_ABORTED: errno.EINTR,
         winerror.ERROR_OUTOFMEMORY: errno.ENOMEM,
         winerror.ERROR_PASSWORD_EXPIRED: errno.EACCES,
         winerror.ERROR_PATH_BUSY: errno.EBUSY,
         winerror.ERROR_PATH_NOT_FOUND: errno.ENOENT,
         winerror.ERROR_PIPE_BUSY: errno.EBUSY,
         winerror.ERROR_PIPE_CONNECTED: errno.EPIPE,
         winerror.ERROR_PIPE_LISTENING: errno.EPIPE,
         winerror.ERROR_PIPE_NOT_CONNECTED: errno.EPIPE,
         winerror.ERROR_PRIVILEGE_NOT_HELD: errno.EACCES,
         winerror.ERROR_READ_FAULT: errno.EIO,
         winerror.ERROR_SEEK: errno.EIO,
         winerror.ERROR_SEEK_ON_DEVICE: errno.ESPIPE,
         winerror.ERROR_SHARING_BUFFER_EXCEEDED: errno.ENFILE,
         winerror.ERROR_SHARING_VIOLATION: errno.EACCES,
         winerror.ERROR_STACK_OVERFLOW: errno.ENOMEM,
         winerror.ERROR_SWAPERROR: errno.ENOENT,
         winerror.ERROR_TOO_MANY_MODULES: errno.EMFILE,
         winerror.ERROR_TOO_MANY_OPEN_FILES: errno.EMFILE,
         winerror.ERROR_UNRECOGNIZED_MEDIA: errno.ENXIO,
         winerror.ERROR_UNRECOGNIZED_VOLUME: errno.ENODEV,
         winerror.ERROR_WAIT_NO_CHILDREN: errno.ECHILD,
         winerror.ERROR_WRITE_FAULT: errno.EIO,
         winerror.ERROR_WRITE_PROTECT: errno.EROFS,
         }
 
     def __init__(self, err):
         try:
             # unpack a pywintypes.error tuple
             self.win_errno, self.win_function, self.win_strerror = err
         except ValueError:
             # get attributes from a WindowsError
             self.win_errno = err.winerror
             self.win_function = None
             self.win_strerror = err.strerror
         self.win_strerror = self.win_strerror.rstrip('.')
 
 class WinIOError(WinError, IOError):
     def __init__(self, err, filename=None):
         WinError.__init__(self, err)
         IOError.__init__(self, self.winerror_map.get(self.win_errno, 0),
                          self.win_strerror)
         self.filename = filename
 
 class WinOSError(WinError, OSError):
     def __init__(self, err):
         WinError.__init__(self, err)
         OSError.__init__(self, self.winerror_map.get(self.win_errno, 0),
                          self.win_strerror)
 
 def os_link(src, dst):
     try:
         win32file.CreateHardLink(dst, src)
         # CreateHardLink sometimes succeeds on mapped drives but
         # following nlinks() returns 1. Check it now and bail out.
         if nlinks(src) < 2:
             try:
                 win32file.DeleteFile(dst)
             except:
                 pass
             # Fake hardlinking error
             raise WinOSError((18, 'CreateHardLink', 'The system cannot '
                               'move the file to a different disk drive'))
     except pywintypes.error, details:
         raise WinOSError(details)
     except NotImplementedError: # Another fake error win Win98
         raise WinOSError((18, 'CreateHardLink', 'Hardlinking not supported'))
 
 def nlinks(pathname):
     """Return number of hardlinks for the given file."""
     try:
         fh = win32file.CreateFile(pathname,
             win32file.GENERIC_READ, win32file.FILE_SHARE_READ,
             None, win32file.OPEN_EXISTING, 0, None)
         res = win32file.GetFileInformationByHandle(fh)
         fh.Close()
         return res[7]
     except pywintypes.error:
         return os.lstat(pathname).st_nlink
 
 def testpid(pid):
     '''return True if pid is still running or unable to
     determine, False otherwise'''
     try:
         handle = win32api.OpenProcess(
             win32con.PROCESS_QUERY_INFORMATION, False, pid)
         if handle:
             status = win32process.GetExitCodeProcess(handle)
             return status == win32con.STILL_ACTIVE
     except pywintypes.error, details:
         return details[0] != winerror.ERROR_INVALID_PARAMETER
     return True
 
 def lookup_reg(key, valname=None, scope=None):
     ''' Look up a key/value name in the Windows registry.
 
     valname: value name. If unspecified, the default value for the key
     is used.
     scope: optionally specify scope for registry lookup, this can be
     a sequence of scopes to look up in order. Default (CURRENT_USER,
     LOCAL_MACHINE).
     '''
     try:
         from _winreg import HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE, \
             QueryValueEx, OpenKey
     except ImportError:
         return None
 
     if scope is None:
         scope = (HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE)
     elif not isinstance(scope, (list, tuple)):
         scope = (scope,)
     for s in scope:
         try:
             val = QueryValueEx(OpenKey(s, key), valname)[0]
             # never let a Unicode string escape into the wild
             return encoding.tolocal(val.encode('UTF-8'))
         except EnvironmentError:
             pass
 
 def system_rcpath_win32():
     '''return default os-specific hgrc search path'''
     proc = win32api.GetCurrentProcess()
     try:
         # This will fail on windows < NT
         filename = win32process.GetModuleFileNameEx(proc, 0)
     except:
         filename = win32api.GetModuleFileName(0)
     # Use mercurial.ini found in directory with hg.exe
     progrc = os.path.join(os.path.dirname(filename), 'mercurial.ini')
     if os.path.isfile(progrc):
         return [progrc]
     # else look for a system rcpath in the registry
     try:
         value = win32api.RegQueryValue(
                 win32con.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Mercurial')
         rcpath = []
         for p in value.split(os.pathsep):
             if p.lower().endswith('mercurial.ini'):
                 rcpath.append(p)
             elif os.path.isdir(p):
                 for f, kind in osutil.listdir(p):
                     if f.endswith('.rc'):
                         rcpath.append(os.path.join(p, f))
         return rcpath
     except pywintypes.error:
         return []
 
 def user_rcpath_win32():
     '''return os-specific hgrc search path to the user dir'''
     userdir = os.path.expanduser('~')
     if sys.getwindowsversion()[3] != 2 and userdir == '~':
         # We are on win < nt: fetch the APPDATA directory location and use
         # the parent directory as the user home dir.
         appdir = shell.SHGetPathFromIDList(
             shell.SHGetSpecialFolderLocation(0, shellcon.CSIDL_APPDATA))
         userdir = os.path.dirname(appdir)
     return [os.path.join(userdir, 'mercurial.ini'),
             os.path.join(userdir, '.hgrc')]
 
 def getuser():
     '''return name of current user'''
     return win32api.GetUserName()
 
 def set_signal_handler_win32():
     """Register a termination handler for console events including
     CTRL+C. python signal handlers do not work well with socket
     operations.
     """
     def handler(event):
         win32process.ExitProcess(1)
     win32api.SetConsoleCtrlHandler(handler)
 

tests/test-bdiff.py

@@ -1,54 +1,54 b''
 #!/usr/bin/env python
 
-import sys, struct
+import struct
 from mercurial import bdiff, mpatch
 
 def test1(a, b):
     d = bdiff.bdiff(a, b)
     c = a
     if d:
         c = mpatch.patches(a, [d])
     if c != b:
         print "***", repr(a), repr(b)
         print "bad:"
         print repr(c)[:200]
         print repr(d)
 
 def test(a, b):
     print "***", repr(a), repr(b)
     test1(a, b)
     test1(b, a)
 
 test("a\nc\n\n\n\n", "a\nb\n\n\n")
 test("a\nb\nc\n", "a\nc\n")
 test("", "")
 test("a\nb\nc", "a\nb\nc")
 test("a\nb\nc\nd\n", "a\nd\n")
 test("a\nb\nc\nd\n", "a\nc\ne\n")
 test("a\nb\nc\n", "a\nc\n")
 test("a\n", "c\na\nb\n")
 test("a\n", "")
 test("a\n", "b\nc\n")
 test("a\n", "c\na\n")
 test("", "adjfkjdjksdhfksj")
 test("", "ab")
 test("", "abc")
 test("a", "a")
 test("ab", "ab")
 test("abc", "abc")
 test("a\n", "a\n")
 test("a\nb", "a\nb")
 
 #issue1295
 def showdiff(a, b):
     bin = bdiff.bdiff(a, b)
     pos = 0
     while pos < len(bin):
         p1, p2, l = struct.unpack(">lll", bin[pos:pos + 12])
         pos += 12
         print p1, p2, repr(bin[pos:pos + l])
         pos += l
 showdiff("x\n\nx\n\nx\n\nx\n\nz\n", "x\n\nx\n\ny\n\nx\n\nx\n\nz\n")
 showdiff("x\n\nx\n\nx\n\nx\n\nz\n", "x\n\nx\n\ny\n\nx\n\ny\n\nx\n\nz\n")
 
 print "done"

tests/test-revlog-ancestry.py

@@ -1,74 +1,73 b''
 import os
 from mercurial import hg, ui, merge
-from hgext import graphlog
 
 u = ui.ui()
 
 repo = hg.repository(u, 'test1', create=1)
 os.chdir('test1')
 
 def commit(text, time):
     repo.commit(text=text, date="%d 0" % time)
 
 def addcommit(name, time):
     f = file(name, 'w')
     f.write('%s\n' % name)
     f.close()
     repo.add([name])
     commit(name, time)
 
 def update(rev):
     merge.update(repo, rev, False, True, False)
 
 def merge_(rev):
     merge.update(repo, rev, True, False, False)
 
 if __name__ == '__main__':
     addcommit("A", 0)
     addcommit("B", 1)
 
     update(0)
     addcommit("C", 2)
 
     merge_(1)
     commit("D", 3)
 
     update(2)
     addcommit("E", 4)
     addcommit("F", 5)
 
     update(3)
     addcommit("G", 6)
 
     merge_(5)
     commit("H", 7)
 
     update(5)
     addcommit("I", 8)
 
     # Ancestors
     print 'Ancestors of 5'
     for r in repo.changelog.ancestors(5):
         print r,
 
     print '\nAncestors of 6 and 5'
     for r in repo.changelog.ancestors(6, 5):
         print r,
 
     print '\nAncestors of 5 and 4'
     for r in repo.changelog.ancestors(5, 4):
         print r,
 
     # Descendants
     print '\n\nDescendants of 5'
     for r in repo.changelog.descendants(5):
         print r,
 
     print '\nDescendants of 5 and 3'
     for r in repo.changelog.descendants(5, 3):
         print r,
 
     print '\nDescendants of 5 and 4'
     for r in repo.changelog.descendants(5, 4):
         print r,
 

tests/test-ui-config.py

@@ -1,55 +1,55 b''
 #!/usr/bin/env python
 
-from mercurial import ui, util, dispatch, error
+from mercurial import ui, dispatch, error
 
 testui = ui.ui()
 parsed = dispatch._parseconfig(testui, [
     'values.string=string value',
     'values.bool1=true',
     'values.bool2=false',
     'lists.list1=foo',
     'lists.list2=foo bar baz',
     'lists.list3=alice, bob',
     'lists.list4=foo bar baz alice, bob',
 ])
 
 print repr(testui.configitems('values'))
 print repr(testui.configitems('lists'))
 print "---"
 print repr(testui.config('values', 'string'))
 print repr(testui.config('values', 'bool1'))
 print repr(testui.config('values', 'bool2'))
 print repr(testui.config('values', 'unknown'))
 print "---"
 try:
     print repr(testui.configbool('values', 'string'))
 except error.ConfigError, inst:
     print inst
 print repr(testui.configbool('values', 'bool1'))
 print repr(testui.configbool('values', 'bool2'))
 print repr(testui.configbool('values', 'bool2', True))
 print repr(testui.configbool('values', 'unknown'))
 print repr(testui.configbool('values', 'unknown', True))
 print "---"
 print repr(testui.configlist('lists', 'list1'))
 print repr(testui.configlist('lists', 'list2'))
 print repr(testui.configlist('lists', 'list3'))
 print repr(testui.configlist('lists', 'list4'))
 print repr(testui.configlist('lists', 'list4', ['foo']))
 print repr(testui.configlist('lists', 'unknown'))
 print repr(testui.configlist('lists', 'unknown', ''))
 print repr(testui.configlist('lists', 'unknown', 'foo'))
 print repr(testui.configlist('lists', 'unknown', ['foo']))
 print repr(testui.configlist('lists', 'unknown', 'foo bar'))
 print repr(testui.configlist('lists', 'unknown', 'foo, bar'))
 print repr(testui.configlist('lists', 'unknown', ['foo bar']))
 print repr(testui.configlist('lists', 'unknown', ['foo', 'bar']))
 
 print repr(testui.config('values', 'String'))
 
 def function():
     pass
 
 # values that aren't strings should work
 testui.setconfig('hook', 'commit', function)
 print function == testui.config('hook', 'commit')

tests/test-walkrepo.py

@@ -1,53 +1,52 b''
 import os
-import os.path
 from mercurial import hg, ui
 from mercurial.util import walkrepos
 from os import mkdir, chdir
 from os.path import join as pjoin
 
 u = ui.ui()
 sym = hasattr(os, 'symlink') and hasattr(os.path, 'samestat')
 
 hg.repository(u, 'top1', create=1)
 mkdir('subdir')
 chdir('subdir')
 hg.repository(u, 'sub1', create=1)
 mkdir('subsubdir')
 chdir('subsubdir')
 hg.repository(u, 'subsub1', create=1)
 chdir(os.path.pardir)
 if sym:
     os.symlink(os.path.pardir, 'circle')
     os.symlink(pjoin('subsubdir', 'subsub1'), 'subsub1')
 
 def runtest():
     reposet = frozenset(walkrepos('.', followsym=True))
     if sym and (len(reposet) != 3):
         print "reposet = %r" % (reposet,)
         print "Found %d repositories when I should have found 3" % (len(reposet),)
     if (not sym) and (len(reposet) != 2):
         print "reposet = %r" % (reposet,)
         print "Found %d repositories when I should have found 2" % (len(reposet),)
     sub1set = frozenset((pjoin('.', 'sub1'),
                          pjoin('.', 'circle', 'subdir', 'sub1')))
     if len(sub1set & reposet) != 1:
         print "sub1set = %r" % (sub1set,)
         print "reposet = %r" % (reposet,)
         print "sub1set and reposet should have exactly one path in common."
     sub2set = frozenset((pjoin('.', 'subsub1'),
                          pjoin('.', 'subsubdir', 'subsub1')))
     if len(sub2set & reposet) != 1:
         print "sub2set = %r" % (sub2set,)
         print "reposet = %r" % (reposet,)
         print "sub1set and reposet should have exactly one path in common."
     sub3 = pjoin('.', 'circle', 'top1')
     if sym and not (sub3 in reposet):
         print "reposet = %r" % (reposet,)
         print "Symbolic links are supported and %s is not in reposet" % (sub3,)
 
 runtest()
 if sym:
     # Simulate not having symlinks.
     del os.path.samestat
     sym = False
     runtest()