This is an archive of the discontinued Mercurial Phabricator instance.

Differential D388

filemerge: extract _maketemp and _makebackup
ClosedPublic

Authored by phillco on Aug 14 2017, 4:57 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG52bd006b4f49: filemerge: extract _maketemp and _makebackup
Summary

These functions will be modified by in-memory merge, so let's extract them first and add some comments.

This also shortens _filemerge a bit.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco created this revision.Aug 14 2017, 4:57 PM
phillco edited the summary of this revision. (Show Details)Aug 14 2017, 4:58 PM
phillco edited the summary of this revision. (Show Details)
phillco updated this revision to Diff 1221.Aug 23 2017, 3:37 PM
phillco updated this revision to Diff 1302.Aug 25 2017, 4:56 PM
phillco updated this revision to Diff 1453.Aug 30 2017, 5:12 PM
martinvonz added a subscriber: martinvonz.Aug 31 2017, 3:13 AM
martinvonz added inline comments.
mercurial/filemerge.py
592–594

Some words missing and/or too many in here

phillco updated this revision to Diff 1477.Aug 31 2017, 1:57 PM
phillco marked an inline comment as done.Aug 31 2017, 1:57 PM
phillco updated this revision to Diff 1485.Aug 31 2017, 2:29 PM
phillco added a comment.Aug 31 2017, 3:45 PM

(Fixed trailing space)

martinvonz added a comment.Aug 31 2017, 3:52 PM
In D388#9515, @phillco wrote:

(Fixed trailing space)

Yep, I saw that in tests and fixed it locally, so you'll probably see divergence when you pull after I've pushed them.

phillco updated this revision to Diff 1507.Aug 31 2017, 4:15 PM
Closed by commit rHG52bd006b4f49: filemerge: extract _maketemp and _makebackup (authored by phillco). · Explain WhyAug 31 2017, 5:22 PM
This revision was automatically updated to reflect the committed changes.
singhsrb updated this revision to Diff 1624.Sep 5 2017, 8:38 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (67 lines)

Diff 1624

mercurial/filemerge.py

"o": "", "o": "",
} }
return { return {
"l": " [%s]" % labels[0], "l": " [%s]" % labels[0],
"o": " [%s]" % labels[1], "o": " [%s]" % labels[1],
} }
def _filemerge(premerge, repo, mynode, orig, fcd, fco, fca, labels=None): def _makebackup(repo, ui, fcd, premerge):
"""perform a 3-way merge in the working directory """Makes a backup of the local `fcd` file prior to merging.
premerge = whether this is a premerge In addition to preserving the user's pre-existing modifications to `fcd`
mynode = parent node before merge (if any), the backup is used to undo certain premerges, confirm whether a
orig = original local filename before merge merge changed anything, and determine what line endings the new file should
martinvonzUnsubmitted
Done

Some words missing and/or too many in here

martinvonz: Some words missing and/or too many in here
fco = other file context have.
fca = ancestor file context """
fcd = local file context for current/destination file if fcd.isabsent():
return None
Returns whether the merge is complete, the return value of the merge, and a = repo.wjoin(fcd.path())
a boolean indicating whether the file was deleted from disk.""" back = scmutil.origpath(ui, repo, a)
if premerge:
util.copyfile(a, back)
return back
def _maketempfiles(repo, fcd, fco, fca):
"""Writes out `fco` and `fca` as temporary files, so an external merge
tool may use them.
`fcd` is returned as-is, by convention, because it currently doubles as both
the local version and merge destination.
"""
def temp(prefix, ctx): def temp(prefix, ctx):
fullbase, ext = os.path.splitext(ctx.path()) fullbase, ext = os.path.splitext(ctx.path())
pre = "%s~%s." % (os.path.basename(fullbase), prefix) pre = "%s~%s." % (os.path.basename(fullbase), prefix)
(fd, name) = tempfile.mkstemp(prefix=pre, suffix=ext) (fd, name) = tempfile.mkstemp(prefix=pre, suffix=ext)
data = repo.wwritedata(ctx.path(), ctx.data()) data = repo.wwritedata(ctx.path(), ctx.data())
f = os.fdopen(fd, pycompat.sysstr("wb")) f = os.fdopen(fd, pycompat.sysstr("wb"))
f.write(data) f.write(data)
f.close() f.close()
return name return name
a = repo.wjoin(fcd.path())
b = temp("base", fca)
c = temp("other", fco)
return a, b, c
def _filemerge(premerge, repo, mynode, orig, fcd, fco, fca, labels=None):
"""perform a 3-way merge in the working directory
premerge = whether this is a premerge
mynode = parent node before merge
orig = original local filename before merge
fco = other file context
fca = ancestor file context
fcd = local file context for current/destination file
Returns whether the merge is complete, the return value of the merge, and
a boolean indicating whether the file was deleted from disk."""
if not fco.cmp(fcd): # files identical? if not fco.cmp(fcd): # files identical?
return True, None, False return True, None, False
ui = repo.ui ui = repo.ui
fd = fcd.path() fd = fcd.path()
binary = fcd.isbinary() or fco.isbinary() or fca.isbinary() binary = fcd.isbinary() or fco.isbinary() or fca.isbinary()
symlink = 'l' in fcd.flags() + fco.flags() symlink = 'l' in fcd.flags() + fco.flags()
changedelete = fcd.isabsent() or fco.isabsent() changedelete = fcd.isabsent() or fco.isabsent()
ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca)) ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca))
if precheck and not precheck(repo, mynode, orig, fcd, fco, fca, if precheck and not precheck(repo, mynode, orig, fcd, fco, fca,
toolconf): toolconf):
if onfailure: if onfailure:
ui.warn(onfailure % fd) ui.warn(onfailure % fd)
return True, 1, False return True, 1, False
a = repo.wjoin(fd) back = _makebackup(repo, ui, fcd, premerge)
b = temp("base", fca) files = _maketempfiles(repo, fcd, fco, fca) + (back,)
c = temp("other", fco)
if not fcd.isabsent():
back = scmutil.origpath(ui, repo, a)
if premerge:
util.copyfile(a, back)
else:
back = None
files = (a, b, c, back)
r = 1 r = 1
try: try:
markerstyle = ui.config('ui', 'mergemarkers') markerstyle = ui.config('ui', 'mergemarkers')
if not labels: if not labels:
labels = _defaultconflictlabels labels = _defaultconflictlabels
if markerstyle != 'basic': if markerstyle != 'basic':
labels = _formatlabels(repo, fcd, fco, fca, labels) labels = _formatlabels(repo, fcd, fco, fca, labels)
if r: if r:
if onfailure: if onfailure:
ui.warn(onfailure % fd) ui.warn(onfailure % fd)
return True, r, deleted return True, r, deleted
finally: finally:
if not r and back is not None: if not r and back is not None:
util.unlink(back) util.unlink(back)
util.unlink(b) util.unlink(files[1])
util.unlink(c) util.unlink(files[2])
def _check(r, ui, tool, fcd, files): def _check(r, ui, tool, fcd, files):
fd = fcd.path() fd = fcd.path()
a, b, c, back = files a, b, c, back = files
if not r and (_toolbool(ui, tool, "checkconflicts") or if not r and (_toolbool(ui, tool, "checkconflicts") or
'conflicts' in _toollist(ui, tool, "check")): 'conflicts' in _toollist(ui, tool, "check")):
if re.search("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data(), if re.search("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data(),