# # # patch "ChangeLog" # from [e9e8644c9797016151bce85adfc60ae717dc3106] # to [fe16ba8abac95601be2a6d2acc1f1495b1a3b783] # # patch "cmd_diff_log.cc" # from [2a0dcbc23af9406c0b97177f5e93d114a09d5c54] # to [9621695332cf1c0dbbe3a829f8b5d97f636e27c2] # ============================================================ --- ChangeLog e9e8644c9797016151bce85adfc60ae717dc3106 +++ ChangeLog fe16ba8abac95601be2a6d2acc1f1495b1a3b783 @@ -1,3 +1,7 @@ +2006-05-13 Matt Johnston + + * cmd_diff_log (log): don't get the roster unless we have restrictions. + 2006-05-13 Timothy Brownawell * netsync.cc: (process_hello_cmd) Build our merkle tries after ============================================================ --- cmd_diff_log.cc 2a0dcbc23af9406c0b97177f5e93d114a09d5c54 +++ cmd_diff_log.cc 9621695332cf1c0dbbe3a829f8b5d97f636e27c2 @@ -562,7 +562,6 @@ F("only one of --last/--next allowed")); revision_set rev; - roster_t roster; while(! frontier.empty() && (last == -1 || last > 0) && (next == -1 || next > 0)) { @@ -582,12 +581,13 @@ seen.insert(rid); app.db.get_revision(rid, rev); - app.db.get_roster(rid, roster); if (!mask.empty()) { // TODO: stop if the restriction is pre-dated by the current roster // i.e. the restriction's nodes are not born in the current roster + roster_t roster; + app.db.get_roster(rid, roster); set nodes_modified; bool any_node_hit = false;