# 
# 
# patch "ChangeLog"
#  from [a81eddc2b756ab71d1850739cfeb69b087fbadd2]
#    to [b3ba228fd4589ed2d8cd047c3b8cf71742b857a7]
# 
# patch "commands.cc"
#  from [641908036ba04947ffe8d58dd96ab464288fba8a]
#    to [5cb99cc9f9c9d2b53b3deab448bbc6cf1443b39c]
# 
# patch "database.cc"
#  from [60b972204926d91705bf155776984c2dd0f8a2af]
#    to [61fe3c82f418f10c32775d8df04e3d73e7e97cde]
# 
# patch "database.hh"
#  from [0ea80c46582059d8a4c75bd0f3d853178e89b2eb]
#    to [0fa8c0eed942fab0712c456303cdd2195796730f]
# 
============================================================
--- ChangeLog	a81eddc2b756ab71d1850739cfeb69b087fbadd2
+++ ChangeLog	b3ba228fd4589ed2d8cd047c3b8cf71742b857a7
@@ -1,5 +1,10 @@
 2006-01-10  Nathaniel Smith  <address@hidden>
 
+	* commands.cc (reindex): Remove.
+	* database.cc (database::rehash): Likewise.
+
+2006-01-10  Nathaniel Smith  <address@hidden>
+
 	* change_set.{cc,hh}: Remove.
 
 2006-01-10  Nathaniel Smith  <address@hidden>
============================================================
--- commands.cc	641908036ba04947ffe8d58dd96ab464288fba8a
+++ commands.cc	5cb99cc9f9c9d2b53b3deab448bbc6cf1443b39c
@@ -1930,19 +1930,6 @@
 }
 
 
-CMD(reindex, N_("network"), "",
-    N_("rebuild the indices used to sync over the network"),
-    OPT_NONE)
-{
-  if (args.size() > 0)
-    throw usage(name);
-
-  transaction_guard guard(app.db);
-  ui.set_tick_trailer("rehashing db");
-  app.db.rehash();
-  guard.commit();
-}
-
 static const var_key default_server_key(var_domain("database"),
                                         var_name("default-server"));
 static const var_key default_include_pattern_key(var_domain("database"),
============================================================
--- database.cc	60b972204926d91705bf155776984c2dd0f8a2af
+++ database.cc	61fe3c82f418f10c32775d8df04e3d73e7e97cde
@@ -505,47 +505,6 @@
   close();
 }
 
-void
-database::rehash()
-{
-  transaction_guard guard(*this);
-  ticker mcerts(_("mcerts"), "m", 1);
-  ticker pubkeys(_("pubkeys"), "+", 1);
-  ticker privkeys(_("privkeys"), "!", 1);
-  
-  {
-    // rehash all mcerts
-    results res;
-    vector<cert> certs;
-    fetch(res, 5, any_rows, 
-          "SELECT id, name, value, keypair, signature "
-          "FROM manifest_certs");
-    results_to_certs(res, certs);
-    execute("DELETE FROM manifest_certs");
-    for(vector<cert>::const_iterator i = certs.begin(); i != certs.end(); ++i)
-      {
-        put_cert(*i, "manifest_certs");
-        ++mcerts;
-      }
-  }
-
-  {
-    // rehash all pubkeys
-    results res;
-    fetch(res, 2, any_rows, "SELECT id, keydata FROM public_keys");
-    execute("DELETE FROM public_keys");
-    for (size_t i = 0; i < res.size(); ++i)
-      {
-        hexenc<id> tmp;
-        key_hash_code(rsa_keypair_id(res[i][0]), base64<rsa_pub_key>(res[i][1]), tmp);
-        execute("INSERT INTO public_keys VALUES(?, ?, ?)", 
-                tmp().c_str(), res[i][0].c_str(), res[i][1].c_str());
-        ++pubkeys;
-      }
-  }
-  guard.commit();
-}
-
 void 
 database::ensure_open()
 {
============================================================
--- database.hh	0ea80c46582059d8a4c75bd0f3d853178e89b2eb
+++ database.hh	0fa8c0eed942fab0712c456303cdd2195796730f
@@ -223,7 +223,6 @@
   void info(std::ostream &);
   void version(std::ostream &);
   void migrate();
-  void rehash();
   void ensure_open();
   bool database_specified();