From fafd09a7baa41bdf4b89329a94c1b7a42f095d6f Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Wed, 9 May 2012 17:31:12 +0200
Subject: [PATCH] Improve output of operations to show details about dev
 versions

---
 .../DependencyResolver/Operation/InstallOperation.php    | 2 +-
 .../DependencyResolver/Operation/SolverOperation.php     | 9 +++++++++
 .../DependencyResolver/Operation/UninstallOperation.php  | 2 +-
 .../DependencyResolver/Operation/UpdateOperation.php     | 4 ++--
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/Composer/DependencyResolver/Operation/InstallOperation.php b/src/Composer/DependencyResolver/Operation/InstallOperation.php
index 0a16629f4..4fd3bcba1 100644
--- a/src/Composer/DependencyResolver/Operation/InstallOperation.php
+++ b/src/Composer/DependencyResolver/Operation/InstallOperation.php
@@ -61,6 +61,6 @@ class InstallOperation extends SolverOperation
      */
     public function __toString()
     {
-        return 'Installing '.$this->package->getPrettyName().' ('.$this->package->getPrettyVersion().')';
+        return 'Installing '.$this->package->getPrettyName().' ('.$this->formatVersion($this->package).')';
     }
 }
diff --git a/src/Composer/DependencyResolver/Operation/SolverOperation.php b/src/Composer/DependencyResolver/Operation/SolverOperation.php
index a0071641e..5fb796d17 100644
--- a/src/Composer/DependencyResolver/Operation/SolverOperation.php
+++ b/src/Composer/DependencyResolver/Operation/SolverOperation.php
@@ -42,4 +42,13 @@ abstract class SolverOperation implements OperationInterface
     {
         return $this->reason;
     }
+
+    protected function formatVersion(PackageInterface $package)
+    {
+        if (!$package->isDev() || !in_array($package->getSourceType(), array('hg', 'git'))) {
+            return $package->getPrettyVersion();
+        }
+
+        return $package->getPrettyVersion().' '.substr($package->getSourceReference(), 0, 6);
+    }
 }
diff --git a/src/Composer/DependencyResolver/Operation/UninstallOperation.php b/src/Composer/DependencyResolver/Operation/UninstallOperation.php
index 018df26c5..1412d2f85 100644
--- a/src/Composer/DependencyResolver/Operation/UninstallOperation.php
+++ b/src/Composer/DependencyResolver/Operation/UninstallOperation.php
@@ -61,6 +61,6 @@ class UninstallOperation extends SolverOperation
      */
     public function __toString()
     {
-        return 'Uninstalling '.$this->package->getPrettyName().' ('.$this->package->getPrettyVersion().')';
+        return 'Uninstalling '.$this->package->getPrettyName().' ('.$this->formatVersion($this->package).')';
     }
 }
diff --git a/src/Composer/DependencyResolver/Operation/UpdateOperation.php b/src/Composer/DependencyResolver/Operation/UpdateOperation.php
index 5f0bae2e2..96b12d35e 100644
--- a/src/Composer/DependencyResolver/Operation/UpdateOperation.php
+++ b/src/Composer/DependencyResolver/Operation/UpdateOperation.php
@@ -74,7 +74,7 @@ class UpdateOperation extends SolverOperation
      */
     public function __toString()
     {
-        return 'Updating '.$this->initialPackage->getPrettyName().' ('.$this->initialPackage->getPrettyVersion().') to '.
-            $this->targetPackage->getPrettyName(). ' ('.$this->targetPackage->getPrettyVersion().')';
+        return 'Updating '.$this->initialPackage->getPrettyName().' ('.$this->formatVersion($this->initialPackage).') to '.
+            $this->targetPackage->getPrettyName(). ' ('.$this->formatVersion($this->targetPackage).')';
     }
 }