changeset 1560:6efad1cc07de

Merge with http://hg.omnifarious.org/~hopper/mercurial

--- a/contrib/hbisect.py	Sun Nov 27 16:37:18 2005 +0100
+++ b/contrib/hbisect.py	Tue Nov 29 18:06:23 2005 +0100
@@ -26,7 +26,7 @@
             ui.warn("Repository is not clean, please commit or revert\n")
             sys.exit(1)
 
-class bisect:
+class bisect(object):
     """dichotomic search in the DAG of changesets"""
     def __init__(self, ui, repo):
         self.repo = repo

--- a/mercurial/commands.py	Sun Nov 27 16:37:18 2005 +0100
+++ b/mercurial/commands.py	Tue Nov 29 18:06:23 2005 +0100
@@ -678,7 +678,7 @@
 
     dest = os.path.realpath(dest)
 
-    class Dircleanup:
+    class Dircleanup(object):
         def __init__(self, dir_):
             self.rmtree = shutil.rmtree
             self.dir_ = dir_
@@ -1188,7 +1188,7 @@
             yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
             begin = lend + 1
 
-    class linestate:
+    class linestate(object):
         def __init__(self, line, linenum, colstart, colend):
             self.line = line
             self.linenum = linenum
@@ -1479,7 +1479,7 @@
     commit. When the -v/--verbose switch is used, the list of changed
     files and full commit message is shown.
     """
-    class dui:
+    class dui(object):
         # Implement and delegate some ui protocol.  Save hunks of
         # output for later display in the desired order.
         def __init__(self, ui):

--- a/mercurial/dirstate.py	Sun Nov 27 16:37:18 2005 +0100
+++ b/mercurial/dirstate.py	Tue Nov 29 18:06:23 2005 +0100
@@ -13,7 +13,7 @@
 from demandload import *
 demandload(globals(), "time bisect stat util re errno")
 
-class dirstate:
+class dirstate(object):
     def __init__(self, opener, ui, root):
         self.opener = opener
         self.root = root

--- a/mercurial/hgweb.py	Sun Nov 27 16:37:18 2005 +0100
+++ b/mercurial/hgweb.py	Tue Nov 29 18:06:23 2005 +0100
@@ -71,7 +71,7 @@
     else:
         return os.stat(hg_path).st_mtime
 
-class hgrequest:
+class hgrequest(object):
     def __init__(self, inp=None, out=None, env=None):
         self.inp = inp or sys.stdin
         self.out = out or sys.stdout
@@ -104,7 +104,7 @@
             headers.append(('Content-length', str(size)))
         self.header(headers)
 
-class templater:
+class templater(object):
     def __init__(self, mapfile, filters={}, defaults={}):
         self.cache = {}
         self.map = {}
@@ -175,7 +175,7 @@
     "rfc822date": lambda x: util.datestr(x, "%a, %d %b %Y %H:%M:%S"),
     }
 
-class hgweb:
+class hgweb(object):
     def __init__(self, repo, name=None):
         if type(repo) == type(""):
             self.repo = hg.repository(ui.ui(), repo)
@@ -952,7 +952,7 @@
         return BaseHTTPServer.HTTPServer((address, port), hgwebhandler)
 
 # This is a stopgap
-class hgwebdir:
+class hgwebdir(object):
     def __init__(self, config):
         def cleannames(items):
             return [(name.strip('/'), path) for name, path in items]

--- a/mercurial/httprangereader.py	Sun Nov 27 16:37:18 2005 +0100
+++ b/mercurial/httprangereader.py	Tue Nov 29 18:06:23 2005 +0100
@@ -7,7 +7,7 @@
 
 import byterange, urllib2
 
-class httprangereader:
+class httprangereader(object):
     def __init__(self, url):
         self.url = url
         self.pos = 0

--- a/mercurial/localrepo.py	Sun Nov 27 16:37:18 2005 +0100
+++ b/mercurial/localrepo.py	Tue Nov 29 18:06:23 2005 +0100
@@ -12,7 +12,7 @@
 from demandload import *
 demandload(globals(), "re lock transaction tempfile stat mdiff errno")
 
-class localrepository:
+class localrepository(object):
     def __init__(self, ui, path=None, create=0):
         if not path:
             p = os.getcwd()

--- a/mercurial/lock.py	Sun Nov 27 16:37:18 2005 +0100
+++ b/mercurial/lock.py	Tue Nov 29 18:06:23 2005 +0100
@@ -11,7 +11,7 @@
 class LockHeld(Exception):
     pass
 
-class lock:
+class lock(object):
     def __init__(self, file, wait=1, releasefn=None):
         self.f = file
         self.held = 0

--- a/mercurial/remoterepo.py	Sun Nov 27 16:37:18 2005 +0100
+++ b/mercurial/remoterepo.py	Tue Nov 29 18:06:23 2005 +0100
@@ -5,11 +5,11 @@
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-class remoterepository:
+class remoterepository(object):
     def local(self):
         return False
 
-class remotelock:
+class remotelock(object):
     def __init__(self, repo):
         self.repo = repo
     def release(self):

--- a/mercurial/revlog.py	Sun Nov 27 16:37:18 2005 +0100
+++ b/mercurial/revlog.py	Tue Nov 29 18:06:23 2005 +0100
@@ -52,7 +52,7 @@
 
 indexformat = ">4l20s20s20s"
 
-class lazyparser:
+class lazyparser(object):
     """
     this class avoids the need to parse the entirety of large indices
 
@@ -94,7 +94,7 @@
             self.map[e[6]] = i
             i += 1
 
-class lazyindex:
+class lazyindex(object):
     """a lazy version of the index array"""
     def __init__(self, parser):
         self.p = parser
@@ -114,7 +114,7 @@
     def trunc(self, pos):
         self.p.trunc(pos)
 
-class lazymap:
+class lazymap(object):
     """a lazy version of the node map"""
     def __init__(self, parser):
         self.p = parser
@@ -152,7 +152,7 @@
 
 class RevlogError(Exception): pass
 
-class revlog:
+class revlog(object):
     """
     the underlying revision storage object
 

--- a/mercurial/transaction.py	Sun Nov 27 16:37:18 2005 +0100
+++ b/mercurial/transaction.py	Tue Nov 29 18:06:23 2005 +0100
@@ -14,7 +14,7 @@
 import os
 from i18n import gettext as _
 
-class transaction:
+class transaction(object):
     def __init__(self, report, opener, journal, after=None):
         self.journal = None
 

--- a/mercurial/ui.py	Sun Nov 27 16:37:18 2005 +0100
+++ b/mercurial/ui.py	Tue Nov 29 18:06:23 2005 +0100
@@ -10,7 +10,7 @@
 from demandload import *
 demandload(globals(), "re socket sys util")
 
-class ui:
+class ui(object):
     def __init__(self, verbose=False, debug=False, quiet=False,
                  interactive=True):
         self.overlay = {}