# HG changeset patch # User Matt Mackall # Date 2008-03-20 16:12:35 # Node ID c5580db9c3aa2e114170b69f1d10c1b198144db4 # Parent 08800489257ef5641c93273836ae13366b8ec30c remoterepo: no longer needed All users already use repo.local() to test for local, which is false in the repository base class. statichttprepository never derived from this class anyway. diff --git a/mercurial/httprepo.py b/mercurial/httprepo.py --- a/mercurial/httprepo.py +++ b/mercurial/httprepo.py @@ -7,7 +7,6 @@ # of the GNU General Public License, incorporated herein by reference. from node import bin, hex -from remoterepo import remoterepository from i18n import _ import repo, os, urllib, urllib2, urlparse, zlib, util, httplib import errno, keepalive, socket, changegroup @@ -181,7 +180,7 @@ def quotepath(path): l[i] = '%%%02X' % ord(c) return ''.join(l) -class httprepository(remoterepository): +class httprepository(repo.repository): def __init__(self, ui, path): self.path = path self.caps = None diff --git a/mercurial/remoterepo.py b/mercurial/remoterepo.py deleted file mode 100644 --- a/mercurial/remoterepo.py +++ /dev/null @@ -1,21 +0,0 @@ -# remoterepo - remote repository proxy classes for mercurial -# -# Copyright 2005, 2006 Matt Mackall -# -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. - -import repo - -class remoterepository(repo.repository): - pass - -class remotelock(object): - def __init__(self, repo): - self.repo = repo - def release(self): - self.repo.unlock() - self.repo = None - def __del__(self): - if self.repo: - self.release() diff --git a/mercurial/sshrepo.py b/mercurial/sshrepo.py --- a/mercurial/sshrepo.py +++ b/mercurial/sshrepo.py @@ -6,11 +6,20 @@ # of the GNU General Public License, incorporated herein by reference. from node import bin, hex -from remoterepo import remotelock, remoterepository from i18n import _ import repo, os, re, util -class sshrepository(remoterepository): +class remotelock(object): + def __init__(self, repo): + self.repo = repo + def release(self): + self.repo.unlock() + self.repo = None + def __del__(self): + if self.repo: + self.release() + +class sshrepository(repo.repository): def __init__(self, ui, path, create=0): self._url = path self.ui = ui