mercurial: comparison mercurial/merge.py

equal deleted inserted replaced

-:27c6518b7287
+:5ce63ee1fe3d
 (updated, merged, removed, unresolved) that describes how many
 files were affected by the update, and filedata is as described in
 batchget.
 """
-actions = mresult.actionsdict
 _prefetchfiles(repo, mctx, mresult)
 updated, merged, removed = 0, 0, 0
 ms = mergestatemod.mergestate.clean(
 repo, wctx.p1().node(), mctx.node(), labels
 # mergestate so that it can be reused on commit
 if op == b'other':
 ms.addmergedother(f)
 moves = []
-for m, l in actions.items():
-l.sort()
 # 'cd' and 'dc' actions are treated like other merge conflicts
-mergeactions = sorted(actions[mergestatemod.ACTION_CHANGED_DELETED])
+mergeactions = mresult.getactions(
-mergeactions.extend(sorted(actions[mergestatemod.ACTION_DELETED_CHANGED]))
+[
-mergeactions.extend(actions[mergestatemod.ACTION_MERGE])
+mergestatemod.ACTION_CHANGED_DELETED,
+mergestatemod.ACTION_DELETED_CHANGED,
+mergestatemod.ACTION_MERGE,
+],
+sort=True,
+)
 for f, args, msg in mergeactions:
 f1, f2, fa, move, anc = args
 if f == b'.hgsubstate':  # merged internally
 continue
 if f1 is None:
 if wctx[f].lexists():
 repo.ui.debug(b"removing %s\n" % f)
 wctx[f].audit()
 wctx[f].remove()
-numupdates = sum(
+numupdates = len(mresult.actions) - len(
-len(l) for m, l in actions.items() if m != mergestatemod.ACTION_KEEP
+mresult._actionmapping[mergestatemod.ACTION_KEEP]
 )
 progress = repo.ui.makeprogress(
 _(b'updating'), unit=_(b'files'), total=numupdates
 )
-if [
+if b'.hgsubstate' in mresult._actionmapping[mergestatemod.ACTION_REMOVE]:
-a
-for a in actions[mergestatemod.ACTION_REMOVE]
-if a[0] == b'.hgsubstate'
-]:
 subrepoutil.submerge(repo, wctx, mctx, wctx, overwrite, labels)
 # record path conflicts
-for f, args, msg in actions[mergestatemod.ACTION_PATH_CONFLICT]:
+for f, args, msg in mresult.getactions(
+[mergestatemod.ACTION_PATH_CONFLICT], sort=True
+):
 f1, fo = args
 s = repo.ui.status
 s(
 _(
 b"%s: path conflict - a file or link has the same name as a "
 prog = worker.worker(
 repo.ui,
 cost,
 batchremove,
 (repo, wctx),
-actions[mergestatemod.ACTION_REMOVE],
+mresult.getactions([mergestatemod.ACTION_REMOVE], sort=True),
 )
 for i, item in prog:
 progress.increment(step=i, item=item)
-removed = len(actions[mergestatemod.ACTION_REMOVE])
+removed = len(mresult._actionmapping[mergestatemod.ACTION_REMOVE])
 # resolve path conflicts (must come before getting)
-for f, args, msg in actions[mergestatemod.ACTION_PATH_CONFLICT_RESOLVE]:
+for f, args, msg in mresult.getactions(
+[mergestatemod.ACTION_PATH_CONFLICT_RESOLVE], sort=True
+):
 repo.ui.debug(b" %s: %s -> pr\n" % (f, msg))
 (f0, origf0) = args
 if wctx[f0].lexists():
 repo.ui.note(_(b"moving %s to %s\n") % (f0, f))
 wctx[f].audit()
 prog = worker.worker(
 repo.ui,
 cost,
 batchget,
 (repo, mctx, wctx, wantfiledata),
-actions[mergestatemod.ACTION_GET],
+mresult.getactions([mergestatemod.ACTION_GET], sort=True),
 threadsafe=threadsafe,
 hasretval=True,
 )
 getfiledata = {}
 for final, res in prog:
 if final:
 getfiledata = res
 else:
 i, item = res
 progress.increment(step=i, item=item)
-updated = len(actions[mergestatemod.ACTION_GET])
+updated = len(mresult._actionmapping[mergestatemod.ACTION_GET])
-if [a for a in actions[mergestatemod.ACTION_GET] if a[0] == b'.hgsubstate']:
+if b'.hgsubstate' in mresult._actionmapping[mergestatemod.ACTION_GET]:
 subrepoutil.submerge(repo, wctx, mctx, wctx, overwrite, labels)
 # forget (manifest only, just log it) (must come first)
-for f, args, msg in actions[mergestatemod.ACTION_FORGET]:
+for f, args, msg in mresult.getactions(
+(mergestatemod.ACTION_FORGET,), sort=True
+):
 repo.ui.debug(b" %s: %s -> f\n" % (f, msg))
 progress.increment(item=f)
 # re-add (manifest only, just log it)
-for f, args, msg in actions[mergestatemod.ACTION_ADD]:
+for f, args, msg in mresult.getactions(
+(mergestatemod.ACTION_ADD,), sort=True
+):
 repo.ui.debug(b" %s: %s -> a\n" % (f, msg))
 progress.increment(item=f)
 # re-add/mark as modified (manifest only, just log it)
-for f, args, msg in actions[mergestatemod.ACTION_ADD_MODIFIED]:
+for f, args, msg in mresult.getactions(
+(mergestatemod.ACTION_ADD_MODIFIED,), sort=True
+):
 repo.ui.debug(b" %s: %s -> am\n" % (f, msg))
 progress.increment(item=f)
 # keep (noop, just log it)
-for f, args, msg in actions[mergestatemod.ACTION_KEEP]:
+for f, args, msg in mresult.getactions(
+(mergestatemod.ACTION_KEEP,), sort=True
+):
 repo.ui.debug(b" %s: %s -> k\n" % (f, msg))
 # no progress
 # directory rename, move local
-for f, args, msg in actions[mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL]:
+for f, args, msg in mresult.getactions(
+(mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,), sort=True
+):
 repo.ui.debug(b" %s: %s -> dm\n" % (f, msg))
 progress.increment(item=f)
 f0, flags = args
 repo.ui.note(_(b"moving %s to %s\n") % (f0, f))
 wctx[f].audit()
 wctx[f].write(wctx.filectx(f0).data(), flags)
 wctx[f0].remove()
 updated += 1
 # local directory rename, get
-for f, args, msg in actions[mergestatemod.ACTION_LOCAL_DIR_RENAME_GET]:
+for f, args, msg in mresult.getactions(
+(mergestatemod.ACTION_LOCAL_DIR_RENAME_GET,), sort=True
+):
 repo.ui.debug(b" %s: %s -> dg\n" % (f, msg))
 progress.increment(item=f)
 f0, flags = args
 repo.ui.note(_(b"getting %s to %s\n") % (f0, f))
 wctx[f].write(mctx.filectx(f0).data(), flags)
 updated += 1
 # exec
-for f, args, msg in actions[mergestatemod.ACTION_EXEC]:
+for f, args, msg in mresult.getactions(
+(mergestatemod.ACTION_EXEC,), sort=True
+):
 repo.ui.debug(b" %s: %s -> e\n" % (f, msg))
 progress.increment(item=f)
 (flags,) = args
 wctx[f].audit()
 wctx[f].setflags(b'l' in flags, b'x' in flags)
 merged += msmerged
 removed += msremoved
 extraactions = ms.actions()
 if extraactions:
-mfiles = {a[0] for a in actions[mergestatemod.ACTION_MERGE]}
+mfiles = {
+a[0] for a in mresult.getactions((mergestatemod.ACTION_MERGE,))
+}
 for k, acts in pycompat.iteritems(extraactions):
-actions[k].extend(acts)
 for a in acts:
 mresult.addfile(a[0], k, *a[1:])
 if k == mergestatemod.ACTION_GET and wantfiledata:
 # no filedata until mergestate is updated to provide it
 for a in acts:
 #
 # We don't need to do the same operation for 'dc' and 'cd' because
 # those lists aren't consulted again.
 mfiles.difference_update(a[0] for a in acts)
-actions[mergestatemod.ACTION_MERGE] = [
-a for a in actions[mergestatemod.ACTION_MERGE] if a[0] in mfiles
-]
 for a in mresult.getactions([mergestatemod.ACTION_MERGE]):
 if a[0] not in mfiles:
 mresult.removefile(a[0])
 progress.complete()
 assert len(getfiledata) == (
-len(actions[mergestatemod.ACTION_GET]) if wantfiledata else 0
+len(mresult._actionmapping[mergestatemod.ACTION_GET])
+if wantfiledata
+else 0
 )
 return updateresult(updated, merged, removed, unresolved), getfiledata
 def _advertisefsmonitor(repo, num_gets, p1node):

changeset 45337	5ce63ee1fe3d
parent 45336	27c6518b7287
child 45338	72b8c082676b