comparison mercurial/commands.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 5884812686f7
children b8661d7c940f
comparison
equal deleted inserted replaced
17191:5884812686f7 17192:1ac628cd7113
14 import archival, changegroup, cmdutil, hbisect 14 import archival, changegroup, cmdutil, hbisect
15 import sshserver, hgweb, hgweb.server, commandserver 15 import sshserver, hgweb, hgweb.server, commandserver
16 import merge as mergemod 16 import merge as mergemod
17 import minirst, revset, fileset 17 import minirst, revset, fileset
18 import dagparser, context, simplemerge, graphmod 18 import dagparser, context, simplemerge, graphmod
19 import random, setdiscovery, treediscovery, dagutil, pvec 19 import random, setdiscovery, treediscovery, dagutil, pvec, localrepo
20 import phases, obsolete 20 import phases, obsolete
21 21
22 table = {} 22 table = {}
23 23
24 command = cmdutil.command(table) 24 command = cmdutil.command(table)
1787 def doit(localheads, remoteheads, remote=remote): 1787 def doit(localheads, remoteheads, remote=remote):
1788 if opts.get('old'): 1788 if opts.get('old'):
1789 if localheads: 1789 if localheads:
1790 raise util.Abort('cannot use localheads with old style ' 1790 raise util.Abort('cannot use localheads with old style '
1791 'discovery') 1791 'discovery')
1792 if not util.safehasattr(remote, 'branches'):
1793 # enable in-client legacy support
1794 remote = localrepo.locallegacypeer(remote.local())
1792 common, _in, hds = treediscovery.findcommonincoming(repo, remote, 1795 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
1793 force=True) 1796 force=True)
1794 common = set(common) 1797 common = set(common)
1795 if not opts.get('nonheads'): 1798 if not opts.get('nonheads'):
1796 ui.write("unpruned common: %s\n" % " ".join([short(n) 1799 ui.write("unpruned common: %s\n" % " ".join([short(n)