mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
9523fa9b6b
In the next patch, we will be creating a bytes version of getopt.getopt() and doing that will leave getopt as unused import in fancyopts. So before removing that there are instances in codebase where instead of importing getopt, we have used fancyopts.getopt. This patch will switch all those cases so that the next patch can remove the import of getopt from fancyopts without breaking things.
68 lines
2.1 KiB
Python
Executable File
68 lines
2.1 KiB
Python
Executable File
#!/usr/bin/env python
|
|
|
|
from mercurial import demandimport
|
|
demandimport.enable()
|
|
|
|
import getopt
|
|
import sys
|
|
from mercurial.i18n import _
|
|
from mercurial import error, simplemerge, fancyopts, util, ui
|
|
|
|
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'))
|
|
sys.exit(simplemerge.simplemerge(ui.ui.load(), *args, **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)
|