hg: change various repository() users to use peer() where appropriate
This gets all the easy cases (peers that aren't also used as repositories).
--- a/hgext/convert/hg.py Fri Jun 10 11:43:38 2011 -0500
+++ b/hgext/convert/hg.py Fri Jun 10 11:43:38 2011 -0500
@@ -112,7 +112,7 @@
self.after()
for pbranch, heads in missings.iteritems():
pbranchpath = os.path.join(self.path, pbranch)
- prepo = hg.repository(self.ui, pbranchpath)
+ prepo = hg.peer(self.ui, {}, pbranchpath)
self.ui.note(_('pulling from %s into %s\n') % (pbranch, branch))
self.repo.pull(prepo, [prepo.lookup(h) for h in heads])
self.before()
--- a/hgext/fetch.py Fri Jun 10 11:43:38 2011 -0500
+++ b/hgext/fetch.py Fri Jun 10 11:43:38 2011 -0500
@@ -63,8 +63,7 @@
raise util.Abort(_('multiple heads in this branch '
'(use "hg heads ." and "hg merge" to merge)'))
- other = hg.repository(hg.remoteui(repo, opts),
- ui.expandpath(source))
+ other = hg.peer(repo, opts, ui.expandpath(source))
ui.status(_('pulling from %s\n') %
util.hidepassword(ui.expandpath(source)))
revs = None
--- a/hgext/patchbomb.py Fri Jun 10 11:43:38 2011 -0500
+++ b/hgext/patchbomb.py Fri Jun 10 11:43:38 2011 -0500
@@ -276,7 +276,7 @@
dest = ui.expandpath(dest or 'default-push', dest or 'default')
dest, branches = hg.parseurl(dest)
revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
- other = hg.repository(hg.remoteui(repo, opts), dest)
+ other = hg.peer(repo, opts, dest)
ui.status(_('comparing with %s\n') % util.hidepassword(dest))
common, _anyinc, _heads = discovery.findcommonincoming(repo, other)
nodes = revs and map(repo.lookup, revs) or revs
--- a/hgext/relink.py Fri Jun 10 11:43:38 2011 -0500
+++ b/hgext/relink.py Fri Jun 10 11:43:38 2011 -0500
@@ -38,9 +38,8 @@
"""
if not hasattr(util, 'samefile') or not hasattr(util, 'samedevice'):
raise util.Abort(_('hardlinks are not supported on this system'))
- src = hg.repository(hg.remoteui(repo, opts),
- ui.expandpath(origin or 'default-relink',
- origin or 'default'))
+ src = hg.repository(ui, ui.expandpath(origin or 'default-relink',
+ origin or 'default'))
if not src.local():
raise util.Abort(_('must specify local origin repository'))
ui.status(_('relinking %s to %s\n') % (src.store.path, repo.store.path))
--- a/hgext/transplant.py Fri Jun 10 11:43:38 2011 -0500
+++ b/hgext/transplant.py Fri Jun 10 11:43:38 2011 -0500
@@ -561,7 +561,7 @@
sourcerepo = opts.get('source')
if sourcerepo:
- source = hg.repository(ui, ui.expandpath(sourcerepo))
+ source = hg.peer(ui, opts, ui.expandpath(sourcerepo))
branches = map(source.lookup, opts.get('branch', ()))
source, csets, cleanupfn = bundlerepo.getremotechanges(ui, repo, source,
onlyheads=branches, force=True)
--- a/mercurial/commands.py Fri Jun 10 11:43:38 2011 -0500
+++ b/mercurial/commands.py Fri Jun 10 11:43:38 2011 -0500
@@ -891,7 +891,7 @@
else:
dest = ui.expandpath(dest or 'default-push', dest or 'default')
dest, branches = hg.parseurl(dest, opts.get('branch'))
- other = hg.repository(hg.remoteui(repo, opts), dest)
+ other = hg.peer(repo, opts, dest)
revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
heads = revs and map(repo.lookup, revs) or revs
common, outheads = discovery.findcommonoutgoing(repo, other,
@@ -1542,7 +1542,7 @@
def debugdiscovery(ui, repo, remoteurl="default", **opts):
"""runs the changeset discovery protocol in isolation"""
remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl), opts.get('branch'))
- remote = hg.repository(hg.remoteui(repo, opts), remoteurl)
+ remote = hg.peer(repo, opts, remoteurl)
ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
# make sure tests are repeatable
@@ -1629,7 +1629,7 @@
Every ID must be a full-length hex node id string. Saves the bundle to the
given file.
"""
- repo = hg.repository(ui, repopath)
+ repo = hg.peer(ui, opts, repopath)
if not repo.capable('getbundle'):
raise util.Abort("getbundle() not supported by target repository")
args = {}
@@ -1804,14 +1804,14 @@
Every ID must be a full-length hex node id string. Returns a list of 0s and 1s
indicating unknown/known.
"""
- repo = hg.repository(ui, repopath)
+ repo = hg.peer(ui, opts, repopath)
if not repo.capable('known'):
raise util.Abort("known() not supported by target repository")
flags = repo.known([bin(s) for s in ids])
ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
@command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'))
-def debugpushkey(ui, repopath, namespace, *keyinfo):
+def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
'''access the pushkey key/value protocol
With two args, list the keys in the given namespace.
@@ -1820,7 +1820,7 @@
Reports success or failure.
'''
- target = hg.repository(ui, repopath)
+ target = hg.peer(ui, {}, repopath)
if keyinfo:
key, old, new = keyinfo
r = target.pushkey(namespace, key, old, new)
@@ -2117,7 +2117,7 @@
] + remoteopts,
_('REPO [OPTIONS]... [ONE [TWO]]'))
def debugwireargs(ui, repopath, *vals, **opts):
- repo = hg.repository(hg.remoteui(ui, opts), repopath)
+ repo = hg.peer(ui, opts, repopath)
for opt in remoteopts:
del opts[opt[1]]
args = {}
@@ -2914,7 +2914,7 @@
if source:
source, branches = hg.parseurl(ui.expandpath(source))
- repo = hg.repository(ui, source)
+ repo = hg.peer(ui, {}, source)
revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
if not repo.local():
@@ -3199,7 +3199,7 @@
if opts.get('bookmarks'):
source, branches = hg.parseurl(ui.expandpath(source),
opts.get('branch'))
- other = hg.repository(hg.remoteui(repo, opts), source)
+ other = hg.peer(repo, opts, source)
if 'bookmarks' not in other.listkeys('namespaces'):
ui.warn(_("remote doesn't support bookmarks\n"))
return 0
@@ -3227,7 +3227,7 @@
Returns 0 on success.
"""
- hg.repository(hg.remoteui(ui, opts), ui.expandpath(dest), create=True)
+ hg.peer(ui, opts, ui.expandpath(dest), create=True)
@command('locate',
[('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
@@ -3561,7 +3561,7 @@
if opts.get('bookmarks'):
dest = ui.expandpath(dest or 'default-push', dest or 'default')
dest, branches = hg.parseurl(dest, opts.get('branch'))
- other = hg.repository(hg.remoteui(repo, opts), dest)
+ other = hg.peer(repo, opts, dest)
if 'bookmarks' not in other.listkeys('namespaces'):
ui.warn(_("remote doesn't support bookmarks\n"))
return 0
@@ -3713,7 +3713,7 @@
Returns 0 on success, 1 if an update had unresolved files.
"""
source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
- other = hg.repository(hg.remoteui(repo, opts), source)
+ other = hg.peer(repo, opts, source)
ui.status(_('pulling from %s\n') % util.hidepassword(source))
revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
@@ -3810,7 +3810,7 @@
dest, branches = hg.parseurl(dest, opts.get('branch'))
ui.status(_('pushing to %s\n') % util.hidepassword(dest))
revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
- other = hg.repository(hg.remoteui(repo, opts), dest)
+ other = hg.peer(repo, opts, dest)
if revs:
revs = [repo.lookup(rev) for rev in revs]
@@ -4742,7 +4742,7 @@
if opts.get('remote'):
t = []
source, branches = hg.parseurl(ui.expandpath('default'))
- other = hg.repository(hg.remoteui(repo, {}), source)
+ other = hg.peer(repo, {}, source)
revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
ui.debug('comparing with %s\n' % util.hidepassword(source))
repo.ui.pushbuffer()
@@ -4755,7 +4755,7 @@
dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
if source != dest:
- other = hg.repository(hg.remoteui(repo, {}), dest)
+ other = hg.peer(repo, {}, dest)
commoninc = None
ui.debug('comparing with %s\n' % util.hidepassword(dest))
repo.ui.pushbuffer()
--- a/mercurial/hg.py Fri Jun 10 11:43:38 2011 -0500
+++ b/mercurial/hg.py Fri Jun 10 11:43:38 2011 -0500
@@ -428,7 +428,7 @@
and is supposed to contain only code that can't be unified.
"""
source, branches = parseurl(ui.expandpath(source), opts.get('branch'))
- other = repository(remoteui(repo, opts), source)
+ other = peer(repo, opts, source)
ui.status(_('comparing with %s\n') % util.hidepassword(source))
revs, checkout = addbranchrevs(repo, other, branches, opts.get('rev'))
@@ -486,7 +486,7 @@
if revs:
revs = [repo.lookup(rev) for rev in revs]
- other = repository(remoteui(repo, opts), dest)
+ other = peer(repo, opts, dest)
common, outheads = discovery.findcommonoutgoing(repo, other, revs,
force=opts.get('force'))
o = repo.changelog.findmissing(common, outheads)
--- a/mercurial/revset.py Fri Jun 10 11:43:38 2011 -0500
+++ b/mercurial/revset.py Fri Jun 10 11:43:38 2011 -0500
@@ -599,7 +599,7 @@
revs, checkout = hg.addbranchrevs(repo, repo, branches, [])
if revs:
revs = [repo.lookup(rev) for rev in revs]
- other = hg.repository(hg.remoteui(repo, {}), dest)
+ other = hg.peer(repo, {}, dest)
repo.ui.pushbuffer()
common, outheads = discovery.findcommonoutgoing(repo, other, onlyheads=revs)
repo.ui.popbuffer()
--- a/mercurial/subrepo.py Fri Jun 10 11:43:38 2011 -0500
+++ b/mercurial/subrepo.py Fri Jun 10 11:43:38 2011 -0500
@@ -437,7 +437,7 @@
if revision not in self._repo:
self._repo._subsource = source
srcurl = _abssource(self._repo)
- other = hg.repository(self._repo.ui, srcurl)
+ other = hg.peer(self._repo.ui, {}, srcurl)
if len(self._repo) == 0:
self._repo.ui.status(_('cloning subrepo %s from %s\n')
% (subrelpath(self), srcurl))
@@ -495,7 +495,7 @@
dsturl = _abssource(self._repo, True)
self._repo.ui.status(_('pushing subrepo %s to %s\n') %
(subrelpath(self), dsturl))
- other = hg.repository(self._repo.ui, dsturl)
+ other = hg.peer(self._repo.ui, {}, dsturl)
return self._repo.push(other, force)
def outgoing(self, ui, dest, opts):