# # # patch "automate.cc" # from [6bf0093432ba70a01969c42e0ba82e7bb8005a8a] # to [71d21b432cb8e9e918e22e3453c317f9c800b87a] # ============================================================ --- automate.cc 6bf0093432ba70a01969c42e0ba82e7bb8005a8a +++ automate.cc 71d21b432cb8e9e918e22e3453c317f9c800b87a @@ -862,18 +862,17 @@ CMD_AUTOMATE(inventory, N_("[PATH]...") app.require_workspace(); parent_map parents; - app.work.get_parent_rosters(parents); + roster_t new_roster; + temp_node_id_source nis; + + app.work.get_work_state_shape_only(parents, new_roster, nis); // for now, until we've figured out what the format could look like // and what conceptional model we can implement // see: http://www.venge.net/mtn-wiki/MultiParentWorkspaceFallout N(parents.size() == 1, F("this command can only be used in a single-parent workspace")); + roster_t const & old_roster = parent_roster(parents.begin()); - roster_t new_roster, old_roster = parent_roster(parents.begin()); - temp_node_id_source nis; - - app.work.get_current_roster_shape(new_roster, nis); - inventory_map inventory; vector includes = args_to_paths(args); vector excludes = args_to_paths(app.opts.exclude_patterns);