# # # patch "ChangeLog" # from [08f33a6a9f82ec2b7598b6dc50a50b0a3c8b400e] # to [b2e00f7675addd6301a4d9a7ec9e0591c4e3615e] # # patch "work.cc" # from [4304e5c44e5ecfdbcd352c6f1a7367324fa6d7ec] # to [53f7f1883a86b241e67b45c2ba37aac04b193581] # # patch "work.hh" # from [60f47948673a128ebc9c533ace6cda4b2d027a51] # to [f81897802d46e26cce16f35afde381567c11a7b8] # ============================================================ --- ChangeLog 08f33a6a9f82ec2b7598b6dc50a50b0a3c8b400e +++ ChangeLog b2e00f7675addd6301a4d9a7ec9e0591c4e3615e @@ -1,5 +1,11 @@ 2006-03-08 Derek Scherger + * work.{cc,hh} (get_current_restricted_roster, + get_base_and_current_restricted_roster): comment out + suspicious/unused functions + +2006-03-08 Derek Scherger + * tests/t_revert_file_blocked_by_dir.at: new XFAIL test for revert * testsuite.at: call it ============================================================ --- work.cc 4304e5c44e5ecfdbcd352c6f1a7367324fa6d7ec +++ work.cc 53f7f1883a86b241e67b45c2ba37aac04b193581 @@ -590,12 +590,12 @@ cs.apply_to(er); } -void -get_current_restricted_roster(roster_t & ros, node_id_source & nis, app_state & app) -{ - get_current_roster_shape(ros, nis, app); - update_restricted_roster_from_filesystem(ros, app); -} +// void +// get_current_restricted_roster(roster_t & ros, node_id_source & nis, app_state & app) +// { +// get_current_roster_shape(ros, nis, app); +// update_restricted_roster_from_filesystem(ros, app); +// } void get_base_and_current_roster_shape(roster_t & base_roster, @@ -611,15 +611,15 @@ cs.apply_to(er); } -void -get_base_and_current_restricted_roster(roster_t & base_roster, - roster_t & current_roster, - node_id_source & nis, - app_state & app) -{ - get_base_and_current_roster_shape(base_roster, current_roster, nis, app); - update_restricted_roster_from_filesystem(current_roster, app); -} +// void +// get_base_and_current_restricted_roster(roster_t & base_roster, +// roster_t & current_roster, +// node_id_source & nis, +// app_state & app) +// { +// get_base_and_current_roster_shape(base_roster, current_roster, nis, app); +// update_restricted_roster_from_filesystem(current_roster, app); +// } // user log file ============================================================ --- work.hh 60f47948673a128ebc9c533ace6cda4b2d027a51 +++ work.hh f81897802d46e26cce16f35afde381567c11a7b8 @@ -99,8 +99,9 @@ // hashes in that roster -- the "shape" is correct, all files and dirs exist // and under the correct names -- but do not trust file content hashes. void get_current_roster_shape(roster_t & ros, node_id_source & nis, app_state & app); + // This does update hashes, but only those that match the current restriction -void get_current_restricted_roster(roster_t & ros, node_id_source & nis, app_state & app); +// void get_current_restricted_roster(roster_t & ros, node_id_source & nis, app_state & app); // This returns the current roster, except it does not bother updating the // hashes in that roster -- the "shape" is correct, all files and dirs exist @@ -109,11 +110,12 @@ roster_t & current_roster, node_id_source & nis, app_state & app); + // This does update hashes, but only those that match the current restriction -void get_base_and_current_restricted_roster(roster_t & base_roster, - roster_t & current_roster, - node_id_source & nis, - app_state & app); +// void get_base_and_current_restricted_roster(roster_t & base_roster, +// roster_t & current_roster, +// node_id_source & nis, +// app_state & app); // the "user log" is a file the user can edit as they program to record // changes they make to their source code. Upon commit the file is read