( )⚙ D378 contrib: make simplemerge script pass context-like objects

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D378

contrib: make simplemerge script pass context-like objects
ClosedPublic

Authored by phillco on Aug 14 2017, 2:15 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGed6f64173121: contrib: make simplemerge script pass context-like objects
Summary

simplemerge() will soon require context-like objects to work. Create a simple
context-like object that wraps the requested files and can be passed to the new
API.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco created this revision.Aug 14 2017, 2:15 AM
phillco updated this revision to Diff 1038.Aug 17 2017, 2:29 PM
phillco added a subscriber: martinvonz.Aug 19 2017, 1:56 PM
phillco added inline comments.
contrib/simplemerge
44–63

As @martinvonz noted this could probably be combined with the arbitraryfilectx I made in https://bitbucket.org/phillco/hg-imm/commits/0cc65baa328bbba84629aeb4708ee2fa765a50f0.

phillco updated this revision to Diff 1277.Aug 25 2017, 12:32 AM
Closed by commit rHGed6f64173121: contrib: make simplemerge script pass context-like objects (authored by phillco). · Explain WhyAug 25 2017, 2:40 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/simplemerge (31 lines)

Diff 1038

contrib/simplemerge

for shortopt, longopt, default, desc in options: for shortopt, longopt, default, desc in options:
out_opts.append(('%2s%s' % (shortopt and '-%s' % shortopt, out_opts.append(('%2s%s' % (shortopt and '-%s' % shortopt,
longopt and ' --%s' % longopt), longopt and ' --%s' % longopt),
'%s' % desc)) '%s' % desc))
opts_len = max([len(opt[0]) for opt in out_opts]) opts_len = max([len(opt[0]) for opt in out_opts])
for first, second in out_opts: for first, second in out_opts:
sys.stdout.write(' %-*s %s\n' % (opts_len, first, second)) sys.stdout.write(' %-*s %s\n' % (opts_len, first, second))
class filebackedctx(object):
"""simplemerge requires context-like objects"""
def __init__(self, path):
self._path = path
def decodeddata(self):
with open(self._path, "rb") as f:
return f.read()
def flags(self):
return ''
def path(self):
return self._path
def write(self, data, flags):
assert not flags
with open(self._path, "w") as f:
f.write(data)
phillcoAuthorUnsubmitted
Not Done

As @martinvonz noted this could probably be combined with the arbitraryfilectx I made in https://bitbucket.org/phillco/hg-imm/commits/0cc65baa328bbba84629aeb4708ee2fa765a50f0.

phillco: As @martinvonz noted this could probably be combined with the `arbitraryfilectx` I made in…
try: try:
for fp in (sys.stdin, sys.stdout, sys.stderr): for fp in (sys.stdin, sys.stdout, sys.stderr):
util.setbinary(fp) util.setbinary(fp)
opts = {} opts = {}
try: try:
args = fancyopts.fancyopts(sys.argv[1:], options, opts) args = fancyopts.fancyopts(sys.argv[1:], options, opts)
except getopt.GetoptError as e: except getopt.GetoptError as e:
raise ParseError(e) raise ParseError(e)
if opts['help']: if opts['help']:
showhelp() showhelp()
sys.exit(0) sys.exit(0)
if len(args) != 3: if len(args) != 3:
raise ParseError(_('wrong number of arguments')) raise ParseError(_('wrong number of arguments'))
sys.exit(simplemerge.simplemerge(ui.ui.load(), *args, **opts)) local, base, other = args
sys.exit(simplemerge.simplemerge(ui.ui.load(),
local,
base,
other,
filebackedctx(local),
filebackedctx(base),
filebackedctx(other),
filtereddata=True,
**opts))
except ParseError as e: except ParseError as e:
sys.stdout.write("%s: %s\n" % (sys.argv[0], e)) sys.stdout.write("%s: %s\n" % (sys.argv[0], e))
showhelp() showhelp()
sys.exit(1) sys.exit(1)
except error.Abort as e: except error.Abort as e:
sys.stderr.write("abort: %s\n" % e) sys.stderr.write("abort: %s\n" % e)
sys.exit(255) sys.exit(255)
except KeyboardInterrupt: except KeyboardInterrupt:
sys.exit(255) sys.exit(255)