This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5472

merge: extract helper for creating empty "actions" dict
ClosedPublic

Authored by martinvonz on Dec 21 2018, 1:11 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG54c3b4bd01f2: merge: extract helper for creating empty "actions" dict
Summary

Replicating the set of actions in multiple places is bad.

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/narrow/narrowcommands.py (2 lines)
Mmercurial/merge.py (36 lines)
Mmercurial/sparse.py (10 lines)

Diff 12947

hgext/narrow/narrowcommands.py

with repo.transaction('widening') as tr,\ with repo.transaction('widening') as tr,\
repo.ui.configoverride(overrides, 'widen'): repo.ui.configoverride(overrides, 'widen'):
tgetter = lambda: tr tgetter = lambda: tr
bundle2.processbundle(repo, bundle, bundle2.processbundle(repo, bundle,
transactiongetter=tgetter) transactiongetter=tgetter)
repo.setnewnarrowpats() repo.setnewnarrowpats()
actions = {k: [] for k in 'a am f g cd dc r dm dg m e k p pr'.split()} actions = merge.emptyactions()
addgaction = actions['g'].append addgaction = actions['g'].append
mf = repo['.'].manifest().matches(newmatch) mf = repo['.'].manifest().matches(newmatch)
for f, fn in mf.iteritems(): for f, fn in mf.iteritems():
if f not in repo.dirstate: if f not in repo.dirstate:
addgaction((f, (mf.flags(f), False), addgaction((f, (mf.flags(f), False),
"add from widened narrow clone")) "add from widened narrow clone"))

mercurial/merge.py

mergedcount = attr.ib() mergedcount = attr.ib()
removedcount = attr.ib() removedcount = attr.ib()
unresolvedcount = attr.ib() unresolvedcount = attr.ib()
def isempty(self): def isempty(self):
return (not self.updatedcount and not self.mergedcount return (not self.updatedcount and not self.mergedcount
and not self.removedcount and not self.unresolvedcount) and not self.removedcount and not self.unresolvedcount)
def emptyactions():
"""create an actions dict, to be populated and passed to applyupdates()"""
return dict((m, [])
for m in (
ACTION_ADD,
ACTION_ADD_MODIFIED,
ACTION_FORGET,
ACTION_GET,
ACTION_CHANGED_DELETED,
ACTION_DELETED_CHANGED,
ACTION_REMOVE,
ACTION_DIR_RENAME_MOVE_LOCAL,
ACTION_LOCAL_DIR_RENAME_GET,
ACTION_MERGE,
ACTION_EXEC,
ACTION_KEEP,
ACTION_PATH_CONFLICT,
ACTION_PATH_CONFLICT_RESOLVE))
def applyupdates(repo, actions, wctx, mctx, overwrite, labels=None): def applyupdates(repo, actions, wctx, mctx, overwrite, labels=None):
"""apply the merge action list to the working directory """apply the merge action list to the working directory
wctx is the working copy context wctx is the working copy context
mctx is the context to be merged into the working copy mctx is the context to be merged into the working copy
Return a tuple of counts (updated, merged, removed, unresolved) that Return a tuple of counts (updated, merged, removed, unresolved) that
describes how many files were affected by the update. describes how many files were affected by the update.
"use (c)hanged version or leave (d)eleted?" "use (c)hanged version or leave (d)eleted?"
"$$ &Changed $$ &Deleted") % prompts, 0) == 0: "$$ &Changed $$ &Deleted") % prompts, 0) == 0:
actionbyfile[f] = (ACTION_GET, (flags, False), actionbyfile[f] = (ACTION_GET, (flags, False),
'prompt recreating') 'prompt recreating')
else: else:
del actionbyfile[f] del actionbyfile[f]
# Convert to dictionary-of-lists format # Convert to dictionary-of-lists format
actions = dict((m, []) actions = emptyactions()
for m in (
ACTION_ADD,
ACTION_ADD_MODIFIED,
ACTION_FORGET,
ACTION_GET,
ACTION_CHANGED_DELETED,
ACTION_DELETED_CHANGED,
ACTION_REMOVE,
ACTION_DIR_RENAME_MOVE_LOCAL,
ACTION_LOCAL_DIR_RENAME_GET,
ACTION_MERGE,
ACTION_EXEC,
ACTION_KEEP,
ACTION_PATH_CONFLICT,
ACTION_PATH_CONFLICT_RESOLVE))
for f, (m, args, msg) in actionbyfile.iteritems(): for f, (m, args, msg) in actionbyfile.iteritems():
if m not in actions: if m not in actions:
actions[m] = [] actions[m] = []
actions[m].append((f, args, msg)) actions[m].append((f, args, msg))
if not util.fscasesensitive(repo.path): if not util.fscasesensitive(repo.path):
# check collision between files only in p2 for clean update # check collision between files only in p2 for clean update
if (not branchmerge and if (not branchmerge and

mercurial/sparse.py

# sparse.py - functionality for sparse checkouts # sparse.py - functionality for sparse checkouts
# #
# Copyright 2014 Facebook, Inc. # Copyright 2014 Facebook, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import collections
import hashlib import hashlib
import os import os
from .i18n import _ from .i18n import _
from .node import ( from .node import (
hex, hex,
nullid, nullid,
) )
dropped = [] dropped = []
tempincludes = readtemporaryincludes(repo) tempincludes = readtemporaryincludes(repo)
for file in tempincludes: for file in tempincludes:
if file in dirstate and not sparsematch(file): if file in dirstate and not sparsematch(file):
message = _('dropping temporarily included sparse files') message = _('dropping temporarily included sparse files')
actions.append((file, None, message)) actions.append((file, None, message))
dropped.append(file) dropped.append(file)
typeactions = collections.defaultdict(list) typeactions = mergemod.emptyactions()
typeactions['r'] = actions typeactions['r'] = actions
mergemod.applyupdates(repo, typeactions, repo[None], repo['.'], False) mergemod.applyupdates(repo, typeactions, repo[None], repo['.'], False)
# Fix dirstate # Fix dirstate
for file in dropped: for file in dropped:
dirstate.drop(file) dirstate.drop(file)
repo.vfs.unlink('tempsparse') repo.vfs.unlink('tempsparse')
actions = [] actions = []
message = 'temporarily adding to sparse checkout' message = 'temporarily adding to sparse checkout'
wctxmanifest = repo[None].manifest() wctxmanifest = repo[None].manifest()
for file in temporaryfiles: for file in temporaryfiles:
if file in wctxmanifest: if file in wctxmanifest:
fctx = repo[None][file] fctx = repo[None][file]
actions.append((file, (fctx.flags(), False), message)) actions.append((file, (fctx.flags(), False), message))
typeactions = collections.defaultdict(list) typeactions = mergemod.emptyactions()
typeactions['g'] = actions typeactions['g'] = actions
mergemod.applyupdates(repo, typeactions, repo[None], repo['.'], mergemod.applyupdates(repo, typeactions, repo[None], repo['.'],
False) False)
dirstate = repo.dirstate dirstate = repo.dirstate
for file, flags, msg in actions: for file, flags, msg in actions:
dirstate.normal(file) dirstate.normal(file)
for file, state in dirstate.iteritems(): for file, state in dirstate.iteritems():
if not file in files: if not file in files:
old = origsparsematch(file) old = origsparsematch(file)
new = sparsematch(file) new = sparsematch(file)
if old and not new: if old and not new:
dropped.append(file) dropped.append(file)
# Apply changes to disk # Apply changes to disk
typeactions = dict((m, []) typeactions = mergemod.emptyactions()
for m in 'a f g am cd dc r dm dg m e k p pr'.split())
for f, (m, args, msg) in actions.iteritems(): for f, (m, args, msg) in actions.iteritems():
if m not in typeactions:
typeactions[m] = []
typeactions[m].append((f, args, msg)) typeactions[m].append((f, args, msg))
mergemod.applyupdates(repo, typeactions, repo[None], repo['.'], False) mergemod.applyupdates(repo, typeactions, repo[None], repo['.'], False)
# Fix dirstate # Fix dirstate
for file in added: for file in added:
dirstate.normal(file) dirstate.normal(file)