This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11863

filemerge: remove `premerge` argument from `_makebackup()`
ClosedPublic

Authored by martinvonz on Dec 6 2021, 3:35 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG0994125a31e5: filemerge: remove `premerge` argument from `_makebackup()`
Summary

We now always pass True, so there's no need to pass it.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Dec 6 2021, 3:35 PM
Alphare accepted this revision.Dec 7 2021, 10:33 AM
This revision is now accepted and ready to land.Dec 7 2021, 10:33 AM
martinvonz added a comment.Dec 7 2021, 12:05 PM

I've rebased this series (but made no other changes) and added some more patches after this one. Those are conceptually quite separate, so you could easily queue up to here first (but I'm also not in a rush to get these patches in).

Alphare added a comment.Dec 8 2021, 3:18 AM
In D11863#182168, @martinvonz wrote:

I've rebased this series (but made no other changes) and added some more patches after this one. Those are conceptually quite separate, so you could easily queue up to here first (but I'm also not in a rush to get these patches in).

That was indeed my plan, thanks for confirming

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (30 lines)

Diff 31325

mercurial/filemerge.py

def _restorebackup(fcd, back): def _restorebackup(fcd, back):
# TODO: Add a workingfilectx.write(otherfilectx) path so we can use # TODO: Add a workingfilectx.write(otherfilectx) path so we can use
# util.copy here instead. # util.copy here instead.
fcd.write(back.data(), fcd.flags()) fcd.write(back.data(), fcd.flags())
def _makebackup(repo, ui, wctx, fcd, premerge): def _makebackup(repo, ui, wctx, fcd):
"""Makes and returns a filectx-like object for ``fcd``'s backup file. """Makes and returns a filectx-like object for ``fcd``'s backup file.
In addition to preserving the user's pre-existing modifications to `fcd` In addition to preserving the user's pre-existing modifications to `fcd`
(if any), the backup is used to undo certain premerges, confirm whether a (if any), the backup is used to undo certain premerges, confirm whether a
merge changed anything, and determine what line endings the new file should merge changed anything, and determine what line endings the new file should
have. have.
Backups only need to be written once (right before the premerge) since their Backups only need to be written once since their content doesn't change
content doesn't change afterwards. 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
back = scmutil.backuppath(ui, repo, fcd.path()) back = scmutil.backuppath(ui, repo, fcd.path())
inworkingdir = back.startswith(repo.wvfs.base) and not back.startswith( inworkingdir = back.startswith(repo.wvfs.base) and not back.startswith(
repo.vfs.base 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:
# 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) 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)
if onfailure: if onfailure:
if wctx.isinmemory(): if wctx.isinmemory():
raise error.InMemoryMergeConflictsError( raise error.InMemoryMergeConflictsError(
b'in-memory merge does not support merge conflicts' b'in-memory merge does not support merge conflicts'
) )
ui.warn(onfailure % fduipath) ui.warn(onfailure % fduipath)
return True, 1, False return True, 1, False
back = _makebackup(repo, ui, wctx, fcd, True) back = _makebackup(repo, ui, wctx, fcd)
files = (None, None, None, back) files = (None, None, None, back)
r = 1 r = 1
try: try:
internalmarkerstyle = ui.config(b'ui', b'mergemarkers') internalmarkerstyle = ui.config(b'ui', b'mergemarkers')
if isexternal: if isexternal:
markerstyle = _toolstr(ui, tool, b'mergemarkers') markerstyle = _toolstr(ui, tool, b'mergemarkers')
else: else:
markerstyle = internalmarkerstyle markerstyle = internalmarkerstyle