[PATCH 5 of 5] merge.applyupdates: only attempt to merge files in mergeactions

[Siddharth Agarwal]

# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1447367342 28800
#      Thu Nov 12 14:29:02 2015 -0800
# Node ID 7ef8c6fd040c8ff0efd49755ebbdc8e16ca50e47
# Parent  bf354f5a168277cf493fc7c95d74d91c6d23447f
merge.applyupdates: only attempt to merge files in mergeactions

This only makes a difference when a merge driver is active -- in that case we
don't want to try and merge all the files, just the ones still unresolved after
the merge driver's preprocess step is over.

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -970,7 +970,7 @@ def applyupdates(repo, actions, wctx, mc
 
     # premerge
     tocomplete = []
-    for f, args, msg in actions['m']:
+    for f, args, msg in mergeactions:
         repo.ui.debug(" %s: %s -> m (premerge)\n" % (f, msg))
         z += 1
         progress(_updating, z, item=f, total=numupdates, unit=_files)