diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py --- a/mercurial/simplemerge.py +++ b/mercurial/simplemerge.py @@ -410,12 +410,30 @@ def simplemerge(ui, localfile, basefile, otherfile, localctx=None, basectx=None, otherctx=None, repo=None, **opts): + """Performs the simplemerge algorithm. + + {local|base|other}ctx are optional. If passed, they (local/base/other) will + be read from. You should pass explicit labels in this mode since the default + is to use the file paths.""" def readfile(filename): f = open(filename, "rb") text = f.read() f.close() return _verifytext(text, filename, ui, opts) + def readctx(ctx): + if not ctx: + return None + if not repo: + raise error.ProgrammingError('simplemerge: repo must be passed if ' + 'using contexts') + # `wwritedata` is used to get the post-filter data from `ctx` (i.e., + # what would have been in the working copy). Since merges were run in + # the working copy, and thus used post-filter data, we do the same to + # maintain behavior. + return repo.wwritedata(ctx.path(), + _verifytext(ctx.data(), ctx.path(), ui, opts)) + mode = opts.get('mode','merge') if mode == 'union': name_a = None @@ -436,9 +454,9 @@ raise error.Abort(_("can only specify three labels.")) try: - localtext = readfile(localfile) - basetext = readfile(basefile) - othertext = readfile(otherfile) + localtext = readctx(localctx) if localctx else readfile(localfile) + basetext = readctx(basectx) if basectx else readfile(basefile) + othertext = readctx(otherctx) if otherctx else readfile(otherfile) except error.Abort: return 1 diff --git a/tests/test-lfconvert.t b/tests/test-lfconvert.t --- a/tests/test-lfconvert.t +++ b/tests/test-lfconvert.t @@ -128,7 +128,7 @@ $ hg merge merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat merging sub/normal2 and stuff/normal2 to stuff/normal2 - warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. (glob) + warning: stuff/maybelarge.dat looks like a binary file. (glob) warning: conflicts while merging stuff/maybelarge.dat! (edit, then use 'hg resolve --mark') 0 files updated, 1 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon