mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +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
58 lines
1.6 KiB
Raku
58 lines
1.6 KiB
Raku
|
|
$ cat > engine.py << EOF
|
|
>
|
|
> from edenscm.mercurial import templater
|
|
>
|
|
> class mytemplater(object):
|
|
> def __init__(self, loader, filters, defaults, aliases):
|
|
> self.loader = loader
|
|
>
|
|
> def process(self, t, map):
|
|
> tmpl = self.loader(t)
|
|
> for k, v in map.iteritems():
|
|
> if k in ('templ', 'ctx', 'repo', 'revcache', 'cache', 'troubles'):
|
|
> continue
|
|
> if hasattr(v, '__call__'):
|
|
> try:
|
|
> v = v(**map)
|
|
> except Exception:
|
|
> continue
|
|
> v = templater.stringify(v)
|
|
> tmpl = tmpl.replace('{{%s}}' % k, v)
|
|
> yield tmpl
|
|
>
|
|
> templater.engines['my'] = mytemplater
|
|
> EOF
|
|
$ hg init test
|
|
$ echo '[extensions]' > test/.hg/hgrc
|
|
$ echo "engine = `pwd`/engine.py" >> test/.hg/hgrc
|
|
$ cd test
|
|
$ cat > mymap << EOF
|
|
> changeset = my:changeset.txt
|
|
> EOF
|
|
$ cat > changeset.txt << EOF
|
|
> {{rev}} {{node}} {{author}}
|
|
> EOF
|
|
$ hg ci -Ama
|
|
adding changeset.txt
|
|
adding mymap
|
|
$ hg log --style=./mymap
|
|
0 97e5f848f0936960273bbf75be6388cd0350a32b test
|
|
|
|
$ cat > changeset.txt << EOF
|
|
> {{p1rev}} {{p1node}} {{p2rev}} {{p2node}}
|
|
> EOF
|
|
$ hg ci -Ama
|
|
$ hg log --style=./mymap
|
|
0 97e5f848f0936960273bbf75be6388cd0350a32b -1 0000000000000000000000000000000000000000
|
|
-1 0000000000000000000000000000000000000000 -1 0000000000000000000000000000000000000000
|
|
|
|
invalid engine type:
|
|
|
|
$ echo 'changeset = unknown:changeset.txt' > unknownenginemap
|
|
$ hg log --style=./unknownenginemap
|
|
abort: invalid template engine: unknown
|
|
[255]
|
|
|
|
$ cd ..
|