# 
# patch "ChangeLog"
#  from [3efd95e1cf7c7253de0a630b5df408f55c968495]
#    to [34ebe49b72bd98491f486d1e4b63738891460ea2]
# 
# patch "commands.cc"
#  from [4a23bb5b1bf2813b1c2d6bd10821f8ee0bebc974]
#    to [494c02090179405cfdd92aa209a38acc62e41872]
# 
# patch "revision.cc"
#  from [7c8168a099c4b67af5d8542e5fb8ae6f6740ec89]
#    to [e6fc8a04e22ce527611646934a5a3bdd13feca77]
# 
========================================================================
--- ChangeLog	3efd95e1cf7c7253de0a630b5df408f55c968495
+++ ChangeLog	34ebe49b72bd98491f486d1e4b63738891460ea2
@@ -1,3 +1,11 @@
+2005-10-12  Nathaniel Smith  <address@hidden>
+
+	* revision.cc (add_node_for_old_revision): Rename to...
+	(add_node_for_oldstyle_revision): ...this.
+	(build_changesets_from_existing_revs): Rename to...
+	(build_roster_style_revs_from_manifest_style_revs): ...this.
+	* commands.cc (db): Rename "rebuild" to "rosterify".
+
 2005-10-08  Nathaniel Smith  <address@hidden>
 
 	* revision.cc (analyze_manifest_changes): Remove.
========================================================================
--- commands.cc	4a23bb5b1bf2813b1c2d6bd10821f8ee0bebc974
+++ commands.cc	494c02090179405cfdd92aa209a38acc62e41872
@@ -2082,7 +2082,7 @@
       "kill_tag_locally TAG\n"
       "check\n"
       "changesetify\n"
-      "rebuild\n"
+      "rosterify\n"
       "set_epoch BRANCH EPOCH\n"), 
     N_("manipulate database state"),
     OPT_NONE)
@@ -2105,8 +2105,8 @@
         check_db(app);
       else if (idx(args, 0)() == "changesetify")
         build_changesets_from_manifest_ancestry(app);
-      else if (idx(args, 0)() == "rebuild")
-        build_changesets_from_existing_revs(app);
+      else if (idx(args, 0)() == "rosterify")
+        build_roster_style_revs_from_manifest_style_revs(app);
       else
         throw usage(name);
     }
========================================================================
--- revision.cc	7c8168a099c4b67af5d8542e5fb8ae6f6740ec89
+++ revision.cc	e6fc8a04e22ce527611646934a5a3bdd13feca77
@@ -966,7 +966,7 @@
                      revision_id const & ident,
                      manifest_id & mid);
 
-u64 anc_graph::add_node_for_old_revision(revision_id const & rev)
+u64 anc_graph::add_node_for_oldstyle_revision(revision_id const & rev)
 {
   I(existing_graph);
   I(!null_id(rev));
@@ -1454,12 +1454,12 @@
 }
 
 void 
-build_changesets_from_existing_revs(app_state & app)
+build_roster_style_revs_from_manifest_style_revs(app_state & app)
 {
   global_sanity.set_relaxed(true);
   anc_graph graph(true, app);
 
-  P(F("rebuilding revision graph from existing graph\n"));
+  P(F("converting existing revision graph to new-style revisions\n"));
   std::multimap<revision_id, revision_id> existing_graph;
 
   {
@@ -1476,8 +1476,8 @@
     {
       if (!null_id(i->first))
         {
-          u64 parent_node = graph.add_node_for_old_revision(i->first);
-          u64 child_node = graph.add_node_for_old_revision(i->second);
+          u64 parent_node = graph.add_node_for_oldstyle_revision(i->first);
+          u64 child_node = graph.add_node_for_oldstyle_revision(i->second);
           graph.add_node_ancestry(child_node, parent_node);
         }
     }