This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8825

merge: pass mergeresult instead of actions in _checkunknownfiles() (API)
ClosedPublic

Authored by pulkit on Jul 25 2020, 6:01 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG4ad6c4e9e35f: merge: pass mergeresult instead of actions in _checkunknownfiles() (API)

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.

Revision Contents
Changeset List

PathPackages
Mhgext/remotefilelog/__init__.py (6 lines)
Mmercurial/merge.py (25 lines)

Diff 22208

hgext/remotefilelog/__init__.py

for f, args, msg in actions[b'g']: for f, args, msg in actions[b'g']:
files.append((f, hex(manifest[f]))) files.append((f, hex(manifest[f])))
# batch fetch the needed files from the server # batch fetch the needed files from the server
repo.fileservice.prefetch(files) repo.fileservice.prefetch(files)
return orig(repo, actions, wctx, mctx, overwrite, wantfiledata, **opts) return orig(repo, actions, wctx, mctx, overwrite, wantfiledata, **opts)
# Prefetch merge checkunknownfiles # Prefetch merge checkunknownfiles
def checkunknownfiles(orig, repo, wctx, mctx, force, actions, *args, **kwargs): def checkunknownfiles(orig, repo, wctx, mctx, force, mresult, *args, **kwargs):
if isenabled(repo): if isenabled(repo):
files = [] files = []
sparsematch = repo.maybesparsematch(mctx.rev()) sparsematch = repo.maybesparsematch(mctx.rev())
for f, (m, actionargs, msg) in pycompat.iteritems(actions): for f, (m, actionargs, msg) in pycompat.iteritems(mresult.actions):
if sparsematch and not sparsematch(f): if sparsematch and not sparsematch(f):
continue continue
if m in (b'c', b'dc', b'cm'): if m in (b'c', b'dc', b'cm'):
files.append((f, hex(mctx.filenode(f)))) files.append((f, hex(mctx.filenode(f))))
elif m == b'dg': elif m == b'dg':
f2 = actionargs[0] f2 = actionargs[0]
files.append((f2, hex(mctx.filenode(f2)))) files.append((f2, hex(mctx.filenode(f2))))
# batch fetch the needed files from the server # batch fetch the needed files from the server
repo.fileservice.prefetch(files) repo.fileservice.prefetch(files)
return orig(repo, wctx, mctx, force, actions, *args, **kwargs) return orig(repo, wctx, mctx, force, mresult, *args, **kwargs)
# Prefetch files before status attempts to look at their size and contents # Prefetch files before status attempts to look at their size and contents
def checklookup(orig, self, files): def checklookup(orig, self, files):
repo = self._repo repo = self._repo
if isenabled(repo): if isenabled(repo):
prefetchfiles = [] prefetchfiles = []
for parent in self._parents: for parent in self._parents:

mercurial/merge.py

for fn in files: for fn in files:
relf = util.pconvert(repo.wvfs.reljoin(p, fn)) relf = util.pconvert(repo.wvfs.reljoin(p, fn))
relf = repo.dirstate.normalize(relf, isknown=True) relf = repo.dirstate.normalize(relf, isknown=True)
if relf not in repo.dirstate: if relf not in repo.dirstate:
return f return f
return None return None
def _checkunknownfiles(repo, wctx, mctx, force, actions, mergeforce): def _checkunknownfiles(repo, wctx, mctx, force, mresult, mergeforce):
""" """
Considers any actions that care about the presence of conflicting unknown Considers any actions that care about the presence of conflicting unknown
files. For some actions, the result is to abort; for others, it is to files. For some actions, the result is to abort; for others, it is to
choose a different action. choose a different action.
""" """
fileconflicts = set() fileconflicts = set()
pathconflicts = set() pathconflicts = set()
warnconflicts = set() warnconflicts = set()
abortconflicts = set() abortconflicts = set()
unknownconfig = _getcheckunknownconfig(repo, b'merge', b'checkunknown') unknownconfig = _getcheckunknownconfig(repo, b'merge', b'checkunknown')
ignoredconfig = _getcheckunknownconfig(repo, b'merge', b'checkignored') ignoredconfig = _getcheckunknownconfig(repo, b'merge', b'checkignored')
pathconfig = repo.ui.configbool( pathconfig = repo.ui.configbool(
b'experimental', b'merge.checkpathconflicts' b'experimental', b'merge.checkpathconflicts'
) )
if not force: if not force:
def collectconflicts(conflicts, config): def collectconflicts(conflicts, config):
if config == b'abort': if config == b'abort':
abortconflicts.update(conflicts) abortconflicts.update(conflicts)
elif config == b'warn': elif config == b'warn':
warnconflicts.update(conflicts) warnconflicts.update(conflicts)
checkunknowndirs = _unknowndirschecker() checkunknowndirs = _unknowndirschecker()
for f, (m, args, msg) in pycompat.iteritems(actions): for f, (m, args, msg) in pycompat.iteritems(mresult.actions):
if m in ( if m in (
mergestatemod.ACTION_CREATED, mergestatemod.ACTION_CREATED,
mergestatemod.ACTION_DELETED_CHANGED, mergestatemod.ACTION_DELETED_CHANGED,
): ):
if _checkunknownfile(repo, wctx, mctx, f): if _checkunknownfile(repo, wctx, mctx, f):
fileconflicts.add(f) fileconflicts.add(f)
elif pathconfig and f not in wctx: elif pathconfig and f not in wctx:
path = checkunknowndirs(repo, wctx, f) path = checkunknowndirs(repo, wctx, f)
if path is not None: if path is not None:
pathconflicts.add(path) pathconflicts.add(path)
elif m == mergestatemod.ACTION_LOCAL_DIR_RENAME_GET: elif m == mergestatemod.ACTION_LOCAL_DIR_RENAME_GET:
if _checkunknownfile(repo, wctx, mctx, f, args[0]): if _checkunknownfile(repo, wctx, mctx, f, args[0]):
fileconflicts.add(f) fileconflicts.add(f)
allconflicts = fileconflicts | pathconflicts allconflicts = fileconflicts | pathconflicts
ignoredconflicts = {c for c in allconflicts if repo.dirstate._ignore(c)} ignoredconflicts = {c for c in allconflicts if repo.dirstate._ignore(c)}
unknownconflicts = allconflicts - ignoredconflicts unknownconflicts = allconflicts - ignoredconflicts
collectconflicts(ignoredconflicts, ignoredconfig) collectconflicts(ignoredconflicts, ignoredconfig)
collectconflicts(unknownconflicts, unknownconfig) collectconflicts(unknownconflicts, unknownconfig)
else: else:
for f, (m, args, msg) in pycompat.iteritems(actions): for f, (m, args, msg) in pycompat.iteritems(mresult.actions):
if m == mergestatemod.ACTION_CREATED_MERGE: if m == mergestatemod.ACTION_CREATED_MERGE:
fl2, anc = args fl2, anc = args
different = _checkunknownfile(repo, wctx, mctx, f) different = _checkunknownfile(repo, wctx, mctx, f)
if repo.dirstate._ignore(f): if repo.dirstate._ignore(f):
config = ignoredconfig config = ignoredconfig
else: else:
config = unknownconfig config = unknownconfig
# The behavior when force is True is described by this table: # The behavior when force is True is described by this table:
# config different mergeforce | action backup # config different mergeforce | action backup
# * n * | get n # * n * | get n
# * y y | merge - # * y y | merge -
# abort y n | merge - (1) # abort y n | merge - (1)
# warn y n | warn + get y # warn y n | warn + get y
# ignore y n | get y # ignore y n | get y
# #
# (1) this is probably the wrong behavior here -- we should # (1) this is probably the wrong behavior here -- we should
# probably abort, but some actions like rebases currently # probably abort, but some actions like rebases currently
# don't like an abort happening in the middle of # don't like an abort happening in the middle of
# merge.update. # merge.update.
if not different: if not different:
actions[f] = ( mresult.addfile(
f,
mergestatemod.ACTION_GET, mergestatemod.ACTION_GET,
(fl2, False), (fl2, False),
b'remote created', b'remote created',
) )
elif mergeforce or config == b'abort': elif mergeforce or config == b'abort':
actions[f] = ( mresult.addfile(
f,
mergestatemod.ACTION_MERGE, mergestatemod.ACTION_MERGE,
(f, f, None, False, anc), (f, f, None, False, anc),
b'remote differs from untracked local', b'remote differs from untracked local',
) )
elif config == b'abort': elif config == b'abort':
abortconflicts.add(f) abortconflicts.add(f)
else: else:
if config == b'warn': if config == b'warn':
warnconflicts.add(f) warnconflicts.add(f)
actions[f] = ( mresult.addfile(
f,
mergestatemod.ACTION_GET, mergestatemod.ACTION_GET,
(fl2, True), (fl2, True),
b'remote created', b'remote created',
) )
for f in sorted(abortconflicts): for f in sorted(abortconflicts):
warn = repo.ui.warn warn = repo.ui.warn
if f in pathconflicts: if f in pathconflicts:
) )
for f in sorted(warnconflicts): for f in sorted(warnconflicts):
if repo.wvfs.isfileorlink(f): if repo.wvfs.isfileorlink(f):
repo.ui.warn(_(b"%s: replacing untracked file\n") % f) repo.ui.warn(_(b"%s: replacing untracked file\n") % f)
else: else:
repo.ui.warn(_(b"%s: replacing untracked files in directory\n") % f) repo.ui.warn(_(b"%s: replacing untracked files in directory\n") % f)
for f, (m, args, msg) in pycompat.iteritems(actions): for f, (m, args, msg) in pycompat.iteritems(mresult.actions):
if m == mergestatemod.ACTION_CREATED: if m == mergestatemod.ACTION_CREATED:
backup = ( backup = (
f in fileconflicts f in fileconflicts
or f in pathconflicts or f in pathconflicts
or any(p in pathconflicts for p in pathutil.finddirs(f)) or any(p in pathconflicts for p in pathutil.finddirs(f))
) )
(flags,) = args (flags,) = args
actions[f] = (mergestatemod.ACTION_GET, (flags, backup), msg) mresult.addfile(f, mergestatemod.ACTION_GET, (flags, backup), msg)
def _forgetremoved(wctx, mctx, branchmerge): def _forgetremoved(wctx, mctx, branchmerge):
""" """
Forget removed files Forget removed files
If we're jumping between revisions (as opposed to merging), and if If we're jumping between revisions (as opposed to merging), and if
neither the working directory nor the target rev has the file, neither the working directory nor the target rev has the file,
mctx, mctx,
ancestors[0], ancestors[0],
branchmerge, branchmerge,
force, force,
matcher, matcher,
acceptremote, acceptremote,
followcopies, followcopies,
) )
_checkunknownfiles(repo, wctx, mctx, force, mresult.actions, mergeforce) _checkunknownfiles(repo, wctx, mctx, force, mresult, mergeforce)
else: # only when merge.preferancestor=* - the default else: # only when merge.preferancestor=* - the default
repo.ui.note( repo.ui.note(
_(b"note: merging %s and %s using bids from ancestors %s\n") _(b"note: merging %s and %s using bids from ancestors %s\n")
% ( % (
wctx, wctx,
mctx, mctx,
_(b' and ').join(pycompat.bytestr(anc) for anc in ancestors), _(b' and ').join(pycompat.bytestr(anc) for anc in ancestors),
ancestor, ancestor,
branchmerge, branchmerge,
force, force,
matcher, matcher,
acceptremote, acceptremote,
followcopies, followcopies,
forcefulldiff=True, forcefulldiff=True,
) )
_checkunknownfiles( _checkunknownfiles(repo, wctx, mctx, force, mresult1, mergeforce)
repo, wctx, mctx, force, mresult1.actions, mergeforce
)
# Track the shortest set of warning on the theory that bid # Track the shortest set of warning on the theory that bid
# merge will correctly incorporate more information # merge will correctly incorporate more information
if diverge is None or len(mresult1.diverge) < len(diverge): if diverge is None or len(mresult1.diverge) < len(diverge):
diverge = mresult1.diverge diverge = mresult1.diverge
if renamedelete is None or len(renamedelete) < len( if renamedelete is None or len(renamedelete) < len(
mresult1.renamedelete mresult1.renamedelete
): ):