# # delete_file "tests/t_inventory.at" # # patch "app_state.cc" # from [ce1db2f11ff67e7eaf842b4cf6badaff41b37423] # to [392734be5cdd5ba62dd214b28aa434e67b678171] # # patch "app_state.hh" # from [4de6215a0b6259059d4106fa74c45ce1d8c80d9b] # to [f98b03dcb276225e48acb2572c939740289b5a23] # # patch "monotone.1" # from [cd2a7b042db1e8ded53fa5c912a23dca72a2c060] # to [c373cde12e52ccdec50edddf091907df83e06060] # # patch "monotone.cc" # from [aea576384e51c9c71cf5ac7d26a5ae68d4ba515e] # to [6a7756f2b80d4429f8a63bfe4550aa08e8764e3d] # --- app_state.cc +++ app_state.cc @@ -30,7 +30,7 @@ static string const key_option("key"); app_state::app_state() - : branch_name(""), db(""), stdhooks(true), rcfiles(true), all_files(false), + : branch_name(""), db(""), stdhooks(true), rcfiles(true), search_root("/"), depth(-1) { db.set_app(this); @@ -324,12 +324,6 @@ } void -app_state::set_all_files(bool b) -{ - all_files = b; -} - -void app_state::add_rcfile(utf8 const & filename) { extra_rcfiles.push_back(filename); --- app_state.hh +++ app_state.hh @@ -35,7 +35,6 @@ lua_hooks lua; bool stdhooks; bool rcfiles; - bool all_files; options_map options; utf8 message; utf8 message_file; @@ -92,7 +91,6 @@ void set_stdhooks(bool b); void set_rcfiles(bool b); - void set_all_files(bool b); void add_rcfile(utf8 const & filename); explicit app_state(); --- monotone.1 +++ monotone.1 @@ -41,9 +41,6 @@ \fBstatus \fI[...]\fP Show status of working copy. .TP -\fBinventory \fI[...]\fP -Show inventory of files in the working copy. -.TP \fBlog\fP \fI[id] \fP Show historical log of revisions, starting from working copy base revision, or \fI[id]\fP if given. --- monotone.cc +++ monotone.cc @@ -238,6 +238,9 @@ % (setlocale(LC_CTYPE, NULL) == NULL ? "n/a" : setlocale(LC_CTYPE, NULL)) % (setlocale(LC_MESSAGES, NULL) == NULL ? "n/a" : setlocale(LC_CTYPE, NULL))); + // Set up secure memory allocation etc + Botan::Init::initialize(); + // decode all argv values into a UTF-8 array save_initial_path();