mercurial/merge.py
changeset 45072 a56ba57c837d
parent 44999 d1471dbbdd63
child 45118 d0ef8c1dddd4
equal deleted inserted replaced
45071:196ba4d4eb86 45072:a56ba57c837d
  1119     ]
  1119     ]
  1120     prefetch = scmutil.prefetchfiles
  1120     prefetch = scmutil.prefetchfiles
  1121     matchfiles = scmutil.matchfiles
  1121     matchfiles = scmutil.matchfiles
  1122     prefetch(
  1122     prefetch(
  1123         repo,
  1123         repo,
  1124         [ctx.rev()],
  1124         [
  1125         matchfiles(repo, [f for sublist in oplist for f, args, msg in sublist]),
  1125             (
       
  1126                 ctx.rev(),
       
  1127                 matchfiles(
       
  1128                     repo, [f for sublist in oplist for f, args, msg in sublist]
       
  1129                 ),
       
  1130             )
       
  1131         ],
  1126     )
  1132     )
  1127 
  1133 
  1128 
  1134 
  1129 @attr.s(frozen=True)
  1135 @attr.s(frozen=True)
  1130 class updateresult(object):
  1136 class updateresult(object):