#
# patch "ChangeLog"
# from [c46de4ebb6269dbe5dd2989b7bcef2573d384a5e]
# to [83cc788edad935eaf345c3d194eed69775b99aaf]
#
# patch "change_set.cc"
# from [77482b1a0949c536a037d6807e291ae4f801299d]
# to [66f05a318cbf9382107ce0ab5f858e69b5912459]
#
# patch "mt_version.cc"
# from [b563e566e66b78fcf5f5f580b1a957addfb05fe9]
# to [7bd1ed918bab15376f29478155f1ac92ffbdb4a5]
#
========================================================================
--- ChangeLog c46de4ebb6269dbe5dd2989b7bcef2573d384a5e
+++ ChangeLog 83cc788edad935eaf345c3d194eed69775b99aaf
@@ -1,3 +1,9 @@
+2005-08-26 Benoît Dejean
+
+ * mt_version.cc (print_full_version): Merged strings.
+ * change_set.cc: No i18n for unittests. Wow, this saves
+ 21 strings (total 781).
+
2005-08-25 Benoît Dejean
* commands.cc (safe_gettext): New function.
========================================================================
--- change_set.cc 77482b1a0949c536a037d6807e291ae4f801299d
+++ change_set.cc 66f05a318cbf9382107ce0ab5f858e69b5912459
@@ -3002,13 +3002,13 @@
{
data tmp;
write_change_set(cs, tmp);
- L(F("[begin changeset %s]\n") % ctx);
+ L(boost::format("[begin changeset %s]\n") % ctx);
std::vector lines;
split_into_lines(tmp(), lines);
for (std::vector::const_iterator i = lines.begin();
i != lines.end(); ++i)
L(boost::format("%s") % *i);
- L(F("[end changeset %s]\n") % ctx);
+ L(boost::format("[end changeset %s]\n") % ctx);
}
static void
@@ -3040,7 +3040,7 @@
app_state app;
- L(F("beginning disjoint_merge_test\n"));
+ L(boost::format("beginning disjoint_merge_test\n"));
read_change_set(data(ab_str), ab);
read_change_set(data(ac_str), ac);
@@ -3058,7 +3058,7 @@
BOOST_CHECK(bm.rearrangement == ac.rearrangement);
BOOST_CHECK(cm.rearrangement == ab.rearrangement);
- L(F("finished disjoint_merge_test\n"));
+ L(boost::format("finished disjoint_merge_test\n"));
}
static void
@@ -3130,18 +3130,18 @@
}
catch (informative_failure & exn)
{
- L(F("informative failure: %s\n") % exn.what);
+ L(boost::format("informative failure: %s\n") % exn.what);
}
catch (std::runtime_error & exn)
{
- L(F("runtime error: %s\n") % exn.what());
+ L(boost::format("runtime error: %s\n") % exn.what());
}
}
static void
invert_change_test()
{
- L(F("STARTING invert_change_test\n"));
+ L(boost::format("STARTING invert_change_test\n"));
change_set cs;
manifest_map a;
@@ -3175,7 +3175,7 @@
dump_change_set("invert_change_test, cs3", cs3);
BOOST_CHECK(cs.rearrangement == cs3.rearrangement);
BOOST_CHECK(cs.deltas == cs3.deltas);
- L(F("ENDING invert_change_test\n"));
+ L(boost::format("ENDING invert_change_test\n"));
}
static void
@@ -3215,11 +3215,11 @@
}
catch (informative_failure & exn)
{
- L(F("informative failure: %s\n") % exn.what);
+ L(boost::format("informative failure: %s\n") % exn.what);
}
catch (std::runtime_error & exn)
{
- L(F("runtime error: %s\n") % exn.what());
+ L(boost::format("runtime error: %s\n") % exn.what());
}
}
@@ -3260,11 +3260,11 @@
}
catch (informative_failure & exn)
{
- L(F("informative failure: %s\n") % exn.what);
+ L(boost::format("informative failure: %s\n") % exn.what);
}
catch (std::runtime_error & exn)
{
- L(F("runtime error: %s\n") % exn.what());
+ L(boost::format("runtime error: %s\n") % exn.what());
}
}
@@ -3284,14 +3284,14 @@
std::string ident;
bad_concatenate_change_test(char const *file, int line) :
do_combine(false),
- ident((F("%s:%d") % file % line).str())
+ ident((boost::format("%s:%d") % file % line).str())
{
- L(F("BEGINNING concatenation test %s\n") % ident);
+ L(boost::format("BEGINNING concatenation test %s\n") % ident);
}
~bad_concatenate_change_test()
{
- L(F("FINISHING concatenation test %s\n") % ident);
+ L(boost::format("FINISHING concatenation test %s\n") % ident);
}
change_set & getit(which_t which)
@@ -3346,7 +3346,7 @@
}
void run()
{
- L(F("RUNNING bad_concatenate_change_test %s\n") % ident);
+ L(boost::format("RUNNING bad_concatenate_change_test %s\n") % ident);
try
{
dump_change_set("a", a);
@@ -3354,28 +3354,28 @@
}
catch (std::logic_error e)
{
- L(F("skipping change_set printing, one or both are not sane\n"));
+ L(boost::format("skipping change_set printing, one or both are not sane\n"));
}
BOOST_CHECK_THROW(concatenate_change_sets(a, b, concat),
std::logic_error);
try { dump_change_set("concat", concat); }
- catch (std::logic_error e) { L(F("concat change_set is insane\n")); }
+ catch (std::logic_error e) { L(boost::format("concat change_set is insane\n")); }
if (do_combine)
{
- L(F("Checking combined change set\n"));
+ L(boost::format("Checking combined change set\n"));
change_set empty_cs, combined_concat;
BOOST_CHECK_THROW(concatenate_change_sets(combined,
empty_cs,
combined_concat),
std::logic_error);
try { dump_change_set("combined_concat", combined_concat); }
- catch (std::logic_error e) { L(F("combined_concat is insane\n")); }
+ catch (std::logic_error e) { L(boost::format("combined_concat is insane\n")); }
}
}
void run_both()
{
run();
- L(F("RUNNING bad_concatenate_change_test %s again backwards\n") % ident);
+ L(boost::format("RUNNING bad_concatenate_change_test %s again backwards\n") % ident);
BOOST_CHECK_THROW(concatenate_change_sets(a, b, concat),
std::logic_error);
}
========================================================================
--- mt_version.cc b563e566e66b78fcf5f5f580b1a957addfb05fe9
+++ mt_version.cc 7bd1ed918bab15376f29478155f1ac92ffbdb4a5
@@ -31,8 +31,9 @@
print_version();
std::string s;
get_system_flavour(s);
- std::cout << F("Running on: %s") % s << std::endl;
- std::cout << F("Changes since base revision:") << std::endl
- << package_full_revision_constant;
+ std::cout << F("Running on: %s\n"
+ "Changes since base revision: %s\n")
+ % s
+ % package_full_revision_constant;
}