This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1059

filemerge: store backups in the overlayworkingctx if using imm
ClosedPublic

Authored by phillco on Oct 13 2017, 3:45 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG123a68e6b473: filemerge: store backups in the overlayworkingctx if using imm
rHGb5e7aa688689: filemerge: store backups in the overlayworkingctx if using imm
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.Oct 13 2017, 3:45 PM
durin42 accepted this revision.Oct 16 2017, 9:18 PM
This revision is now accepted and ready to land.Oct 16 2017, 9:18 PM
Closed by commit rHGb5e7aa688689: filemerge: store backups in the overlayworkingctx if using imm (authored by phillco). · Explain WhyOct 16 2017, 9:46 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (21 lines)

Diff 2864

mercurial/filemerge.py

""" """
if fcd.isabsent(): if fcd.isabsent():
return None return None
# TODO: Break this import cycle somehow. (filectx -> ctx -> fileset -> # TODO: Break this import cycle somehow. (filectx -> ctx -> fileset ->
# merge -> filemerge). (I suspect the fileset import is the weakest link) # merge -> filemerge). (I suspect the fileset import is the weakest link)
from . import context from . import context
a = _workingpath(repo, fcd) a = _workingpath(repo, fcd)
back = scmutil.origpath(ui, repo, a) back = scmutil.origpath(ui, repo, a)
inworkingdir = (back.startswith(repo.wvfs.base) and not
back.startswith(repo.vfs.base))
if isinstance(fcd, context.overlayworkingfilectx) and inworkingdir:
# If the backup file is to be in the working directory, and we're
# merging in-memory, we must redirect the backup to the memory context
# so we don't disturb the working directory.
relpath = back[len(repo.wvfs.base) + 1:]
wctx[relpath].write(fcd.data(), fcd.flags())
return wctx[relpath]
else:
# Otherwise, write to wherever the user specified the backups should go.
#
# A arbitraryfilectx is returned, so we can run the same functions on
# the backup context regardless of where it lives.
if premerge: if premerge:
util.copyfile(a, back) util.copyfile(a, back)
return context.arbitraryfilectx(back, repo=repo) return context.arbitraryfilectx(back, repo=repo)
def _maketempfiles(repo, fco, fca): def _maketempfiles(repo, fco, fca):
"""Writes out `fco` and `fca` as temporary files, so an external merge """Writes out `fco` and `fca` as temporary files, so an external merge
tool may use them. tool may use them.
""" """
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)