facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 00:14:35 +03:00
Code Issues Projects Releases Wiki Activity

simplemerge: simplify code now that we always write to a context

Browse Source 
There's no need for an `out` abstraction between files and contexts anymore.

Differential Revision: https://phab.mercurial-scm.org/D383
This commit is contained in:
Phil Cohen 2017-08-24 21:30:51 -07:00
parent b2eda692d7
commit 2687ed6e48
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mercurial/simplemerge.py
View File

@ -436,17 +436,6 @@ def simplemerge(ui, localctx, basectx, otherctx, repo=None, **opts):
# repository usually sees) might be more useful. # repository usually sees) might be more useful.
return _verifytext(ctx.decodeddata(), ctx.path(), ui, opts) return _verifytext(ctx.decodeddata(), ctx.path(), ui, opts)
class ctxwriter(object):
def __init__(self, ctx):
self.ctx = ctx
self.text = ""
def write(self, text):
self.text += text
def close(self):
self.ctx.write(self.text, self.ctx.flags())
mode = opts.get('mode','merge') mode = opts.get('mode','merge')
name_a, name_b, name_base = None, None, None name_a, name_b, name_base = None, None, None
if mode != 'union': if mode != 'union':
@ -461,11 +450,6 @@ def simplemerge(ui, localctx, basectx, otherctx, repo=None, **opts):
except error.Abort: except error.Abort:
return 1 return 1
if opts.get('print'):
out = ui.fout
else:
out = ctxwriter(localctx)
m3 = Merge3Text(basetext, localtext, othertext) m3 = Merge3Text(basetext, localtext, othertext)
extrakwargs = { extrakwargs = {
"localorother": opts.get("localorother", None), "localorother": opts.get("localorother", None),
@ -479,12 +463,17 @@ def simplemerge(ui, localctx, basectx, otherctx, repo=None, **opts):
extrakwargs['base_marker'] = '|||||||' extrakwargs['base_marker'] = '|||||||'
extrakwargs['name_base'] = name_base extrakwargs['name_base'] = name_base
extrakwargs['minimize'] = False extrakwargs['minimize'] = False
mergedtext = ""
for line in m3.merge_lines(name_a=name_a, name_b=name_b, for line in m3.merge_lines(name_a=name_a, name_b=name_b,
**pycompat.strkwargs(extrakwargs)): **pycompat.strkwargs(extrakwargs)):
out.write(line) if opts.get('print'):
ui.fout.write(line)
else:
mergedtext += line
if not opts.get('print'): if not opts.get('print'):
out.close() localctx.write(mergedtext, localctx.flags())
if m3.conflicts and not mode == 'union': if m3.conflicts and not mode == 'union':
return 1 return 1