# # patch "ChangeLog" # from [365395983fc17703a6f4f3099953334e9b40c072] # to [0b3699da5f833c7b9c244861907f5b8ca9dd5166] # # patch "lua.cc" # from [7d6ce6d0a923bfe263b82b0254d0379a21c354a9] # to [d8ba62363d2f7aa516ec894abeeb933715c58fb6] # # patch "paths.cc" # from [f756d2d0e4a70ba64f23a652923df12db757c501] # to [f8bc4189a92f0e68a67bed39d8ee3ce43f01130f] # ======================================================================== --- ChangeLog 365395983fc17703a6f4f3099953334e9b40c072 +++ ChangeLog 0b3699da5f833c7b9c244861907f5b8ca9dd5166 @@ -1,5 +1,9 @@ 2005-08-23 Nathaniel Smith + * lua.cc, paths.cc: Few more tweaks for previous change. + +2005-08-23 Nathaniel Smith + * paths.{cc,hh}: Add / operators. Make that the usual way to use bookkeeping_path's. * work.cc: Adjust accordingly. ======================================================================== --- lua.cc 7d6ce6d0a923bfe263b82b0254d0379a21c354a9 +++ lua.cc d8ba62363d2f7aa516ec894abeeb933715c58fb6 @@ -653,7 +653,7 @@ void lua_hooks::default_rcfilename(system_path & file) { - file = system_path(get_homedir() + "/.monotone/monotonerc"); + file = get_homedir() / ".monotone/monotonerc"); } void ======================================================================== --- paths.cc f756d2d0e4a70ba64f23a652923df12db757c501 +++ paths.cc f8bc4189a92f0e68a67bed39d8ee3ce43f01130f @@ -472,6 +472,7 @@ BOOST_CHECK_THROW(bookkeeping_path(*c), logic_error); BOOST_CHECK_THROW(bookkeeping_root / *c, logic_error); } + BOOST_CHECK_THROW(bookkeeping_root("foo/bar"), logic_error); check_bk_normalizes_to("", "MT"); check_bk_normalizes_to("foo", "MT/foo");