Rev 2544: Merge bzr.dev in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2544
revision-id: pqm at pqm.ubuntu.com-20070621070542-od3c9uxurv03i41p
parent: pqm at pqm.ubuntu.com-20070621055651-p2zqigyl0rju375h
parent: aaron.bentley at utoronto.ca-20070621063927-35dli0ujb998wku3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-21 08:05:42 +0100
message:
  Merge bzr.dev
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
    ------------------------------------------------------------
    revno: 2490.2.35
    merged: aaron.bentley at utoronto.ca-20070621063927-35dli0ujb998wku3
    parent: aaron.bentley at utoronto.ca-20070621063206-rjmdoolr3qu24y7q
    parent: pqm at pqm.ubuntu.com-20070621055651-p2zqigyl0rju375h
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: graphwalker
    timestamp: Thu 2007-06-21 02:39:27 -0400
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    revno: 2490.2.34
    merged: aaron.bentley at utoronto.ca-20070621063206-rjmdoolr3qu24y7q
    parent: aaron.bentley at utoronto.ca-20070621032939-kcnl1dmxsixygskb
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: graphwalker
    timestamp: Thu 2007-06-21 02:32:06 -0400
    message:
      Update NEWS and change implementation to return an iterator
=== modified file 'NEWS'
--- a/NEWS	2007-06-20 08:40:28 +0000
+++ b/NEWS	2007-06-21 06:39:27 +0000
@@ -35,6 +35,9 @@
       number of stages is adjusted accordingly.
       (Ian Clatworthy)
 
+    * Various operations that are now faster due to avoiding unnecessary
+      topological sorts. (Aaron Bentley)
+
   TESTING:
 
     * Removed the ``--keep-output`` option from selftest and clean up test

=== modified file 'bzrlib/graph.py'
--- a/bzrlib/graph.py	2007-06-21 01:58:29 +0000
+++ b/bzrlib/graph.py	2007-06-21 06:32:06 +0000
@@ -285,7 +285,8 @@
         An ancestor may sort after a descendant if the relationship is not
         visible in the supplied list of revisions.
         """
-        return tsort.topo_sort(zip(revisions, self.get_parents(revisions)))
+        sorter = tsort.TopoSorter(zip(revisions, self.get_parents(revisions)))
+        return sorter.iter_topo_order()
 
 
 class _BreadthFirstSearcher(object):