This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1807

filemerge: only write in-memory backup during premerge
ClosedPublic

Authored by phillco on Jan 4 2018, 2:36 PM.

Details

Reviewers
durham
Group Reviewers
hg-reviewers
Commits
rHG9a50ffd15b25: filemerge: only write in-memory backup during premerge
Summary

This wasn't broken, but should mirror the non-in memory case to save an extra write.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco created this revision.Jan 4 2018, 2:36 PM
durham accepted this revision.Jan 4 2018, 3:19 PM
phillco updated this revision to Diff 4698.Jan 5 2018, 12:35 AM
phillco updated this revision to Diff 4700.Jan 5 2018, 12:38 AM
Closed by commit rHG9a50ffd15b25: filemerge: only write in-memory backup during premerge (authored by phillco). · Explain WhyJan 18 2018, 8:01 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (3 lines)

Diff 4698

mercurial/filemerge.py

back = scmutil.origpath(ui, repo, a) 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:
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):