--- a/mercurial/merge.py Fri Mar 06 10:52:44 2020 +0100
+++ b/mercurial/merge.py Fri Mar 06 13:27:41 2020 -0500
@@ -1796,8 +1796,8 @@
def emptyactions():
"""create an actions dict, to be populated and passed to applyupdates()"""
- return dict(
- (m, [])
+ return {
+ m: []
for m in (
ACTION_ADD,
ACTION_ADD_MODIFIED,
@@ -1814,7 +1814,7 @@
ACTION_PATH_CONFLICT,
ACTION_PATH_CONFLICT_RESOLVE,
)
- )
+ }
def applyupdates(
@@ -2070,7 +2070,7 @@
extraactions = ms.actions()
if extraactions:
- mfiles = set(a[0] for a in actions[ACTION_MERGE])
+ mfiles = {a[0] for a in actions[ACTION_MERGE]}
for k, acts in pycompat.iteritems(extraactions):
actions[k].extend(acts)
if k == ACTION_GET and wantfiledata: