# # patch "ChangeLog" # from [7bfe89370da9649f8bd5a0dc518a65cf3d148e72] # to [22c31e72a7a1fcd26f530206819b9e8baa8d3af6] # # patch "app_state.cc" # from [34d5aae11fc52ae3b384e3b0450bc9f314413fd5] # to [843ebcf38ec1ce9d803a7317695f8bfc1db72b7a] # # patch "app_state.hh" # from [687cd3f0e9ff0229173f5b0815f28056f1068b65] # to [ad40f04b056e67723f755a752d17e0ab7107dac4] # # patch "commands.cc" # from [c19d66fa4ae9d7fe6236b91707f8cc665557ccba] # to [668364db356c8b18906474160174ee9b30d7d699] # --- ChangeLog +++ ChangeLog @@ -1,5 +1,12 @@ 2005-07-16 Nathaniel Smith + * app_state.{cc,hh} (require_working_copy): Take an optional + argument to give more details about why a working copy was + required. + * commands.cc (log): Give said details. + +2005-07-16 Nathaniel Smith + * monotone.texi (CVS Phrasebook): Include 'log'. 2005-07-16 Nathaniel Smith --- app_state.cc +++ app_state.cc @@ -86,9 +86,11 @@ } void -app_state::require_working_copy() +app_state::require_working_copy(std::string const & explanation) { - N(found_working_copy, F("working copy directory required but not found")); + N(found_working_copy, + F("working copy directory required but not found%s%s") + % (explanation ? "\n" : "") % explanation); write_options(); } --- app_state.hh +++ app_state.hh @@ -52,7 +52,7 @@ fs::path pidfile; void allow_working_copy(); - void require_working_copy(); + void require_working_copy(std::string const & explanation = ""); void create_working_copy(std::string const & dir); file_path prefix(utf8 const & path); --- commands.cc +++ commands.cc @@ -3601,7 +3601,7 @@ file_path file; if (app.revision_selectors.size() == 0) - app.require_working_copy(); + app.require_working_copy("try passing a --revision to start at"); if (args.size() > 1) throw usage(name);