mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +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
53 lines
1.4 KiB
Python
53 lines
1.4 KiB
Python
# Extension dedicated to test patch.diff() upgrade modes
|
|
|
|
from __future__ import absolute_import
|
|
|
|
from edenscm.mercurial import error, patch, registrar, scmutil
|
|
|
|
|
|
cmdtable = {}
|
|
command = registrar.command(cmdtable)
|
|
|
|
|
|
@command(
|
|
"autodiff",
|
|
[("", "git", "", "git upgrade mode (yes/no/auto/warn/abort)")],
|
|
"[OPTION]... [FILE]...",
|
|
)
|
|
def autodiff(ui, repo, *pats, **opts):
|
|
diffopts = patch.difffeatureopts(ui, opts)
|
|
git = opts.get("git", "no")
|
|
brokenfiles = set()
|
|
losedatafn = None
|
|
if git in ("yes", "no"):
|
|
diffopts.git = git == "yes"
|
|
diffopts.upgrade = False
|
|
elif git == "auto":
|
|
diffopts.git = False
|
|
diffopts.upgrade = True
|
|
elif git == "warn":
|
|
diffopts.git = False
|
|
diffopts.upgrade = True
|
|
|
|
def losedatafn(fn=None, **kwargs):
|
|
brokenfiles.add(fn)
|
|
return True
|
|
|
|
elif git == "abort":
|
|
diffopts.git = False
|
|
diffopts.upgrade = True
|
|
|
|
def losedatafn(fn=None, **kwargs):
|
|
raise error.Abort("losing data for %s" % fn)
|
|
|
|
else:
|
|
raise error.Abort("--git must be yes, no or auto")
|
|
|
|
node1, node2 = scmutil.revpair(repo, [])
|
|
m = scmutil.match(repo[node2], pats, opts)
|
|
it = patch.diff(repo, node1, node2, match=m, opts=diffopts, losedatafn=losedatafn)
|
|
for chunk in it:
|
|
ui.write(chunk)
|
|
for fn in sorted(brokenfiles):
|
|
ui.write(("data lost for: %s\n" % fn))
|