##// END OF EJS Templates
commit: move the addremove logic around to make the next changeset clearer...
commit: move the addremove logic around to make the next changeset clearer Lets do the noise now, without changing any thing. So the new changeset can focus on the actual semantic changes.

File last commit:

r50666:e78a4168 default
r50923:a46dfc2b default
Show More
amend.py
75 lines | 2.3 KiB | text/x-python | PythonLexer
Jun Wu
amend: new extension providing the amend command...
r33404 # 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 mercurial.i18n import _
from mercurial import (
cmdutil,
commands,
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.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 testedwith = b'ships-with-hg-core'
Jun Wu
amend: new extension providing the amend command...
r33404
cmdtable = {}
command = registrar.command(cmdtable)
Augie Fackler
formatting: blacken the codebase...
r43346
@command(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'amend',
Augie Fackler
formatting: blacken the codebase...
r43346 [
(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'A',
b'addremove',
Augie Fackler
formatting: blacken the codebase...
r43346 None,
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b'mark new/missing files as added/removed before committing'),
Augie Fackler
formatting: blacken the codebase...
r43346 ),
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
(b'i', b'interactive', None, _(b'use interactive mode')),
Augie Fackler
formatting: blacken the codebase...
r43346 (
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')),
Martin von Zweigbergk
amend: add a --draft option to set phase to draft...
r50666 (b'', b'draft', None, _(b'use the draft phase for committing')),
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 (b'n', b'note', b'', _(b'store a note on the amend')),
Augie Fackler
formatting: blacken the codebase...
r43346 ]
+ cmdutil.walkopts
+ cmdutil.commitopts
+ cmdutil.commitopts2
+ cmdutil.commitopts3,
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b'[OPTION]... [FILE]...'),
rdamazio@google.com
help: assigning categories to existing commands...
r40329 helpcategory=command.CATEGORY_COMMITTING,
Augie Fackler
formatting: blacken the codebase...
r43346 inferrepo=True,
)
Jun Wu
amend: new extension providing the amend command...
r33404 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.
"""
Martin von Zweigbergk
amend: add a --draft option to set phase to draft...
r50666 cmdutil.check_at_most_one_arg(opts, 'draft', 'secret')
Martin von Zweigbergk
cmdutil: make checknotesize() work on str-keyed opts...
r48221 cmdutil.check_note_size(opts)
Matt Harbison
amend: prevent '\n' in the note string...
r43203
Jun Wu
amend: new extension providing the amend command...
r33404 with repo.wlock(), repo.lock():
Martin von Zweigbergk
amend: work mostly with str-type **opts for simplicity...
r48220 if not opts.get('logfile'):
opts['message'] = opts.get('message') or repo[b'.'].description()
opts['amend'] = True
return commands._docommit(ui, repo, *pats, **opts)