This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5856

filemerge: migrate to scmutil.backuppath()
ClosedPublic

Authored by martinvonz on Feb 5 2019, 12:52 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa8ccd821b7d2: filemerge: migrate to scmutil.backuppath()
rHG2eed54dcf6d4: filemerge: migrate to scmutil.backuppath()
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

martinvonz created this revision.Feb 5 2019, 12:52 PM
martinvonz updated this revision to Diff 13861.Feb 6 2019, 6:59 PM
Closed by commit rHG2eed54dcf6d4: filemerge: migrate to scmutil.backuppath() (authored by martinvonz). · Explain WhyFeb 6 2019, 9:03 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (4 lines)

Diff 13878

mercurial/filemerge.py

Backups only need to be written once (right before the premerge) since their Backups only need to be written once (right before the premerge) since their
content doesn't change afterwards. content doesn't change afterwards.
""" """
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) back = scmutil.backuppath(ui, repo, fcd.path())
back = scmutil.origpath(ui, repo, a)
inworkingdir = (back.startswith(repo.wvfs.base) and not inworkingdir = (back.startswith(repo.wvfs.base) and not
back.startswith(repo.vfs.base)) back.startswith(repo.vfs.base))
if isinstance(fcd, context.overlayworkingfilectx) and inworkingdir: if isinstance(fcd, context.overlayworkingfilectx) and inworkingdir:
# If the backup file is to be in the working directory, and we're # 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 # merging in-memory, we must redirect the backup to the memory context
# so we don't disturb the working directory. # so we don't disturb the working directory.
relpath = back[len(repo.wvfs.base) + 1:] relpath = back[len(repo.wvfs.base) + 1:]
if premerge: if premerge:
wctx[relpath].write(fcd.data(), fcd.flags()) wctx[relpath].write(fcd.data(), fcd.flags())
return wctx[relpath] return wctx[relpath]
else: else:
if premerge: if premerge:
# Otherwise, write to wherever path the user specified the backups # Otherwise, write to wherever path the user specified the backups
# should go. We still need to switch based on whether the source is # should go. We still need to switch based on whether the source is
# in-memory so we can use the fast path of ``util.copy`` if both are # in-memory so we can use the fast path of ``util.copy`` if both are
# on disk. # on disk.
if isinstance(fcd, context.overlayworkingfilectx): if isinstance(fcd, context.overlayworkingfilectx):
util.writefile(back, fcd.data()) util.writefile(back, fcd.data())
else: else:
a = _workingpath(repo, fcd)
util.copyfile(a, back) util.copyfile(a, back)
# A arbitraryfilectx is returned, so we can run the same functions on # A arbitraryfilectx is returned, so we can run the same functions on
# the backup context regardless of where it lives. # the backup context regardless of where it lives.
return context.arbitraryfilectx(back, repo=repo) return context.arbitraryfilectx(back, repo=repo)
@contextlib.contextmanager @contextlib.contextmanager
def _maketempfiles(repo, fco, fca, localpath, uselocalpath): def _maketempfiles(repo, fco, fca, localpath, uselocalpath):
"""Writes out `fco` and `fca` as temporary files, and (if uselocalpath) """Writes out `fco` and `fca` as temporary files, and (if uselocalpath)