dedupe: Only clone + load-extraneous

When idealizing the tree for dedupe, only clone and load-extraneous

1 files changed, 21 insertions, 4 deletions

diff --git a/lib/dedupe.js b/lib/dedupe.js
index cfec9e1b4..28d1b12b9 100644
--- a/lib/dedupe.js
+++ b/lib/dedupe.js
@@ -54,22 +54,39 @@ Deduper.prototype.normalizeTree = function (log, cb) {
   Installer.prototype.normalizeTree.call(this, log, cb)
 }
 
-Deduper.prototype.loadAllDepsIntoIdealTree = function (cb) {
+Deduper.prototype.loadIdealTree = function (cb) {
   validate('F', arguments)
-  log.silly('dedupe', 'loadAllDepsIntoIdealTree')
-  var cg = this.progress.loadAllDepsIntoIdealTree
-  loadExtraneous(this.idealTree, cg.newGroup('loadExtraneous'), cb)
+  log.silly('install', 'loadIdealTree')
+
+  var self = this
+  chain([
+    [this.newTracker(this.progress.loadIdealTree, 'cloneCurrentTree')],
+    [this, this.cloneCurrentTreeToIdealTree],
+    [this, this.finishTracker, 'cloneCurrentTree'],
+
+    [this.newTracker(this.progress.loadIdealTree, 'loadAllDepsIntoIdealTree', 10)],
+    [function (next) {
+      loadExtraneous(self.idealTree, self.progress.loadAllDepsIntoIdealTree, next)
+    }],
+    [this, this.finishTracker, 'loadAllDepsIntoIdealTree'],
+
+    [this, function (next) { recalculateMetadata(this.idealTree, log, next) } ],
+  ], cb)
 }
 
 Deduper.prototype.generateActionsToTake = function (cb) {
   validate('F', arguments)
   log.silly('dedupe', 'generateActionsToTake')
   chain([
+    [this.newTracker(log, 'hoist', 1)],
     [hoistChildren, this.idealTree, this.differences],
+    [this, this.finishTracker, 'hoist'],
+    [this.newTracker(log, 'sort-actions', 1)],
     [this, function (next) {
       this.differences = sortActions(this.differences)
       next()
     }],
+    [this, this.finishTracker, 'sort-actions'],
     [filterInvalidActions, this.where, this.differences],
     [checkPermissions, this.differences],
     [decomposeActions, this.differences, this.todo]