#
#
# patch "enumerator.cc"
#  from [dab80484661f97432593b8cd831ad875ed308869]
#    to [788c7f07cd0356e9493f3bad2dd635c6b9bf2fe3]
# 
# patch "enumerator.hh"
#  from [682804347386396f210b558a4daec90cee67a7fb]
#    to [bf7aeaecfc004b85bea23405d38a8691c7a94eec]
# 
# patch "netsync.cc"
#  from [cf1767eaaae71ceec00a977403fcf26eeeca3e3f]
#    to [ae45fdfbd36aed55f631e64540ef24197f72be5c]
#
============================================================
--- enumerator.cc	dab80484661f97432593b8cd831ad875ed308869
+++ enumerator.cc	788c7f07cd0356e9493f3bad2dd635c6b9bf2fe3
@@ -28,13 +28,13 @@ revision_enumerator::revision_enumerator
 using std::vector;
 
 revision_enumerator::revision_enumerator(enumerator_callbacks & cb,
-                                         project_set & projects)
-  : cb(cb), projects(projects)
+                                         database & db)
+  : cb(cb), db(db)
 {
   revision_id root;
   revs.push_back(root);
 
-  projects.db.get_revision_ancestry(graph);
+  db.get_revision_ancestry(graph);
   for (multimap<revision_id, revision_id>::const_iterator i = graph.begin();
        i != graph.end(); ++i)
     {
@@ -101,7 +101,7 @@ revision_enumerator::files_for_revision(
 
   revision_t rs;
   MM(rs);
-  projects.db.get_revision(r, rs);
+  db.get_revision(r, rs);
 
   for (edge_map::const_iterator i = rs.edges.begin();
        i != rs.edges.end(); ++i)
@@ -186,7 +186,7 @@ revision_enumerator::get_revision_certs(
 	hashes.push_back(i->second);
     }
   if (!found_one)
-    projects.db.get_revision_certs(rid, hashes);
+    db.get_revision_certs(rid, hashes);
 }
 
 void
============================================================
--- enumerator.hh	682804347386396f210b558a4daec90cee67a7fb
+++ enumerator.hh	bf7aeaecfc004b85bea23405d38a8691c7a94eec
@@ -17,7 +17,6 @@ class database;
 #include "vocab.hh"
 
 class database;
-class project_set;
 
 // The revision_enumerator struct acts as a cursor which emits files,
 // deltas, revisions and certs in dependency-correct order. This is
@@ -53,7 +52,7 @@ revision_enumerator
 revision_enumerator
 {
   enumerator_callbacks & cb;
-  project_set & projects;
+  database & db;
   std::set<revision_id> terminal_nodes;
   std::set<revision_id> enumerated_nodes;
   std::deque<revision_id> revs;
@@ -71,7 +70,7 @@ public:
 
 public:
   revision_enumerator(enumerator_callbacks & cb,
-                      project_set & projects);
+                      database & db);
   void get_revision_parents(revision_id const & rid,
 			    std::vector<revision_id> & parents);
   void note_cert(revision_id const & rid,
============================================================
--- netsync.cc	cf1767eaaae71ceec00a977403fcf26eeeca3e3f
+++ netsync.cc	ae45fdfbd36aed55f631e64540ef24197f72be5c
@@ -572,7 +572,7 @@ session::session(protocol_role role,
   key_refiner(key_item, voice, *this),
   cert_refiner(cert_item, voice, *this),
   rev_refiner(revision_item, voice, *this),
-  rev_enumerator(*this, projects),
+  rev_enumerator(*this, projects.db),
   initiated_by_server(initiated_by_server)
 {}