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
68 lines
1.7 KiB
Perl
68 lines
1.7 KiB
Perl
$ cat > showhint.py << EOF
|
|
> from edenscm.mercurial import (
|
|
> cmdutil,
|
|
> hintutil,
|
|
> registrar,
|
|
> )
|
|
>
|
|
> cmdtable = {}
|
|
> command = registrar.command(cmdtable)
|
|
>
|
|
> hint = registrar.hint()
|
|
>
|
|
> @hint('next')
|
|
> def hintnext(a, b):
|
|
> return "use 'hg next' to go from %s to %s" % (a, b)
|
|
>
|
|
> @hint('export')
|
|
> def hintexport(a):
|
|
> return "use 'hg export %s' to show commit content" % (a,)
|
|
>
|
|
> @command('showhint', norepo=True)
|
|
> def showhint(*args):
|
|
> hintutil.trigger('export', 'P')
|
|
> hintutil.trigger('next', 'X', 'Y')
|
|
> hintutil.trigger('export', 'Q')
|
|
> EOF
|
|
|
|
$ setconfig extensions.showhint=$TESTTMP/showhint.py
|
|
|
|
$ hg showhint
|
|
hint[export]: use 'hg export P' to show commit content
|
|
hint[next]: use 'hg next' to go from X to Y
|
|
hint[hint-ack]: use 'hg hint --ack export next' to silence these hints
|
|
|
|
Test HGPLAIN=1 or HGPLAIN=hint silences all hints
|
|
|
|
$ HGPLAIN=1 hg showhint
|
|
$ HGPLAIN=hint hg showhint
|
|
|
|
Test silence configs
|
|
|
|
$ hg showhint --config hint.ack-export=True
|
|
hint[next]: use 'hg next' to go from X to Y
|
|
hint[hint-ack]: use 'hg hint --ack next' to silence these hints
|
|
$ hg showhint --config hint.ack=next
|
|
hint[export]: use 'hg export P' to show commit content
|
|
hint[hint-ack]: use 'hg hint --ack export' to silence these hints
|
|
$ hg showhint --config hint.ack=*
|
|
|
|
Test hint --ack command
|
|
|
|
$ HGRCPATH=$HGRCPATH:$HOME/.hgrc
|
|
$ hg hint --ack next hint-ack
|
|
hints about next, hint-ack are silenced
|
|
$ cat .hgrc
|
|
[hint]
|
|
ack = next hint-ack
|
|
|
|
$ hg showhint
|
|
hint[export]: use 'hg export P' to show commit content
|
|
|
|
$ hg hint --ack export -q
|
|
$ cat .hgrc
|
|
[hint]
|
|
ack = next hint-ack export
|
|
|
|
$ hg showhint
|