1 | diff -ur work.orig/monotone-0.38/cmd_ws_commit.cc work/monotone-0.38/cmd_ws_commit.cc␊ |
2 | --- work.orig/monotone-0.38/cmd_ws_commit.cc␉Thu Dec 13 04:45:28 2007␊ |
3 | +++ work/monotone-0.38/cmd_ws_commit.cc␉Sat Dec 22 18:19:46 2007␊ |
4 | @@ -35,7 +35,7 @@␊ |
5 | using boost::shared_ptr;␊ |
6 | ␊ |
7 | static void␊ |
8 | -revision_summary(revision_t const & rev, branch_name const & branch, utf8 & summary)␊ |
9 | +revision_summary(revision_t const & rev, branch_name const & branch, external & summary)␊ |
10 | {␊ |
11 | string out;␊ |
12 | // We intentionally do not collapse the final \n into the format␊ |
13 | @@ -90,7 +90,7 @@␊ |
14 | " attr %s")␊ |
15 | % (i->first) % (i->second)).str() += "\n";␊ |
16 | }␊ |
17 | - summary = utf8(out);␊ |
18 | + summary = external(out);␊ |
19 | }␊ |
20 | ␊ |
21 | static void␊ |
22 | @@ -98,10 +98,8 @@␊ |
23 | app_state & app,␊ |
24 | utf8 & log_message)␊ |
25 | {␊ |
26 | - utf8 summary;␊ |
27 | - revision_summary(cs, app.opts.branchname, summary);␊ |
28 | external summary_external;␊ |
29 | - utf8_to_system_best_effort(summary, summary_external);␊ |
30 | + revision_summary(cs, app.opts.branchname, summary_external);␊ |
31 | ␊ |
32 | utf8 branch_comment = utf8((F("branch \"%s\"\n\n") % app.opts.branchname).str());␊ |
33 | external branch_external;␊ |
34 | @@ -515,10 +513,8 @@␊ |
35 | app.work.update_current_roster_from_filesystem(new_roster, mask);␊ |
36 | make_restricted_revision(old_rosters, new_roster, mask, rev);␊ |
37 | ␊ |
38 | - utf8 summary;␊ |
39 | - revision_summary(rev, app.opts.branchname, summary);␊ |
40 | external summary_external;␊ |
41 | - utf8_to_system_best_effort(summary, summary_external);␊ |
42 | + revision_summary(rev, app.opts.branchname, summary_external);␊ |
43 | cout << summary_external;␊ |
44 | }␊ |
45 | ␊ |