# # # rename "tests/workspace_inventory" # to "tests/automate_inventory" # # patch "ChangeLog" # from [cb2eb56fc9e3f509ee9624a25c620dfadfbdcd7a] # to [47af496cda6da566b536247ee54ce5cacbb403e4] # # patch "automate.cc" # from [2cc558b424a910762e809216f3de3791dab71212] # to [c2d1209b39ea49b0c5c4c40496b7b5afe9791c61] # # patch "testsuite.lua" # from [312ec6d69368d990e0d3337da4894e4ebd4f259b] # to [94338590190082fc40303c9cec4ce756526ca5cf] # ============================================================ --- ChangeLog cb2eb56fc9e3f509ee9624a25c620dfadfbdcd7a +++ ChangeLog 47af496cda6da566b536247ee54ce5cacbb403e4 @@ -1,3 +1,8 @@ +2006-10-04 Timothy Brownawell + + * automate.cc: Fix automate inventory. + "workspace_inventory" test should be named "automate_inventory". + 2006-09-29 Timothy Brownawell * tests/workspace_inventory/__driver__.lua: This test has been ============================================================ --- automate.cc 2cc558b424a910762e809216f3de3791dab71212 +++ automate.cc c2d1209b39ea49b0c5c4c40496b7b5afe9791c61 @@ -800,7 +800,12 @@ AUTOMATE(inventory, "") switch (i->second.node_state) { - case inventory_item::UNCHANGED_NODE: output << " "; break; + case inventory_item::UNCHANGED_NODE: + if (i->second.post_state == inventory_item::ADDED_PATH) + output << "P"; + else + output << " "; + break; case inventory_item::PATCHED_NODE: output << "P"; break; case inventory_item::UNKNOWN_NODE: output << "U"; break; case inventory_item::IGNORED_NODE: output << "I"; break; ============================================================ --- testsuite.lua 312ec6d69368d990e0d3337da4894e4ebd4f259b +++ testsuite.lua 94338590190082fc40303c9cec4ce756526ca5cf @@ -507,7 +507,7 @@ table.insert(tests, "normalized_filename table.insert(tests, "commit_update_multiple_heads_message") table.insert(tests, "diffing_with_explicit_rev_same_as_wc_rev") table.insert(tests, "normalized_filenames") -table.insert(tests, "workspace_inventory") +table.insert(tests, "automate_inventory") table.insert(tests, "rename_file_to_dir") table.insert(tests, "replace_file_with_dir") table.insert(tests, "replace_dir_with_file")