Show More
@@ -497,14 +497,6 b' def overridedebugstate(orig, ui, repo, *' | |||
|
497 | 497 | orig(ui, repo, *pats, **opts) |
|
498 | 498 | |
|
499 | 499 | |
|
500 | # Register the MERGE_ACTION_LARGEFILE_MARK_REMOVED in emptyactions() return type | |
|
501 | @eh.wrapfunction(merge, b'emptyactions') | |
|
502 | def overrideemptyactions(origfn): | |
|
503 | ret = origfn() | |
|
504 | ret[MERGE_ACTION_LARGEFILE_MARK_REMOVED] = [] | |
|
505 | return ret | |
|
506 | ||
|
507 | ||
|
508 | 500 | # Before starting the manifest merge, merge.updates will call |
|
509 | 501 | # _checkunknownfile to check if there are any files in the merged-in |
|
510 | 502 | # changeset that collide with unknown files in the working copy. |
@@ -687,7 +687,7 b' class mergeresult(object):' | |||
|
687 | 687 | def actionsdict(self): |
|
688 | 688 | """ returns a dictionary of actions to be perfomed with action as key |
|
689 | 689 | and a list of files and related arguments as values """ |
|
690 |
res = e |
|
|
690 | res = collections.defaultdict(list) | |
|
691 | 691 | for a, d in pycompat.iteritems(self._actionmapping): |
|
692 | 692 | for f, (args, msg) in pycompat.iteritems(d): |
|
693 | 693 | res[a].append((f, args, msg)) |
@@ -1338,29 +1338,6 b' class updateresult(object):' | |||
|
1338 | 1338 | ) |
|
1339 | 1339 | |
|
1340 | 1340 | |
|
1341 | def emptyactions(): | |
|
1342 | """create an actions dict, to be populated and passed to applyupdates()""" | |
|
1343 | return { | |
|
1344 | m: [] | |
|
1345 | for m in ( | |
|
1346 | mergestatemod.ACTION_ADD, | |
|
1347 | mergestatemod.ACTION_ADD_MODIFIED, | |
|
1348 | mergestatemod.ACTION_FORGET, | |
|
1349 | mergestatemod.ACTION_GET, | |
|
1350 | mergestatemod.ACTION_CHANGED_DELETED, | |
|
1351 | mergestatemod.ACTION_DELETED_CHANGED, | |
|
1352 | mergestatemod.ACTION_REMOVE, | |
|
1353 | mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL, | |
|
1354 | mergestatemod.ACTION_LOCAL_DIR_RENAME_GET, | |
|
1355 | mergestatemod.ACTION_MERGE, | |
|
1356 | mergestatemod.ACTION_EXEC, | |
|
1357 | mergestatemod.ACTION_KEEP, | |
|
1358 | mergestatemod.ACTION_PATH_CONFLICT, | |
|
1359 | mergestatemod.ACTION_PATH_CONFLICT_RESOLVE, | |
|
1360 | ) | |
|
1361 | } | |
|
1362 | ||
|
1363 | ||
|
1364 | 1341 | def applyupdates( |
|
1365 | 1342 | repo, |
|
1366 | 1343 | mresult, |
General Comments 0
You need to be logged in to leave comments.
Login now