mercurial-scm/hg: comparison mercurial/commands.py

equal deleted inserted replaced

-:1ceb2cf9f9d9
+:517e1d88bf7e
 common = [repo.lookup(rev) for rev in base]
 heads = revs and map(repo.lookup, revs) or revs
 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,
 onlyheads=heads,
 force=opts.get('force'))
 ] + remoteopts,
 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
 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
 random.seed(12323)
 """retrieves a bundle from a repo
 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 = {}
 if common:
 args['common'] = [bin(s) for s in common]
 """test whether node ids are known to a repo
 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.
 With five args, set a key to new if it currently is set to old.
 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)
 ui.status(str(r) + '\n')
 return not r
 ('', 'four', '', 'four'),
 ('', 'five', '', 'five'),
 ] + 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 = {}
 for k, v in opts.iteritems():
 if v:
 output = []
 revs = []
 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():
 if num or branch or tags:
 raise util.Abort(
 raise util.Abort(_('cannot combine --bundle and --subrepos'))
 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
 ui.status(_('comparing with %s\n') % util.hidepassword(source))
 return bookmarks.diff(ui, repo, other)
 It is possible to specify an ``ssh://`` URL as the destination.
 See :hg:`help urls` for more information.
 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')),
 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
 """
 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
 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
 return bookmarks.diff(ui, other, repo)
 See :hg:`help urls` for more information.
 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'))
 if opts.get('bookmark'):
 if not revs:
 dest = ui.expandpath(dest or 'default-push', dest or 'default')
 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]
 repo._subtoppath = dest
 try:
 (new, len(bheads)))
 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()
 commoninc = discovery.findcommonincoming(repo, other)
 _common, incoming, _rheads = commoninc
 t.append(_('1 or more incoming'))
 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()
 common, outheads = discovery.findcommonoutgoing(repo, other,
 commoninc=commoninc)

changeset 14556	517e1d88bf7e
parent 14553	d976542986d2
child 14557	f966979f61ce