This is an archive of the discontinued Mercurial Phabricator instance.

Differential D374

simplemerge: use contexts to read file data from, if passed
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG8b91a4ff23ad: simplemerge: use contexts to read file data from, if passed
Summary

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.Aug 14 2017, 2:15 AM
Closed by commit rHG8b91a4ff23ad: simplemerge: use contexts to read file data from, if passed (authored by phillco). · Explain WhyAug 15 2017, 5:32 PM
This revision was automatically updated to reflect the committed changes.
martinvonz added a subscriber: martinvonz.Aug 19 2017, 12:51 AM
martinvonz added inline comments.
mercurial/simplemerge.py
425

leftovers? doesn't seem to happen because you guard against it on lines 457-459

430

What is this "post-filter data"? I didn't know hg had this feature. Something like git' clean/smudge filters?

phillco added inline comments.Aug 19 2017, 1:52 PM
mercurial/simplemerge.py
430

Yeah, exactly. I didn't know about it either. https://www.mercurial-scm.org/wiki/EncodeDecodeFilter?highlight=%28filter%29

Perhaps including that link in the comment, or in wwritedata (later, decodeddata()) might be a good idea.

Revision Contents
Changeset List

PathPackages
Mmercurial/simplemerge.py (24 lines)
Mtests/test-lfconvert.t (2 lines)

Diff 955

mercurial/simplemerge.py

if not opts.get('quiet'): if not opts.get('quiet'):
ui.warn(_('warning: %s\n') % msg) ui.warn(_('warning: %s\n') % msg)
if not opts.get('text'): if not opts.get('text'):
raise error.Abort(msg) raise error.Abort(msg)
return text return text
def simplemerge(ui, localfile, basefile, otherfile, def simplemerge(ui, localfile, basefile, otherfile,
localctx=None, basectx=None, otherctx=None, repo=None, **opts): 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): def readfile(filename):
f = open(filename, "rb") f = open(filename, "rb")
text = f.read() text = f.read()
f.close() f.close()
return _verifytext(text, filename, ui, opts) return _verifytext(text, filename, ui, opts)
def readctx(ctx):
if not ctx:
martinvonzUnsubmitted
Not Done

leftovers? doesn't seem to happen because you guard against it on lines 457-459

martinvonz: leftovers? doesn't seem to happen because you guard against it on lines 457-459
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.,
martinvonzUnsubmitted
Not Done

What is this "post-filter data"? I didn't know hg had this feature. Something like git' clean/smudge filters?

martinvonz: What is this "post-filter data"? I didn't know hg had this feature. Something like git'…
phillcoAuthorUnsubmitted
Not Done

Yeah, exactly. I didn't know about it either. https://www.mercurial-scm.org/wiki/EncodeDecodeFilter?highlight=%28filter%29

Perhaps including that link in the comment, or in wwritedata (later, decodeddata()) might be a good idea.

phillco: Yeah, exactly. I didn't know about it either. https://www.mercurial-scm.
# 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') mode = opts.get('mode','merge')
if mode == 'union': if mode == 'union':
name_a = None name_a = None
name_b = None name_b = None
name_base = None name_base = None
else: else:
name_a = localfile name_a = localfile
name_b = otherfile name_b = otherfile
name_base = None name_base = None
labels = opts.get('label', []) labels = opts.get('label', [])
if len(labels) > 0: if len(labels) > 0:
name_a = labels[0] name_a = labels[0]
if len(labels) > 1: if len(labels) > 1:
name_b = labels[1] name_b = labels[1]
if len(labels) > 2: if len(labels) > 2:
name_base = labels[2] name_base = labels[2]
if len(labels) > 3: if len(labels) > 3:
raise error.Abort(_("can only specify three labels.")) raise error.Abort(_("can only specify three labels."))
try: try:
localtext = readfile(localfile) localtext = readctx(localctx) if localctx else readfile(localfile)
basetext = readfile(basefile) basetext = readctx(basectx) if basectx else readfile(basefile)
othertext = readfile(otherfile) othertext = readctx(otherctx) if otherctx else readfile(otherfile)
except error.Abort: except error.Abort:
return 1 return 1
localfile = os.path.realpath(localfile) localfile = os.path.realpath(localfile)
if not opts.get('print'): if not opts.get('print'):
opener = vfsmod.vfs(os.path.dirname(localfile)) opener = vfsmod.vfs(os.path.dirname(localfile))
out = opener(os.path.basename(localfile), "w", atomictemp=True) out = opener(os.path.basename(localfile), "w", atomictemp=True)
else: else:

tests/test-lfconvert.t

$ hg commit -A -m"add normal3, modify sub/*" $ hg commit -A -m"add normal3, modify sub/*"
adding normal3 adding normal3
created new head created new head
$ hg rm large normal3 $ hg rm large normal3
$ hg commit -q -m"remove large, normal3" $ hg commit -q -m"remove large, normal3"
$ hg merge $ hg merge
merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat
merging sub/normal2 and stuff/normal2 to stuff/normal2 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') 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 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 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
[1] [1]
$ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat
$ hg resolve -m stuff/maybelarge.dat $ hg resolve -m stuff/maybelarge.dat
(no more unresolved files) (no more unresolved files)
$ hg commit -m"merge" $ hg commit -m"merge"