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
93 lines
1.9 KiB
Python
93 lines
1.9 KiB
Python
from __future__ import absolute_import, print_function
|
|
|
|
import os
|
|
|
|
from edenscm.mercurial import hg, merge, ui as uimod
|
|
|
|
|
|
u = uimod.ui.load()
|
|
|
|
repo = hg.repository(u, "test1", create=1)
|
|
os.chdir("test1")
|
|
|
|
|
|
def commit(text, time):
|
|
repo.commit(text=text, date="%d 0" % time)
|
|
|
|
|
|
def addcommit(name, time):
|
|
f = open(name, "w")
|
|
f.write("%s\n" % name)
|
|
f.close()
|
|
repo[None].add([name])
|
|
commit(name, time)
|
|
|
|
|
|
def update(rev):
|
|
merge.update(repo, rev, False, True)
|
|
|
|
|
|
def merge_(rev):
|
|
merge.update(repo, rev, True, False)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
addcommit("A", 0)
|
|
addcommit("B", 1)
|
|
|
|
update(0)
|
|
addcommit("C", 2)
|
|
|
|
merge_(1)
|
|
commit("D", 3)
|
|
|
|
update(2)
|
|
addcommit("E", 4)
|
|
addcommit("F", 5)
|
|
|
|
update(3)
|
|
addcommit("G", 6)
|
|
|
|
merge_(5)
|
|
commit("H", 7)
|
|
|
|
update(5)
|
|
addcommit("I", 8)
|
|
|
|
# Ancestors
|
|
print("Ancestors of 5")
|
|
for r in repo.changelog.ancestors([5]):
|
|
print(r, end=" ")
|
|
|
|
print("\nAncestors of 6 and 5")
|
|
for r in repo.changelog.ancestors([6, 5]):
|
|
print(r, end=" ")
|
|
|
|
print("\nAncestors of 5 and 4")
|
|
for r in repo.changelog.ancestors([5, 4]):
|
|
print(r, end=" ")
|
|
|
|
print("\nAncestors of 7, stop at 6")
|
|
for r in repo.changelog.ancestors([7], 6):
|
|
print(r, end=" ")
|
|
|
|
print("\nAncestors of 7, including revs")
|
|
for r in repo.changelog.ancestors([7], inclusive=True):
|
|
print(r, end=" ")
|
|
|
|
print("\nAncestors of 7, 5 and 3, including revs")
|
|
for r in repo.changelog.ancestors([7, 5, 3], inclusive=True):
|
|
print(r, end=" ")
|
|
|
|
# Descendants
|
|
print("\n\nDescendants of 5")
|
|
for r in repo.changelog.descendants([5]):
|
|
print(r, end=" ")
|
|
|
|
print("\nDescendants of 5 and 3")
|
|
for r in repo.changelog.descendants([5, 3]):
|
|
print(r, end=" ")
|
|
|
|
print("\nDescendants of 5 and 4")
|
|
print(*repo.changelog.descendants([5, 4]), sep=" ")
|