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

comparison mercurial/commands.py @ 46702:a4c19a162615

sshpeer: enable+fix warning about sshpeers not being closed explicitly I recommend looking at this with a diff that ignores indentation. The test changes are because localrepo.close() updates some cache, which appears happens earlier now on rollbacks or strips or something. The http changes are because httppeer.close() prints stats with --verbose. Differential Revision: https://phab.mercurial-scm.org/D9999

author	Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
date	Mon, 15 Feb 2021 14:48:36 -0500
parents	4a012e531066
children	66fb04552122

comparison

equal deleted inserted replaced

-:db8037e38085
+:a4c19a162615
 default = not (num or id or branch or tags or bookmarks)
 output = []
 revs = []
-if source:
+peer = None
-source, branches = hg.parseurl(ui.expandpath(source))
+try:
-peer = hg.peer(repo or ui, opts, source)  # only pass ui when no repo
+if source:
-repo = peer.local()
+source, branches = hg.parseurl(ui.expandpath(source))
-revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
+# only pass ui when no repo
+peer = hg.peer(repo or ui, opts, source)
-fm = ui.formatter(b'identify', opts)
+repo = peer.local()
-fm.startitem()
+revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
-if not repo:
+fm = ui.formatter(b'identify', opts)
-if num or branch or tags:
+fm.startitem()
-raise error.InputError(
-_(b"can't query remote revision number, branch, or tags")
+if not repo:
-)
+if num or branch or tags:
-if not rev and revs:
+raise error.InputError(
-rev = revs[0]
+_(b"can't query remote revision number, branch, or tags")
-if not rev:
+)
-rev = b"tip"
+if not rev and revs:
+rev = revs[0]
-remoterev = peer.lookup(rev)
+if not rev:
-hexrev = fm.hexfunc(remoterev)
+rev = b"tip"
-if default or id:
-output = [hexrev]
+remoterev = peer.lookup(rev)
-fm.data(id=hexrev)
+hexrev = fm.hexfunc(remoterev)
+if default or id:
-@util.cachefunc
+output = [hexrev]
-def getbms():
+fm.data(id=hexrev)
-bms = []
+@util.cachefunc
-if b'bookmarks' in peer.listkeys(b'namespaces'):
+def getbms():
-hexremoterev = hex(remoterev)
+bms = []
-bms = [
-bm
+if b'bookmarks' in peer.listkeys(b'namespaces'):
-for bm, bmr in pycompat.iteritems(
+hexremoterev = hex(remoterev)
-peer.listkeys(b'bookmarks')
+bms = [
+bm
+for bm, bmr in pycompat.iteritems(
+peer.listkeys(b'bookmarks')
+)
+if bmr == hexremoterev
+]
+return sorted(bms)
+if fm.isplain():
+if bookmarks:
+output.extend(getbms())
+elif default and not ui.quiet:
+# multiple bookmarks for a single parent separated by '/'
+bm = b'/'.join(getbms())
+if bm:
+output.append(bm)
+else:
+fm.data(node=hex(remoterev))
+if bookmarks or b'bookmarks' in fm.datahint():
+fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
+else:
+if rev:
+repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
+ctx = scmutil.revsingle(repo, rev, None)
+if ctx.rev() is None:
+ctx = repo[None]
+parents = ctx.parents()
+taglist = []
+for p in parents:
+taglist.extend(p.tags())
+dirty = b""
+if ctx.dirty(missing=True, merge=False, branch=False):
+dirty = b'+'
+fm.data(dirty=dirty)
+hexoutput = [fm.hexfunc(p.node()) for p in parents]
+if default or id:
+output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
+fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
+if num:
+numoutput = [b"%d" % p.rev() for p in parents]
+output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
+fm.data(
+parents=fm.formatlist(
+[fm.hexfunc(p.node()) for p in parents], name=b'node'
 )
-if bmr == hexremoterev
+)
-]
+else:
+hexoutput = fm.hexfunc(ctx.node())
-return sorted(bms)
+if default or id:
+output = [hexoutput]
-if fm.isplain():
+fm.data(id=hexoutput)
-if bookmarks:
-output.extend(getbms())
+if num:
-elif default and not ui.quiet:
+output.append(pycompat.bytestr(ctx.rev()))
+taglist = ctx.tags()
+if default and not ui.quiet:
+b = ctx.branch()
+if b != b'default':
+output.append(b"(%s)" % b)
+# multiple tags for a single parent separated by '/'
+t = b'/'.join(taglist)
+if t:
+output.append(t)
 # multiple bookmarks for a single parent separated by '/'
-bm = b'/'.join(getbms())
+bm = b'/'.join(ctx.bookmarks())
 if bm:
 output.append(bm)
 else:
-fm.data(node=hex(remoterev))
+if branch:
-if bookmarks or b'bookmarks' in fm.datahint():
+output.append(ctx.branch())
-fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
-else:
+if tags:
-if rev:
+output.extend(taglist)
-repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
-ctx = scmutil.revsingle(repo, rev, None)
+if bookmarks:
+output.extend(ctx.bookmarks())
-if ctx.rev() is None:
-ctx = repo[None]
+fm.data(node=ctx.hex())
-parents = ctx.parents()
+fm.data(branch=ctx.branch())
-taglist = []
+fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
-for p in parents:
+fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
-taglist.extend(p.tags())
+fm.context(ctx=ctx)
-dirty = b""
+fm.plain(b"%s\n" % b' '.join(output))
-if ctx.dirty(missing=True, merge=False, branch=False):
+fm.end()
-dirty = b'+'
+finally:
-fm.data(dirty=dirty)
+if peer:
+peer.close()
-hexoutput = [fm.hexfunc(p.node()) for p in parents]
-if default or id:
-output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
-fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
-if num:
-numoutput = [b"%d" % p.rev() for p in parents]
-output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
-fm.data(
-parents=fm.formatlist(
-[fm.hexfunc(p.node()) for p in parents], name=b'node'
-)
-)
-else:
-hexoutput = fm.hexfunc(ctx.node())
-if default or id:
-output = [hexoutput]
-fm.data(id=hexoutput)
-if num:
-output.append(pycompat.bytestr(ctx.rev()))
-taglist = ctx.tags()
-if default and not ui.quiet:
-b = ctx.branch()
-if b != b'default':
-output.append(b"(%s)" % b)
-# multiple tags for a single parent separated by '/'
-t = b'/'.join(taglist)
-if t:
-output.append(t)
-# multiple bookmarks for a single parent separated by '/'
-bm = b'/'.join(ctx.bookmarks())
-if bm:
-output.append(bm)
-else:
-if branch:
-output.append(ctx.branch())
-if tags:
-output.extend(taglist)
-if bookmarks:
-output.extend(ctx.bookmarks())
-fm.data(node=ctx.hex())
-fm.data(branch=ctx.branch())
-fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
-fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
-fm.context(ctx=ctx)
-fm.plain(b"%s\n" % b' '.join(output))
-fm.end()
 @command(
 b'import|patch',
 [
 if opts.get(b'bookmarks'):
 source, branches = hg.parseurl(
 ui.expandpath(source), opts.get(b'branch')
 )
 other = hg.peer(repo, opts, source)
-if b'bookmarks' not in other.listkeys(b'namespaces'):
+try:
-ui.warn(_(b"remote doesn't support bookmarks\n"))
+if b'bookmarks' not in other.listkeys(b'namespaces'):
-return 0
+ui.warn(_(b"remote doesn't support bookmarks\n"))
-ui.pager(b'incoming')
+return 0
-ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
+ui.pager(b'incoming')
-return bookmarks.incoming(ui, repo, other)
+ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
+return bookmarks.incoming(ui, repo, other)
+finally:
+other.close()
 repo._subtoppath = ui.expandpath(source)
 try:
 return hg.incoming(ui, repo, source, opts)
 finally:
 See :hg:`help urls` for more information.
 Returns 0 on success.
 """
 opts = pycompat.byteskwargs(opts)
-hg.peer(ui, opts, ui.expandpath(dest), create=True)
+peer = hg.peer(ui, opts, ui.expandpath(dest), create=True)
+peer.close()
 @command(
 b'locate',
 [
 return 0
 if opts.get(b'bookmarks'):
 dest = path.pushloc or path.loc
 other = hg.peer(repo, opts, dest)
-if b'bookmarks' not in other.listkeys(b'namespaces'):
+try:
-ui.warn(_(b"remote doesn't support bookmarks\n"))
+if b'bookmarks' not in other.listkeys(b'namespaces'):
-return 0
+ui.warn(_(b"remote doesn't support bookmarks\n"))
-ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
+return 0
-ui.pager(b'outgoing')
+ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
-return bookmarks.outgoing(ui, repo, other)
+ui.pager(b'outgoing')
+return bookmarks.outgoing(ui, repo, other)
+finally:
+other.close()
 repo._subtoppath = path.pushloc or path.loc
 try:
 return hg.outgoing(ui, repo, dest, opts)
 finally:
 branches = (path.branch, opts.get(b'branch') or [])
 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
 other = hg.peer(repo, opts, dest)
-if revs:
+try:
-revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
+if revs:
-if not revs:
+revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
+if not revs:
+raise error.InputError(
+_(b"specified revisions evaluate to an empty set"),
+hint=_(b"use different revision arguments"),
+)
+elif path.pushrev:
+# It doesn't make any sense to specify ancestor revisions. So limit
+# to DAG heads to make discovery simpler.
+expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
+revs = scmutil.revrange(repo, [expr])
+revs = [repo[rev].node() for rev in revs]
+if not revs:
+raise error.InputError(
+_(b'default push revset for path evaluates to an empty set')
+)
+elif ui.configbool(b'commands', b'push.require-revs'):
 raise error.InputError(
-_(b"specified revisions evaluate to an empty set"),
+_(b'no revisions specified to push'),
-hint=_(b"use different revision arguments"),
+hint=_(b'did you mean "hg push -r ."?'),
 )
-elif path.pushrev:
-# It doesn't make any sense to specify ancestor revisions. So limit
+repo._subtoppath = dest
-# to DAG heads to make discovery simpler.
+try:
-expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
+# push subrepos depth-first for coherent ordering
-revs = scmutil.revrange(repo, [expr])
+c = repo[b'.']
-revs = [repo[rev].node() for rev in revs]
+subs = c.substate  # only repos that are committed
-if not revs:
+for s in sorted(subs):
-raise error.InputError(
+result = c.sub(s).push(opts)
-_(b'default push revset for path evaluates to an empty set')
+if result == 0:
-)
+return not result
-elif ui.configbool(b'commands', b'push.require-revs'):
+finally:
-raise error.InputError(
+del repo._subtoppath
-_(b'no revisions specified to push'),
-hint=_(b'did you mean "hg push -r ."?'),
+opargs = dict(
+opts.get(b'opargs', {})
+)  # copy opargs since we may mutate it
+opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
+pushop = exchange.push(
+repo,
+other,
+opts.get(b'force'),
+revs=revs,
+newbranch=opts.get(b'new_branch'),
+bookmarks=opts.get(b'bookmark', ()),
+publish=opts.get(b'publish'),
+opargs=opargs,
 )
-repo._subtoppath = dest
+result = not pushop.cgresult
-try:
-# push subrepos depth-first for coherent ordering
+if pushop.bkresult is not None:
-c = repo[b'.']
+if pushop.bkresult == 2:
-subs = c.substate  # only repos that are committed
+result = 2
-for s in sorted(subs):
+elif not result and pushop.bkresult:
-result = c.sub(s).push(opts)
+result = 2
-if result == 0:
-return not result
 finally:
-del repo._subtoppath
+other.close()
-opargs = dict(opts.get(b'opargs', {}))  # copy opargs since we may mutate it
-opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
-pushop = exchange.push(
-repo,
-other,
-opts.get(b'force'),
-revs=revs,
-newbranch=opts.get(b'new_branch'),
-bookmarks=opts.get(b'bookmark', ()),
-publish=opts.get(b'publish'),
-opargs=opargs,
-)
-result = not pushop.cgresult
-if pushop.bkresult is not None:
-if pushop.bkresult == 2:
-result = 2
-elif not result and pushop.bkresult:
-result = 2
 return result
 @command(
 b'recover',

Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 46702:a4c19a162615