#
# patch "ChangeLog"
#  from [e51357408eb2964c5392b354b7e3e4eb9738c39d]
#    to [03dcab1512b00c64f0d156c71cf92b10c186aa81]
#
# patch "cert.cc"
#  from [43de7f5240b7caa27fc590630afe3ffeea0bfa0b]
#    to [42559a303b7e3a7896fc98035dfd13509cbb0b96]
#
# patch "lua.cc"
#  from [882a8da44c61cc9ef4dd68a298900d42a73292b8]
#    to [7adcfab1864ac11bd60a241a3c607b9ddf031716]
#
# patch "rcs_import.cc"
#  from [e01d4dc824657c684430fdf98d0132a1298f10d3]
#    to [1cae15157195ea7014977d5184a10d6472a959b2]
#
========================================================================
--- ChangeLog	e51357408eb2964c5392b354b7e3e4eb9738c39d
+++ ChangeLog	03dcab1512b00c64f0d156c71cf92b10c186aa81
@@ -1,5 +1,12 @@
 2005-09-25  Benoît Dejean  <address@hidden>

+	* cert.cc (cert_signable_text): F() vs. boost::format.
+	* lua.cc (monotone_guess_binary_file_contents_for_lua),
+	(monotone_include_for_lua), (monotone_includedir_for_lua):
+	* rcs_import.cc (import_cvs_repo): Merged some strings.
+	
+2005-09-25  Benoît Dejean  <address@hidden>
+
 	* lua.cc (monotone_guess_binary_file_contents_for_lua):
 	Fixed signednes warning and istream usage.

========================================================================
--- cert.cc	43de7f5240b7caa27fc590630afe3ffeea0bfa0b
+++ cert.cc	42559a303b7e3a7896fc98035dfd13509cbb0b96
@@ -299,7 +299,7 @@
 cert_signable_text(cert const & t,
                        string & out)
 {
-  out = (F("address@hidden:%s]") % t.name % t.ident % remove_ws(t.value())).str();
+  out = (boost::format("address@hidden:%s]") % t.name % t.ident % remove_ws(t.value())).str();
   L(F("cert: signable text %s\n") % out);
 }

========================================================================
--- lua.cc	882a8da44c61cc9ef4dd68a298900d42a73292b8
+++ lua.cc	7adcfab1864ac11bd60a241a3c607b9ddf031716
@@ -524,7 +524,7 @@
   monotone_guess_binary_file_contents_for_lua(lua_State *L)
   {
     const char *path = lua_tostring(L, -1);
-    N(path, F("guess_binary called with an invalid parameter"));
+    N(path, F("%s called with an invalid parameter") % "guess_binary");

     std::ifstream file(path, ios_base::binary);
     if (!file)
@@ -553,7 +553,7 @@
   monotone_include_for_lua(lua_State *L)
   {
     const char *path = lua_tostring(L, -1);
-    N(path, F("Include called with an invalid parameter"));
+    N(path, F("%s called with an invalid parameter") % "Include");

     bool res =Lua(L)
     .loadfile(std::string(path, lua_strlen(L, -1)))
@@ -568,7 +568,7 @@
   monotone_includedir_for_lua(lua_State *L)
   {
     const char *pathstr = lua_tostring(L, -1);
-    N(pathstr, F("IncludeDir called with an invalid parameter"));
+    N(pathstr, F("%s called with an invalid parameter") % "IncludeDir");

     fs::path locpath(pathstr, fs::native);
     N(fs::exists(locpath), F("Directory '%s' does not exists") % pathstr);
========================================================================
--- rcs_import.cc	e01d4dc824657c684430fdf98d0132a1298f10d3
+++ rcs_import.cc	1cae15157195ea7014977d5184a10d6472a959b2
@@ -1246,7 +1246,7 @@
     cvs_tree_walker walker(cvs, app.db);
     require_path_is_directory(cvsroot,
                               F("path %s does not exist") % cvsroot,
-                              F("path %s is not a directory") % cvsroot);
+                              F("'%s' is not a directory") % cvsroot);
     app.db.ensure_open();
     change_current_working_dir(cvsroot);
     walk_tree(file_path(), walker);