#
#
# patch "project.cc"
#  from [e36cabaeb25304c08435a3a8aa1ab9c22ed820a7]
#    to [bff2c8ff7455f6e988707c7cd7627ecf59f1a8c1]
# 
# patch "project.hh"
#  from [004e43c04a1873b95043b80bb1f2ce9ec7178553]
#    to [006890147145473431c3da49d6883ea10cd4c200]
# 
# patch "revision.cc"
#  from [6454a4c8bf1812223adcbb165febb3315465b03d]
#    to [563793f4cf2d265fafa9ac422ab9adc854448fe0]
# 
# patch "revision.hh"
#  from [11085059e347c4e47ea631169b70231d3db5a180]
#    to [eb8fe69255a0e21fcfd1074060f5c6b87b844b5a]
#
============================================================
--- project.cc	e36cabaeb25304c08435a3a8aa1ab9c22ed820a7
+++ project.cc	bff2c8ff7455f6e988707c7cd7627ecf59f1a8c1
@@ -13,6 +13,8 @@ using std::vector;
 using std::string;
 using std::set;
 using std::vector;
+using std::multimap;
+using std::make_pair;
 
 project_t::project_t(app_state & app)
   : app(app)
@@ -26,6 +28,8 @@ project_t::get_branch_list(std::set<bran
       std::vector<std::string> got;
       indicator = app.db.get_branches(got);
       branches.clear();
+      multimap<revision_id, revision_id> inverse_graph_cache;
+  
       for (std::vector<std::string>::iterator i = got.begin();
            i != got.end(); ++i)
         {
@@ -33,7 +37,7 @@ project_t::get_branch_list(std::set<bran
           const branch_name branch(*i);
           std::set<revision_id> heads;
 
-          get_branch_heads(branch, heads);
+          get_branch_heads(branch, heads, &inverse_graph_cache);
           
           if (!heads.empty())
             branches.insert(branch);
@@ -50,6 +54,8 @@ project_t::get_branch_list(globish const
   std::vector<std::string> got;
   app.db.get_branches(glob(), got);
   names.clear();
+  multimap<revision_id, revision_id> inverse_graph_cache;
+  
   for (std::vector<std::string>::iterator i = got.begin();
        i != got.end(); ++i)
     {
@@ -57,7 +63,7 @@ project_t::get_branch_list(globish const
       const branch_name branch(*i);
       std::set<revision_id> heads;
 
-      get_branch_heads(branch, heads);
+      get_branch_heads(branch, heads, &inverse_graph_cache);
 
       if (!heads.empty())
         names.insert(branch);
@@ -108,7 +114,8 @@ void
 }
 
 void
-project_t::get_branch_heads(branch_name const & name, std::set<revision_id> & heads)
+project_t::get_branch_heads(branch_name const & name, std::set<revision_id> & heads,
+                            multimap<revision_id, revision_id> *inverse_graph_cache_ptr)
 {
   std::pair<outdated_indicator, std::set<revision_id> > & branch = branch_heads[name];
   if (branch.first.outdated())
@@ -123,7 +130,7 @@ project_t::get_branch_heads(branch_name 
                                                     branch.second);
 
       not_in_branch p(app, branch_encoded);
-      erase_ancestors_and_failures(branch.second, p, app);
+      erase_ancestors_and_failures(branch.second, p, app, inverse_graph_cache_ptr);
       
       if (!app.opts.ignore_suspend_certs)
         {
============================================================
--- project.hh	004e43c04a1873b95043b80bb1f2ce9ec7178553
+++ project.hh	006890147145473431c3da49d6883ea10cd4c200
@@ -35,7 +35,8 @@ public:
 
   void get_branch_list(std::set<branch_name> & names);
   void get_branch_list(globish const & glob, std::set<branch_name> & names);
-  void get_branch_heads(branch_name const & name, std::set<revision_id> & heads);
+  void get_branch_heads(branch_name const & name, std::set<revision_id> & heads,
+                        std::multimap<revision_id, revision_id> *inverse_graph_cache_ptr = NULL);
 
   outdated_indicator get_tags(std::set<tag_t> & tags);
   void put_tag(revision_id const & id, std::string const & name);
============================================================
--- revision.cc	6454a4c8bf1812223adcbb165febb3315465b03d
+++ revision.cc	563793f4cf2d265fafa9ac422ab9adc854448fe0
@@ -457,17 +457,21 @@ erase_ancestors_and_failures(std::set<re
 void
 erase_ancestors_and_failures(std::set<revision_id> & candidates,
                              is_failure & p,
-                             app_state & app)
+                             app_state & app,
+                             multimap<revision_id, revision_id> *inverse_graph_cache_ptr)
 {
   // Load up the ancestry graph
   multimap<revision_id, revision_id> inverse_graph;
   
+  if (inverse_graph_cache_ptr == NULL)
+    inverse_graph_cache_ptr = &inverse_graph;
+  if (inverse_graph_cache_ptr->empty())
   {
     multimap<revision_id, revision_id> graph;
     app.db.get_revision_ancestry(graph);
     for (multimap<revision_id, revision_id>::const_iterator i = graph.begin();
          i != graph.end(); ++i)
-      inverse_graph.insert(make_pair(i->second, i->first));
+      inverse_graph_cache_ptr->insert(make_pair(i->second, i->first));
   }
 
   // Keep a set of all ancestors that we've traversed -- to avoid
@@ -494,7 +498,7 @@ erase_ancestors_and_failures(std::set<re
         }
       // okay, it is good enough that all its ancestors should be
       // eliminated
-      accumulate_strict_ancestors(rid, all_ancestors, inverse_graph);
+      accumulate_strict_ancestors(rid, all_ancestors, *inverse_graph_cache_ptr);
     }
 
   // now go and eliminate the ancestors
============================================================
--- revision.hh	11085059e347c4e47ea631169b70231d3db5a180
+++ revision.hh	eb8fe69255a0e21fcfd1074060f5c6b87b844b5a
@@ -11,6 +11,7 @@
 // PURPOSE.
 
 #include <set>
+#include <map>
 
 #include <boost/shared_ptr.hpp>
 
@@ -150,7 +151,8 @@ erase_ancestors_and_failures(std::set<re
 void
 erase_ancestors_and_failures(std::set<revision_id> & revisions,
                              is_failure & p,
-                             app_state & app);
+                             app_state & app,
+                             std::multimap<revision_id, revision_id> *inverse_graph_cache_ptr = NULL);
 
 void
 ancestry_difference(revision_id const & a, std::set<revision_id> const & bs,