sapling/eden/scm/edenscm/mercurial/mergeutil.py

# Portions Copyright (c) Facebook, Inc. and its affiliates.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2.

# mergeutil.py - help for merge processing in mercurial
#
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.

from __future__ import absolute_import

from . import error
from .i18n import _


def checkunresolved(ms):
    if list(ms.unresolved()):
        raise error.Abort(_("unresolved merge conflicts " "(see 'hg help resolve')"))
    if ms.mdstate() != "s" or list(ms.driverresolved()):
        raise error.Abort(
            _("driver-resolved merge conflicts"),
            hint=_('run "hg resolve --all" to resolve'),
        )
apply Facebook copyright headers to all Mercurial Python files Summary: Make sure all Python files under `mercurial/` have a consistent Facebook copyright header. In most cases a `Portions Copyright Facebook` notice has been prepended before the existing copyright notice in the file. For the few files that did not have an existing copyright notice I added a notice for `Matt Mackall and others`, similar to the existing notice in other files. Some files previously had a Facebook copyright notice, but have had other non-Facebook authors as well. In this case I changed the Facebook notice to `Portions Copyright Facebook` and added a `Matt Mackall and others` notice below. For a handful of files that were solely authored by Facebook employees I left only a Facebook copyright notice. Reviewed By: quark-zju Differential Revision: D18266085 fbshipit-source-id: 2f0c25b9887837541774abea7a31904d89fd94ea 2019-11-01 22:33:28 +03:00			`# Portions Copyright (c) Facebook, Inc. and its affiliates.`
			`#`
			`# This software may be used and distributed according to the terms of the`
			`# GNU General Public License version 2.`

checkunresolved: move to new package to help avoid import cycles This will allow localrepo to stop using cmdutil, which should avoid some future import cycles. There's room for an adventurous soul to delve deeper into merge.py and figure out how to disentangle more of it - it appears to be a nexus of cycle problems. Some of it might be able to move into this new mergeutil package. 2016-11-22 05:31:45 +03:00			`# mergeutil.py - help for merge processing in mercurial`
			`#`
			`# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>`
			`#`
			`# This software may be used and distributed according to the terms of the`
			`# GNU General Public License version 2 or any later version.`

			`from __future__ import absolute_import`

codemod: join the auto-formatter party 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 2018-05-26 07:34:37 +03:00			`from . import error`
checkunresolved: move to new package to help avoid import cycles This will allow localrepo to stop using cmdutil, which should avoid some future import cycles. There's room for an adventurous soul to delve deeper into merge.py and figure out how to disentangle more of it - it appears to be a nexus of cycle problems. Some of it might be able to move into this new mergeutil package. 2016-11-22 05:31:45 +03:00			`from .i18n import _`


			`def checkunresolved(ms):`
			`if list(ms.unresolved()):`
codemod: join the auto-formatter party 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 2018-05-26 07:34:37 +03:00			`raise error.Abort(_("unresolved merge conflicts " "(see 'hg help resolve')"))`
			`if ms.mdstate() != "s" or list(ms.driverresolved()):`
			`raise error.Abort(`
			`_("driver-resolved merge conflicts"),`
			`hint=_('run "hg resolve --all" to resolve'),`
			`)`