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
72 lines
2.2 KiB
Python
72 lines
2.2 KiB
Python
# bruterebase.py - brute force rebase testing
|
|
#
|
|
# 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 __future__ import absolute_import
|
|
|
|
from edenscm.hgext import rebase
|
|
from edenscm.mercurial import error, registrar, revsetlang
|
|
|
|
|
|
try:
|
|
xrange
|
|
except NameError:
|
|
xrange = range
|
|
|
|
cmdtable = {}
|
|
command = registrar.command(cmdtable)
|
|
|
|
|
|
@command(b"debugbruterebase")
|
|
def debugbruterebase(ui, repo, source, dest):
|
|
"""for every non-empty subset of source, run rebase -r subset -d dest
|
|
|
|
Print one line summary for each subset. Assume obsstore is enabled.
|
|
"""
|
|
srevs = list(repo.revs(source))
|
|
|
|
with repo.wlock(), repo.lock():
|
|
repolen = len(repo)
|
|
cl = repo.changelog
|
|
|
|
def getdesc(rev):
|
|
result = cl.changelogrevision(rev).description
|
|
if rev >= repolen:
|
|
result += b"'"
|
|
return result
|
|
|
|
for i in xrange(1, 2 ** len(srevs)):
|
|
subset = [rev for j, rev in enumerate(srevs) if i & (1 << j) != 0]
|
|
spec = revsetlang.formatspec(b"%ld", subset)
|
|
tr = repo.transaction(b"rebase")
|
|
tr.report = lambda x: 0 # hide "transaction abort"
|
|
|
|
ui.pushbuffer()
|
|
try:
|
|
rebase.rebase(ui, repo, dest=dest, rev=[spec])
|
|
except error.Abort as ex:
|
|
summary = b"ABORT: %s" % ex
|
|
except Exception as ex:
|
|
summary = b"CRASH: %s" % ex
|
|
else:
|
|
# short summary about new nodes
|
|
cl = repo.changelog
|
|
descs = []
|
|
for rev in xrange(repolen, len(repo)):
|
|
desc = b"%s:" % getdesc(rev)
|
|
for prev in cl.parentrevs(rev):
|
|
if prev > -1:
|
|
desc += getdesc(prev)
|
|
descs.append(desc)
|
|
descs.sort()
|
|
summary = " ".join(descs)
|
|
ui.popbuffer()
|
|
repo.localvfs.tryunlink(b"rebasestate")
|
|
|
|
subsetdesc = b"".join(getdesc(rev) for rev in subset)
|
|
ui.write((b"%s: %s\n") % (subsetdesc.rjust(len(srevs)), summary))
|
|
tr.abort()
|