OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 13-Sep-2009 22:12:42
Branch: HEAD Handle: 2009091321124100
Modified files:
openpkg-src/monotone monotone.patch.rse monotone.spec
Log:
upgrading package: monotone 0.44 -> 0.45
Summary:
Revision Changes Path
1.18 +80 -84 openpkg-src/monotone/monotone.patch.rse
1.48 +2 -2 openpkg-src/monotone/monotone.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/monotone/monotone.patch.rse
============================================================================
$ cvs diff -u -r1.17 -r1.18 monotone.patch.rse
--- openpkg-src/monotone/monotone.patch.rse 7 Aug 2009 20:20:55 -0000
1.17
+++ openpkg-src/monotone/monotone.patch.rse 13 Sep 2009 20:12:41 -0000
1.18
@@ -70,9 +70,9 @@
===================================================================
Index: cmd_diff_log.cc
---- cmd_diff_log.cc ddcd0dfc3c690b04ce83cb0fb68b8cce2795137e
-+++ cmd_diff_log.cc 0c8cb180ac373e88a26e8cdf6a29e19a4a02edbe
-@@ -100,6 +100,27 @@ print_indented_set(ostream & os,
+--- cmd_diff_log.cc aac2aabe76bf2ba7b53a07325861479f56f8ff9d
++++ cmd_diff_log.cc 3cc3c603379b203917ace5c1f6f5fa7b76b4e458
+@@ -101,6 +101,27 @@ print_indented_set(ostream & os,
set<file_path> const & s,
size_t max_cols)
{
@@ -100,7 +100,7 @@
size_t cols = 8;
os << " ";
for (set<file_path>::const_iterator i = s.begin();
-@@ -117,6 +138,7 @@ print_indented_set(ostream & os,
+@@ -118,6 +139,7 @@ print_indented_set(ostream & os,
cols += str.size() + 1;
}
os << '\n';
@@ -108,7 +108,7 @@
}
void
-@@ -135,7 +157,11 @@ changes_summary::print(ostream & os, siz
+@@ -136,7 +158,11 @@ changes_summary::print(ostream & os, siz
for (map<file_path, file_path>::const_iterator
i = cs.nodes_renamed.begin();
i != cs.nodes_renamed.end(); i++)
@@ -120,7 +120,7 @@
<< " to " << i->second << '\n';
}
-@@ -230,7 +256,12 @@ static void
+@@ -231,7 +257,12 @@ static void
}
static void
@@ -133,9 +133,9 @@
database & db,
cset const & cs,
set<file_path> const & paths,
-@@ -240,8 +271,13 @@ dump_diffs(lua_hooks & lua,
+@@ -242,8 +273,13 @@ dump_diffs(lua_hooks & lua,
bool show_encloser,
- bool limit_paths = false)
+ bool limit_paths)
{
+#if defined(RSE) /* cosmetics-diff-and-log */
+ // 67 is somewhat arbitrary (CVS uses this), but less than 80
@@ -147,7 +147,7 @@
for (map<file_path, file_id>::const_iterator
i = cs.files_added.begin();
-@@ -250,6 +286,9 @@ dump_diffs(lua_hooks & lua,
+@@ -252,6 +288,9 @@ dump_diffs(lua_hooks & lua,
if (limit_paths && paths.find(i->first) == paths.end())
continue;
@@ -157,7 +157,7 @@
output << patch_sep << '\n';
data unpacked;
vector<string> lines;
-@@ -296,6 +335,9 @@ dump_diffs(lua_hooks & lua,
+@@ -298,6 +337,9 @@ dump_diffs(lua_hooks & lua,
file_data f_old;
data data_old, data_new;
@@ -166,8 +166,8 @@
+#endif
output << patch_sep << '\n';
- db.get_file_version(delta_entry_src(i), f_old);
-@@ -333,7 +375,12 @@ static void
+ if (old_is_archived)
+@@ -344,7 +386,12 @@ static void
}
static void
@@ -180,51 +180,51 @@
database & db,
cset const & cs,
std::ostream & output,
-@@ -342,8 +389,13 @@ dump_diffs(lua_hooks & lua,
+@@ -354,8 +401,13 @@ dump_diffs(lua_hooks & lua,
bool show_encloser)
{
set<file_path> dummy;
+#if defined(RSE) /* cosmetics-diff-and-log */
+ dump_diffs(app, lua, db, cs, dummy, output,
-+ diff_format, new_is_archived, show_encloser);
++ diff_format, new_is_archived, old_is_archived, show_encloser,
false);
+#else
dump_diffs(lua, db, cs, dummy, output,
- diff_format, new_is_archived, show_encloser);
+ diff_format, new_is_archived, old_is_archived, show_encloser,
false);
+#endif
}
// common functionality for diff and automate content_diff to determine
-@@ -543,9 +595,15 @@ CMD(diff, "diff", "di", CMD_REF(informat
+@@ -571,9 +623,15 @@ CMD(diff, "diff", "di", CMD_REF(informat
}
else
{
+#if defined(RSE) /* cosmetics-diff-and-log */
+ dump_diffs(app, app.lua, db, included, cout,
-+ app.opts.diff_format, new_is_archived,
++ app.opts.diff_format, new_is_archived, old_is_archived,
+ !app.opts.no_show_encloser);
+#else
dump_diffs(app.lua, db, included, cout,
- app.opts.diff_format, new_is_archived,
+ app.opts.diff_format, new_is_archived, old_is_archived,
!app.opts.no_show_encloser);
+#endif
}
}
-@@ -579,8 +637,13 @@ CMD_AUTOMATE(content_diff, N_("[FILE [..
+@@ -608,8 +666,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,
-+ app.opts.diff_format, new_is_archived,
!app.opts.no_show_encloser);
++ app.opts.diff_format, new_is_archived, old_is_archived,
!app.opts.no_show_encloser);
+#else
dump_diffs(app.lua, db, included, output,
- app.opts.diff_format, new_is_archived,
!app.opts.no_show_encloser);
+ app.opts.diff_format, new_is_archived, old_is_archived,
!app.opts.no_show_encloser);
+#endif
}
-@@ -1001,7 +1064,11 @@ CMD(log, "log", "", CMD_REF(informative)
+@@ -1087,7 +1150,11 @@ CMD(log, "log", "", CMD_REF(informative)
else
{
out << string(65, '-') << '\n';
@@ -236,36 +236,32 @@
changes_summary csum;
-@@ -1016,12 +1083,21 @@ CMD(log, "log", "", CMD_REF(informative)
-
- for (set<revision_id>::const_iterator anc = ancestors.begin();
+@@ -1104,10 +1171,17 @@ CMD(log, "log", "", CMD_REF(informative)
anc != ancestors.end(); ++anc)
-+#if defined(RSE) /* cosmetics-diff-and-log */
-+ out << "Ancestor: " << *anc << '\n';
-+
-+ log_certs(certs, out, rid, author_name, "Author: ", false);
-+ log_certs(certs, out, rid, date_name, "Date: ", false);
-+ log_certs(certs, out, rid, branch_name, "Branch: ", false);
-+ log_certs(certs, out, rid, tag_name, "Tag: ", false);
-+#else
out << "Ancestor: " << *anc << '\n';
- log_certs(certs, out, rid, author_name, "Author: ", false);
- log_certs(certs, out, rid, date_name, "Date: ", false);
- log_certs(certs, out, rid, branch_name, "Branch: ", false);
- log_certs(certs, out, rid, tag_name, "Tag: ", false);
++#if defined(RSE) /* cosmetics-diff-and-log */
++ log_certs(certs, out, author_name, "Author: ", false);
++ log_date_certs(certs, out, date_fmt, "Date: ", false);
++ log_certs(certs, out, branch_name, "Branch: ", false);
++ log_certs(certs, out, tag_name, "Tag: ", false);
++#else
+ log_certs(certs, out, author_name, "Author: ", false);
+ log_date_certs(certs, out, date_fmt, "Date: ", false);
+ log_certs(certs, out, branch_name, "Branch: ", false);
+ log_certs(certs, out, tag_name, "Tag: ", false);
+#endif
if (!app.opts.no_files && !csum.cs.empty())
{
-@@ -1031,16 +1107,26 @@ CMD(log, "log", "", CMD_REF(informative)
+@@ -1117,16 +1191,26 @@ CMD(log, "log", "", CMD_REF(informative)
}
- log_certs(certs, out, rid, changelog_name, "ChangeLog: ",
true);
+ log_certs(certs, out, changelog_name, "ChangeLog: ", true);
+#if defined(RSE) /* cosmetics-diff-and-log */
-+ log_certs(certs, out, rid, comment_name, "Comments: ",
true);
++ log_certs(certs, out, comment_name, "Comments: ", true);
+#else
- log_certs(certs, out, rid, comment_name, "Comments: ",
true);
+ log_certs(certs, out, comment_name, "Comments: ", true);
+#endif
}
@@ -275,11 +271,11 @@
e != rev.edges.end(); ++e)
+#if defined(RSE) /* cosmetics-diff-and-log */
+ dump_diffs(app, app.lua, db, edge_changes(e), diff_paths,
out,
-+ app.opts.diff_format, true,
++ app.opts.diff_format, true, true,
+ !app.opts.no_show_encloser, !mask.empty());
+#else
dump_diffs(app.lua, db, edge_changes(e), diff_paths, out,
- app.opts.diff_format, true,
+ app.opts.diff_format, true, true,
!app.opts.no_show_encloser, !mask.empty());
+#endif
}
@@ -287,9 +283,9 @@
if (next > 0)
===================================================================
Index: cmd_netsync.cc
---- cmd_netsync.cc 8bfd914c3727818036e83c65f72cff22cca86222
-+++ cmd_netsync.cc 62e691118436783783090de567c4504b34842604
-@@ -258,7 +258,11 @@ CMD(pull, "pull", "", CMD_REF(network),
+--- cmd_netsync.cc a45569ce4b7735f449ed9b05e3e12ac7c0457c97
++++ cmd_netsync.cc 39d5b5db57238c9b6ee526b16870185020e4ee40
+@@ -265,7 +265,11 @@ CMD(pull, "pull", "", CMD_REF(network),
args, info, false);
if (!keys.have_signing_key())
@@ -301,7 +297,7 @@
run_netsync_protocol(app.opts, app.lua, project, keys,
client_voice, sink_role, info);
-@@ -362,9 +366,16 @@ CMD(clone, "clone", "", CMD_REF(network)
+@@ -400,9 +404,16 @@ CMD(clone, "clone", "", CMD_REF(network)
// paths.cc's idea of the current workspace root is wrong at this point
if (internal_db)
@@ -318,7 +314,7 @@
// this is actually stupid, but app.opts.branch must be set here
// otherwise it will not be written into _MTN/options, in case
-@@ -389,7 +400,11 @@ CMD(clone, "clone", "", CMD_REF(network)
+@@ -427,7 +438,11 @@ CMD(clone, "clone", "", CMD_REF(network)
info, true, true, false);
if (!keys.have_signing_key())
@@ -332,8 +328,8 @@
change_current_working_dir(start_dir);
===================================================================
Index: cmd_ws_commit.cc
---- cmd_ws_commit.cc c80c17bafef3305b0cfe4cc522835e38278cf443
-+++ cmd_ws_commit.cc 49a3e645f1fe4566321e8156eb1b3177f71702f4
+--- cmd_ws_commit.cc 8e8a55dc2e283f4ee01f2b862f38f574d330a9b9
++++ cmd_ws_commit.cc 3fd254a1e313ebcf8c84963381bdbeb356ed4426
@@ -73,7 +73,14 @@ revision_summary(revision_t const & rev,
for (set<file_path>::const_iterator i = cs.dirs_added.begin();
@@ -349,7 +345,7 @@
for (map<file_path, file_id>::const_iterator i =
cs.files_added.begin();
i != cs.files_added.end(); ++i)
-@@ -1433,12 +1440,20 @@ CMD_NO_WORKSPACE(import, "import", "", C
+@@ -1431,12 +1438,20 @@ CMD_NO_WORKSPACE(import, "import", "", C
catch (...)
{
// clean up before rethrowing
@@ -396,9 +392,9 @@
ost << "--- " << filename2 << '\t'
===================================================================
Index: file_io.cc
---- file_io.cc 34e9c1581a7c336b0406c2601ac7cee5012723c7
-+++ file_io.cc cb70a15a07da0fbbc14b445a319f91020a1ec5d7
-@@ -406,16 +406,36 @@ write_data(file_path const & path, data
+--- file_io.cc 1c79107b3af55f17b13b5dae75d1e5dc3448e59f
++++ file_io.cc dab3264acc2d2ebf9a5a29db8b75ad57f89a0d40
+@@ -420,16 +420,36 @@ write_data(file_path const & path, data
write_data(file_path const & path, data const & dat)
{
// use the bookkeeping root as the temporary directory.
@@ -437,9 +433,9 @@
void
===================================================================
Index: lua_hooks.cc
---- lua_hooks.cc 14c47b49b38e31bc04dd47c1ea5d53231c772f8d
-+++ lua_hooks.cc 7123d03e09450f2f9c6ffb242592f3751ea9528e
-@@ -206,7 +206,11 @@ lua_hooks::load_rcfiles(options & opts)
+--- lua_hooks.cc 071959bce2f7b86e171fb65e35f536e32959b61c
++++ lua_hooks.cc db3cd988144a9547dfbd203d7cf7d123cca10e74
+@@ -224,7 +224,11 @@ lua_hooks::load_rcfiles(options & opts)
{
load_rcfile(opts.conf_dir / "monotonerc", false);
}
@@ -483,9 +479,9 @@
// fill-column: 76
===================================================================
Index: merge_roster.cc
---- merge_roster.cc 0350ccbd3b9b7d79f93c7d8852b890ee4020e14c
-+++ merge_roster.cc c31f695342bef084cbd8222c0f0e0cd897ef1c64
-@@ -722,6 +722,20 @@ roster_merge(roster_t const & left_paren
+--- merge_roster.cc e54910bfbd63ee800962d313e433fc79ad3534c1
++++ merge_roster.cc 81da5df67cdc3f82ab59cfad104bba6174b7aa28
+@@ -723,6 +723,20 @@ roster_merge(roster_t const & left_paren
result.roster.detach_node(n->self);
result.invalid_name_conflicts.push_back(conflict);
}
@@ -610,9 +606,9 @@
{
===================================================================
Index: options_list.hh
---- options_list.hh fe3b7714d2c58e05d75fefc8d28bbe5935d22051
-+++ options_list.hh 4d3c1f9e9503a2b454a63ae4144fe42b17286ee5
-@@ -266,6 +266,24 @@ OPTION(diff_options, with_header, false,
+--- options_list.hh 556f0e2b7f83c5baece9886bcf2ef842ef2fc29e
++++ options_list.hh 3e8b26764f9e2191a5b3bbd4e12c7dcdea80d19f
+@@ -313,6 +313,24 @@ OPTION(diff_options, with_header, false,
without_header = false;
}
#endif
@@ -639,8 +635,8 @@
#ifdef option_bodies
===================================================================
Index: paths.cc
---- paths.cc 30a2058671b87385d855d97cd20705f91870b777
-+++ paths.cc 3c3e7441a14aed59f2917855cf780374d06f934d
+--- paths.cc 29c4401e73c9b708fb3b95c41677c8b46e0d43af
++++ paths.cc bacf142f6c005eecab5944a0019f5c7b0bdd4647
@@ -231,7 +231,11 @@ in_bookkeeping_dir(string const & path)
static inline bool
in_bookkeeping_dir(string const & path)
@@ -653,7 +649,7 @@
return false;
if (path.size() == 1 || (path[1] != 'M' && path[1] != 'm'))
return false;
-@@ -991,6 +995,9 @@ find_and_go_to_workspace(string const &
+@@ -1000,6 +1004,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.
@@ -663,7 +659,7 @@
if (!find_bookdir(root, bookkeeping_root_component, current, removed))
if (!find_bookdir(root, old_bookkeeping_root_component, current,
removed))
return false;
-@@ -1021,6 +1028,13 @@ mark_std_paths_used(void)
+@@ -1030,6 +1037,13 @@ mark_std_paths_used(void)
initial_rel_path.get();
}
@@ -679,9 +675,9 @@
///////////////////////////////////////////////////////////////////////////
===================================================================
Index: paths.hh
---- paths.hh cbd3ac7810f4fd8c528bcb5f87549d9d0e358d0a
-+++ paths.hh a2ab108311e8f0365c71ba6dacbc1dbd6f49452d
-@@ -349,6 +349,15 @@ private:
+--- paths.hh 7405e173fac28aa9974fd515a06b7d66e1b3fa67
++++ paths.hh abcea42550cdf0b63a7dfe099e14527daf1b59db
+@@ -350,6 +350,15 @@ private:
// for migration
#define old_bookkeeping_root_component (path_component("MT"))
@@ -697,7 +693,7 @@
// this will always be an absolute path
class system_path : public any_path
{
-@@ -448,8 +457,12 @@ find_new_path_for(std::map<file_path, fi
+@@ -449,8 +458,12 @@ find_new_path_for(std::map<file_path, fi
find_new_path_for(std::map<file_path, file_path> const & renames,
file_path const & old_path);
@@ -712,8 +708,8 @@
// fill-column: 76
===================================================================
Index: std_hooks.lua
---- std_hooks.lua eff8bcbd98c0643e183c5a1ee043a2af914129ac
-+++ std_hooks.lua 1993689109813e2b55ee06e825e2652b129115e9
+--- std_hooks.lua 4fd91de30f180e1c8bd1b790fa81f642ea839d55
++++ std_hooks.lua f948c697c2d4726f703ced401adae74897bfc4a0
@@ -304,6 +304,15 @@ function edit_comment(basetext, user_log
if user_log_message == "" or string.sub(user_log_message, -1) ~= "\n"
then
tmp:write("\n")
@@ -730,7 +726,7 @@
tmp:write(basetext)
io.close(tmp)
-@@ -1375,3 +1384,267 @@ end
+@@ -1399,3 +1408,267 @@ end
return push_hook_functions(notifier)
end
end
@@ -1033,9 +1029,9 @@
UNIT_TEST_CHECK(bookkeeping_path(bp.as_internal(),
===================================================================
Index: work.cc
---- work.cc c51fba22fdcce8d71385eb0aded4c4df512eb640
-+++ work.cc 85beba2a5a072ff41ba19007eefb29a1e5303460
-@@ -58,42 +58,66 @@ get_revision_path(bookkeeping_path & m_p
+--- work.cc 7badc3da940f8ef7f9ed821adca729c8b5cad408
++++ work.cc fbb89f6243f4563875fe7ffc948d8c8d7bdc90be
+@@ -59,42 +59,66 @@ get_revision_path(bookkeeping_path & m_p
static void
get_revision_path(bookkeeping_path & m_path)
{
@@ -1102,7 +1098,7 @@
L(FL("update path is %s") % update_path);
}
-@@ -104,7 +128,11 @@ directory_is_workspace(system_path const
+@@ -105,7 +129,11 @@ directory_is_workspace(system_path const
{
// as far as the users of this function are concerned, a version 0
// workspace (MT directory instead of _MTN) does not count.
@@ -1114,7 +1110,7 @@
}
bool workspace::found;
-@@ -137,13 +165,24 @@ workspace::create_workspace(options cons
+@@ -138,13 +166,24 @@ workspace::create_workspace(options cons
go_to_workspace(new_dir);
mark_std_paths_used();
@@ -1139,8 +1135,8 @@
mkdir_p(bookkeeping_root);
workspace::found = true;
-@@ -522,9 +561,16 @@ workspace::get_database_option(system_pa
- rsa_keypair_id workspace_key;
+@@ -521,9 +560,16 @@ workspace::get_database_option(system_pa
+ external_key_name workspace_key;
system_path workspace_keydir;
+#if defined(RSE) /* alt-book-keeping-root */
@@ -1156,7 +1152,7 @@
read_options_file(o_path,
workspace_database, workspace_branch,
workspace_key, workspace_keydir);
-@@ -606,7 +652,11 @@ workspace::get_local_dump_path(bookkeepi
+@@ -605,7 +651,11 @@ workspace::get_local_dump_path(bookkeepi
{
E(workspace::found, origin::user, F("workspace required but not found"));
@@ -1168,7 +1164,7 @@
L(FL("local dump path is %s") % d_path);
}
-@@ -1015,7 +1065,11 @@ path_for_detached_nids()
+@@ -1018,7 +1068,11 @@ path_for_detached_nids()
static inline bookkeeping_path
path_for_detached_nids()
{
@@ -1180,7 +1176,7 @@
}
static inline bookkeeping_path
-@@ -1761,9 +1815,15 @@ workspace::perform_pivot_root(database &
+@@ -1819,9 +1873,15 @@ workspace::perform_pivot_root(database &
E(is_dir_t(old_roster.get_node(new_root)), origin::user,
F("proposed new root directory '%s' is not a directory") % new_root);
{
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/monotone/monotone.spec
============================================================================
$ cvs diff -u -r1.47 -r1.48 monotone.spec
--- openpkg-src/monotone/monotone.spec 7 Aug 2009 20:20:55 -0000
1.47
+++ openpkg-src/monotone/monotone.spec 13 Sep 2009 20:12:41 -0000
1.48
@@ -31,8 +31,8 @@
Class: EVAL
Group: SCM
License: GPL
-Version: 0.44
-Release: 20090807
+Version: 0.45
+Release: 20090913
# package options
%option with_rse yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
