[patch] optimize merge order by delaying the merge of root nodes

delay_root_nodes.patch (text/plain), 909 bytes, created by Zac Medico on 2007-02-18 20:58:37 UTC

Index: bin/emerge
===================================================================
--- bin/emerge	(revision 5996)
+++ bin/emerge	(revision 5997)
@@ -2021,8 +2021,18 @@
 						# output, so it's disabled in reversed mode.
 						selected_nodes = nodes
 					else:
-						# Only pop one node for optimal merge order.
-						selected_nodes = [nodes[0]]
+						# For optimal merge order:
+						#  * Only pop one node.
+						#  * Removing a root node (node without a parent)
+						#    will not produce a leaf node, so avoid it.
+						for node in nodes:
+							if mygraph.parent_nodes(node):
+								# found a non-root node
+								selected_nodes = [node]
+								break
+						if not selected_nodes:
+							# settle for a root node
+							selected_nodes = [nodes[0]]
 				else:
 					"""Recursively gather a group of nodes that RDEPEND on
 					eachother.  This ensures that they are merged as a group