Mercurial > hg
view hgext/amend.py @ 43105:649d3ac37a12
py3: define and use pycompat.iteritems() for hgext/
.iteritems() -> .items() is the last source transform being performed.
But it is also the most widely used.
This commit adds a pycompat.iteritems symbol and imports it in place
of .iteritems() for usage in hgext/. I chose to stop at just hgext/
because the patch will be large and it is an easy boundary to stop at
since we can disable source transformation on a per-package basis.
There are places where the type does implement items() and we could
call items() directly. However, this would require critical thought
and I thought it would be easier to just blindly change the code. We
know which call sites need to be audited in the future because they
have "pycompat.iteritems."
With this change, we no longer perform source transformation on
hgext!
Differential Revision: https://phab.mercurial-scm.org/D7014
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Sun, 06 Oct 2019 19:25:18 -0400 |
parents | 687b865b95ad |
children | 6ce89165eaa0 |
line wrap: on
line source
# amend.py - provide the amend command # # Copyright 2017 Facebook, Inc. # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. """provide the amend command (EXPERIMENTAL) This extension provides an ``amend`` command that is similar to ``commit --amend`` but does not prompt an editor. """ from __future__ import absolute_import from mercurial.i18n import _ from mercurial import ( cmdutil, commands, pycompat, registrar, ) # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. testedwith = b'ships-with-hg-core' cmdtable = {} command = registrar.command(cmdtable) @command( b'amend', [ ( b'A', b'addremove', None, _(b'mark new/missing files as added/removed before committing'), ), (b'e', b'edit', None, _(b'invoke editor on commit messages')), (b'i', b'interactive', None, _(b'use interactive mode')), ( b'', b'close-branch', None, _(b'mark a branch as closed, hiding it from the branch list'), ), (b's', b'secret', None, _(b'use the secret phase for committing')), (b'n', b'note', b'', _(b'store a note on the amend')), ] + cmdutil.walkopts + cmdutil.commitopts + cmdutil.commitopts2 + cmdutil.commitopts3, _(b'[OPTION]... [FILE]...'), helpcategory=command.CATEGORY_COMMITTING, inferrepo=True, ) def amend(ui, repo, *pats, **opts): """amend the working copy parent with all or specified outstanding changes Similar to :hg:`commit --amend`, but reuse the commit message without invoking editor, unless ``--edit`` was set. See :hg:`help commit` for more details. """ opts = pycompat.byteskwargs(opts) cmdutil.checknotesize(ui, opts) with repo.wlock(), repo.lock(): if not opts.get(b'logfile'): opts[b'message'] = opts.get(b'message') or repo[b'.'].description() opts[b'amend'] = True return commands._docommit(ui, repo, *pats, **pycompat.strkwargs(opts))