hg 2.3+ compat
diff --git a/infocalypse/__init__.py b/infocalypse/__init__.py
--- a/infocalypse/__init__.py
+++ b/infocalypse/__init__.py
@@ -723,13 +723,17 @@ entry[1].extend(FCP_OPTS)
# Starting an FTP repo. Not yet used, except for throwing errors for missing commands and faking the lock.
-from mercurial import peer, util
+from mercurial import util
+try:
+ from mercurial.peer import peerrepository
+except ImportError:
+ from mercurial.repo import repository as peerrepository
try:
from mercurial.error import RepoError
except ImportError:
from mercurial.repo import RepoError
-class InfocalypseRepository(peer.peerrepository):
+class InfocalypseRepository(peerrepository):
def __init__(self, ui, path, create):
self.create = create
self.ui = ui
diff --git a/infocalypse/freenetrepo.py b/infocalypse/freenetrepo.py
--- a/infocalypse/freenetrepo.py
+++ b/infocalypse/freenetrepo.py
@@ -8,13 +8,17 @@
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
-from mercurial import repo, util
+from mercurial import util
+try:
+ from mercurial.peer import peerrepository
+except ImportError:
+ from mercurial.repo import repository as peerrepository
try:
from mercurial.error import RepoError
except ImportError:
from mercurial.repo import RepoError
-class freenetrepo(repo.repository):
+class freenetrepo(peerrepository):
capabilities = ['lookup']
def __init__(self, ui, path, create):