# # # patch "project.cc" # from [98b70fd8d652825717df5f2ce37c427f0a2c6a2f] # to [c470df10a4d213a27b64ec1caf26bf2703a025e7] # ============================================================ --- project.cc 98b70fd8d652825717df5f2ce37c427f0a2c6a2f +++ project.cc c470df10a4d213a27b64ec1caf26bf2703a025e7 @@ -53,20 +53,20 @@ namespace { struct not_in_branch : public is_failure { - app_state & app; + database & db; base64 const & branch_encoded; - not_in_branch(app_state & app, + not_in_branch(database & db, base64 const & branch_encoded) - : app(app), branch_encoded(branch_encoded) + : db(db), branch_encoded(branch_encoded) {} virtual bool operator()(revision_id const & rid) { vector< revision > certs; - app.db.get_revision_certs(rid, - cert_name(branch_cert_name), - branch_encoded, - certs); - erase_bogus_certs(certs, app.db); + db.get_revision_certs(rid, + cert_name(branch_cert_name), + branch_encoded, + certs); + erase_bogus_certs(certs, db); return certs.empty(); } }; @@ -87,7 +87,7 @@ project_t::get_branch_heads(branch_name branch_encoded, branch.second); - not_in_branch p(app, branch_encoded); + not_in_branch p(app.db, branch_encoded); erase_ancestors_and_failures(branch.second, p, app.db); L(FL("found heads of branch %s (%s heads)") % name % branch.second.size());