OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [email protected] Module: openpkg-src Date: 28-Dec-2008 15:11:15 Branch: HEAD Handle: 2008122814111500 Modified files: openpkg-src/monotone monotone.patch.rse monotone.spec Log: upgrading package: monotone 0.41 -> 0.42 Summary: Revision Changes Path 1.11 +47 -67 openpkg-src/monotone/monotone.patch.rse 1.40 +2 -2 openpkg-src/monotone/monotone.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/monotone/monotone.patch.rse ============================================================================ $ cvs diff -u -r1.10 -r1.11 monotone.patch.rse --- openpkg-src/monotone/monotone.patch.rse 4 Sep 2008 21:35:37 -0000 1.10 +++ openpkg-src/monotone/monotone.patch.rse 28 Dec 2008 14:11:15 -0000 1.11 @@ -64,8 +64,8 @@ =================================================================== Index: cmd_diff_log.cc ---- cmd_diff_log.cc fd455eacd212d63aa201035e9417b9cf726f498b -+++ cmd_diff_log.cc 234ce11a43478c6ed8fb9b711f31039e3609bd60 +--- cmd_diff_log.cc b1684ddc5633e2d8e7ed741f418ccd13731fdbdd ++++ cmd_diff_log.cc 8c1621ccb0822878cb70b718e84b5b9ac399b4df @@ -100,6 +100,27 @@ print_indented_set(ostream & os, set<file_path> const & s, size_t max_cols) @@ -188,27 +188,7 @@ } // common functionality for diff and automate content_diff to determine -@@ -506,6 +558,9 @@ CMD(diff, "diff", "di", CMD_REF(informat - data summary; - write_cset(included, summary); - -+#if defined(RSE) /* cosmetics-diff-and-log */ -+ if (!app.opts.no_show_header) { -+#endif - vector<string> lines; - split_into_lines(summary(), lines); - cout << "#\n"; -@@ -521,6 +576,9 @@ CMD(diff, "diff", "di", CMD_REF(informat - cout << "# " << _("no changes") << '\n'; - } - cout << "#\n"; -+#if defined(RSE) /* cosmetics-diff-and-log */ -+ } -+#endif - - if (app.opts.diff_format == external_diff) - { -@@ -528,9 +586,15 @@ CMD(diff, "diff", "di", CMD_REF(informat +@@ -541,9 +593,15 @@ CMD(diff, "diff", "di", CMD_REF(informat } else { @@ -224,9 +204,9 @@ } } -@@ -558,8 +622,13 @@ CMD_AUTOMATE(content_diff, N_("[FILE [.. - - prepare_diff(app, db, included, args, new_is_archived, dummy_header); +@@ -577,8 +635,13 @@ CMD_AUTOMATE(content_diff, N_("[FILE [.. + dump_header(dummy_header, included, output, false); + } +#if defined(RSE) /* cosmetics-diff-and-log */ + dump_diffs(app, app.lua, db, included, output, @@ -238,7 +218,7 @@ } -@@ -889,7 +958,11 @@ CMD(log, "log", "", CMD_REF(informative) +@@ -908,7 +971,11 @@ CMD(log, "log", "", CMD_REF(informative) else { out << string(65, '-') << '\n'; @@ -250,7 +230,7 @@ changes_summary csum; -@@ -904,12 +977,21 @@ CMD(log, "log", "", CMD_REF(informative) +@@ -923,12 +990,21 @@ CMD(log, "log", "", CMD_REF(informative) for (set<revision_id>::const_iterator anc = ancestors.begin(); anc != ancestors.end(); ++anc) @@ -272,7 +252,7 @@ if (!app.opts.no_files && !csum.cs.empty()) { -@@ -919,16 +1001,26 @@ CMD(log, "log", "", CMD_REF(informative) +@@ -938,16 +1014,26 @@ CMD(log, "log", "", CMD_REF(informative) } log_certs(project, out, rid, changelog_name, "ChangeLog: ", true); @@ -301,8 +281,8 @@ if (next > 0) =================================================================== Index: cmd_netsync.cc ---- cmd_netsync.cc 34174bb7ce83722d7a9859b7065c40243ca0ba75 -+++ cmd_netsync.cc 9e4cf97f7d4f031cd68999517822f5fc6121fb82 +--- cmd_netsync.cc 6076270daf87ef2173729846525a80aebc0322b4 ++++ cmd_netsync.cc 5590bc26877ac0375b6b57852407a5a080f90d50 @@ -253,7 +253,11 @@ CMD(pull, "pull", "", CMD_REF(network), args, info, false); @@ -346,8 +326,8 @@ change_current_working_dir(start_dir); =================================================================== Index: cmd_ws_commit.cc ---- cmd_ws_commit.cc 77b18e38145f345b0eb65b73cc05619464a8fc59 -+++ cmd_ws_commit.cc da1133ed41a571f4921798526af49743dc48d0a2 +--- cmd_ws_commit.cc f19eb71e76506b5ac8a706f610e6a34b595266a1 ++++ cmd_ws_commit.cc aa7dd461a1acbf45af445ec70f006ee137c0c123 @@ -73,7 +73,14 @@ revision_summary(revision_t const & rev, for (set<file_path>::const_iterator i = cs.dirs_added.begin(); @@ -386,9 +366,9 @@ CMD_NO_WORKSPACE(migrate_workspace, "migrate_workspace", "", CMD_REF(tree), =================================================================== Index: diff_patch.cc ---- diff_patch.cc 211424b28fdc3a5dcdae5a781feea97e1e915326 -+++ diff_patch.cc 0ebf55f44a911f3e72dc381c1dda3e762103ae7e -@@ -1449,6 +1449,9 @@ make_diff(string const & filename1, +--- diff_patch.cc c232c91aae83cbbf28cf519431034c32a7dac67b ++++ diff_patch.cc 403e3d815df83c75b5faa1f9e1daab540c4c3fe9 +@@ -1519,6 +1519,9 @@ make_diff(string const & filename1, { case unified_diff: { @@ -398,7 +378,7 @@ ost << "--- " << filename1 << '\t' << id1 << '\n'; ost << "+++ " << filename2 << '\t' -@@ -1460,6 +1463,9 @@ make_diff(string const & filename1, +@@ -1530,6 +1533,9 @@ make_diff(string const & filename1, } case context_diff: { @@ -451,8 +431,8 @@ void =================================================================== Index: lua_hooks.cc ---- lua_hooks.cc e93b511c04660956edd432fda230877ca3c6fc2b -+++ lua_hooks.cc 0286c7452a45384187df02ccf6e33ee311828372 +--- lua_hooks.cc 2cea55853bda5f175dc82c227ee21947236327e8 ++++ lua_hooks.cc 70b9435d12f6f563b5d0517ce74abe4a4ecd0086 @@ -209,7 +209,11 @@ lua_hooks::load_rcfiles(options & opts) { load_rcfile(opts.conf_dir / "monotonerc", false); @@ -467,10 +447,10 @@ // Command-line rcfiles override even that. =================================================================== Index: options_list.hh ---- options_list.hh cd0ff5a0d051b4644c02a5f81ed262a512c65360 -+++ options_list.hh 25e39a62d57d8c82427a8deae709826cc2bff4a3 -@@ -233,6 +233,24 @@ OPTION(diff_options, no_show_encloser, f - no_show_encloser = true; +--- options_list.hh f8e7d28b9c65b05918602919dfe526b7ef549fbe ++++ options_list.hh 4da9c69c3eaf3489dafc09fd08e33fde1743c79d +@@ -253,6 +253,24 @@ OPTION(diff_options, with_header, false, + without_header = false; } #endif +#if defined(RSE) /* cosmetics-diff-and-log */ @@ -496,21 +476,21 @@ #ifdef option_bodies =================================================================== Index: paths.cc ---- paths.cc dde6659e387c8890c96278ea29e3196bdf588139 -+++ paths.cc 3101fad7134c9f2383bee0b65219cdec1d46f2e4 -@@ -227,7 +227,11 @@ in_bookkeeping_dir(string const & path) +--- paths.cc 48204b427b950c618d3fc05be66018256d8c44f4 ++++ paths.cc e121ec8fd8baae41689529c40c12eab09d1bb216 +@@ -228,7 +228,11 @@ in_bookkeeping_dir(string const & path) static inline bool in_bookkeeping_dir(string const & path) { +#if defined(RSE) /* alt-book-keeping-root */ -+ if (path.size() == 0 || (path[0] != '_' && path[0] != '.')) ++ if (path.empty() || (path[0] != '_' && path[0] != '.')) +#else - if (path.size() == 0 || (path[0] != '_')) + if (path.empty() || (path[0] != '_')) +#endif return false; if (path.size() == 1 || (path[1] != 'M' && path[1] != 'm')) return false; -@@ -929,6 +933,9 @@ find_and_go_to_workspace(string const & +@@ -961,6 +965,9 @@ find_and_go_to_workspace(string const & // first look for the current name of the bookkeeping directory. // if we don't find it, look for it under the old name, so that // migration has a chance to work. @@ -520,7 +500,7 @@ if (!find_bookdir(root, bookkeeping_root_component, current, removed)) if (!find_bookdir(root, old_bookkeeping_root_component, current, removed)) return false; -@@ -1488,7 +1495,11 @@ static void check_bk_normalizes_to(char +@@ -1516,7 +1523,11 @@ static void check_bk_normalizes_to(char static void check_bk_normalizes_to(char const * before, char const * after) { @@ -534,9 +514,9 @@ UNIT_TEST_CHECK(bookkeeping_path(bp.as_internal()).as_internal() == bp.as_internal()); =================================================================== Index: paths.hh ---- paths.hh 7dd47155b2962d3e4f5fe8764b11c955791803fc -+++ paths.hh d29c84938079b1571cc843c7b7c6c61e420421d7 -@@ -328,6 +328,15 @@ private: +--- paths.hh edb57b0c1b475e6c1fa9605b04cc78bf09b92f29 ++++ paths.hh 2dfb9d3bee75d5c530b9ecc2769e365f06f12c6e +@@ -344,6 +344,15 @@ private: // for migration #define old_bookkeeping_root_component (path_component("MT")) @@ -554,9 +534,9 @@ { =================================================================== Index: roster_merge.cc ---- roster_merge.cc 9bb39c2c87f92180b0a5db5697ff6ea15b82d25b -+++ roster_merge.cc 9b75d448ee88458f86092ee8d7f4720b24d211a9 -@@ -1854,6 +1854,20 @@ roster_merge(roster_t const & left_paren +--- roster_merge.cc 78e23a1381bbc2f2ba604f09f53b2dd6bfd18344 ++++ roster_merge.cc 3aa179fa6b4571cc2c23ba66be3024decf029fc7 +@@ -3089,6 +3089,20 @@ roster_merge(roster_t const & left_paren result.roster.detach_node(n->self); result.invalid_name_conflicts.push_back(conflict); } @@ -577,7 +557,7 @@ } } -@@ -2786,7 +2800,12 @@ struct simple_invalid_name_conflict : pu +@@ -4021,7 +4035,12 @@ struct simple_invalid_name_conflict : pu I(!result.is_clean()); invalid_name_conflict const & c = idx(result.invalid_name_conflicts, 0); I(c.nid == bad_dir_nid); @@ -592,9 +572,9 @@ result.invalid_name_conflicts.pop_back(); =================================================================== Index: std_hooks.lua ---- std_hooks.lua 7e22137903335a8b7dd2ce7bc9969b8962ff85be -+++ std_hooks.lua 751f8ca2cb91b2ecca05caef00466bd020ce3ca8 -@@ -284,6 +284,15 @@ function edit_comment(basetext, user_log +--- std_hooks.lua 6fa95c0269b7e1b615bf5d2dad24e32948e48350 ++++ std_hooks.lua 8e2abab018791dcda7f0abb10ca7750f446cb668 +@@ -292,6 +292,15 @@ function edit_comment(basetext, user_log if user_log_message == "" or string.sub(user_log_message, -1) ~= "\n" then tmp:write("\n") end @@ -610,7 +590,7 @@ tmp:write(basetext) io.close(tmp) -@@ -1273,3 +1282,201 @@ end +@@ -1328,3 +1337,201 @@ end return push_hook_functions(notifier) end end @@ -814,8 +794,8 @@ + =================================================================== Index: work.cc ---- work.cc 0ef66673796d2a408587d70530944a5a8747d488 -+++ work.cc 8cfa90878704a6fc1553c4dc14bf1be428831674 +--- work.cc b005a944d5e5ebcbfed43ac742871eba7d5e7ad0 ++++ work.cc 5881fb653feab664f832f9e5c77aa178b84a98e5 @@ -57,35 +57,55 @@ get_revision_path(bookkeeping_path & m_p static void get_revision_path(bookkeeping_path & m_path) @@ -909,7 +889,7 @@ mkdir_p(bookkeeping_root); workspace::found = true; -@@ -483,9 +518,16 @@ workspace::get_database_option(system_pa +@@ -485,9 +520,16 @@ workspace::get_database_option(system_pa rsa_keypair_id key_option; system_path keydir_option; @@ -926,7 +906,7 @@ read_options_file(o_path, database_option, branch_option, key_option, keydir_option); } -@@ -563,7 +605,11 @@ workspace::get_local_dump_path(bookkeepi +@@ -565,7 +607,11 @@ workspace::get_local_dump_path(bookkeepi { N(workspace::found, F("workspace required but not found")); @@ -938,7 +918,7 @@ L(FL("local dump path is %s") % d_path); } -@@ -976,7 +1022,11 @@ path_for_detached_nids() +@@ -983,7 +1029,11 @@ path_for_detached_nids() static inline bookkeeping_path path_for_detached_nids() { @@ -950,7 +930,7 @@ } static inline bookkeeping_path -@@ -1715,9 +1765,15 @@ workspace::perform_pivot_root(database & +@@ -1722,9 +1772,15 @@ workspace::perform_pivot_root(database & N(is_dir_t(new_roster.get_node(new_root)), F("proposed new root directory '%s' is not a directory") % new_root); { @@ . patch -p0 <<'@@ .' Index: openpkg-src/monotone/monotone.spec ============================================================================ $ cvs diff -u -r1.39 -r1.40 monotone.spec --- openpkg-src/monotone/monotone.spec 4 Sep 2008 21:35:37 -0000 1.39 +++ openpkg-src/monotone/monotone.spec 28 Dec 2008 14:11:15 -0000 1.40 @@ -31,8 +31,8 @@ Class: EVAL Group: SCM License: GPL -Version: 0.41 -Release: 20080904 +Version: 0.42 +Release: 20081228 # package options %option with_rse yes @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List [email protected]
