#
#
# patch "enumerator.cc"
#  from [bbf94536322448b253ba46c2a679f658e2393c70]
#    to [569a5c9282b5073a150fb788275a5c3bd6ce5dfa]
# 
# patch "enumerator.hh"
#  from [051909004ac5fdeed44714e2d49acb5e1af4fe48]
#    to [e37159cff28065b774569dfc441b2306646965ca]
# 
# patch "inodeprint.hh"
#  from [9b599b89eb011fb1f9b0fc43d095cfe7e5a6a7f7]
#    to [01a40d2fab8b3cd94d1f293b5c4472d213f72e5e]
# 
# patch "netsync.cc"
#  from [eeb000f1a3fac789b96e6c28e96daef08ac09ac2]
#    to [79992b1f68a78cc67796bb57d503e99a9e528660]
#
============================================================
--- enumerator.cc	bbf94536322448b253ba46c2a679f658e2393c70
+++ enumerator.cc	569a5c9282b5073a150fb788275a5c3bd6ce5dfa
@@ -17,7 +17,8 @@
 #include "enumerator.hh"
 #include "revision.hh"
 #include "vocab.hh"
-#include "app_state.hh"
+#include "database.hh"
+#include "project.hh"
 
 using std::make_pair;
 using std::map;
@@ -27,10 +28,10 @@ revision_enumerator::revision_enumerator
 using std::vector;
 
 revision_enumerator::revision_enumerator(enumerator_callbacks & cb,
-                                         app_state & app,
+                                         database & db,
                                          set<revision_id> const & initial,
                                          set<revision_id> const & terminal)
-  : cb(cb), app(app), terminal_nodes(terminal)
+  : cb(cb), db(db), terminal_nodes(terminal)
 {
   for (set<revision_id>::const_iterator i = initial.begin();
        i != initial.end(); ++i)
@@ -39,8 +40,8 @@ revision_enumerator::revision_enumerator
 }
 
 revision_enumerator::revision_enumerator(enumerator_callbacks & cb,
-                                         app_state & app)
-  : cb(cb), app(app)
+                                         database & db)
+  : cb(cb), db(db)
 {
   revision_id root;
   revs.push_back(root);
@@ -50,7 +51,7 @@ revision_enumerator::load_graphs()
 void
 revision_enumerator::load_graphs()
 {
-  app.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)
     {
@@ -118,7 +119,7 @@ revision_enumerator::files_for_revision(
 
   revision_t rs;
   MM(rs);
-  app.db.get_revision(r, rs);
+  db.get_revision(r, rs);
 
   for (edge_map::const_iterator i = rs.edges.begin();
        i != rs.edges.end(); ++i)
@@ -204,7 +205,7 @@ revision_enumerator::get_revision_certs(
     }
   if (!found_one)
     {
-      app.get_project().get_revision_cert_hashes(rid, hashes);
+      db.get_project().get_revision_cert_hashes(rid, hashes);
     }
 }
 
============================================================
--- enumerator.hh	051909004ac5fdeed44714e2d49acb5e1af4fe48
+++ enumerator.hh	e37159cff28065b774569dfc441b2306646965ca
@@ -14,9 +14,9 @@
 #include <map>
 #include <set>
 #include "vector.hh"
+#include "vocab.hh"
 
-#include "vocab.hh"
-class app_state;
+class database;
 
 // The revision_enumerator struct acts as a cursor which emits files,
 // deltas, revisions and certs in dependency-correct order. This is
@@ -52,7 +52,7 @@ revision_enumerator
 revision_enumerator
 {
   enumerator_callbacks & cb;
-  app_state & app;
+  database & db;
   std::set<revision_id> terminal_nodes;
   std::set<revision_id> enumerated_nodes;
   std::deque<revision_id> revs;
@@ -69,11 +69,11 @@ revision_enumerator
 			    std::vector<revision_id> & parents);
 
   revision_enumerator(enumerator_callbacks & cb,
-                      app_state & app,
+                      database & db,
                       std::set<revision_id> const & initial,
                       std::set<revision_id> const & terminal);
   revision_enumerator(enumerator_callbacks & cb,
-                      app_state & app);
+                      database & db);
   void load_graphs();
   bool all_parents_enumerated(revision_id const & child);
   void files_for_revision(revision_id const & r,
============================================================
--- inodeprint.hh	9b599b89eb011fb1f9b0fc43d095cfe7e5a6a7f7
+++ inodeprint.hh	01a40d2fab8b3cd94d1f293b5c4472d213f72e5e
@@ -23,8 +23,6 @@ std::ostream & operator<<(std::ostream &
 
 std::ostream & operator<<(std::ostream & out, inodeprint_entry const & e);
 
-class app_state;
-
 void read_inodeprint_map(data const & dat,
                          inodeprint_map & ipm);
 
============================================================
--- netsync.cc	eeb000f1a3fac789b96e6c28e96daef08ac09ac2
+++ netsync.cc	79992b1f68a78cc67796bb57d503e99a9e528660
@@ -554,7 +554,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, app),
+  rev_enumerator(*this, app.db),
   initiated_by_server(initiated_by_server)
 {}