This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2701

merge: use constants for actions
ClosedPublic

Authored by indygreg on Mar 5 2018, 7:15 PM.
Tags
None
Subscribers
yuja, quark, sid0 and 3 others

Details

Reviewers
phillco
durin42
Group Reviewers
hg-reviewers
Commits
rHG43ffd9070da1: merge: use constants for actions
Summary

We finish up establishing named constants in this file with
actions.

I remember scratching my head trying to figure out what this
code was doing as part of addressing a recent security issue with
subrepos. Having the named constants in place definitely makes
things easier to read.

I'm not convinced the new constants have the best names (I'm not
an expert in this code). But they can be changed easily enough.

Also, since these constants are internal only, we might want
to change their values to something more human readable to
facilitate debugging. Or maybe we could employ an enum type
some day...

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Mar 5 2018, 7:15 PM
pulkit added a subscriber: pulkit.Mar 5 2018, 7:29 PM

I also faced difficulty in past understanding these magic single or double
character values. I am +1 on this series.

phillco accepted this revision.Mar 5 2018, 9:06 PM
phillco added a subscriber: phillco.

Strong +1

mercurial/merge.py
909

Update this too?

indygreg marked an inline comment as done.Mar 5 2018, 9:11 PM
indygreg added inline comments.
mercurial/merge.py
909

Done.

What's... amusing is that `dr and rd` are not actions in the current code base.

phillco added inline comments.Mar 5 2018, 10:02 PM
mercurial/merge.py
909

lol

phillco added subscribers: sid0, quark.Mar 5 2018, 10:03 PM

btw, @quark mentioned there could be a perf hit (@sid0 mentioned this too a long time ago iirc)

indygreg marked an inline comment as done.Mar 6 2018, 11:53 AM
In D2701#43478, @phillco wrote:

btw, @quark mentioned there could be a perf hit (@sid0 mentioned this too a long time ago iirc)

Are we sure about that? I could see a perf hit for dirstate. But I don't think merge things are in any critical paths. If you are performing a merge, you need to do working directory updates and/or read data from storage. I would expect these things to dwarf the time spent resolving Python variables to values.

durin42 accepted this revision.Mar 24 2018, 3:08 PM
This revision is now accepted and ready to land.Mar 24 2018, 3:08 PM
Closed by commit rHG43ffd9070da1: merge: use constants for actions (authored by indygreg). · Explain WhyMar 24 2018, 5:22 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Mar 26 2018, 10:11 AM

If the perf hit was because of lookup of global variables, maybe we can alias
them in functions where hot loop exists.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (334 lines)

Diff 6661

mercurial/merge.py

MERGE_DRIVER_STATE_SUCCESS = b's' MERGE_DRIVER_STATE_SUCCESS = b's'
MERGE_RECORD_UNRESOLVED = b'u' MERGE_RECORD_UNRESOLVED = b'u'
MERGE_RECORD_RESOLVED = b'r' MERGE_RECORD_RESOLVED = b'r'
MERGE_RECORD_UNRESOLVED_PATH = b'pu' MERGE_RECORD_UNRESOLVED_PATH = b'pu'
MERGE_RECORD_RESOLVED_PATH = b'pr' MERGE_RECORD_RESOLVED_PATH = b'pr'
MERGE_RECORD_DRIVER_RESOLVED = b'd' MERGE_RECORD_DRIVER_RESOLVED = b'd'
ACTION_FORGET = b'f'
ACTION_REMOVE = b'r'
ACTION_ADD = b'a'
ACTION_GET = b'g'
ACTION_PATH_CONFLICT = b'p'
ACTION_PATH_CONFLICT_RESOLVE = b'pr'
ACTION_ADD_MODIFIED = b'am'
ACTION_CREATED = b'c'
ACTION_DELETED_CHANGED = b'dc'
ACTION_CHANGED_DELETED = b'cd'
ACTION_MERGE = b'm'
ACTION_LOCAL_DIR_RENAME_GET = b'dg'
ACTION_DIR_RENAME_MOVE_LOCAL = b'dm'
ACTION_KEEP = b'k'
ACTION_EXEC = b'e'
ACTION_CREATED_MERGE = b'cm'
class mergestate(object): class mergestate(object):
'''track 3-way merge state of individual files '''track 3-way merge state of individual files
The merge state is stored on disk when needed. Two files are used: one with The merge state is stored on disk when needed. Two files are used: one with
an old format (version 1), and one with a new format (version 2). Version 2 an old format (version 1), and one with a new format (version 2). Version 2
stores a superset of the data in version 1, including new kinds of records stores a superset of the data in version 1, including new kinds of records
in the future. For more about the new format, see the documentation for in the future. For more about the new format, see the documentation for
`_readrecordsv2`. `_readrecordsv2`.
self.mark(dfile, MERGE_RECORD_RESOLVED) self.mark(dfile, MERGE_RECORD_RESOLVED)
if complete: if complete:
action = None action = None
if deleted: if deleted:
if fcd.isabsent(): if fcd.isabsent():
# dc: local picked. Need to drop if present, which may # dc: local picked. Need to drop if present, which may
# happen on re-resolves. # happen on re-resolves.
action = 'f' action = ACTION_FORGET
else: else:
# cd: remote picked (or otherwise deleted) # cd: remote picked (or otherwise deleted)
action = 'r' action = ACTION_REMOVE
else: else:
if fcd.isabsent(): # dc: remote picked if fcd.isabsent(): # dc: remote picked
action = 'g' action = ACTION_GET
elif fco.isabsent(): # cd: local picked elif fco.isabsent(): # cd: local picked
if dfile in self.localctx: if dfile in self.localctx:
action = 'am' action = ACTION_ADD_MODIFIED
else: else:
action = 'a' action = ACTION_ADD
# else: regular merges (no action necessary) # else: regular merges (no action necessary)
self._results[dfile] = r, action self._results[dfile] = r, action
return complete, r return complete, r
def _filectxorabsent(self, hexnode, ctx, f): def _filectxorabsent(self, hexnode, ctx, f):
if hexnode == nullhex: if hexnode == nullhex:
return filemerge.absentfilectx(ctx, f) return filemerge.absentfilectx(ctx, f)
def counts(self): def counts(self):
"""return counts for updated, merged and removed files in this """return counts for updated, merged and removed files in this
session""" session"""
updated, merged, removed = 0, 0, 0 updated, merged, removed = 0, 0, 0
for r, action in self._results.itervalues(): for r, action in self._results.itervalues():
if r is None: if r is None:
updated += 1 updated += 1
elif r == 0: elif r == 0:
if action == 'r': if action == ACTION_REMOVE:
removed += 1 removed += 1
else: else:
merged += 1 merged += 1
return updated, merged, removed return updated, merged, removed
def unresolvedcount(self): def unresolvedcount(self):
"""get unresolved count for this merge (persistent)""" """get unresolved count for this merge (persistent)"""
return len(list(self.unresolved())) return len(list(self.unresolved()))
def actions(self): def actions(self):
"""return lists of actions to perform on the dirstate""" """return lists of actions to perform on the dirstate"""
actions = {'r': [], 'f': [], 'a': [], 'am': [], 'g': []} actions = {
ACTION_REMOVE: [],
ACTION_FORGET: [],
ACTION_ADD: [],
ACTION_ADD_MODIFIED: [],
ACTION_GET: [],
}
for f, (r, action) in self._results.iteritems(): for f, (r, action) in self._results.iteritems():
if action is not None: if action is not None:
actions[action].append((f, None, "merge result")) actions[action].append((f, None, "merge result"))
return actions return actions
def recordactions(self): def recordactions(self):
"""record remove/add/get actions in the dirstate""" """record remove/add/get actions in the dirstate"""
branchmerge = self._repo.dirstate.p2() != nullid branchmerge = self._repo.dirstate.p2() != nullid
recordupdates(self._repo, self.actions(), branchmerge) recordupdates(self._repo, self.actions(), branchmerge)
def queueremove(self, f): def queueremove(self, f):
"""queues a file to be removed from the dirstate """queues a file to be removed from the dirstate
Meant for use by custom merge drivers.""" Meant for use by custom merge drivers."""
self._results[f] = 0, 'r' self._results[f] = 0, ACTION_REMOVE
def queueadd(self, f): def queueadd(self, f):
"""queues a file to be added to the dirstate """queues a file to be added to the dirstate
Meant for use by custom merge drivers.""" Meant for use by custom merge drivers."""
self._results[f] = 0, 'a' self._results[f] = 0, ACTION_ADD
def queueget(self, f): def queueget(self, f):
"""queues a file to be marked modified in the dirstate """queues a file to be marked modified in the dirstate
Meant for use by custom merge drivers.""" Meant for use by custom merge drivers."""
self._results[f] = 0, 'g' self._results[f] = 0, ACTION_GET
def _getcheckunknownconfig(repo, section, name): def _getcheckunknownconfig(repo, section, name):
config = repo.ui.config(section, name) config = repo.ui.config(section, name)
valid = ['abort', 'ignore', 'warn'] valid = ['abort', 'ignore', 'warn']
if config not in valid: if config not in valid:
validstr = ', '.join(["'" + v + "'" for v in valid]) validstr = ', '.join(["'" + v + "'" for v in valid])
raise error.ConfigError(_("%s.%s not valid " raise error.ConfigError(_("%s.%s not valid "
"('%s' is none of %s)") "('%s' is none of %s)")
def collectconflicts(conflicts, config): def collectconflicts(conflicts, config):
if config == 'abort': if config == 'abort':
abortconflicts.update(conflicts) abortconflicts.update(conflicts)
elif config == 'warn': elif config == 'warn':
warnconflicts.update(conflicts) warnconflicts.update(conflicts)
checkunknowndirs = _unknowndirschecker() checkunknowndirs = _unknowndirschecker()
for f, (m, args, msg) in actions.iteritems(): for f, (m, args, msg) in actions.iteritems():
if m in ('c', 'dc'): if m in (ACTION_CREATED, 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 == 'dg': elif m == 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 = set([c for c in allconflicts ignoredconflicts = set([c for c in allconflicts
if repo.dirstate._ignore(c)]) 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 actions.iteritems(): for f, (m, args, msg) in actions.iteritems():
if m == 'cm': if m == 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] = ('g', (fl2, False), "remote created") actions[f] = (ACTION_GET, (fl2, False), 'remote created')
elif mergeforce or config == 'abort': elif mergeforce or config == 'abort':
actions[f] = ('m', (f, f, None, False, anc), actions[f] = (ACTION_MERGE, (f, f, None, False, anc),
"remote differs from untracked local") 'remote differs from untracked local')
elif config == 'abort': elif config == 'abort':
abortconflicts.add(f) abortconflicts.add(f)
else: else:
if config == 'warn': if config == 'warn':
warnconflicts.add(f) warnconflicts.add(f)
actions[f] = ('g', (fl2, True), "remote created") actions[f] = (ACTION_GET, (fl2, True), '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:
if repo.wvfs.isfileorlink(f): if repo.wvfs.isfileorlink(f):
warn(_("%s: untracked file conflicts with directory\n") % f) warn(_("%s: untracked file conflicts with directory\n") % f)
else: else:
warn(_("%s: untracked directory conflicts with file\n") % f) warn(_("%s: untracked directory conflicts with file\n") % f)
else: else:
warn(_("%s: untracked file differs\n") % f) warn(_("%s: untracked file differs\n") % f)
if abortconflicts: if abortconflicts:
raise error.Abort(_("untracked files in working directory " raise error.Abort(_("untracked files in working directory "
"differ from files in requested revision")) "differ from files in requested revision"))
for f in sorted(warnconflicts): for f in sorted(warnconflicts):
if repo.wvfs.isfileorlink(f): if repo.wvfs.isfileorlink(f):
repo.ui.warn(_("%s: replacing untracked file\n") % f) repo.ui.warn(_("%s: replacing untracked file\n") % f)
else: else:
repo.ui.warn(_("%s: replacing untracked files in directory\n") % f) repo.ui.warn(_("%s: replacing untracked files in directory\n") % f)
for f, (m, args, msg) in actions.iteritems(): for f, (m, args, msg) in actions.iteritems():
if m == 'c': if m == ACTION_CREATED:
backup = (f in fileconflicts or f in pathconflicts or backup = (f in fileconflicts or f in pathconflicts or
any(p in pathconflicts for p in util.finddirs(f))) any(p in pathconflicts for p in util.finddirs(f)))
flags, = args flags, = args
actions[f] = ('g', (flags, backup), msg) actions[f] = (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,
then we need to remove it from the dirstate, to prevent the then we need to remove it from the dirstate, to prevent the
dirstate from listing the file when it is no longer in the dirstate from listing the file when it is no longer in the
manifest. manifest.
If we're merging, and the other revision has removed a file If we're merging, and the other revision has removed a file
that is not present in the working directory, we need to mark it that is not present in the working directory, we need to mark it
as removed. as removed.
""" """
actions = {} actions = {}
m = 'f' m = ACTION_FORGET
if branchmerge: if branchmerge:
m = 'r' m = ACTION_REMOVE
for f in wctx.deleted(): for f in wctx.deleted():
if f not in mctx: if f not in mctx:
actions[f] = m, None, "forget deleted" actions[f] = m, None, "forget deleted"
if not branchmerge: if not branchmerge:
for f in wctx.removed(): for f in wctx.removed():
if f not in mctx: if f not in mctx:
actions[f] = 'f', None, "forget removed" actions[f] = ACTION_FORGET, None, "forget removed"
return actions return actions
def _checkcollision(repo, wmf, actions): def _checkcollision(repo, wmf, actions):
# build provisional merged manifest up # build provisional merged manifest up
pmmf = set(wmf) pmmf = set(wmf)
if actions: if actions:
# k, dr, e and rd are no-op # k, dr, e and rd are no-op
phillcoUnsubmitted
Done

Update this too?

phillco: Update this too?
indygregAuthorUnsubmitted
Not Done

Done.

What's... amusing is that `dr and rd` are not actions in the current code base.

indygreg: Done. What's... amusing is that ``dr`` and ``rd`` are not actions in the current code base.
phillcoUnsubmitted
Not Done

lol

phillco: lol
for m in 'a', 'am', 'f', 'g', 'cd', 'dc': for m in (ACTION_ADD, ACTION_ADD_MODIFIED, ACTION_FORGET, ACTION_GET,
ACTION_CHANGED_DELETED, ACTION_DELETED_CHANGED):
for f, args, msg in actions[m]: for f, args, msg in actions[m]:
pmmf.add(f) pmmf.add(f)
for f, args, msg in actions['r']: for f, args, msg in actions[ACTION_REMOVE]:
pmmf.discard(f) pmmf.discard(f)
for f, args, msg in actions['dm']: for f, args, msg in actions[ACTION_DIR_RENAME_MOVE_LOCAL]:
f2, flags = args f2, flags = args
pmmf.discard(f2) pmmf.discard(f2)
pmmf.add(f) pmmf.add(f)
for f, args, msg in actions['dg']: for f, args, msg in actions[ACTION_LOCAL_DIR_RENAME_GET]:
pmmf.add(f) pmmf.add(f)
for f, args, msg in actions['m']: for f, args, msg in actions[ACTION_MERGE]:
f1, f2, fa, move, anc = args f1, f2, fa, move, anc = args
if move: if move:
pmmf.discard(f1) pmmf.discard(f1)
pmmf.add(f) pmmf.add(f)
# check case-folding collision in provisional merged manifest # check case-folding collision in provisional merged manifest
foldmap = {} foldmap = {}
for f in pmmf: for f in pmmf:
# The set of directories that contain files that are being created. # The set of directories that contain files that are being created.
createdfiledirs = set() createdfiledirs = set()
# The set of files deleted by all the actions. # The set of files deleted by all the actions.
deletedfiles = set() deletedfiles = set()
for f, (m, args, msg) in actions.items(): for f, (m, args, msg) in actions.items():
if m in ('c', 'dc', 'm', 'cm'): if m in (ACTION_CREATED, ACTION_DELETED_CHANGED, ACTION_MERGE,
ACTION_CREATED_MERGE):
# This action may create a new local file. # This action may create a new local file.
createdfiledirs.update(util.finddirs(f)) createdfiledirs.update(util.finddirs(f))
if mf.hasdir(f): if mf.hasdir(f):
# The file aliases a local directory. This might be ok if all # The file aliases a local directory. This might be ok if all
# the files in the local directory are being deleted. This # the files in the local directory are being deleted. This
# will be checked once we know what all the deleted files are. # will be checked once we know what all the deleted files are.
remoteconflicts.add(f) remoteconflicts.add(f)
# Track the names of all deleted files. # Track the names of all deleted files.
if m == 'r': if m == ACTION_REMOVE:
deletedfiles.add(f) deletedfiles.add(f)
if m == 'm': if m == ACTION_MERGE:
f1, f2, fa, move, anc = args f1, f2, fa, move, anc = args
if move: if move:
deletedfiles.add(f1) deletedfiles.add(f1)
if m == 'dm': if m == ACTION_DIR_RENAME_MOVE_LOCAL:
f2, flags = args f2, flags = args
deletedfiles.add(f2) deletedfiles.add(f2)
# Check all directories that contain created files for path conflicts. # Check all directories that contain created files for path conflicts.
for p in createdfiledirs: for p in createdfiledirs:
if p in mf: if p in mf:
if p in mctx: if p in mctx:
# A file is in a directory which aliases both a local # A file is in a directory which aliases both a local
# and a remote file. This is an internal inconsistency # and a remote file. This is an internal inconsistency
# within the remote manifest. # within the remote manifest.
invalidconflicts.add(p) invalidconflicts.add(p)
else: else:
# A file is in a directory which aliases a local file. # A file is in a directory which aliases a local file.
# We will need to rename the local file. # We will need to rename the local file.
localconflicts.add(p) localconflicts.add(p)
if p in actions and actions[p][0] in ('c', 'dc', 'm', 'cm'): if p in actions and actions[p][0] in (ACTION_CREATED,
ACTION_DELETED_CHANGED,
ACTION_MERGE,
ACTION_CREATED_MERGE):
# The file is in a directory which aliases a remote file. # The file is in a directory which aliases a remote file.
# This is an internal inconsistency within the remote # This is an internal inconsistency within the remote
# manifest. # manifest.
invalidconflicts.add(p) invalidconflicts.add(p)
# Rename all local conflicting files that have not been deleted. # Rename all local conflicting files that have not been deleted.
for p in localconflicts: for p in localconflicts:
if p not in deletedfiles: if p not in deletedfiles:
ctxname = bytes(wctx).rstrip('+') ctxname = bytes(wctx).rstrip('+')
pnew = util.safename(p, ctxname, wctx, set(actions.keys())) pnew = util.safename(p, ctxname, wctx, set(actions.keys()))
actions[pnew] = ('pr', (p,), "local path conflict") actions[pnew] = (ACTION_PATH_CONFLICT_RESOLVE, (p,),
actions[p] = ('p', (pnew, 'l'), "path conflict") 'local path conflict')
actions[p] = (ACTION_PATH_CONFLICT, (pnew, 'l'),
'path conflict')
if remoteconflicts: if remoteconflicts:
# Check if all files in the conflicting directories have been removed. # Check if all files in the conflicting directories have been removed.
ctxname = bytes(mctx).rstrip('+') ctxname = bytes(mctx).rstrip('+')
for f, p in _filesindirs(repo, mf, remoteconflicts): for f, p in _filesindirs(repo, mf, remoteconflicts):
if f not in deletedfiles: if f not in deletedfiles:
m, args, msg = actions[p] m, args, msg = actions[p]
pnew = util.safename(p, ctxname, wctx, set(actions.keys())) pnew = util.safename(p, ctxname, wctx, set(actions.keys()))
if m in ('dc', 'm'): if m in (ACTION_DELETED_CHANGED, ACTION_MERGE):
# Action was merge, just update target. # Action was merge, just update target.
actions[pnew] = (m, args, msg) actions[pnew] = (m, args, msg)
else: else:
# Action was create, change to renamed get action. # Action was create, change to renamed get action.
fl = args[0] fl = args[0]
actions[pnew] = ('dg', (p, fl), "remote path conflict") actions[pnew] = (ACTION_LOCAL_DIR_RENAME_GET, (p, fl),
actions[p] = ('p', (pnew, 'r'), "path conflict") 'remote path conflict')
actions[p] = (ACTION_PATH_CONFLICT, (pnew, ACTION_REMOVE),
'path conflict')
remoteconflicts.remove(p) remoteconflicts.remove(p)
break break
if invalidconflicts: if invalidconflicts:
for p in invalidconflicts: for p in invalidconflicts:
repo.ui.warn(_("%s: is both a file and a directory\n") % p) repo.ui.warn(_("%s: is both a file and a directory\n") % p)
raise error.Abort(_("destination manifest contains path conflicts")) raise error.Abort(_("destination manifest contains path conflicts"))
matcher = matchmod.always('', '') matcher = matchmod.always('', '')
actions = {} actions = {}
for f, ((n1, fl1), (n2, fl2)) in diff.iteritems(): for f, ((n1, fl1), (n2, fl2)) in diff.iteritems():
if n1 and n2: # file exists on both local and remote side if n1 and n2: # file exists on both local and remote side
if f not in ma: if f not in ma:
fa = copy.get(f, None) fa = copy.get(f, None)
if fa is not None: if fa is not None:
actions[f] = ('m', (f, f, fa, False, pa.node()), actions[f] = (ACTION_MERGE, (f, f, fa, False, pa.node()),
"both renamed from " + fa) 'both renamed from %s' % fa)
else: else:
actions[f] = ('m', (f, f, None, False, pa.node()), actions[f] = (ACTION_MERGE, (f, f, None, False, pa.node()),
"both created") 'both created')
else: else:
a = ma[f] a = ma[f]
fla = ma.flags(f) fla = ma.flags(f)
nol = 'l' not in fl1 + fl2 + fla nol = 'l' not in fl1 + fl2 + fla
if n2 == a and fl2 == fla: if n2 == a and fl2 == fla:
actions[f] = ('k', (), "remote unchanged") actions[f] = (ACTION_KEEP, (), 'remote unchanged')
elif n1 == a and fl1 == fla: # local unchanged - use remote elif n1 == a and fl1 == fla: # local unchanged - use remote
if n1 == n2: # optimization: keep local content if n1 == n2: # optimization: keep local content
actions[f] = ('e', (fl2,), "update permissions") actions[f] = (ACTION_EXEC, (fl2,), 'update permissions')
else: else:
actions[f] = ('g', (fl2, False), "remote is newer") actions[f] = (ACTION_GET, (fl2, False),
'remote is newer')
elif nol and n2 == a: # remote only changed 'x' elif nol and n2 == a: # remote only changed 'x'
actions[f] = ('e', (fl2,), "update permissions") actions[f] = (ACTION_EXEC, (fl2,), 'update permissions')
elif nol and n1 == a: # local only changed 'x' elif nol and n1 == a: # local only changed 'x'
actions[f] = ('g', (fl1, False), "remote is newer") actions[f] = (ACTION_GET, (fl1, False), 'remote is newer')
else: # both changed something else: # both changed something
actions[f] = ('m', (f, f, f, False, pa.node()), actions[f] = (ACTION_MERGE, (f, f, f, False, pa.node()),
"versions differ") 'versions differ')
elif n1: # file exists only on local side elif n1: # file exists only on local side
if f in copied: if f in copied:
pass # we'll deal with it on m2 side pass # we'll deal with it on m2 side
elif f in movewithdir: # directory rename, move local elif f in movewithdir: # directory rename, move local
f2 = movewithdir[f] f2 = movewithdir[f]
if f2 in m2: if f2 in m2:
actions[f2] = ('m', (f, f2, None, True, pa.node()), actions[f2] = (ACTION_MERGE, (f, f2, None, True, pa.node()),
"remote directory rename, both created") 'remote directory rename, both created')
else: else:
actions[f2] = ('dm', (f, fl1), actions[f2] = (ACTION_DIR_RENAME_MOVE_LOCAL, (f, fl1),
"remote directory rename - move from " + f) 'remote directory rename - move from %s' % f)
elif f in copy: elif f in copy:
f2 = copy[f] f2 = copy[f]
actions[f] = ('m', (f, f2, f2, False, pa.node()), actions[f] = (ACTION_MERGE, (f, f2, f2, False, pa.node()),
"local copied/moved from " + f2) 'local copied/moved from %s' % f2)
elif f in ma: # clean, a different, no remote elif f in ma: # clean, a different, no remote
if n1 != ma[f]: if n1 != ma[f]:
if acceptremote: if acceptremote:
actions[f] = ('r', None, "remote delete") actions[f] = (ACTION_REMOVE, None, 'remote delete')
else: else:
actions[f] = ('cd', (f, None, f, False, pa.node()), actions[f] = (ACTION_CHANGED_DELETED,
"prompt changed/deleted") (f, None, f, False, pa.node()),
'prompt changed/deleted')
elif n1 == addednodeid: elif n1 == addednodeid:
# This extra 'a' is added by working copy manifest to mark # This extra 'a' is added by working copy manifest to mark
# the file as locally added. We should forget it instead of # the file as locally added. We should forget it instead of
# deleting it. # deleting it.
actions[f] = ('f', None, "remote deleted") actions[f] = (ACTION_FORGET, None, 'remote deleted')
else: else:
actions[f] = ('r', None, "other deleted") actions[f] = (ACTION_REMOVE, None, 'other deleted')
elif n2: # file exists only on remote side elif n2: # file exists only on remote side
if f in copied: if f in copied:
pass # we'll deal with it on m1 side pass # we'll deal with it on m1 side
elif f in movewithdir: elif f in movewithdir:
f2 = movewithdir[f] f2 = movewithdir[f]
if f2 in m1: if f2 in m1:
actions[f2] = ('m', (f2, f, None, False, pa.node()), actions[f2] = (ACTION_MERGE,
"local directory rename, both created") (f2, f, None, False, pa.node()),
'local directory rename, both created')
else: else:
actions[f2] = ('dg', (f, fl2), actions[f2] = (ACTION_LOCAL_DIR_RENAME_GET, (f, fl2),
"local directory rename - get from " + f) 'local directory rename - get from %s' % f)
elif f in copy: elif f in copy:
f2 = copy[f] f2 = copy[f]
if f2 in m2: if f2 in m2:
actions[f] = ('m', (f2, f, f2, False, pa.node()), actions[f] = (ACTION_MERGE, (f2, f, f2, False, pa.node()),
"remote copied from " + f2) 'remote copied from %s' % f2)
else: else:
actions[f] = ('m', (f2, f, f2, True, pa.node()), actions[f] = (ACTION_MERGE, (f2, f, f2, True, pa.node()),
"remote moved from " + f2) 'remote moved from %s' % f2)
elif f not in ma: elif f not in ma:
# local unknown, remote created: the logic is described by the # local unknown, remote created: the logic is described by the
# following table: # following table:
# #
# force branchmerge different | action # force branchmerge different | action
# n * * | create # n * * | create
# y n * | create # y n * | create
# y y n | create # y y n | create
# y y y | merge # y y y | merge
# #
# Checking whether the files are different is expensive, so we # Checking whether the files are different is expensive, so we
# don't do that when we can avoid it. # don't do that when we can avoid it.
if not force: if not force:
actions[f] = ('c', (fl2,), "remote created") actions[f] = (ACTION_CREATED, (fl2,), 'remote created')
elif not branchmerge: elif not branchmerge:
actions[f] = ('c', (fl2,), "remote created") actions[f] = (ACTION_CREATED, (fl2,), 'remote created')
else: else:
actions[f] = ('cm', (fl2, pa.node()), actions[f] = (ACTION_CREATED_MERGE, (fl2, pa.node()),
"remote created, get or merge") 'remote created, get or merge')
elif n2 != ma[f]: elif n2 != ma[f]:
df = None df = None
for d in dirmove: for d in dirmove:
if f.startswith(d): if f.startswith(d):
# new file added in a directory that was moved # new file added in a directory that was moved
df = dirmove[d] + f[len(d):] df = dirmove[d] + f[len(d):]
break break
if df is not None and df in m1: if df is not None and df in m1:
actions[df] = ('m', (df, f, f, False, pa.node()), actions[df] = (ACTION_MERGE, (df, f, f, False, pa.node()),
"local directory rename - respect move from " + f) 'local directory rename - respect move '
'from %s' % f)
elif acceptremote: elif acceptremote:
actions[f] = ('c', (fl2,), "remote recreating") actions[f] = (ACTION_CREATED, (fl2,), 'remote recreating')
else: else:
actions[f] = ('dc', (None, f, f, False, pa.node()), actions[f] = (ACTION_DELETED_CHANGED,
"prompt deleted/changed") (None, f, f, False, pa.node()),
'prompt deleted/changed')
if repo.ui.configbool('experimental', 'merge.checkpathconflicts'): if repo.ui.configbool('experimental', 'merge.checkpathconflicts'):
# If we are merging, look for path conflicts. # If we are merging, look for path conflicts.
checkpathconflicts(repo, wctx, p2, actions) checkpathconflicts(repo, wctx, p2, actions)
return actions, diverge, renamedelete return actions, diverge, renamedelete
def _resolvetrivial(repo, wctx, mctx, ancestor, actions): def _resolvetrivial(repo, wctx, mctx, ancestor, actions):
"""Resolves false conflicts where the nodeid changed but the content """Resolves false conflicts where the nodeid changed but the content
remained the same.""" remained the same."""
# We force a copy of actions.items() because we're going to mutate # We force a copy of actions.items() because we're going to mutate
# actions as we resolve trivial conflicts. # actions as we resolve trivial conflicts.
for f, (m, args, msg) in list(actions.items()): for f, (m, args, msg) in list(actions.items()):
if m == 'cd' and f in ancestor and not wctx[f].cmp(ancestor[f]): if (m == ACTION_CHANGED_DELETED and f in ancestor
and not wctx[f].cmp(ancestor[f])):
# local did change but ended up with same content # local did change but ended up with same content
actions[f] = 'r', None, "prompt same" actions[f] = ACTION_REMOVE, None, 'prompt same'
elif m == 'dc' and f in ancestor and not mctx[f].cmp(ancestor[f]): elif (m == ACTION_DELETED_CHANGED and f in ancestor
and not mctx[f].cmp(ancestor[f])):
# remote did change but ended up with same content # remote did change but ended up with same content
del actions[f] # don't get = keep local deleted del actions[f] # don't get = keep local deleted
def calculateupdates(repo, wctx, mctx, ancestors, branchmerge, force, def calculateupdates(repo, wctx, mctx, ancestors, branchmerge, force,
acceptremote, followcopies, matcher=None, acceptremote, followcopies, matcher=None,
mergeforce=False): mergeforce=False):
"""Calculate the actions needed to merge mctx into wctx using ancestors""" """Calculate the actions needed to merge mctx into wctx using ancestors"""
# Avoid cycle. # Avoid cycle.
for f, bids in sorted(fbids.items()): for f, bids in sorted(fbids.items()):
# bids is a mapping from action method to list af actions # bids is a mapping from action method to list af actions
# Consensus? # Consensus?
if len(bids) == 1: # all bids are the same kind of method if len(bids) == 1: # all bids are the same kind of method
m, l = list(bids.items())[0] m, l = list(bids.items())[0]
if all(a == l[0] for a in l[1:]): # len(bids) is > 1 if all(a == l[0] for a in l[1:]): # len(bids) is > 1
repo.ui.note(_(" %s: consensus for %s\n") % (f, m)) repo.ui.note(_(" %s: consensus for %s\n") % (f, m))
actions[f] = l[0] actions[f] = l[0]
if m == 'dm': if m == ACTION_DIR_RENAME_MOVE_LOCAL:
dms.append(f) dms.append(f)
continue continue
# If keep is an option, just do it. # If keep is an option, just do it.
if 'k' in bids: if ACTION_KEEP in bids:
repo.ui.note(_(" %s: picking 'keep' action\n") % f) repo.ui.note(_(" %s: picking 'keep' action\n") % f)
actions[f] = bids['k'][0] actions[f] = bids[ACTION_KEEP][0]
continue continue
# If there are gets and they all agree [how could they not?], do it. # If there are gets and they all agree [how could they not?], do it.
if 'g' in bids: if ACTION_GET in bids:
ga0 = bids['g'][0] ga0 = bids[ACTION_GET][0]
if all(a == ga0 for a in bids['g'][1:]): if all(a == ga0 for a in bids[ACTION_GET][1:]):
repo.ui.note(_(" %s: picking 'get' action\n") % f) repo.ui.note(_(" %s: picking 'get' action\n") % f)
actions[f] = ga0 actions[f] = ga0
continue continue
# TODO: Consider other simple actions such as mode changes # TODO: Consider other simple actions such as mode changes
# Handle inefficient democrazy. # Handle inefficient democrazy.
repo.ui.note(_(' %s: multiple bids for merge action:\n') % f) repo.ui.note(_(' %s: multiple bids for merge action:\n') % f)
for m, l in sorted(bids.items()): for m, l in sorted(bids.items()):
for _f, args, msg in l: for _f, args, msg in l:
repo.ui.note(' %s -> %s\n' % (msg, m)) repo.ui.note(' %s -> %s\n' % (msg, m))
# Pick random action. TODO: Instead, prompt user when resolving # Pick random action. TODO: Instead, prompt user when resolving
m, l = list(bids.items())[0] m, l = list(bids.items())[0]
repo.ui.warn(_(' %s: ambiguous merge - picked %s action\n') % repo.ui.warn(_(' %s: ambiguous merge - picked %s action\n') %
(f, m)) (f, m))
actions[f] = l[0] actions[f] = l[0]
if m == 'dm': if m == ACTION_DIR_RENAME_MOVE_LOCAL:
dms.append(f) dms.append(f)
continue continue
# Work around 'dm' that can cause multiple actions for the same file # Work around 'dm' that can cause multiple actions for the same file
for f in dms: for f in dms:
dm, (f0, flags), msg = actions[f] dm, (f0, flags), msg = actions[f]
assert dm == 'dm', dm assert dm == ACTION_DIR_RENAME_MOVE_LOCAL, dm
if f0 in actions and actions[f0][0] == 'r': if f0 in actions and actions[f0][0] == ACTION_REMOVE:
# We have one bid for removing a file and another for moving it. # We have one bid for removing a file and another for moving it.
# These two could be merged as first move and then delete ... # These two could be merged as first move and then delete ...
# but instead drop moving and just delete. # but instead drop moving and just delete.
del actions[f] del actions[f]
repo.ui.note(_('end of auction\n\n')) repo.ui.note(_('end of auction\n\n'))
_resolvetrivial(repo, wctx, mctx, ancestors[0], actions) _resolvetrivial(repo, wctx, mctx, ancestors[0], actions)
def _prefetchfiles(repo, ctx, actions): def _prefetchfiles(repo, ctx, actions):
"""Invoke ``scmutil.fileprefetchhooks()`` for the files relevant to the dict """Invoke ``scmutil.fileprefetchhooks()`` for the files relevant to the dict
of merge actions. ``ctx`` is the context being merged in.""" of merge actions. ``ctx`` is the context being merged in."""
# Skipping 'a', 'am', 'f', 'r', 'dm', 'e', 'k', 'p' and 'pr', because they # Skipping 'a', 'am', 'f', 'r', 'dm', 'e', 'k', 'p' and 'pr', because they
# don't touch the context to be merged in. 'cd' is skipped, because # don't touch the context to be merged in. 'cd' is skipped, because
# changed/deleted never resolves to something from the remote side. # changed/deleted never resolves to something from the remote side.
oplist = [actions[a] for a in 'g dc dg m'.split()] oplist = [actions[a] for a in (ACTION_GET, ACTION_DELETED_CHANGED,
ACTION_LOCAL_DIR_RENAME_GET, ACTION_MERGE)]
prefetch = scmutil.fileprefetchhooks prefetch = scmutil.fileprefetchhooks
prefetch(repo, ctx, [f for sublist in oplist for f, args, msg in sublist]) prefetch(repo, ctx, [f for sublist in oplist for f, args, msg in sublist])
@attr.s(frozen=True) @attr.s(frozen=True)
class updateresult(object): class updateresult(object):
updatedcount = attr.ib() updatedcount = attr.ib()
mergedcount = attr.ib() mergedcount = attr.ib()
removedcount = attr.ib() removedcount = attr.ib()
updated, merged, removed = 0, 0, 0 updated, merged, removed = 0, 0, 0
ms = mergestate.clean(repo, wctx.p1().node(), mctx.node(), labels) ms = mergestate.clean(repo, wctx.p1().node(), mctx.node(), labels)
moves = [] moves = []
for m, l in actions.items(): for m, l in actions.items():
l.sort() l.sort()
# 'cd' and 'dc' actions are treated like other merge conflicts # 'cd' and 'dc' actions are treated like other merge conflicts
mergeactions = sorted(actions['cd']) mergeactions = sorted(actions[ACTION_CHANGED_DELETED])
mergeactions.extend(sorted(actions['dc'])) mergeactions.extend(sorted(actions[ACTION_DELETED_CHANGED]))
mergeactions.extend(actions['m']) mergeactions.extend(actions[ACTION_MERGE])
for f, args, msg in mergeactions: for f, args, msg in mergeactions:
f1, f2, fa, move, anc = args f1, f2, fa, move, anc = args
if f == '.hgsubstate': # merged internally if f == '.hgsubstate': # merged internally
continue continue
if f1 is None: if f1 is None:
fcl = filemerge.absentfilectx(wctx, fa) fcl = filemerge.absentfilectx(wctx, fa)
else: else:
repo.ui.debug(" preserving %s for resolve of %s\n" % (f1, f)) repo.ui.debug(" preserving %s for resolve of %s\n" % (f1, f))
# remove renamed files after safely stored # remove renamed files after safely stored
for f in moves: for f in moves:
if wctx[f].lexists(): if wctx[f].lexists():
repo.ui.debug("removing %s\n" % f) repo.ui.debug("removing %s\n" % f)
wctx[f].audit() wctx[f].audit()
wctx[f].remove() wctx[f].remove()
numupdates = sum(len(l) for m, l in actions.items() if m != 'k') numupdates = sum(len(l) for m, l in actions.items()
if m != ACTION_KEEP)
z = 0 z = 0
if [a for a in actions['r'] if a[0] == '.hgsubstate']: if [a for a in actions[ACTION_REMOVE] if a[0] == '.hgsubstate']:
subrepoutil.submerge(repo, wctx, mctx, wctx, overwrite, labels) subrepoutil.submerge(repo, wctx, mctx, wctx, overwrite, labels)
# record path conflicts # record path conflicts
for f, args, msg in actions['p']: for f, args, msg in actions[ACTION_PATH_CONFLICT]:
f1, fo = args f1, fo = args
s = repo.ui.status s = repo.ui.status
s(_("%s: path conflict - a file or link has the same name as a " s(_("%s: path conflict - a file or link has the same name as a "
"directory\n") % f) "directory\n") % f)
if fo == 'l': if fo == 'l':
s(_("the local file has been renamed to %s\n") % f1) s(_("the local file has been renamed to %s\n") % f1)
else: else:
s(_("the remote file has been renamed to %s\n") % f1) s(_("the remote file has been renamed to %s\n") % f1)
s(_("resolve manually then use 'hg resolve --mark %s'\n") % f) s(_("resolve manually then use 'hg resolve --mark %s'\n") % f)
ms.addpath(f, f1, fo) ms.addpath(f, f1, fo)
z += 1 z += 1
progress(_updating, z, item=f, total=numupdates, unit=_files) progress(_updating, z, item=f, total=numupdates, unit=_files)
# When merging in-memory, we can't support worker processes, so set the # When merging in-memory, we can't support worker processes, so set the
# per-item cost at 0 in that case. # per-item cost at 0 in that case.
cost = 0 if wctx.isinmemory() else 0.001 cost = 0 if wctx.isinmemory() else 0.001
# remove in parallel (must come before resolving path conflicts and getting) # remove in parallel (must come before resolving path conflicts and getting)
prog = worker.worker(repo.ui, cost, batchremove, (repo, wctx), prog = worker.worker(repo.ui, cost, batchremove, (repo, wctx),
actions['r']) actions[ACTION_REMOVE])
for i, item in prog: for i, item in prog:
z += i z += i
progress(_updating, z, item=item, total=numupdates, unit=_files) progress(_updating, z, item=item, total=numupdates, unit=_files)
removed = len(actions['r']) removed = len(actions[ACTION_REMOVE])
# resolve path conflicts (must come before getting) # resolve path conflicts (must come before getting)
for f, args, msg in actions['pr']: for f, args, msg in actions[ACTION_PATH_CONFLICT_RESOLVE]:
repo.ui.debug(" %s: %s -> pr\n" % (f, msg)) repo.ui.debug(" %s: %s -> pr\n" % (f, msg))
f0, = args f0, = args
if wctx[f0].lexists(): if wctx[f0].lexists():
repo.ui.note(_("moving %s to %s\n") % (f0, f)) repo.ui.note(_("moving %s to %s\n") % (f0, f))
wctx[f].audit() wctx[f].audit()
wctx[f].write(wctx.filectx(f0).data(), wctx.filectx(f0).flags()) wctx[f].write(wctx.filectx(f0).data(), wctx.filectx(f0).flags())
wctx[f0].remove() wctx[f0].remove()
z += 1 z += 1
progress(_updating, z, item=f, total=numupdates, unit=_files) progress(_updating, z, item=f, total=numupdates, unit=_files)
# get in parallel # get in parallel
prog = worker.worker(repo.ui, cost, batchget, (repo, mctx, wctx), prog = worker.worker(repo.ui, cost, batchget, (repo, mctx, wctx),
actions['g']) actions[ACTION_GET])
for i, item in prog: for i, item in prog:
z += i z += i
progress(_updating, z, item=item, total=numupdates, unit=_files) progress(_updating, z, item=item, total=numupdates, unit=_files)
updated = len(actions['g']) updated = len(actions[ACTION_GET])
if [a for a in actions['g'] if a[0] == '.hgsubstate']: if [a for a in actions[ACTION_GET] if a[0] == '.hgsubstate']:
subrepoutil.submerge(repo, wctx, mctx, wctx, overwrite, labels) subrepoutil.submerge(repo, wctx, mctx, wctx, overwrite, labels)
# forget (manifest only, just log it) (must come first) # forget (manifest only, just log it) (must come first)
for f, args, msg in actions['f']: for f, args, msg in actions[ACTION_FORGET]:
repo.ui.debug(" %s: %s -> f\n" % (f, msg)) repo.ui.debug(" %s: %s -> f\n" % (f, msg))
z += 1 z += 1
progress(_updating, z, item=f, total=numupdates, unit=_files) progress(_updating, z, item=f, total=numupdates, unit=_files)
# re-add (manifest only, just log it) # re-add (manifest only, just log it)
for f, args, msg in actions['a']: for f, args, msg in actions[ACTION_ADD]:
repo.ui.debug(" %s: %s -> a\n" % (f, msg)) repo.ui.debug(" %s: %s -> a\n" % (f, msg))
z += 1 z += 1
progress(_updating, z, item=f, total=numupdates, unit=_files) progress(_updating, z, item=f, total=numupdates, unit=_files)
# re-add/mark as modified (manifest only, just log it) # re-add/mark as modified (manifest only, just log it)
for f, args, msg in actions['am']: for f, args, msg in actions[ACTION_ADD_MODIFIED]:
repo.ui.debug(" %s: %s -> am\n" % (f, msg)) repo.ui.debug(" %s: %s -> am\n" % (f, msg))
z += 1 z += 1
progress(_updating, z, item=f, total=numupdates, unit=_files) progress(_updating, z, item=f, total=numupdates, unit=_files)
# keep (noop, just log it) # keep (noop, just log it)
for f, args, msg in actions['k']: for f, args, msg in actions[ACTION_KEEP]:
repo.ui.debug(" %s: %s -> k\n" % (f, msg)) repo.ui.debug(" %s: %s -> k\n" % (f, msg))
# no progress # no progress
# directory rename, move local # directory rename, move local
for f, args, msg in actions['dm']: for f, args, msg in actions[ACTION_DIR_RENAME_MOVE_LOCAL]:
repo.ui.debug(" %s: %s -> dm\n" % (f, msg)) repo.ui.debug(" %s: %s -> dm\n" % (f, msg))
z += 1 z += 1
progress(_updating, z, item=f, total=numupdates, unit=_files) progress(_updating, z, item=f, total=numupdates, unit=_files)
f0, flags = args f0, flags = args
repo.ui.note(_("moving %s to %s\n") % (f0, f)) repo.ui.note(_("moving %s to %s\n") % (f0, f))
wctx[f].audit() wctx[f].audit()
wctx[f].write(wctx.filectx(f0).data(), flags) wctx[f].write(wctx.filectx(f0).data(), flags)
wctx[f0].remove() wctx[f0].remove()
updated += 1 updated += 1
# local directory rename, get # local directory rename, get
for f, args, msg in actions['dg']: for f, args, msg in actions[ACTION_LOCAL_DIR_RENAME_GET]:
repo.ui.debug(" %s: %s -> dg\n" % (f, msg)) repo.ui.debug(" %s: %s -> dg\n" % (f, msg))
z += 1 z += 1
progress(_updating, z, item=f, total=numupdates, unit=_files) progress(_updating, z, item=f, total=numupdates, unit=_files)
f0, flags = args f0, flags = args
repo.ui.note(_("getting %s to %s\n") % (f0, f)) repo.ui.note(_("getting %s to %s\n") % (f0, f))
wctx[f].write(mctx.filectx(f0).data(), flags) wctx[f].write(mctx.filectx(f0).data(), flags)
updated += 1 updated += 1
# exec # exec
for f, args, msg in actions['e']: for f, args, msg in actions[ACTION_EXEC]:
repo.ui.debug(" %s: %s -> e\n" % (f, msg)) repo.ui.debug(" %s: %s -> e\n" % (f, msg))
z += 1 z += 1
progress(_updating, z, item=f, total=numupdates, unit=_files) progress(_updating, z, item=f, total=numupdates, unit=_files)
flags, = args flags, = args
wctx[f].audit() wctx[f].audit()
wctx[f].setflags('l' in flags, 'x' in flags) wctx[f].setflags('l' in flags, 'x' in flags)
updated += 1 updated += 1
msupdated, msmerged, msremoved = ms.counts() msupdated, msmerged, msremoved = ms.counts()
updated += msupdated updated += msupdated
merged += msmerged merged += msmerged
removed += msremoved removed += msremoved
extraactions = ms.actions() extraactions = ms.actions()
if extraactions: if extraactions:
mfiles = set(a[0] for a in actions['m']) mfiles = set(a[0] for a in actions[ACTION_MERGE])
for k, acts in extraactions.iteritems(): for k, acts in extraactions.iteritems():
actions[k].extend(acts) actions[k].extend(acts)
# Remove these files from actions['m'] as well. This is important # Remove these files from actions[ACTION_MERGE] as well. This is
# because in recordupdates, files in actions['m'] are processed # important because in recordupdates, files in actions[ACTION_MERGE]
# after files in other actions, and the merge driver might add # are processed after files in other actions, and the merge driver
# files to those actions via extraactions above. This can lead to a # might add files to those actions via extraactions above. This can
# file being recorded twice, with poor results. This is especially # lead to a file being recorded twice, with poor results. This is
# problematic for actions['r'] (currently only possible with the # especially problematic for actions[ACTION_REMOVE] (currently only
# merge driver in the initial merge process; interrupted merges # possible with the merge driver in the initial merge process;
# don't go through this flow). # interrupted merges don't go through this flow).
# #
# The real fix here is to have indexes by both file and action so # The real fix here is to have indexes by both file and action so
# that when the action for a file is changed it is automatically # that when the action for a file is changed it is automatically
# reflected in the other action lists. But that involves a more # reflected in the other action lists. But that involves a more
# complex data structure, so this will do for now. # complex data structure, so this will do for now.
# #
# We don't need to do the same operation for 'dc' and 'cd' because # We don't need to do the same operation for 'dc' and 'cd' because
# those lists aren't consulted again. # those lists aren't consulted again.
mfiles.difference_update(a[0] for a in acts) mfiles.difference_update(a[0] for a in acts)
actions['m'] = [a for a in actions['m'] if a[0] in mfiles] actions[ACTION_MERGE] = [a for a in actions[ACTION_MERGE]
if a[0] in mfiles]
progress(_updating, None, total=numupdates, unit=_files) progress(_updating, None, total=numupdates, unit=_files)
return updateresult(updated, merged, removed, unresolved) return updateresult(updated, merged, removed, unresolved)
def recordupdates(repo, actions, branchmerge): def recordupdates(repo, actions, branchmerge):
"record merge actions to the dirstate" "record merge actions to the dirstate"
# remove (must come first) # remove (must come first)
for f, args, msg in actions.get('r', []): for f, args, msg in actions.get(ACTION_REMOVE, []):
if branchmerge: if branchmerge:
repo.dirstate.remove(f) repo.dirstate.remove(f)
else: else:
repo.dirstate.drop(f) repo.dirstate.drop(f)
# forget (must come first) # forget (must come first)
for f, args, msg in actions.get('f', []): for f, args, msg in actions.get(ACTION_FORGET, []):
repo.dirstate.drop(f) repo.dirstate.drop(f)
# resolve path conflicts # resolve path conflicts
for f, args, msg in actions.get('pr', []): for f, args, msg in actions.get(ACTION_PATH_CONFLICT_RESOLVE, []):
f0, = args f0, = args
origf0 = repo.dirstate.copied(f0) or f0 origf0 = repo.dirstate.copied(f0) or f0
repo.dirstate.add(f) repo.dirstate.add(f)
repo.dirstate.copy(origf0, f) repo.dirstate.copy(origf0, f)
if f0 == origf0: if f0 == origf0:
repo.dirstate.remove(f0) repo.dirstate.remove(f0)
else: else:
repo.dirstate.drop(f0) repo.dirstate.drop(f0)
# re-add # re-add
for f, args, msg in actions.get('a', []): for f, args, msg in actions.get(ACTION_ADD, []):
repo.dirstate.add(f) repo.dirstate.add(f)
# re-add/mark as modified # re-add/mark as modified
for f, args, msg in actions.get('am', []): for f, args, msg in actions.get(ACTION_ADD_MODIFIED, []):
if branchmerge: if branchmerge:
repo.dirstate.normallookup(f) repo.dirstate.normallookup(f)
else: else:
repo.dirstate.add(f) repo.dirstate.add(f)
# exec change # exec change
for f, args, msg in actions.get('e', []): for f, args, msg in actions.get(ACTION_EXEC, []):
repo.dirstate.normallookup(f) repo.dirstate.normallookup(f)
# keep # keep
for f, args, msg in actions.get('k', []): for f, args, msg in actions.get(ACTION_KEEP, []):
pass pass
# get # get
for f, args, msg in actions.get('g', []): for f, args, msg in actions.get(ACTION_GET, []):
if branchmerge: if branchmerge:
repo.dirstate.otherparent(f) repo.dirstate.otherparent(f)
else: else:
repo.dirstate.normal(f) repo.dirstate.normal(f)
# merge # merge
for f, args, msg in actions.get('m', []): for f, args, msg in actions.get(ACTION_MERGE, []):
f1, f2, fa, move, anc = args f1, f2, fa, move, anc = args
if branchmerge: if branchmerge:
# We've done a branch merge, mark this file as merged # We've done a branch merge, mark this file as merged
# so that we properly record the merger later # so that we properly record the merger later
repo.dirstate.merge(f) repo.dirstate.merge(f)
if f1 != f2: # copy/rename if f1 != f2: # copy/rename
if move: if move:
repo.dirstate.remove(f1) repo.dirstate.remove(f1)
if f1 != f: if f1 != f:
repo.dirstate.copy(f1, f) repo.dirstate.copy(f1, f)
else: else:
repo.dirstate.copy(f2, f) repo.dirstate.copy(f2, f)
else: else:
# We've update-merged a locally modified file, so # We've update-merged a locally modified file, so
# we set the dirstate to emulate a normal checkout # we set the dirstate to emulate a normal checkout
# of that file some time in the past. Thus our # of that file some time in the past. Thus our
# merge will appear as a normal local file # merge will appear as a normal local file
# modification. # modification.
if f2 == f: # file not locally copied/moved if f2 == f: # file not locally copied/moved
repo.dirstate.normallookup(f) repo.dirstate.normallookup(f)
if move: if move:
repo.dirstate.drop(f1) repo.dirstate.drop(f1)
# directory rename, move local # directory rename, move local
for f, args, msg in actions.get('dm', []): for f, args, msg in actions.get(ACTION_DIR_RENAME_MOVE_LOCAL, []):
f0, flag = args f0, flag = args
if branchmerge: if branchmerge:
repo.dirstate.add(f) repo.dirstate.add(f)
repo.dirstate.remove(f0) repo.dirstate.remove(f0)
repo.dirstate.copy(f0, f) repo.dirstate.copy(f0, f)
else: else:
repo.dirstate.normal(f) repo.dirstate.normal(f)
repo.dirstate.drop(f0) repo.dirstate.drop(f0)
# directory rename, get # directory rename, get
for f, args, msg in actions.get('dg', []): for f, args, msg in actions.get(ACTION_LOCAL_DIR_RENAME_GET, []):
f0, flag = args f0, flag = args
if branchmerge: if branchmerge:
repo.dirstate.add(f) repo.dirstate.add(f)
repo.dirstate.copy(f0, f) repo.dirstate.copy(f0, f)
else: else:
repo.dirstate.normal(f) repo.dirstate.normal(f)
def update(repo, node, branchmerge, force, ancestor=None, def update(repo, node, branchmerge, force, ancestor=None,
### calculate phase ### calculate phase
actionbyfile, diverge, renamedelete = calculateupdates( actionbyfile, diverge, renamedelete = calculateupdates(
repo, wc, p2, pas, branchmerge, force, mergeancestor, repo, wc, p2, pas, branchmerge, force, mergeancestor,
followcopies, matcher=matcher, mergeforce=mergeforce) followcopies, matcher=matcher, mergeforce=mergeforce)
if updatecheck == 'noconflict': if updatecheck == 'noconflict':
for f, (m, args, msg) in actionbyfile.iteritems(): for f, (m, args, msg) in actionbyfile.iteritems():
if m not in ('g', 'k', 'e', 'r', 'pr'): if m not in (ACTION_GET, ACTION_KEEP, ACTION_EXEC,
ACTION_REMOVE, ACTION_PATH_CONFLICT_RESOLVE):
msg = _("conflicting changes") msg = _("conflicting changes")
hint = _("commit or update --clean to discard changes") hint = _("commit or update --clean to discard changes")
raise error.Abort(msg, hint=hint) raise error.Abort(msg, hint=hint)
# Prompt and create actions. Most of this is in the resolve phase # Prompt and create actions. Most of this is in the resolve phase
# already, but we can't handle .hgsubstate in filemerge or # already, but we can't handle .hgsubstate in filemerge or
# subrepoutil.submerge yet so we have to keep prompting for it. # subrepoutil.submerge yet so we have to keep prompting for it.
if '.hgsubstate' in actionbyfile: if '.hgsubstate' in actionbyfile:
f = '.hgsubstate' f = '.hgsubstate'
m, args, msg = actionbyfile[f] m, args, msg = actionbyfile[f]
prompts = filemerge.partextras(labels) prompts = filemerge.partextras(labels)
prompts['f'] = f prompts['f'] = f
if m == 'cd': if m == ACTION_CHANGED_DELETED:
if repo.ui.promptchoice( if repo.ui.promptchoice(
_("local%(l)s changed %(f)s which other%(o)s deleted\n" _("local%(l)s changed %(f)s which other%(o)s deleted\n"
"use (c)hanged version or (d)elete?" "use (c)hanged version or (d)elete?"
"$$ &Changed $$ &Delete") % prompts, 0): "$$ &Changed $$ &Delete") % prompts, 0):
actionbyfile[f] = ('r', None, "prompt delete") actionbyfile[f] = (ACTION_REMOVE, None, 'prompt delete')
elif f in p1: elif f in p1:
actionbyfile[f] = ('am', None, "prompt keep") actionbyfile[f] = (ACTION_ADD_MODIFIED, None, 'prompt keep')
else: else:
actionbyfile[f] = ('a', None, "prompt keep") actionbyfile[f] = (ACTION_ADD, None, 'prompt keep')
elif m == 'dc': elif m == ACTION_DELETED_CHANGED:
f1, f2, fa, move, anc = args f1, f2, fa, move, anc = args
flags = p2[f2].flags() flags = p2[f2].flags()
if repo.ui.promptchoice( if repo.ui.promptchoice(
_("other%(o)s changed %(f)s which local%(l)s deleted\n" _("other%(o)s changed %(f)s which local%(l)s deleted\n"
"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] = ('g', (flags, False), "prompt recreating") actionbyfile[f] = (ACTION_GET, (flags, False),
'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 = dict((m, [])
for m in 'a am f g cd dc r dm dg m e k p pr'.split()) 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
# itself because a) fsmonitor may have already printed a warning # itself because a) fsmonitor may have already printed a warning
# b) we only care about the config state here. # b) we only care about the config state here.
except KeyError: except KeyError:
fsmonitorenabled = False fsmonitorenabled = False
if (fsmonitorwarning if (fsmonitorwarning
and not fsmonitorenabled and not fsmonitorenabled
and p1.node() == nullid and p1.node() == nullid
and len(actions['g']) >= fsmonitorthreshold and len(actions[ACTION_GET]) >= fsmonitorthreshold
and pycompat.sysplatform.startswith(('linux', 'darwin'))): and pycompat.sysplatform.startswith(('linux', 'darwin'))):
repo.ui.warn( repo.ui.warn(
_('(warning: large working directory being used without ' _('(warning: large working directory being used without '
'fsmonitor enabled; enable fsmonitor to improve performance; ' 'fsmonitor enabled; enable fsmonitor to improve performance; '
'see "hg help -e fsmonitor")\n')) 'see "hg help -e fsmonitor")\n'))
stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels) stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels)