[Checkins] SVN: zc.buildout/trunk/ Revert r124059, is only relevant for 1.4.

[Ross Patterson]

Log message for revision 124125:
  Revert r124059, is only relevant for 1.4.
  
  Not sure what 1.5 is doing differently, I couldn't find the difference
  reading the code but both profiling and timing data show that this
  isn't an issue under 1.5/trunk, just under 1.4 into which this change
  has already been merged.

Changed:
  U   zc.buildout/trunk/CHANGES.txt
  U   zc.buildout/trunk/src/zc/buildout/easy_install.py

-=-
Modified: zc.buildout/trunk/CHANGES.txt
===================================================================
--- zc.buildout/trunk/CHANGES.txt	2012-01-21 16:57:50 UTC (rev 124124)
+++ zc.buildout/trunk/CHANGES.txt	2012-01-22 01:35:51 UTC (rev 124125)
@@ -4,13 +4,6 @@
 1.6.0 (unreleased)
 ==================
 
-- Avoid sorting the working set and requirements when it won't be
-  logged.  When profiling a simple buildout with 10 parts with
-  identical and large working sets, this resulted in a decrease of run
-  time from 93.411 to 15.068 seconds, about a 6 fold improvement.  To
-  see the benefit be sure to run without any increase in verbosity
-  ("-v" option).  (rossp)
-
 - The buildout init command now accepts distribution requirements and
   paths to set up a custom interpreter part that has the distributions
   or parts in the path. For example::

Modified: zc.buildout/trunk/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/easy_install.py	2012-01-21 16:57:50 UTC (rev 124124)
+++ zc.buildout/trunk/src/zc/buildout/easy_install.py	2012-01-22 01:35:51 UTC (rev 124125)
@@ -1850,15 +1850,6 @@
         return "Couldn't find a distribution for %r." % str(req)
 
 def _log_requirement(ws, req):
-    if not logger.isEnabledFor(logging.DEBUG):
-        # Sorting the working set and iterating over it's requirements
-        # is expensive, so short cirtuit the work if it won't even be
-        # logged.  When profiling a simple buildout with 10 parts with
-        # identical and large working sets, this resulted in a
-        # decrease of run time from 93.411 to 15.068 seconds, about a
-        # 6 fold improvement.
-        return
-    
     ws = list(ws)
     ws.sort()
     for dist in ws: