This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11860

filemerge: inline `_filemerge()` into `filemerge()`
ClosedPublic

Authored by martinvonz on Dec 4 2021, 2:06 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGf45a4a47f6a8: filemerge: inline `_filemerge()` into `filemerge()`
Summary

The caller is now trivial, so the indirection is pointless.

Diff Detail

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

Event Timeline

martinvonz created this revision.Dec 4 2021, 2:06 AM
Alphare accepted this revision.Dec 7 2021, 10:32 AM
This revision is now accepted and ready to land.Dec 7 2021, 10:32 AM
martinvonz added a commit: rHGf45a4a47f6a8: filemerge: inline `_filemerge()` into `filemerge()`.Dec 8 2021, 3:17 AM
Closed by commit rHGf45a4a47f6a8: filemerge: inline `_filemerge()` into `filemerge()` (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 31312

hgext/largefiles/overrides.py

lfdirstate.update_file(lfile, p1_tracked=False, wc_tracked=True) lfdirstate.update_file(lfile, p1_tracked=False, wc_tracked=True)
lfdirstate.write(repo.currenttransaction()) lfdirstate.write(repo.currenttransaction())
return orig(repo, actions, branchmerge, getfiledata) return orig(repo, actions, branchmerge, getfiledata)
# Override filemerge to prompt the user about how they wish to merge # Override filemerge to prompt the user about how they wish to merge
# largefiles. This will handle identical edits without prompting the user. # largefiles. This will handle identical edits without prompting the user.
@eh.wrapfunction(filemerge, b'_filemerge') @eh.wrapfunction(filemerge, b'filemerge')
def overridefilemerge( def overridefilemerge(
origfn, repo, wctx, mynode, orig, fcd, fco, fca, labels=None origfn, repo, wctx, mynode, orig, fcd, fco, fca, labels=None
): ):
if not lfutil.isstandin(orig) or fcd.isabsent() or fco.isabsent(): if not lfutil.isstandin(orig) or fcd.isabsent() or fco.isabsent():
return origfn(repo, wctx, mynode, orig, fcd, fco, fca, labels=labels) return origfn(repo, wctx, mynode, orig, fcd, fco, fca, labels=labels)
ahash = lfutil.readasstandin(fca).lower() ahash = lfutil.readasstandin(fca).lower()
dhash = lfutil.readasstandin(fcd).lower() dhash = lfutil.readasstandin(fcd).lower()

mercurial/filemerge.py

util.unlink(b) util.unlink(b)
util.unlink(c) util.unlink(c)
# if not uselocalpath, d is the 'orig'/backup file which we # if not uselocalpath, d is the 'orig'/backup file which we
# shouldn't delete. # shouldn't delete.
if d and uselocalpath: if d and uselocalpath:
util.unlink(d) util.unlink(d)
def _filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None): def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
"""perform a 3-way merge in the working directory """perform a 3-way merge in the working directory
premerge = whether this is a premerge premerge = whether this is a premerge
mynode = parent node before merge mynode = parent node before merge
orig = original local filename before merge orig = original local filename before merge
fco = other file context fco = other file context
fca = ancestor file context fca = ancestor file context
fcd = local file context for current/destination file fcd = local file context for current/destination file
return r return r
def _workingpath(repo, ctx): def _workingpath(repo, ctx):
return repo.wjoin(ctx.path()) return repo.wjoin(ctx.path())
def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
return _filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=labels)
def loadinternalmerge(ui, extname, registrarobj): def loadinternalmerge(ui, extname, registrarobj):
"""Load internal merge tool from specified registrarobj""" """Load internal merge tool from specified registrarobj"""
for name, func in pycompat.iteritems(registrarobj._table): for name, func in pycompat.iteritems(registrarobj._table):
fullname = b':' + name fullname = b':' + name
internals[fullname] = func internals[fullname] = func
internals[b'internal:' + name] = func internals[b'internal:' + name] = func
internalsdoc[fullname] = func internalsdoc[fullname] = func

tests/failfilemerge.py

# extension to emulate interrupting filemerge._filemerge # extension to emulate interrupting filemerge._filemerge
from __future__ import absolute_import from __future__ import absolute_import
from mercurial import ( from mercurial import (
error, error,
extensions, extensions,
filemerge, filemerge,
) )
def failfilemerge(*args, **kwargs): def failfilemerge(*args, **kwargs):
raise error.Abort(b"^C") raise error.Abort(b"^C")
def extsetup(ui): def extsetup(ui):
extensions.wrapfunction(filemerge, '_filemerge', failfilemerge) extensions.wrapfunction(filemerge, 'filemerge', failfilemerge)