# # patch "ChangeLog" # from [e4f0ea9c6ed9e606f9f0d4f5eece59f22d091d78] # to [5da896cc49f3aa004dcd0939472edfe2e4b4e86f] # # patch "file_io.cc" # from [16d497ee84e7a6ea0ac66e37c8ba6175e2a48461] # to [bac267e2021de44e60740191a0b028f6b598d37a] # # patch "lua.cc" # from [f0e7ebb9ffcce6dda847a58dfb5ead6bebe6904d] # to [cf86919cb5d7d07c9d8a12ca1ebaf292af8e6f86] # ======================================================================== --- ChangeLog e4f0ea9c6ed9e606f9f0d4f5eece59f22d091d78 +++ ChangeLog 5da896cc49f3aa004dcd0939472edfe2e4b4e86f @@ -1,3 +1,10 @@ +2005-08-26 Nathaniel Smith
+ + * file_io.cc (ident_existing_file): Remove accidentally-left-in + code. Test 26 now passes. + * lua.cc (monotone_includedir_for_lua, load_rcfile): Add + fs::native's. + 2005-08-25 Nathaniel Smith * paths.hh (system_path::system_path): Add new boolean argument ======================================================================== --- file_io.cc 16d497ee84e7a6ea0ac66e37c8ba6175e2a48461 +++ file_io.cc bac267e2021de44e60740191a0b028f6b598d37a @@ -104,11 +104,6 @@ bool ident_existing_file(file_path const & p, file_id & ident, lua_hooks & lua) { - fs::path local_p(p.as_external()); - - if (!fs::exists(local_p)) - return false; - switch (get_path_status(p)) { case path::nonexistent: ======================================================================== --- lua.cc f0e7ebb9ffcce6dda847a58dfb5ead6bebe6904d +++ lua.cc cf86919cb5d7d07c9d8a12ca1ebaf292af8e6f86 @@ -547,7 +547,7 @@ const char *pathstr = lua_tostring(L, -1); N(pathstr, F("IncludeDir called with an invalid parameter")); - fs::path locpath(pathstr); + fs::path locpath(pathstr, fs::native); N(fs::exists(locpath), F("Directory '%s' does not exists") % pathstr); N(fs::is_directory(locpath), F("'%s' is not a directory") % pathstr); @@ -669,7 +669,7 @@ I(st); if (rc() != "-") { - fs::path locpath(system_path(rc).as_external()); + fs::path locpath(system_path(rc).as_external(), fs::native); if (fs::exists(locpath) && fs::is_directory(locpath)) { // directory, iterate over it, skipping subdirs, taking every filename,