Mercurial > public > mercurial-scm > hg-stable
diff mercurial/statichttprepo.py @ 17192:1ac628cd7113
peer: introduce real peer classes
This change separates peer implementations from the repository implementation.
localpeer currently is a simple pass-through to localrepository, except for
legacy calls, which have already been removed from localpeer. This ensures that
the local client code only uses the most modern peer API when talking to local
repos.
Peers have a .local() method which returns either None or the underlying
localrepository (or descendant thereof). Repos have a .peer() method to return
a freshly constructed localpeer. The latter is used by hg.peer(), and also to
allow folks to pass either a peer or a repo to some generic helper methods.
We might want to get rid of .peer() eventually.
The only user of locallegacypeer is debugdiscovery, which uses it to pose as a
pre-setdiscovery client. But we decided to leave the old API defined in
locallegacypeer for clarity and maybe for other uses in the future.
It might be nice to actually define the peer API directly in peer.py as stub
methods. One problem there is, however, that localpeer implements
lock/addchangegroup, whereas the true remote peers implement unbundle.
It might be desireable to get rid of this distinction eventually.
| author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
|---|---|
| date | Fri, 13 Jul 2012 21:47:06 +0200 |
| parents | 7034365089bf |
| children | 1d710fe5ee0e |
line wrap: on
line diff
--- a/mercurial/statichttprepo.py Fri Jul 13 21:46:53 2012 +0200 +++ b/mercurial/statichttprepo.py Fri Jul 13 21:47:06 2012 +0200 @@ -76,6 +76,10 @@ return statichttpopener +class statichttppeer(localrepo.localpeer): + def local(self): + return None + class statichttprepository(localrepo.localrepository): def __init__(self, ui, path): self._url = path @@ -116,6 +120,7 @@ self.svfs = self.sopener self.sjoin = self.store.join self._filecache = {} + self.requirements = requirements self.manifest = manifest.manifest(self.sopener) self.changelog = changelog.changelog(self.sopener) @@ -125,7 +130,9 @@ self._branchcachetip = None self.encodepats = None self.decodepats = None - self.capabilities.difference_update(["pushkey"]) + + def _restrictcapabilities(self, caps): + return caps.difference(["pushkey"]) def url(self): return self._url @@ -133,6 +140,9 @@ def local(self): return False + def peer(self): + return statichttppeer(self) + def lock(self, wait=True): raise util.Abort(_('cannot lock static-http repository'))