mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 16:57:49 +03:00
584656dff3
Summary: Turned on the auto formatter. Ran `arc lint --apply-patches --take BLACK **/*.py`. Then run `arc lint` again so some other autofixers like spellchecker etc. looked at the code base. Manually accept the changes whenever they make sense, or use a workaround (ex. changing "dict()" to "dict constructor") where autofix is false positive. Disabled linters on files that are hard (i18n/polib.py) to fix, or less interesting to fix (hgsubversion tests), or cannot be fixed without breaking OSS build (FBPYTHON4). Conflicted linters (test-check-module-imports.t, part of test-check-code.t, test-check-pyflakes.t) are removed or disabled. Duplicated linters (test-check-pyflakes.t, test-check-pylint.t) are removed. An issue of the auto-formatter is lines are no longer guarnateed to be <= 80 chars. But that seems less important comparing with the benefit auto-formatter provides. As we're here, also remove test-check-py3-compat.t, as it is currently broken if `PYTHON3=/bin/python3` is set. Reviewed By: wez, phillco, simpkins, pkaush, singhsrb Differential Revision: D8173629 fbshipit-source-id: 90e248ae0c5e6eaadbe25520a6ee42d32005621b
64 lines
2.0 KiB
Python
64 lines
2.0 KiB
Python
# 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 import cmdutil, commands, error, pycompat, registrar
|
|
from mercurial.i18n import _
|
|
|
|
|
|
# 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 = "ships-with-hg-core"
|
|
|
|
cmdtable = {}
|
|
command = registrar.command(cmdtable)
|
|
|
|
|
|
@command(
|
|
"amend",
|
|
[
|
|
(
|
|
"A",
|
|
"addremove",
|
|
None,
|
|
_("mark new/missing files as added/removed before committing"),
|
|
),
|
|
("e", "edit", None, _("invoke editor on commit messages")),
|
|
("i", "interactive", None, _("use interactive mode")),
|
|
("n", "note", "", _("store a note on the amend")),
|
|
]
|
|
+ cmdutil.walkopts
|
|
+ cmdutil.commitopts
|
|
+ cmdutil.commitopts2,
|
|
_("[OPTION]... [FILE]..."),
|
|
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)
|
|
if len(opts["note"]) > 255:
|
|
raise error.Abort(_("cannot store a note of more than 255 bytes"))
|
|
with repo.wlock(), repo.lock():
|
|
if not opts.get("logfile"):
|
|
opts["message"] = opts.get("message") or repo["."].description()
|
|
opts["amend"] = True
|
|
return commands._docommit(ui, repo, *pats, **pycompat.strkwargs(opts))
|