From 4af89d51e1c04c2ac1e972922bdf7b7750dbc01e Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sun, 12 Jun 2011 21:32:51 -0400 Subject: [PATCH] dump a bit less state on cycles --- .../dependency-management/parent-publish/project/Parent.scala | 2 +- tasks/Execute.scala | 3 ++- tasks/standard/Action.scala | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sbt/src/sbt-test/dependency-management/parent-publish/project/Parent.scala b/sbt/src/sbt-test/dependency-management/parent-publish/project/Parent.scala index 709c99154..bf204ab00 100644 --- a/sbt/src/sbt-test/dependency-management/parent-publish/project/Parent.scala +++ b/sbt/src/sbt-test/dependency-management/parent-publish/project/Parent.scala @@ -5,5 +5,5 @@ object ParentTest extends Build lazy val parent: Project = Project("Flowmodel", file(".")) aggregate(core, reporters) lazy val core: Project = Project("Flowmodel core", file("core"), delegates = parent :: Nil) lazy val reporters: Project = Project("Extra reporters", file("reporters"), delegates = parent :: Nil) aggregate(jfreechart) dependsOn(jfreechart) - lazy val jfreechart: Project = Project("JFreeChart reporters", file("jfreechart"), delegates = reporters :: Nil) dependsOn(core) + lazy val jfreechart: Project = Project("JFreeChart reporters", file("jfreechart")/*, delegates = reporters :: Nil*/) dependsOn(core) } diff --git a/tasks/Execute.scala b/tasks/Execute.scala index 3423110b3..c386e3828 100644 --- a/tasks/Execute.scala +++ b/tasks/Execute.scala @@ -67,7 +67,7 @@ final class Execute[A[_] <: AnyRef](checkCycles: Boolean, triggers: Triggers[A]) assert( !reverse.isEmpty, "Nothing to process." ) if( !state.values.exists( _ == Running ) ) { snapshotCycleCheck() - assert(false, "Internal task engine error: nothing running. This usually indicates a cycle in tasks.\n Dumping state:\n" + state.mkString("\n\t")) + assert(false, "Internal task engine error: nothing running. This usually indicates a cycle in tasks.\n Calling tasks (internal task engine state):\n" + dumpCalling) } } @@ -81,6 +81,7 @@ final class Execute[A[_] <: AnyRef](checkCycles: Boolean, triggers: Triggers[A]) assert( complete, "Not all state was Done." ) } } + def dumpCalling: String = state.filter(_._2 == Calling).mkString("\n\t") def call[T](node: A[T], target: A[T])(implicit strategy: Strategy) { diff --git a/tasks/standard/Action.scala b/tasks/standard/Action.scala index cc58df7ad..4dbf4fa79 100644 --- a/tasks/standard/Action.scala +++ b/tasks/standard/Action.scala @@ -25,7 +25,7 @@ object Task final case class Task[T](info: Info[T], work: Action[T]) { def original = info.original getOrElse this - override def toString = info.name orElse original.info.name getOrElse ("Task(" + info + ", " + work + ")") + override def toString = info.name orElse original.info.name getOrElse ("Task(" + info + ")") } /** `original` is used during transformation only.*/ final case class Info[T](attributes: AttributeMap = AttributeMap.empty, original: Option[Task[T]] = None)