From 7c5b8479ea0d660e341f11a548374160011f3d79 Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Wed, 13 Feb 2019 10:04:54 +0100
Subject: [PATCH] Adjust dependency graph printing

---
 .../src/main/scala/coursier/sbtcoursier/DisplayTasks.scala | 7 +++++--
 .../src/sbt-test/sbt-coursier/dependency-graph/build.sbt   | 5 ++++-
 .../sbt-coursier/dependency-graph/whatDependsOnResult.log  | 6 +-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala
index b43ff0d5e..0da889b8f 100644
--- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala
+++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala
@@ -4,7 +4,6 @@ import coursier.core._
 import coursier.lmcoursier._
 import coursier.sbtcoursier.Keys._
 import coursier.sbtcoursiershared.SbtCoursierShared.autoImport._
-import coursier.util.Print.Colors
 import coursier.util.{Parse, Print}
 import sbt.Def
 import sbt.Keys._
@@ -112,7 +111,11 @@ object DisplayTasks {
     val resolutions = coursierResolutionTask(sbtClassifiers, ignoreArtifactErrors).value
     val result = new mutable.StringBuilder
     for (ResolutionResult(subGraphConfigs, resolution, _) <- resolutions) {
-      val roots: Seq[Dependency] = resolution.transitiveDependencies.filter(f => f.module == module)
+      val roots = resolution
+        .minDependencies
+        .filter(f => f.module == module)
+        .toVector
+        .sortBy(_.toString) // elements already have the same module, there's not much left for sorting…
       val strToPrint = s"$projectName (configurations ${subGraphConfigs.toVector.sorted.map(_.value).mkString(", ")})" + "\n" +
         Print.dependencyTree(
           resolution,
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/build.sbt
index c628273cb..1cd3d6a13 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/build.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/build.sbt
@@ -1,6 +1,9 @@
 scalaVersion := "2.11.8"
 
-libraryDependencies += "org.apache.zookeeper" % "zookeeper" % "3.5.0-alpha"
+libraryDependencies += {
+  sys.props("sbt.log.noformat") = "true" // disables colors in coursierWhatDependsOn output
+  "org.apache.zookeeper" % "zookeeper" % "3.5.0-alpha"
+}
 
 lazy val whatDependsOnCheck = TaskKey[Unit]("whatDependsOnCheck")
 
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/whatDependsOnResult.log b/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/whatDependsOnResult.log
index 365ee39a0..e0e5a5377 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/whatDependsOnResult.log
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/whatDependsOnResult.log
@@ -1,9 +1,5 @@
 dependency-graph (configurations compile, compile-internal, optional, provided, runtime, runtime-internal, test, test-internal)
-├─ log4j:log4j:1.2.16
-│  ├─ org.apache.zookeeper:zookeeper:3.5.0-alpha log4j:log4j:1.2.16 -> 1.2.17
-│  └─ org.slf4j:slf4j-log4j12:1.7.5
-│     └─ org.apache.zookeeper:zookeeper:3.5.0-alpha
 └─ log4j:log4j:1.2.17
-   ├─ org.apache.zookeeper:zookeeper:3.5.0-alpha log4j:log4j:1.2.16 -> 1.2.17
+   ├─ org.apache.zookeeper:zookeeper:3.5.0-alpha log4j:log4j:1.2.16 -> 1.2.17
    └─ org.slf4j:slf4j-log4j12:1.7.5
       └─ org.apache.zookeeper:zookeeper:3.5.0-alpha