126 def _checkunknownfiles(repo, wctx, mctx, force, mresult, mergeforce):  argument
150         for f in mresult.files(
162         for f, args, msg in mresult.getactions(
175             mresult.getactions([mergestatemod.ACTION_CREATED_MERGE])
197                 mresult.addfile(
204                 mresult.addfile(
215                 mresult.addfile(
246         mresult.getactions([mergestatemod.ACTION_CREATED])
254         mresult.addfile(f, mergestatemod.ACTION_GET, (flags, backup), msg)
257 def _forgetremoved(wctx, mctx, branchmerge, mresult):  argument
277             mresult.addfile(f, m, None, b"forget deleted")
282                 mresult.addfile(
290 def _checkcollision(repo, wmf, mresult):  argument
298         if mresult:
299             for f in list(mresult.files()):
301                     mresult.removefile(f)
306     if mresult:
308         for f in mresult.files(
319         for f in mresult.files((mergestatemod.ACTION_REMOVE,)):
321         for f, args, msg in mresult.getactions(
327         for f in mresult.files((mergestatemod.ACTION_LOCAL_DIR_RENAME_GET,)):
329         for f, args, msg in mresult.getactions([mergestatemod.ACTION_MERGE]):
373 def checkpathconflicts(repo, wctx, mctx, mresult):  argument
398     for f in mresult.files(
414     for f in mresult.files((mergestatemod.ACTION_REMOVE,)):
416     for (f, args, msg) in mresult.getactions((mergestatemod.ACTION_MERGE,)):
420     for (f, args, msg) in mresult.getactions(
438         pd = mresult.getfile(p)
454             pnew = util.safename(p, ctxname, wctx, set(mresult.files()))
456             mresult.addfile(
462             mresult.addfile(
474                 m, args, msg = mresult.getfile(p)
475                 pnew = util.safename(p, ctxname, wctx, set(mresult.files()))
481                     mresult.addfile(pnew, m, args, msg)
485                     mresult.addfile(
491                 mresult.addfile(
508 def _filternarrowactions(narrowmatch, branchmerge, mresult):  argument
528     for f, action in mresult.filemap():
532             mresult.removefile(f)  # just updating, ignore changes outside clone
534             mresult.removefile(f)  # merge does not affect file
736     mresult = mergeresult()
823                 mresult.addfile(f, mergestatemod.ACTION_MERGE, args, msg)
826                 mresult.addfile(
834                 mresult.addfile(
845                     mresult.addfile(
853                         mresult.addfile(
860                         mresult.addfile(
867                             mresult.addcommitinfo(
871                     mresult.addfile(
878                     mresult.addfile(
885                         mresult.addcommitinfo(f, b'filenode-source', b'other')
887                     mresult.addfile(
901                     mresult.addfile(
908                     mresult.addfile(
916                 mresult.addfile(
925                         mresult.addfile(
932                         mresult.addfile(
939                             mresult.addcommitinfo(
945                     mresult.addfile(
952                     mresult.addfile(
963                         mresult.addcommitinfo(
968                 mresult.addfile(
981                     mresult.addfile(
988                     mresult.addfile(
1003                 mresult.addfile(f, mergestatemod.ACTION_MERGE, args, msg)
1017                     mresult.addfile(
1024                     mresult.addfile(
1031                     mresult.addfile(
1045                     mresult.addfile(
1053                     mresult.addfile(
1060                     mresult.addfile(
1067                         mresult.addcommitinfo(
1071                 mresult.addfile(
1082                     mresult.addcommitinfo(f, b'merge-removal-candidate', b'yes')
1086         checkpathconflicts(repo, wctx, p2, mresult)
1091         _filternarrowactions(narrowmatch, branchmerge, mresult)
1096     mresult.updatevalues(diverge, renamedelete)
1097     return mresult
1100 def _resolvetrivial(repo, wctx, mctx, ancestor, mresult):  argument
1105     for f in list(mresult.files((mergestatemod.ACTION_CHANGED_DELETED,))):
1108             mresult.addfile(
1112     for f in list(mresult.files((mergestatemod.ACTION_DELETED_CHANGED,))):
1115             mresult.removefile(f)  # don't get = keep local deleted
1144     mresult = None
1146         mresult = manifestmerge(
1157         _checkunknownfiles(repo, wctx, mctx, force, mresult, mergeforce)
1175         mresult = mergeresult()
1206             mresult._commitinfo.update(mresult1._commitinfo)
1238                     mresult.addfile(f, *l[0])
1243                 mresult.addfile(f, *bids[mergestatemod.ACTION_KEEP][0])
1248                 mresult.addfile(f, *bids[mergestatemod.ACTION_KEEP_ABSENT][0])
1260                 mresult.addfile(
1267                 mresult.addfile(f, *bids[mergestatemod.ACTION_KEEP_NEW][0])
1279                 mresult.addfile(
1288                     mresult.addfile(f, *ga0)
1301             mresult.addfile(f, *l[0])
1304         mresult.updatevalues(diverge, renamedelete)
1307         _forgetremoved(wctx, mctx, branchmerge, mresult)
1309     sparse.filterupdatesactions(repo, wctx, mctx, branchmerge, mresult)
1310     _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult)
1312     return mresult
1421 def _prefetchfiles(repo, ctx, mresult):  argument
1428     files = mresult.files(
1468     mresult,  argument
1487     _prefetchfiles(repo, mctx, mresult)
1493     for f, op in pycompat.iteritems(mresult.commitinfo):
1498     numupdates = mresult.len() - mresult.len(mergestatemod.NO_OP_ACTIONS)
1503     if b'.hgsubstate' in mresult._actionmapping[mergestatemod.ACTION_REMOVE]:
1507     for f, args, msg in mresult.getactions(
1537         list(mresult.getactions([mergestatemod.ACTION_REMOVE], sort=True)),
1541     removed = mresult.len((mergestatemod.ACTION_REMOVE,))
1544     for f, args, msg in mresult.getactions(
1565         list(mresult.getactions([mergestatemod.ACTION_GET], sort=True)),
1577     if b'.hgsubstate' in mresult._actionmapping[mergestatemod.ACTION_GET]:
1581     for f, args, msg in mresult.getactions(
1588     for f, args, msg in mresult.getactions(
1595     for f, args, msg in mresult.getactions(
1603         for f, args, msg in mresult.getactions((a,), sort=True):
1608     for f, args, msg in mresult.getactions(
1620     for f, args, msg in mresult.getactions(
1630     for f, args, msg in mresult.getactions(
1643         mresult.getactions(
1683     updated = mresult.len(
1991         mresult = calculateupdates(
2005             if mresult.hasconflicts():
2013         vals = mresult.getfile(b'.hgsubstate')
2029                     mresult.addfile(
2036                     mresult.addfile(
2043                     mresult.addfile(
2064                     mresult.addfile(
2071                     mresult.removefile(f)
2080                 _checkcollision(repo, wc.manifest(), mresult)
2083         for f, fl in sorted(pycompat.iteritems(mresult.diverge)):
2095         for f, fl in sorted(pycompat.iteritems(mresult.renamedelete)):
2119             repo, mresult.len((mergestatemod.ACTION_GET,)), p1.node()
2125             mresult,
2137                         mresult.addfile(a[0], k, *a[1:])
2144                 mresult.len((mergestatemod.ACTION_GET,)) if wantfiledata else 0
2149                     repo, mresult.actionsdict, branchmerge, getfiledata