sapling/hgext/inhibit.py

# inhibit.py - redefine bumped(), divergent() revsets
#
# 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.
"""redefine obsolete(), bumped(), divergent() revsets"""

from __future__ import absolute_import

from mercurial import error, extensions, obsolete, util


revive = obsolete.revive


def uisetup(ui):
    revsets = obsolete.cachefuncs

    # make divergent() and bumped() empty
    # NOTE: we should avoid doing this but just change templates to only show a
    # subset of troubles we care about.
    revsets["divergent"] = revsets["bumped"] = lambda repo: frozenset()
obsolete: move commit reviving logic to core Summary: Reviving commits is an essential feature. So move it to core. Most test changes are caused by the auto-date-bump behavior, which is needed to revive commits automatically. Note the existing code is not fully ready for the change. For example, `precursors.get(node)`, `successors.get(node)` do not filter out markers that are suppressed. For example, some code paths treat node as obsoleted if `precursors.get(node)` is non-empty. That's no longer true. markbt's planned visibility change might clean up this area a bit. Regarding on tests, most changes are because of the "auto bump date" feature. The graphlog change in `test-obsmarker-template.t` is because it creates a cycle, which behaves differently in the new code. Half of obsmarker exchange tests break. Given the fact that we do not use and will probably rewrite the exchange algorithm, related tests are deleted, including `test-obsolete-distributed.t`. Reviewed By: DurhamG Differential Revision: D9236661 fbshipit-source-id: 85b983f8bd46dece908c05f56bea2abbc8ffbaf6 2018-08-18 20:40:33 +03:00			`# inhibit.py - redefine bumped(), divergent() revsets`
inhibit: completely rewrite the extension Summary: The main feature we want is to be able to unobsolete an already obsoleted changeset. The old inhibit code is causing all kinds of unsolvable weird cases and is hard to deubg or maintain. This patch rewrites it completely. Basically, we now require people to use obsmarkers to "unobsolete" changesets. We treat cycles in obsstore as a normal case and break the cycle using date information. It should be a neat and correct solution until we want marker exchange. A "revive" API was provided for other extensions to use. Tests and other code changes will be fixed in a follow up. Test Plan: `test-inhibit.t` was rewritten to test the new features. Other tests are broken and skipped for now. The next diff will fix them. Reviewers: #mercurial, kulshrax Reviewed By: kulshrax Subscribers: medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5391320 Signature: t1:5391320:1499716172:a946381421cc242411f5175ee3b7a3a0bc5a4f07 2017-07-11 01:45:07 +03:00			`#`
			`# 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.`
			`"""redefine obsolete(), bumped(), divergent() revsets"""`

			`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 mercurial import error, extensions, obsolete, util`

inhibit: completely rewrite the extension Summary: The main feature we want is to be able to unobsolete an already obsoleted changeset. The old inhibit code is causing all kinds of unsolvable weird cases and is hard to deubg or maintain. This patch rewrites it completely. Basically, we now require people to use obsmarkers to "unobsolete" changesets. We treat cycles in obsstore as a normal case and break the cycle using date information. It should be a neat and correct solution until we want marker exchange. A "revive" API was provided for other extensions to use. Tests and other code changes will be fixed in a follow up. Test Plan: `test-inhibit.t` was rewritten to test the new features. Other tests are broken and skipped for now. The next diff will fix them. Reviewers: #mercurial, kulshrax Reviewed By: kulshrax Subscribers: medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5391320 Signature: t1:5391320:1499716172:a946381421cc242411f5175ee3b7a3a0bc5a4f07 2017-07-11 01:45:07 +03:00
obsolete: move commit reviving logic to core Summary: Reviving commits is an essential feature. So move it to core. Most test changes are caused by the auto-date-bump behavior, which is needed to revive commits automatically. Note the existing code is not fully ready for the change. For example, `precursors.get(node)`, `successors.get(node)` do not filter out markers that are suppressed. For example, some code paths treat node as obsoleted if `precursors.get(node)` is non-empty. That's no longer true. markbt's planned visibility change might clean up this area a bit. Regarding on tests, most changes are because of the "auto bump date" feature. The graphlog change in `test-obsmarker-template.t` is because it creates a cycle, which behaves differently in the new code. Half of obsmarker exchange tests break. Given the fact that we do not use and will probably rewrite the exchange algorithm, related tests are deleted, including `test-obsolete-distributed.t`. Reviewed By: DurhamG Differential Revision: D9236661 fbshipit-source-id: 85b983f8bd46dece908c05f56bea2abbc8ffbaf6 2018-08-18 20:40:33 +03:00			`revive = obsolete.revive`
inhibit: completely rewrite the extension Summary: The main feature we want is to be able to unobsolete an already obsoleted changeset. The old inhibit code is causing all kinds of unsolvable weird cases and is hard to deubg or maintain. This patch rewrites it completely. Basically, we now require people to use obsmarkers to "unobsolete" changesets. We treat cycles in obsstore as a normal case and break the cycle using date information. It should be a neat and correct solution until we want marker exchange. A "revive" API was provided for other extensions to use. Tests and other code changes will be fixed in a follow up. Test Plan: `test-inhibit.t` was rewritten to test the new features. Other tests are broken and skipped for now. The next diff will fix them. Reviewers: #mercurial, kulshrax Reviewed By: kulshrax Subscribers: medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5391320 Signature: t1:5391320:1499716172:a946381421cc242411f5175ee3b7a3a0bc5a4f07 2017-07-11 01:45:07 +03:00
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
inhibit: completely rewrite the extension Summary: The main feature we want is to be able to unobsolete an already obsoleted changeset. The old inhibit code is causing all kinds of unsolvable weird cases and is hard to deubg or maintain. This patch rewrites it completely. Basically, we now require people to use obsmarkers to "unobsolete" changesets. We treat cycles in obsstore as a normal case and break the cycle using date information. It should be a neat and correct solution until we want marker exchange. A "revive" API was provided for other extensions to use. Tests and other code changes will be fixed in a follow up. Test Plan: `test-inhibit.t` was rewritten to test the new features. Other tests are broken and skipped for now. The next diff will fix them. Reviewers: #mercurial, kulshrax Reviewed By: kulshrax Subscribers: medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5391320 Signature: t1:5391320:1499716172:a946381421cc242411f5175ee3b7a3a0bc5a4f07 2017-07-11 01:45:07 +03:00			`def uisetup(ui):`
			`revsets = obsolete.cachefuncs`

			`# make divergent() and bumped() empty`
			`# NOTE: we should avoid doing this but just change templates to only show a`
			`# subset of troubles we care about.`
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			`revsets["divergent"] = revsets["bumped"] = lambda repo: frozenset()`