store prior step's flags to cut resolution time

fsprojects · Dec 3, 2016 · 2625e15 · 2625e15
1 parent cd6d161
commit 2625e15
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/Paket.Core/PackageResolver.fs b/src/Paket.Core/PackageResolver.fs
@@ -604,9 +604,9 @@ type private StepFlags (ready:bool,useUnlisted:bool,hasUnlisted:bool,forceBreak:
 
 
 type private Stage =
-    | Step  of currentConflict : (ConflictState * ResolverStep * PackageRequirement) * priorConflictSteps : (ConflictState * ResolverStep * PackageRequirement) list
-    | Outer of currentConflict : (ConflictState * ResolverStep * PackageRequirement) * priorConflictSteps : (ConflictState * ResolverStep * PackageRequirement) list
-    | Inner of currentConflict : (ConflictState * ResolverStep * PackageRequirement) * priorConflictSteps : (ConflictState * ResolverStep * PackageRequirement) list
+    | Step  of currentConflict : (ConflictState * ResolverStep * PackageRequirement) * priorConflictSteps : (ConflictState * ResolverStep * PackageRequirement * StepFlags) list
+    | Outer of currentConflict : (ConflictState * ResolverStep * PackageRequirement) * priorConflictSteps : (ConflictState * ResolverStep * PackageRequirement * StepFlags) list
+    | Inner of currentConflict : (ConflictState * ResolverStep * PackageRequirement) * priorConflictSteps : (ConflictState * ResolverStep * PackageRequirement * StepFlags) list
 
 
 /// Resolves all direct and transitive dependencies
@@ -637,11 +637,11 @@ let Resolve (getVersionsF, getPackageDetailsF, groupName:GroupName, globalStrate
 
         let fuseConflicts currentConflict priorConflictSteps =
             match currentConflict, priorConflictSteps with
-            | currentConflict, (lastConflict,lastStep,lastRequirement)::priorConflictSteps -> 
+            | currentConflict, (lastConflict,lastStep,lastRequirement,lastFlags)::priorConflictSteps -> 
                 let continueConflict = 
                     { currentConflict with VersionsToExplore = lastConflict.VersionsToExplore }        
 
-                step (Inner((continueConflict,lastStep,lastRequirement),priorConflictSteps))  stackpack compatibleVersions  flags 
+                step (Inner((continueConflict,lastStep,lastRequirement),priorConflictSteps))  stackpack compatibleVersions  lastFlags 
             | currentConflict, [] -> currentConflict
 
         match stage with            
@@ -652,7 +652,7 @@ let Resolve (getVersionsF, getPackageDetailsF, groupName:GroupName, globalStrate
                         Status = Resolution.Ok (cleanupNames currentStep.CurrentResolution) }
 
                 match currentConflict, priorConflictSteps with
-                | currentConflict, (lastConflict,lastStep,lastRequirement)::priorConflictSteps -> 
+                | currentConflict, (lastConflict,lastStep,lastRequirement,lastFlags)::priorConflictSteps -> 
                     let continueConflict = {
                         currentConflict with
                             VersionsToExplore = lastConflict.VersionsToExplore
@@ -666,7 +666,7 @@ let Resolve (getVersionsF, getPackageDetailsF, groupName:GroupName, globalStrate
                                 r = lastRequirement
                                 || r.Graph |> List.contains lastRequirement)) ->
                         let flags = 
-                            StepFlags(flags.Ready,flags.UseUnlisted,flags.HasUnlisted,true,flags.FirstTrial)
+                            StepFlags(lastFlags.Ready,lastFlags.UseUnlisted,lastFlags.HasUnlisted,true,lastFlags.FirstTrial)
 
                         step (Inner((continueConflict,lastStep,lastRequirement),priorConflictSteps)) stackpack compatibleVersions  flags 
                     | _ ->
@@ -784,7 +784,7 @@ let Resolve (getVersionsF, getPackageDetailsF, groupName:GroupName, globalStrate
                                        This will result in an endless loop.%sCurrent Requirement: %A%sRequirements: %A" 
                                             Environment.NewLine currentRequirement Environment.NewLine nextStep.OpenRequirements
 
-                        step (Step((currentConflict,nextStep,currentRequirement), (currentConflict,currentStep,currentRequirement)::priorConflictSteps)) stackpack compatibleVersions flags
+                        step (Step((currentConflict,nextStep,currentRequirement), (currentConflict,currentStep,currentRequirement,flags)::priorConflictSteps)) stackpack compatibleVersions flags
 
 
     let startingStep = {