mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +03:00
9dc21f8d0b
Summary: D13853115 adds `edenscm/` to `sys.path` and code still uses `import mercurial`. That has nasty problems if both `import mercurial` and `import edenscm.mercurial` are used, because Python would think `mercurial.foo` and `edenscm.mercurial.foo` are different modules so code like `try: ... except mercurial.error.Foo: ...`, or `isinstance(x, mercurial.foo.Bar)` would fail to handle the `edenscm.mercurial` version. There are also some module-level states (ex. `extensions._extensions`) that would cause trouble if they have multiple versions in a single process. Change imports to use the `edenscm` so ideally the `mercurial` is no longer imported at all. Add checks in extensions.py to catch unexpected extensions importing modules from the old (wrong) locations when running tests. Reviewed By: phillco Differential Revision: D13868981 fbshipit-source-id: f4e2513766957fd81d85407994f7521a08e4de48
42 lines
1.1 KiB
Python
42 lines
1.1 KiB
Python
# stat.py
|
|
#
|
|
# 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.
|
|
|
|
from edenscm.mercurial import error, patch, registrar, templatekw, util
|
|
from edenscm.mercurial.i18n import _
|
|
|
|
|
|
templatefunc = registrar.templatefunc()
|
|
|
|
|
|
@templatefunc("stat(style=none)", argspec="style")
|
|
def showdiffstat(context, mapping, args):
|
|
"""String. Return diffstat-style summary of changes.
|
|
|
|
If 'style' is not 'none', it could be 'status', in which case "added",
|
|
"changed", "removed" will be shown before file names.
|
|
"""
|
|
if "style" in args:
|
|
style = args["style"][1]
|
|
else:
|
|
style = "none"
|
|
|
|
repo = mapping["repo"]
|
|
ctx = mapping["ctx"]
|
|
revcache = mapping["revcache"]
|
|
width = repo.ui.termwidth()
|
|
|
|
if style == "none":
|
|
status = None
|
|
elif style == "status":
|
|
status = templatekw.getfiles(repo, ctx, revcache)
|
|
else:
|
|
raise error.ParseError(_("stat does not support style %r") % (style,))
|
|
|
|
return patch.diffstat(
|
|
util.iterlines(ctx.diff(noprefix=False)), width=width, status=status
|
|
)
|