This is an archive of the discontinued Mercurial Phabricator instance.

Differential D604

context: add arbitraryfilectx, which can represent files outside the workdir
ClosedPublic

Authored by phillco on Sep 1 2017, 2:53 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd2fc88426d21: context: add arbitraryfilectx, which can represent files outside the workdir
rHG244e2e937b73: context: add arbitraryfilectx, which can represent files outside the workdir
Summary

Move it from contrib/simplemerge so it can be re-used in the future.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

phillco created this revision.Sep 1 2017, 2:53 PM
martinvonz added a subscriber: martinvonz.Sep 1 2017, 4:23 PM
martinvonz added inline comments.
mercurial/context.py
2389

Maybe indygreg will come and make this extend an abstract abc class one day :-)

Closed by commit rHG244e2e937b73: context: add arbitraryfilectx, which can represent files outside the workdir (authored by phillco). · Explain WhySep 1 2017, 4:58 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/simplemerge (27 lines)
Mmercurial/context.py (31 lines)

Diff 1559

contrib/simplemerge

#!/usr/bin/env python #!/usr/bin/env python
from __future__ import absolute_import from __future__ import absolute_import
import getopt import getopt
import sys import sys
import hgdemandimport import hgdemandimport
hgdemandimport.enable() hgdemandimport.enable()
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
context,
error, error,
fancyopts, fancyopts,
simplemerge, simplemerge,
ui as uimod, ui as uimod,
util, util,
) )
options = [('L', 'label', [], _('labels to use on conflict markers')), options = [('L', 'label', [], _('labels to use on conflict markers')),
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)
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'))
local, base, other = args local, base, other = args
sys.exit(simplemerge.simplemerge(uimod.ui.load(), sys.exit(simplemerge.simplemerge(uimod.ui.load(),
filebackedctx(local), context.arbitraryfilectx(local),
filebackedctx(base), context.arbitraryfilectx(base),
filebackedctx(other), context.arbitraryfilectx(other),
**opts)) **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)

mercurial/context.py

if not managing(f): if not managing(f):
added.append(f) added.append(f)
elif f in self: elif f in self:
modified.append(f) modified.append(f)
else: else:
removed.append(f) removed.append(f)
return scmutil.status(modified, added, removed, [], [], [], []) return scmutil.status(modified, added, removed, [], [], [], [])
class arbitraryfilectx(object):
martinvonzUnsubmitted
Not Done

Maybe indygreg will come and make this extend an abstract abc class one day :-)

martinvonz: Maybe indygreg will come and make this extend an abstract abc class one day :-)
"""Allows you to use filectx-like functions on a file in an arbitrary
location on disk, possibly not in the working directory.
"""
def __init__(self, path):
self._path = path
def cmp(self, otherfilectx):
return self.data() != otherfilectx.data()
def path(self):
return self._path
def flags(self):
return ''
def data(self):
return util.readfile(self._path)
def decodeddata(self):
with open(self._path, "rb") as f:
return f.read()
def remove(self):
util.unlink(self._path)
def write(self, data, flags):
assert not flags
with open(self._path, "w") as f:
f.write(data)