#
#
# patch "automate.cc"
#  from [46cd7b100578361c5542ac381e9254afcec4a8d8]
#    to [7c170bb85a285c11f30ada7f7f0523ae77b3a0ea]
# 
# patch "cmd_diff_log.cc"
#  from [3115670c4956765d30fb00d5e387cd741875da22]
#    to [4d4a9320d7e844e5d690a83d3f6eca7cdec7e1bf]
# 
# patch "cmd_list.cc"
#  from [532385156665e4e401c1001557a15ab826fe5668]
#    to [cfca33fa377f79f1d0ffdde1fc85fc082c2f8272]
# 
# patch "cmd_merging.cc"
#  from [8e41c7945842d6fb763442c1bd0d49198785bbae]
#    to [be7922b8b7fcfeda8e9ca10b19d428bc385bd1bc]
# 
# patch "cmd_ws_commit.cc"
#  from [f2de0b9981eccd52be3dedd1a8a6df1268541a5a]
#    to [ca65ca47504d4fc3c0f8361b6fa53fe41078b3f2]
# 
# patch "roster.cc"
#  from [acf1a7c274f42c9c2fc950b4a8478302d7057d76]
#    to [3576d908a65b098b6dfcd7075a7fa5a66758bc01]
# 
# patch "work.cc"
#  from [6dc2f9122f0173070675dde7447b9429a2c6ceed]
#    to [eeeb7204b7d8cc209d13df715d4df8e8e3484214]
# 
# patch "work.hh"
#  from [0bf190df19de108ff192d56ac76d1a455852bdf6]
#    to [efb521d96bab83ce35aab8f05d245bcdb540a9bf]
#
============================================================
--- automate.cc	46cd7b100578361c5542ac381e9254afcec4a8d8
+++ automate.cc	7c170bb85a285c11f30ada7f7f0523ae77b3a0ea
@@ -677,7 +677,7 @@ CMD_AUTOMATE(inventory, "",
     // FIXME: this is totally gross, we load the parent roster(s) twice for
     // no reason, etc.
     parent_map parents;
-    app.work.get_current_roster_shape(parents, curr, nis);
+    app.work.get_work_state_shape_only(parents, curr, nis);
   }
   app.work.get_work_rev(rev);
   N(rev.edges.size() == 1,
@@ -882,7 +882,7 @@ CMD_AUTOMATE(get_revision, N_("[REVID]")
       revision_t rev;
 
       app.require_workspace();
-      app.work.get_current_roster_shape(old_rosters, new_roster, nis);
+      app.work.get_work_state_shape_only(old_rosters, new_roster, nis);
       app.work.update_current_roster_from_filesystem(new_roster);
 
       make_revision(old_rosters, new_roster, rev);
@@ -949,7 +949,7 @@ CMD_AUTOMATE(get_current_revision_id, ""
   temp_node_id_source nis;
 
   app.require_workspace();
-  app.work.get_current_roster_shape(parents, new_roster, nis);
+  app.work.get_work_state_shape_only(parents, new_roster, nis);
   app.work.update_current_roster_from_filesystem(new_roster);
 
   app.work.get_parent_rosters(parents);
@@ -1019,7 +1019,7 @@ CMD_AUTOMATE(get_manifest_of, N_("[REVID
 
       app.require_workspace();
       parent_map parents;
-      app.work.get_current_roster_shape(parents, new_roster, nis);
+      app.work.get_work_state_shape_only(parents, new_roster, nis);
       app.work.update_current_roster_from_filesystem(new_roster);
     }
   else
============================================================
--- cmd_diff_log.cc	3115670c4956765d30fb00d5e387cd741875da22
+++ cmd_diff_log.cc	4d4a9320d7e844e5d690a83d3f6eca7cdec7e1bf
@@ -362,7 +362,7 @@ prepare_diff(cset & included,
       revision_id old_rid;
       parent_map parents;
 
-      app.work.get_current_roster_shape(parents, new_roster, nis);
+      app.work.get_work_state_shape_only(parents, new_roster, nis);
 
       // With no arguments, which parent should we diff against?
       N(parents.size() == 1,
@@ -399,7 +399,7 @@ prepare_diff(cset & included,
       app.db.get_roster(r_old_id, old_roster);
       {
         parent_map parents;
-        app.work.get_current_roster_shape(parents, new_roster, nis);
+        app.work.get_work_state_shape_only(parents, new_roster, nis);
       }
 
       node_restriction mask(args_to_paths(args),
@@ -676,7 +676,7 @@ CMD(log, "log", "", CMD_REF(informative)
           parent_map parents;
           temp_node_id_source nis;
 
-          app.work.get_current_roster_shape(parents, new_roster, nis);
+          app.work.get_work_state_shape_only(parents, new_roster, nis);
 
           mask = node_restriction(args_to_paths(args),
                                   args_to_paths(app.opts.exclude_patterns), 
============================================================
--- cmd_list.cc	532385156665e4e401c1001557a15ab826fe5668
+++ cmd_list.cc	cfca33fa377f79f1d0ffdde1fc85fc082c2f8272
@@ -364,7 +364,7 @@ CMD(known, "known", "", CMD_REF(list), "
   app.require_workspace();
   {
     parent_map parents;
-    app.work.get_current_roster_shape(parents, new_roster, nis);
+    app.work.get_work_state_shape_only(parents, new_roster, nis);
   }
 
   node_restriction mask(args_to_paths(args),
@@ -432,7 +432,7 @@ CMD(missing, "missing", "", CMD_REF(list
 {
   temp_node_id_source nis;
   roster_t current_roster_shape;
-  app.work.get_current_roster_shape(current_roster_shape, nis);
+  app.work.get_work_state_shape_only(current_roster_shape, nis);
   node_restriction mask(args_to_paths(args),
                         args_to_paths(app.opts.exclude_patterns),
                         app.opts.depth,
@@ -457,7 +457,7 @@ CMD(changed, "changed", "", CMD_REF(list
 
   app.require_workspace();
 
-  app.work.get_current_roster_shape(parents, new_roster, nis);
+  app.work.get_work_state_shape_only(parents, new_roster, nis);
   app.work.update_current_roster_from_filesystem(new_roster);
 
   node_restriction mask(args_to_paths(args),
============================================================
--- cmd_merging.cc	8e41c7945842d6fb763442c1bd0d49198785bbae
+++ cmd_merging.cc	be7922b8b7fcfeda8e9ca10b19d428bc385bd1bc
@@ -144,7 +144,7 @@ update(app_state & app, commands::comman
   // Figure out where we are, and what we look like.
   parent_map parents;
   roster_t working_roster; MM(working_roster);
-  app.work.get_current_roster_shape(parents, working_roster, nis);
+  app.work.get_work_state_shape_only(parents, working_roster, nis);
 
   N(parents.size() == 1,
     F("this command can only be used in a single-parent workspace"));
@@ -701,7 +701,7 @@ CMD(merge_into_workspace, "merge_into_wo
   {
     parent_map parents;
     temp_node_id_source nis;
-    app.work.get_current_roster_shape(parents, working_roster, nis);
+    app.work.get_work_state_shape_only(parents, working_roster, nis);
 
     N(parents.size() == 1,
       F("this command can only be used in a single-parent workspace"));
@@ -918,7 +918,7 @@ CMD(pluck, "pluck", "", CMD_REF(workspac
   // Get the WORKING roster
   parent_map parents;
   roster_t working_roster; MM(working_roster);
-  app.work.get_current_roster_shape(parents, working_roster, nis);
+  app.work.get_work_state_shape_only(parents, working_roster, nis);
 
   app.work.update_current_roster_from_filesystem(working_roster);
 
@@ -1037,7 +1037,7 @@ CMD(get_roster, "get_roster", "", CMD_RE
       revision_id rid(fake_id());
       
       app.require_workspace();
-      app.work.get_current_roster_shape(parents, roster, nis);
+      app.work.get_work_state_shape_only(parents, roster, nis);
       app.work.update_current_roster_from_filesystem(roster);
 
       if (parents.size() == 0)
============================================================
--- cmd_ws_commit.cc	f2de0b9981eccd52be3dedd1a8a6df1268541a5a
+++ cmd_ws_commit.cc	ca65ca47504d4fc3c0f8361b6fa53fe41078b3f2
@@ -159,7 +159,7 @@ CMD(revert, "revert", "", CMD_REF(worksp
 
   parent_map parents;
   temp_node_id_source nis;
-  app.work.get_current_roster_shape(parents, new_roster, nis);
+  app.work.get_work_state_shape_only(parents, new_roster, nis);
 
   N(parents.size() == 1,
     F("this command can only be used in a single-parent workspace"));
@@ -417,7 +417,7 @@ CMD(drop, "drop", "rm", CMD_REF(workspac
       temp_node_id_source nis;
       roster_t current_roster_shape;
       parent_map parents;
-      app.work.get_current_roster_shape(parents, current_roster_shape, nis);
+      app.work.get_work_state_shape_only(parents, current_roster_shape, nis);
       node_restriction mask(args_to_paths(args),
                             args_to_paths(app.opts.exclude_patterns),
                             app.opts.depth,
@@ -498,7 +498,7 @@ CMD(status, "status", "", CMD_REF(inform
   temp_node_id_source nis;
 
   app.require_workspace();
-  app.work.get_current_roster_shape(old_rosters, new_roster, nis);
+  app.work.get_work_state_shape_only(old_rosters, new_roster, nis);
 
   node_restriction mask(args_to_paths(args),
                         args_to_paths(app.opts.exclude_patterns),
@@ -642,7 +642,7 @@ CMD(attr_drop, "drop", "", CMD_REF(attr)
   temp_node_id_source nis;
 
   app.require_workspace();
-  app.work.get_current_roster_shape(parents, new_roster, nis);
+  app.work.get_work_state_shape_only(parents, new_roster, nis);
 
   file_path path = file_path_external(idx(args, 0));
 
@@ -686,7 +686,7 @@ CMD(attr_get, "get", "", CMD_REF(attr), 
   app.require_workspace();
   {
     parent_map parents;
-    app.work.get_current_roster_shape(parents, new_roster, nis);
+    app.work.get_work_state_shape_only(parents, new_roster, nis);
   }
 
   file_path path = file_path_external(idx(args, 0));
@@ -738,7 +738,7 @@ CMD(attr_set, "set", "", CMD_REF(attr), 
   temp_node_id_source nis;
 
   app.require_workspace();
-  app.work.get_current_roster_shape(parents, new_roster, nis);
+  app.work.get_work_state_shape_only(parents, new_roster, nis);
 
   file_path path = file_path_external(idx(args, 0));
 
@@ -792,7 +792,7 @@ CMD_AUTOMATE(get_attributes, N_("PATH"),
   temp_node_id_source nis;
 
   // get the base and the current roster of this workspace
-  app.work.get_current_roster_shape(parents, current, nis);
+  app.work.get_work_state_shape_only(parents, current, nis);
   N(parents.size() == 1,
     F("this command can only be used in a single-parent workspace"));
   base = parent_roster(parents.begin());
@@ -903,7 +903,7 @@ CMD_AUTOMATE(set_attribute, N_("PATH KEY
   temp_node_id_source nis;
 
   app.require_workspace();
-  app.work.get_current_roster_shape(parents, new_roster, nis);
+  app.work.get_work_state_shape_only(parents, new_roster, nis);
 
   file_path path = file_path_external(idx(args,0));
 
@@ -943,7 +943,7 @@ CMD_AUTOMATE(drop_attribute, N_("PATH [K
   temp_node_id_source nis;
 
   app.require_workspace();
-  app.work.get_current_roster_shape(parents, new_roster, nis);
+  app.work.get_work_state_shape_only(parents, new_roster, nis);
 
   file_path path = file_path_external(idx(args,0));
 
@@ -992,7 +992,7 @@ commit(app_state & app, commands::comman
   }
 
   app.make_branch_sticky();
-  app.work.get_current_roster_shape(old_rosters, new_roster, nis);
+  app.work.get_work_state_shape_only(old_rosters, new_roster, nis);
 
   node_restriction mask(args_to_paths(args),
                         args_to_paths(app.opts.exclude_patterns),
============================================================
--- roster.cc	acf1a7c274f42c9c2fc950b4a8478302d7057d76
+++ roster.cc	3576d908a65b098b6dfcd7075a7fa5a66758bc01
@@ -1841,7 +1841,7 @@ namespace {
 
       // Kluge: If both csets have no content changes, and the node_id_source
       // passed to this function is a temp_node_id_source, then we are being
-      // called from get_current_roster_shape, and we should not attempt to
+      // called from get_work_state_shape_only, and we should not attempt to
       // verify that these rosters match as far as content IDs.
       if (left_cs.deltas_applied.size() == 0
           && right_cs.deltas_applied.size() == 0
============================================================
--- work.cc	6dc2f9122f0173070675dde7447b9429a2c6ceed
+++ work.cc	eeeb7204b7d8cc209d13df715d4df8e8e3484214
@@ -162,8 +162,8 @@ void
 }
 
 void
-workspace::get_current_roster_shape(parent_map & parents,
-                                    roster_t & ros, node_id_source & nis)
+workspace::get_work_state_shape_only(parent_map & parents,
+                                     roster_t & ros, node_id_source & nis)
 {
   revision_t rev;
   get_work_rev(rev);
@@ -419,7 +419,7 @@ workspace::maybe_update_inodeprints()
 
   {
     parent_map parents;
-    get_current_roster_shape(parents, new_roster, nis);
+    get_work_state_shape_only(parents, new_roster, nis);
   }
   update_current_roster_from_filesystem(new_roster);
 
@@ -1244,7 +1244,7 @@ workspace::find_unknown_and_ignored(path
 
   {
     parent_map parents;
-    get_current_roster_shape(parents, new_roster, nis);
+    get_work_state_shape_only(parents, new_roster, nis);
   }
   new_roster.extract_path_set(known);
 
@@ -1267,7 +1267,7 @@ workspace::perform_additions(set<file_pa
   parent_map parents;
   roster_t new_roster;
   MM(new_roster);
-  get_current_roster_shape(parents, new_roster, nis);
+  get_work_state_shape_only(parents, new_roster, nis);
 
   editable_roster_base er(new_roster, nis);
 
@@ -1334,7 +1334,7 @@ workspace::perform_deletions(set<file_pa
   parent_map parents;
   roster_t new_roster;
   MM(new_roster);
-  get_current_roster_shape(parents, new_roster, nis);
+  get_work_state_shape_only(parents, new_roster, nis);
 
   // we traverse the the paths backwards, so that we always hit deep paths
   // before shallow paths (because set<file_path> is lexicographically
@@ -1423,7 +1423,7 @@ workspace::perform_rename(set<file_path>
 
   I(!srcs.empty());
 
-  get_current_roster_shape(parents, new_roster, nis);
+  get_work_state_shape_only(parents, new_roster, nis);
 
   // validation.  it's okay if the target exists as a file; we just won't
   // clobber it (in !--bookkeep-only mode).  similarly, it's okay if the
@@ -1536,7 +1536,7 @@ workspace::perform_pivot_root(file_path 
   parent_map parents;
   roster_t new_roster;
   MM(new_roster);
-  get_current_roster_shape(parents, new_roster, nis);
+  get_work_state_shape_only(parents, new_roster, nis);
 
   I(new_roster.has_root());
   N(new_roster.has_node(new_root),
@@ -1602,7 +1602,7 @@ workspace::perform_content_update(cset c
 
   {
     parent_map parents;
-    get_current_roster_shape(parents, new_roster, nis);
+    get_work_state_shape_only(parents, new_roster, nis);
   }
   new_roster.extract_path_set(known);
 
@@ -1627,7 +1627,7 @@ workspace::update_any_attrs()
   roster_t new_roster;
   {
     parent_map parents;
-    get_current_roster_shape(parents, new_roster, nis);
+    get_work_state_shape_only(parents, new_roster, nis);
   }
   node_map const & nodes = new_roster.all_nodes();
   for (node_map::const_iterator i = nodes.begin();
============================================================
--- work.hh	0bf190df19de108ff192d56ac76d1a455852bdf6
+++ work.hh	efb521d96bab83ce35aab8f05d245bcdb540a9bf
@@ -134,8 +134,8 @@ struct workspace
   // this function.  Under almost all conditions, NIS should be a
   // temp_node_id_source.  (It also returns the parent rosters, because this
   // is free.)
-  void get_current_roster_shape(parent_map & parents,
-                                roster_t & ros, node_id_source & nis);
+  void get_work_state_shape_only(parent_map & parents,
+                                 roster_t & ros, node_id_source & nis);
 
   // Inspect the workspace and classify all the paths in it according to
   // what ROS thinks of them.