mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +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
31 lines
749 B
Python
31 lines
749 B
Python
# Extension to write out fake unsupported records into the merge state
|
|
#
|
|
#
|
|
|
|
from __future__ import absolute_import
|
|
|
|
from mercurial import merge, registrar
|
|
|
|
|
|
cmdtable = {}
|
|
command = registrar.command(cmdtable)
|
|
|
|
|
|
@command(
|
|
"fakemergerecord",
|
|
[
|
|
("X", "mandatory", None, "add a fake mandatory record"),
|
|
("x", "advisory", None, "add a fake advisory record"),
|
|
],
|
|
"",
|
|
)
|
|
def fakemergerecord(ui, repo, *pats, **opts):
|
|
with repo.wlock():
|
|
ms = merge.mergestate.read(repo)
|
|
records = ms._makerecords()
|
|
if opts.get("mandatory"):
|
|
records.append(("X", "mandatory record"))
|
|
if opts.get("advisory"):
|
|
records.append(("x", "advisory record"))
|
|
ms._writerecords(records)
|