mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 16:57:49 +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
82 lines
2.5 KiB
Python
Executable File
82 lines
2.5 KiB
Python
Executable File
#!/usr/bin/env python
|
|
from __future__ import absolute_import
|
|
|
|
import getopt
|
|
import sys
|
|
|
|
from edenscm import hgdemandimport
|
|
hgdemandimport.enable()
|
|
|
|
from edenscm.mercurial.i18n import _
|
|
from edenscm.mercurial import (
|
|
context,
|
|
error,
|
|
fancyopts,
|
|
simplemerge,
|
|
ui as uimod,
|
|
util,
|
|
)
|
|
|
|
options = [('L', 'label', [], _('labels to use on conflict markers')),
|
|
('a', 'text', None, _('treat all files as text')),
|
|
('p', 'print', None,
|
|
_('print results instead of overwriting LOCAL')),
|
|
('', 'no-minimal', None, _('no effect (DEPRECATED)')),
|
|
('h', 'help', None, _('display help and exit')),
|
|
('q', 'quiet', None, _('suppress output'))]
|
|
|
|
usage = _('''simplemerge [OPTS] LOCAL BASE OTHER
|
|
|
|
Simple three-way file merge utility with a minimal feature set.
|
|
|
|
Apply to LOCAL the changes necessary to go from BASE to OTHER.
|
|
|
|
By default, LOCAL is overwritten with the results of this operation.
|
|
''')
|
|
|
|
class ParseError(Exception):
|
|
"""Exception raised on errors in parsing the command line."""
|
|
|
|
def showhelp():
|
|
sys.stdout.write(usage)
|
|
sys.stdout.write('\noptions:\n')
|
|
|
|
out_opts = []
|
|
for shortopt, longopt, default, desc in options:
|
|
out_opts.append(('%2s%s' % (shortopt and '-%s' % shortopt,
|
|
longopt and ' --%s' % longopt),
|
|
'%s' % desc))
|
|
opts_len = max([len(opt[0]) for opt in out_opts])
|
|
for first, second in out_opts:
|
|
sys.stdout.write(' %-*s %s\n' % (opts_len, first, second))
|
|
|
|
try:
|
|
for fp in (sys.stdin, sys.stdout, sys.stderr):
|
|
util.setbinary(fp)
|
|
|
|
opts = {}
|
|
try:
|
|
args = fancyopts.fancyopts(sys.argv[1:], options, opts)
|
|
except getopt.GetoptError as e:
|
|
raise ParseError(e)
|
|
if opts['help']:
|
|
showhelp()
|
|
sys.exit(0)
|
|
if len(args) != 3:
|
|
raise ParseError(_('wrong number of arguments'))
|
|
local, base, other = args
|
|
sys.exit(simplemerge.simplemerge(uimod.ui.load(),
|
|
context.arbitraryfilectx(local),
|
|
context.arbitraryfilectx(base),
|
|
context.arbitraryfilectx(other),
|
|
**opts))
|
|
except ParseError as e:
|
|
sys.stdout.write("%s: %s\n" % (sys.argv[0], e))
|
|
showhelp()
|
|
sys.exit(1)
|
|
except error.Abort as e:
|
|
sys.stderr.write("abort: %s\n" % e)
|
|
sys.exit(255)
|
|
except KeyboardInterrupt:
|
|
sys.exit(255)
|