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: 13-Dec-2007 10:28:57
Branch: HEAD Handle: 2007121309285700
Modified files:
openpkg-src/monotone monotone.patch.rse monotone.spec
Removed files:
openpkg-src/monotone monotone.patch
Log:
upgrading package: monotone 0.37 -> 0.38
Summary:
Revision Changes Path
1.12 +0 -35 openpkg-src/monotone/monotone.patch
1.5 +77 -89 openpkg-src/monotone/monotone.patch.rse
1.28 +2 -4 openpkg-src/monotone/monotone.spec
____________________________________________________________________________
rm -f openpkg-src/monotone/monotone.patch <<'@@ .'
Index: openpkg-src/monotone/monotone.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/monotone/monotone.patch.rse
============================================================================
$ cvs diff -u -r1.4 -r1.5 monotone.patch.rse
--- openpkg-src/monotone/monotone.patch.rse 30 Oct 2007 08:13:23 -0000
1.4
+++ openpkg-src/monotone/monotone.patch.rse 13 Dec 2007 09:28:57 -0000
1.5
@@ -62,11 +62,10 @@
[EMAIL PROTECTED]
www.engelschall.com
-===================================================================
Index: app_state.cc
---- app_state.cc 6be9949e433ff6166fd030b34d8eb2d3e18c10b6
-+++ app_state.cc ce1cdaffff8c14261ab0a22a16571a0737532bbb
-@@ -138,13 +138,24 @@ app_state::create_workspace(system_path
+--- app_state.cc.orig 2007-12-12 20:45:21 +0100
++++ app_state.cc 2007-12-13 08:59:14 +0100
+@@ -138,13 +138,24 @@
go_to_workspace(new_dir);
mark_std_paths_used();
@@ -91,11 +90,10 @@
mkdir_p(bookkeeping_root);
make_branch_sticky();
-===================================================================
Index: cmd_diff_log.cc
---- cmd_diff_log.cc bd55c33e185979f03a6e5fe2d32188fac1dc0676
-+++ cmd_diff_log.cc 86f22362b1640761711b1ca75a1a63f19a5b1a1c
-@@ -96,6 +96,27 @@ print_indented_set(ostream & os,
+--- cmd_diff_log.cc.orig 2007-12-12 20:45:27 +0100
++++ cmd_diff_log.cc 2007-12-13 08:59:14 +0100
+@@ -96,6 +96,27 @@
set<file_path> const & s,
size_t max_cols)
{
@@ -123,7 +121,7 @@
size_t cols = 8;
os << " ";
for (set<file_path>::const_iterator i = s.begin();
-@@ -111,6 +132,7 @@ print_indented_set(ostream & os,
+@@ -113,6 +134,7 @@
cols += str.size() + 1;
}
os << '\n';
@@ -131,7 +129,7 @@
}
void
-@@ -129,7 +151,11 @@ changes_summary::print(ostream & os, siz
+@@ -131,7 +153,11 @@
for (map<file_path, file_path>::const_iterator
i = cs.nodes_renamed.begin();
i != cs.nodes_renamed.end(); i++)
@@ -143,7 +141,7 @@
<< " to " << i->second << '\n';
}
-@@ -230,8 +256,13 @@ dump_diffs(cset const & cs,
+@@ -232,8 +258,13 @@
set<file_path> const & paths,
bool limit_paths = false)
{
@@ -157,7 +155,7 @@
for (map<file_path, file_id>::const_iterator
i = cs.files_added.begin();
-@@ -240,6 +271,9 @@ dump_diffs(cset const & cs,
+@@ -242,6 +273,9 @@
if (limit_paths && paths.find(i->first) == paths.end())
continue;
@@ -167,7 +165,7 @@
output << patch_sep << '\n';
data unpacked;
vector<string> lines;
-@@ -286,6 +320,9 @@ dump_diffs(cset const & cs,
+@@ -288,6 +322,9 @@
file_data f_old;
data data_old, data_new;
@@ -177,7 +175,7 @@
output << patch_sep << '\n';
app.db.get_file_version(delta_entry_src(i), f_old);
-@@ -499,6 +536,9 @@ CMD(diff, "diff", "", CMD_REF(informativ
+@@ -503,6 +540,9 @@
data summary;
write_cset(included, summary);
@@ -187,7 +185,7 @@
vector<string> lines;
split_into_lines(summary(), lines);
cout << "#\n";
-@@ -514,6 +554,9 @@ CMD(diff, "diff", "", CMD_REF(informativ
+@@ -518,6 +558,9 @@
cout << "# " << _("no changes") << '\n';
}
cout << "#\n";
@@ -197,7 +195,7 @@
if (app.opts.diff_format == external_diff)
{
-@@ -877,7 +920,11 @@ CMD(log, "log", "", CMD_REF(informative)
+@@ -881,7 +924,11 @@
else
{
out << string(65, '-') << '\n';
@@ -209,7 +207,7 @@
changes_summary csum;
-@@ -892,12 +939,21 @@ CMD(log, "log", "", CMD_REF(informative)
+@@ -896,12 +943,21 @@
for (set<revision_id>::const_iterator anc = ancestors.begin();
anc != ancestors.end(); ++anc)
@@ -231,7 +229,7 @@
if (!app.opts.no_files && !csum.cs.empty())
{
-@@ -907,7 +963,11 @@ CMD(log, "log", "", CMD_REF(informative)
+@@ -911,7 +967,11 @@
}
log_certs(out, app, rid, changelog_name, "ChangeLog: ", true);
@@ -243,11 +241,10 @@
}
if (app.opts.diffs)
-===================================================================
Index: cmd_netsync.cc
---- cmd_netsync.cc 5f1360b0446a86c6e9fc646141a54e6e5a20dbe8
-+++ cmd_netsync.cc f8a1dbbcdfd3bd36740964c0095f6128ff2ba7ab
-@@ -179,7 +179,11 @@ CMD(pull, "pull", "", CMD_REF(network),
+--- cmd_netsync.cc.orig 2007-12-12 20:45:28 +0100
++++ cmd_netsync.cc 2007-12-13 08:59:14 +0100
+@@ -179,7 +179,11 @@
find_key_if_needed(addr, include_pattern, exclude_pattern, app, false);
if (app.opts.signing_key() == "")
@@ -259,7 +256,7 @@
std::list<utf8> uris;
uris.push_back(addr);
-@@ -277,7 +281,11 @@ CMD(clone, "clone", "", CMD_REF(network)
+@@ -277,7 +281,11 @@
app.create_workspace(workspace_dir);
if (internal_db)
@@ -271,7 +268,7 @@
else
app.set_database(app.opts.dbname);
-@@ -299,7 +307,11 @@ CMD(clone, "clone", "", CMD_REF(network)
+@@ -299,7 +307,11 @@
app, false);
if (app.opts.signing_key() == "")
@@ -283,11 +280,10 @@
if (!app.db.var_exists(default_include_pattern_key)
|| app.opts.set_default)
-===================================================================
Index: cmd_ws_commit.cc
---- cmd_ws_commit.cc 8321ee742a65e2ebaf58c328bdf6bdda11c8f21c
-+++ cmd_ws_commit.cc 9a5206ea33d8580755038d375e7ca7779dc69877
-@@ -66,7 +66,14 @@ revision_summary(revision_t const & rev,
+--- cmd_ws_commit.cc.orig 2007-12-12 20:45:28 +0100
++++ cmd_ws_commit.cc 2007-12-13 08:59:14 +0100
+@@ -66,7 +66,14 @@
for (set<file_path>::const_iterator i = cs.dirs_added.begin();
i != cs.dirs_added.end(); ++i)
@@ -302,7 +298,7 @@
for (map<file_path, file_id>::const_iterator i =
cs.files_added.begin();
i != cs.files_added.end(); ++i)
-@@ -1349,7 +1356,11 @@ CMD_NO_WORKSPACE(import, "import", "", C
+@@ -1355,7 +1362,11 @@
catch (...)
{
// clean up before rethrowing
@@ -314,11 +310,10 @@
throw;
}
-===================================================================
Index: diff_patch.cc
---- diff_patch.cc 2016526a3148b6c23a04dd3c50b1af6f5f70a2fd
-+++ diff_patch.cc e634a994222ce41429f90f12c19b23c7782013d5
-@@ -1324,6 +1324,9 @@ make_diff(string const & filename1,
+--- diff_patch.cc.orig 2007-12-12 20:45:30 +0100
++++ diff_patch.cc 2007-12-13 08:59:14 +0100
+@@ -1324,6 +1324,9 @@
{
case unified_diff:
{
@@ -328,7 +323,7 @@
ost << "--- " << filename1 << '\t' << id1 << '\n';
ost << "+++ " << filename2 << '\t' << id2 << '\n';
-@@ -1333,6 +1336,9 @@ make_diff(string const & filename1,
+@@ -1333,6 +1336,9 @@
}
case context_diff:
{
@@ -338,11 +333,10 @@
ost << "*** " << filename1 << '\t' << id1 << '\n';
ost << "--- " << filename2 << '\t' << id2 << '\n';
-===================================================================
Index: file_io.cc
---- file_io.cc 358fb964dc42e7f936a136342b93bb3a4744d1b3
-+++ file_io.cc 6b452acaa58ca24fa5611ea3e6e82e83a7cf7552
-@@ -398,16 +398,36 @@ write_data(file_path const & path, data
+--- file_io.cc.orig 2007-12-12 20:45:31 +0100
++++ file_io.cc 2007-12-13 08:59:14 +0100
+@@ -398,16 +398,36 @@
write_data(file_path const & path, data const & dat)
{
// use the bookkeeping root as the temporary directory.
@@ -379,11 +373,10 @@
}
void
-===================================================================
Index: lua_hooks.cc
---- lua_hooks.cc e61801cae30ad803e68f8419729619159719137a
-+++ lua_hooks.cc 90e1266bafdac90484593fad2422ef2d3f6d4147
-@@ -162,7 +162,11 @@ lua_hooks::workspace_rcfilename(bookkeep
+--- lua_hooks.cc.orig 2007-12-12 20:45:33 +0100
++++ lua_hooks.cc 2007-12-13 08:59:14 +0100
+@@ -162,7 +162,11 @@
void
lua_hooks::workspace_rcfilename(bookkeeping_path & file)
{
@@ -395,11 +388,10 @@
}
-===================================================================
Index: monotone.cc
---- monotone.cc 38b648aa00e33cc5bd36114cd92ba9c04879290e
-+++ monotone.cc b0d445153e03190779c99bc6da61cdcff5c7cdbf
-@@ -229,12 +229,28 @@ cpp_main(int argc, char ** argv)
+--- monotone.cc.orig 2007-12-12 20:45:33 +0100
++++ monotone.cc 2007-12-13 08:59:14 +0100
+@@ -229,12 +229,28 @@
if (!app.opts.dbname.empty())
app.db.set_filename(app.opts.dbname);
}
@@ -428,11 +420,10 @@
// at this point we allow a workspace (meaning search for it
// and if found read _MTN/options, but don't use the data quite
-===================================================================
Index: options_list.hh
---- options_list.hh e0359c1c2454708b66f9d7e6e613dc44953e1766
-+++ options_list.hh a4ef1088dad69309db69320d223cf9c168769fc5
-@@ -178,6 +178,24 @@ OPTION(diff_options, no_show_encloser, f
+--- options_list.hh.orig 2007-12-12 20:45:35 +0100
++++ options_list.hh 2007-12-13 08:59:14 +0100
+@@ -178,6 +178,24 @@
no_show_encloser = true;
}
#endif
@@ -457,11 +448,10 @@
OPT(diffs, "diffs", bool, false, gettext_noop("print diffs along with
logs"))
#ifdef option_bodies
-===================================================================
Index: paths.cc
---- paths.cc d850c3efae62041b8003589817387e5877f63b01
-+++ paths.cc 30e8e5ea486bbbda2344474f7bfa86f0b152c438
-@@ -226,7 +226,11 @@ in_bookkeeping_dir(string const & path)
+--- paths.cc.orig 2007-12-12 20:45:35 +0100
++++ paths.cc 2007-12-13 08:59:14 +0100
+@@ -226,7 +226,11 @@
static inline bool
in_bookkeeping_dir(string const & path)
{
@@ -473,7 +463,7 @@
return false;
if (path.size() == 1 || (path[1] != 'M' && path[1] != 'm'))
return false;
-@@ -919,6 +923,9 @@ find_and_go_to_workspace(string const &
+@@ -919,6 +923,9 @@
// 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.
@@ -483,11 +473,10 @@
if (!find_bookdir(root, bookkeeping_root_component, current, removed))
if (!find_bookdir(root, old_bookkeeping_root_component, current,
removed))
return false;
-===================================================================
Index: paths.hh
---- paths.hh f37bdd30f00c3448268723a701924ca5b9450891
-+++ paths.hh 9aa55788e3a3b521f75a5c4d1e318d9dc97cdd40
-@@ -325,6 +325,15 @@ private:
+--- paths.hh.orig 2007-12-12 20:45:35 +0100
++++ paths.hh 2007-12-13 08:59:14 +0100
+@@ -325,6 +325,15 @@
// for migration
#define old_bookkeeping_root_component (path_component("MT"))
@@ -503,11 +492,10 @@
// this will always be an absolute path
class system_path : public any_path
{
-===================================================================
Index: roster_merge.cc
---- roster_merge.cc 5cbf793f50cf62a073ce837d337569d4ddb9475b
-+++ roster_merge.cc 2a0fa3fcf1d7fb60f0fdca0238d9bdbfc34cb1a1
-@@ -607,6 +607,20 @@ roster_merge(roster_t const & left_paren
+--- roster_merge.cc.orig 2007-12-12 20:45:37 +0100
++++ roster_merge.cc 2007-12-13 08:59:14 +0100
+@@ -633,6 +633,20 @@
result.roster.detach_node(n->self);
result.illegal_name_conflicts.push_back(conflict);
}
@@ -528,11 +516,10 @@
}
}
-===================================================================
Index: std_hooks.lua
---- std_hooks.lua a53348ca15431cc67266c65e6215640f6f55eee7
-+++ std_hooks.lua 916cd22d3934d696d72799215b5e579e0b0ea899
-@@ -284,6 +284,15 @@ function edit_comment(basetext, user_log
+--- std_hooks.lua.orig 2007-12-12 20:45:39 +0100
++++ std_hooks.lua 2007-12-13 10:12:23 +0100
+@@ -284,6 +284,15 @@
if user_log_message == "" or string.sub(user_log_message, -1) ~= "\n"
then
tmp:write("\n")
end
@@ -548,10 +535,13 @@
tmp:write(basetext)
io.close(tmp)
-@@ -1175,3 +1184,164 @@ end
- netsync_notifiers[precedence] = notifier
- return true, warning
- end
+@@ -1220,4 +1229,165 @@
+ function push_netsync_notifier(notifier)
+ return push_hook_functions(notifier)
+ end
+-end
+\ No newline at end of file
++end
+
+-- #if defined(RSE) /* extra-command */
+
@@ -713,11 +703,10 @@
+
+-- #endif
+
-===================================================================
Index: work.cc
---- work.cc 04389e4274f38d0b2bc866c6938d53bbda5e8a2f
-+++ work.cc 6eefd2d6271215c56bf601ce08485a9f0cd88e25
-@@ -53,28 +53,44 @@ get_revision_path(bookkeeping_path & m_p
+--- work.cc.orig 2007-12-12 20:45:48 +0100
++++ work.cc 2007-12-13 08:59:14 +0100
+@@ -53,28 +53,44 @@
static void
get_revision_path(bookkeeping_path & m_path)
{
@@ -762,7 +751,7 @@
L(FL("inodeprints path is %s") % ip_path);
}
-@@ -205,7 +221,11 @@ workspace::get_user_log_path(bookkeeping
+@@ -205,7 +221,11 @@
void
workspace::get_user_log_path(bookkeeping_path & ul_path)
{
@@ -774,7 +763,7 @@
L(FL("user log path is %s") % ul_path);
}
-@@ -387,7 +407,11 @@ workspace::get_local_dump_path(bookkeepi
+@@ -387,7 +407,11 @@
void
workspace::get_local_dump_path(bookkeeping_path & d_path)
{
@@ -786,7 +775,7 @@
L(FL("local dump path is %s") % d_path);
}
-@@ -747,7 +771,11 @@ path_for_detached_nids()
+@@ -747,7 +771,11 @@
static inline bookkeeping_path
path_for_detached_nids()
{
@@ -798,7 +787,7 @@
}
static inline bookkeeping_path
-@@ -1483,9 +1511,15 @@ workspace::perform_pivot_root(file_path
+@@ -1483,9 +1511,15 @@
N(is_dir_t(new_roster.get_node(new_root)),
F("proposed new root directory '%s' is not a directory") % new_root);
{
@@ -814,11 +803,10 @@
}
{
-===================================================================
Index: work_migration.cc
---- work_migration.cc 3d58c3332cd195309eacf5cc52d4e88ad66a6c81
-+++ work_migration.cc f044e25cc757899f97d413f3fe109a9bafe73553
-@@ -55,9 +55,18 @@ get_ws_format()
+--- work_migration.cc.orig 2007-12-12 20:45:48 +0100
++++ work_migration.cc 2007-12-13 08:59:14 +0100
+@@ -55,9 +55,18 @@
{
unsigned int format;
bookkeeping_path f_path = bookkeeping_root / "format";
@@ -837,7 +825,7 @@
format = 1;
else if (directory_exists(file_path() /
old_bookkeeping_root_component))
format = 0;
-@@ -69,7 +78,11 @@ get_ws_format()
+@@ -69,7 +78,11 @@
data f_dat;
try
{
@@ -849,7 +837,7 @@
format = lexical_cast<unsigned int>(remove_ws(f_dat()));
}
catch (exception & e)
-@@ -80,7 +93,11 @@ get_ws_format()
+@@ -80,7 +93,11 @@
if (format == 1)
{
W(F("_MTN/format should not exist in a format 1 workspace;
corrected"));
@@ -861,7 +849,7 @@
}
}
return format;
-@@ -90,6 +107,9 @@ workspace::write_ws_format()
+@@ -90,6 +107,9 @@
workspace::write_ws_format()
{
bookkeeping_path f_path = bookkeeping_root / "format";
@@ -871,7 +859,7 @@
// one or other side of this conditional will always be dead code, but
// both sides should be preserved, to document all historical formats.
// N.B. this will _not_ do the right thing for format 0. Which is fine.
-@@ -97,10 +117,19 @@ workspace::write_ws_format()
+@@ -97,10 +117,19 @@
{
if (file_exists(f_path))
delete_file(f_path);
@@ -891,7 +879,7 @@
write_data(f_path, f_dat);
}
}
-@@ -180,7 +209,11 @@ migrate_1_to_2()
+@@ -180,7 +209,11 @@
// information, and _MTN/work does not exist; also, there may be more than
// one parent revision, but we do not have to worry about that here.
@@ -903,7 +891,7 @@
data base_rev_data; MM(base_rev_data);
try
{
-@@ -196,7 +229,11 @@ migrate_1_to_2()
+@@ -196,7 +229,11 @@
cset workcs;
MM(workcs);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/monotone/monotone.spec
============================================================================
$ cvs diff -u -r1.27 -r1.28 monotone.spec
--- openpkg-src/monotone/monotone.spec 30 Nov 2007 10:08:08 -0000
1.27
+++ openpkg-src/monotone/monotone.spec 13 Dec 2007 09:28:57 -0000
1.28
@@ -32,8 +32,8 @@
Class: EVAL
Group: SCM
License: GPL
-Version: 0.37
-Release: 20071130
+Version: 0.38
+Release: 20071213
# package options
%option with_rse yes
@@ -45,7 +45,6 @@
Source4: monotone-colorize.pl
Source5: monotone-colorize.bashrc
Source6: monotone.bashrc
-Patch0: monotone.patch
Patch1: monotone.patch.rse
# build information
@@ -78,7 +77,6 @@
%prep
%setup -q
- %patch -p0
%if "%{with_rse}" == "yes"
%patch -p0 -P 1
%endif
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
