pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/monotone Update to 0.36:
details: https://anonhg.NetBSD.org/pkgsrc/rev/2bdd0b1cafae
branches: trunk
changeset: 531645:2bdd0b1cafae
user: jmmv <jmmv%pkgsrc.org@localhost>
date: Fri Aug 03 18:01:23 2007 +0000
description:
Update to 0.36:
Changes
- The help command is now able to show documentation on subcommands
(such as 'attr set').
- The help command now shows a brief abstract of each command,
instead of only listing their names.
- The command `list changed` now outputs the new path of any
renamed item making it easier to copy and paste these paths
for external program usage.
- `automate attributes` has been renamed to `automate get_attributes`,
also a bug has been fixed there so resurrected attributes are now
properly outputted as "new" and not "changed".
New features
- Two new commands to set and drop attributes over automate:
`automate set_attribute` and `automate drop_attribute`
- There is a new function available to the lua hooks,
'server_request_sync(what, address, include, exclude)', which will
initate a netsync connection to the server at "address", with the
given include and exclude patterns, and will sync, push, or pull,
as given in the "what" argument. If called from a monotone instance
which is not acting as a server, this function will do nothing.
- There is a new hook available,
'get_netsync_key(server, include, exclude)', which is called to
determine which key to use for netsync operations. Note that the
server calls this once at startup with the address it is listening
on, "*", and "" as arguments, rather than for each connection.
Other
- Giving the --confdir argument will automatically set the key store
directory to keys/ under that directory, unless --keydir is also
given. This is a bugfix.
- Fixed a regression in 0.35 that resulted in some databases
becoming significantly larger when storing new revisions. Existing
databases with this problem can be fixed by pulling into a fresh
database using 0.36.
- contrib/lua-mode.el, a Lua mode for GNU emacs.
- contrib/monotone-buildbot-notification.lua, a netsync hook to have a
server notify a buildbot when new changes have arrived. Useful for
anyone who uses a buildbot with monotone as source.
- contrib/monotone-cluster-push.lua, a netsync hook script to have
arriving changes be forwarded to other servers automatically. It
uses the new internal lua function 'server_request_sync'.
- contrib/mtn_makepermissions, a simple script to create
read-permissions and write-permissions from files in the directories
read-permissions.d and write-permissions.d, Debian style.
- contrib/Monotone.pm, a first attempt to write a Perl module to
interface with 'monotone automate stdio'.
- contrib/monotone-import.pl has been removed since monotone now has
an internal import command.
Internal
- Commands are now defined as a tree of commands instead of a
plain list, which allows the help system to look up information
of a command at an level in the tree.
- The command class, the automate class and all the associated
macros have been cleaned up.
- All C++ files now depend on base.hh, which includes the few things
that are used virtually everywhere. 'make distcheck' will check for
the presence of base.hh in all source files and will protest if
it's not there. This is explained further in HACKING.
- Update the internal SQLite to version 3.4.0.
- Updated Visual C building system, which now also builds the test
programs. The script visualc/runtests.bat can be used to run the
tests.
- Monotone can now be built successfully with Boost 1.34. Older
versions of monotone would sometimes seem to work depending on
the compiler used, but would have bugs in path normalization.
- Monotone now requires Boost 1.33 or later.
- The Boost filesystem library is no longer required.
- The Boost unit test system is no longer required.
diffstat:
devel/monotone/Makefile | 10 +-
devel/monotone/distinfo | 13 +---
devel/monotone/patches/patch-da | 30 ----------
devel/monotone/patches/patch-db | 114 ----------------------------------------
devel/monotone/patches/patch-dc | 35 ------------
devel/monotone/patches/patch-dd | 70 ------------------------
devel/monotone/patches/patch-de | 21 -------
7 files changed, 9 insertions(+), 284 deletions(-)
diffs (truncated from 335 to 300 lines):
diff -r 70149e1cb4cc -r 2bdd0b1cafae devel/monotone/Makefile
--- a/devel/monotone/Makefile Fri Aug 03 17:12:00 2007 +0000
+++ b/devel/monotone/Makefile Fri Aug 03 18:01:23 2007 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.40 2007/07/05 23:20:49 rillig Exp $
+# $NetBSD: Makefile,v 1.41 2007/08/03 18:01:23 jmmv Exp $
#
-DISTNAME= monotone-0.35
-PKGREVISION= 2
+DISTNAME= monotone-0.36
CATEGORIES= devel scm
-MASTER_SITES= http://monotone.ca/downloads/0.35/
+MASTER_SITES= http://monotone.ca/downloads/0.36/
MAINTAINER= jmmv%NetBSD.org@localhost
HOMEPAGE= http://monotone.ca/
@@ -34,7 +33,8 @@
.endif
post-install:
- cd ${WRKSRC} && pax -wr figures/*.png ${DESTDIR}${PREFIX}/share/doc/monotone
+ cd ${WRKSRC} && pax -rw -pp -pm figures/*.png \
+ ${DESTDIR}${PREFIX}/share/doc/monotone
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"
diff -r 70149e1cb4cc -r 2bdd0b1cafae devel/monotone/distinfo
--- a/devel/monotone/distinfo Fri Aug 03 17:12:00 2007 +0000
+++ b/devel/monotone/distinfo Fri Aug 03 18:01:23 2007 +0000
@@ -1,10 +1,5 @@
-$NetBSD: distinfo,v 1.30 2007/05/28 08:13:25 dan Exp $
+$NetBSD: distinfo,v 1.31 2007/08/03 18:01:23 jmmv Exp $
-SHA1 (monotone-0.35.tar.gz) = b745eee239ab198f4263493c7f79cfd1b6935127
-RMD160 (monotone-0.35.tar.gz) = 91cb91fc25415f8357a57f199a5f83b8ea9293a1
-Size (monotone-0.35.tar.gz) = 4857094 bytes
-SHA1 (patch-da) = 7788a38488e3ea143ba0a82dbe5a367c34f0d41f
-SHA1 (patch-db) = 3225f5e42e3fc36d071e67d66778c38a28ac03ab
-SHA1 (patch-dc) = 2daf64dc25410b82d9ba031e3e77fd099493ad63
-SHA1 (patch-dd) = 84748f95117632726b7ded61ece7cd1f895011a4
-SHA1 (patch-de) = 25839f337dff78514b845647b948a53902a83172
+SHA1 (monotone-0.36.tar.gz) = d6f5ae91dc8045624dfc0dfbca00d60fea569ac3
+RMD160 (monotone-0.36.tar.gz) = 1e542073aa0f528e04653a66693a219b71f905fd
+Size (monotone-0.36.tar.gz) = 4836460 bytes
diff -r 70149e1cb4cc -r 2bdd0b1cafae devel/monotone/patches/patch-da
--- a/devel/monotone/patches/patch-da Fri Aug 03 17:12:00 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-da,v 1.1 2007/05/28 08:13:25 dan Exp $
-#
-# old_revision [f92dd754bf5c1e6eddc9c462b8d68691cfeb7f8b]
-#
-# patch "database.hh"
-# from [aa0ee865053a7c27df33ab9906ce681db1e9d6c8]
-# to [954a78c55234b282b7c047569cc5cc6ca9014341]
-#
-============================================================
---- database.hh aa0ee865053a7c27df33ab9906ce681db1e9d6c8
-+++ database.hh 954a78c55234b282b7c047569cc5cc6ca9014341
-@@ -187,6 +187,7 @@ private:
- bool have_delayed_file(file_id const & id);
- void load_delayed_file(file_id const & id, file_data & dat);
- void cancel_delayed_file(file_id const & id);
-+ void drop_or_cancel_file(file_id const & id);
- void schedule_delayed_file(file_id const & id, file_data const & dat);
-
- std::map<file_id, file_data> delayed_files;
-@@ -215,6 +216,10 @@ private:
- bool delta_exists(std::string const & ident,
- std::string const & table);
-
-+ bool delta_exists(std::string const & ident,
-+ std::string const & base,
-+ std::string const & table);
-+
- void get_file_or_manifest_base_unchecked(hexenc<id> const & new_id,
- data & dat,
- std::string const & table);
diff -r 70149e1cb4cc -r 2bdd0b1cafae devel/monotone/patches/patch-db
--- a/devel/monotone/patches/patch-db Fri Aug 03 17:12:00 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-$NetBSD: patch-db,v 1.1 2007/05/28 08:13:25 dan Exp $
-#
-# old_revision [f92dd754bf5c1e6eddc9c462b8d68691cfeb7f8b]
-#
-# patch "database.cc"
-# from [4e7fc712cb49d0e87413ee46797b07ce53c286af]
-# to [d2603c50782ad0ee0f86fa96f58846608a6d9748]
-#
-============================================================
---- database.cc 4e7fc712cb49d0e87413ee46797b07ce53c286af
-+++ database.cc d2603c50782ad0ee0f86fa96f58846608a6d9748
-@@ -922,6 +922,15 @@ void
- }
-
- void
-+database::drop_or_cancel_file(file_id const & id)
-+{
-+ if (have_delayed_file(id))
-+ cancel_delayed_file(id);
-+ else
-+ drop(id.inner()(), "files");
-+}
-+
-+void
- database::schedule_delayed_file(file_id const & an_id,
- file_data const & dat)
- {
-@@ -1032,6 +1041,17 @@ database::delta_exists(string const & id
- return table_has_entry(ident, "id", table);
- }
-
-+bool
-+database::delta_exists(string const & ident,
-+ string const & base,
-+ string const & table)
-+{
-+ results res;
-+ query q("SELECT 1 FROM " + table + " WHERE id = ? and base = ? LIMIT 1");
-+ fetch(res, one_col, any_rows, q % text(ident) % text(base));
-+ return !res.empty();
-+}
-+
- string
- database::count(string const & table)
- {
-@@ -1692,15 +1712,10 @@ database::put_file_version(file_id const
- file_id const & new_id,
- file_delta const & del)
- {
-+ I(!(old_id == new_id));
- file_data old_data, new_data;
- file_delta reverse_delta;
-
-- if (file_version_exists(new_id))
-- {
-- L(FL("file version '%s' already exists in db") % new_id);
-- return;
-- }
--
- if (!file_version_exists(old_id))
- {
- W(F("file preimage '%s' missing in db") % old_id);
-@@ -1714,6 +1729,7 @@ database::put_file_version(file_id const
- patch(old_data.inner(), del.inner(), tmp);
- new_data = file_data(tmp);
- }
-+
- {
- string tmp;
- invert_xdelta(old_data.inner()(), del.inner()(), tmp);
-@@ -1724,20 +1740,25 @@ database::put_file_version(file_id const
- calculate_ident(old_tmp, old_tmp_id);
- I(file_id(old_tmp_id) == old_id);
- }
--
-- transaction_guard guard(*this);
-+
-+ transaction_guard guard(*this);
- if (file_or_manifest_base_exists(old_id.inner(), "files"))
- {
- // descendent of a head version replaces the head, therefore old head
- // must be disposed of
-- if (have_delayed_file(old_id))
-- cancel_delayed_file(old_id);
-- else
-- drop(old_id.inner()(), "files");
-+ drop_or_cancel_file(old_id);
- }
-- schedule_delayed_file(new_id, new_data);
-- put_file_delta(old_id, new_id, reverse_delta);
-- guard.commit();
-+ if (!file_or_manifest_base_exists(new_id.inner(), "files"))
-+ {
-+ schedule_delayed_file(new_id, new_data);
-+ drop(new_id.inner()(), "file_deltas");
-+ }
-+
-+ if (!delta_exists(old_id.inner()(), new_id.inner()(), "file_deltas"))
-+ {
-+ put_file_delta(old_id, new_id, reverse_delta);
-+ guard.commit();
-+ }
- }
-
- void
-@@ -1944,7 +1965,7 @@ database::deltify_revision(revision_id c
- delta delt;
- diff(old_data.inner(), new_data.inner(), delt);
- file_delta del(delt);
-- drop(delta_entry_dst(j).inner()(), "files");
-+ drop_or_cancel_file(delta_entry_dst(j));
- drop(delta_entry_dst(j).inner()(), "file_deltas");
- put_file_version(delta_entry_src(j), delta_entry_dst(j), del);
- }
diff -r 70149e1cb4cc -r 2bdd0b1cafae devel/monotone/patches/patch-dc
--- a/devel/monotone/patches/patch-dc Fri Aug 03 17:12:00 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-$NetBSD: patch-dc,v 1.1 2007/05/28 08:13:25 dan Exp $
-#
-# old_revision [f92dd754bf5c1e6eddc9c462b8d68691cfeb7f8b]
-#
-# patch "diff_patch.hh"
-# from [f80e158dc7f4b50ac1ce4157896c226e95acfc54]
-# to [d481b1cf53caed0381272a18713c357880d3bd03]
-#
-============================================================
---- diff_patch.hh f80e158dc7f4b50ac1ce4157896c226e95acfc54
-+++ diff_patch.hh d481b1cf53caed0381272a18713c357880d3bd03
-@@ -48,6 +48,7 @@ content_merge_adaptor
- file_id const & right_ident,
- file_id const & merged_ident,
- file_data const & left_data,
-+ file_data const & right_data,
- file_data const & merged_data) = 0;
-
- virtual void get_ancestral_roster(node_id nid,
-@@ -75,6 +76,7 @@ content_merge_database_adaptor
- file_id const & right_ident,
- file_id const & merged_ident,
- file_data const & left_data,
-+ file_data const & right_data,
- file_data const & merged_data);
-
- void get_ancestral_roster(node_id nid,
-@@ -101,6 +103,7 @@ content_merge_workspace_adaptor
- file_id const & right_ident,
- file_id const & merged_ident,
- file_data const & left_data,
-+ file_data const & right_data,
- file_data const & merged_data);
-
- void get_ancestral_roster(node_id nid,
diff -r 70149e1cb4cc -r 2bdd0b1cafae devel/monotone/patches/patch-dd
--- a/devel/monotone/patches/patch-dd Fri Aug 03 17:12:00 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-$NetBSD: patch-dd,v 1.1 2007/05/28 08:13:25 dan Exp $
-#
-# old_revision [f92dd754bf5c1e6eddc9c462b8d68691cfeb7f8b]
-#
-# patch "diff_patch.cc"
-# from [5437f74550a59622f0aca36b00dd43f104b7692a]
-# to [d4826b42f48007454d5827ae45c9eb39d99dbe6a]
-#
-============================================================
---- diff_patch.cc 5437f74550a59622f0aca36b00dd43f104b7692a
-+++ diff_patch.cc d4826b42f48007454d5827ae45c9eb39d99dbe6a
-@@ -500,19 +500,26 @@ content_merge_database_adaptor::record_m
- file_id const & right_ident,
- file_id const & merged_ident,
- file_data const & left_data,
-+ file_data const & right_data,
- file_data const & merged_data)
- {
- L(FL("recording successful merge of %s <-> %s into %s")
- % left_ident % right_ident % merged_ident);
-
-- delta left_delta, right_delta;
- transaction_guard guard(app.db);
-
-- diff(left_data.inner(), merged_data.inner(), left_delta);
-- diff(left_data.inner(), merged_data.inner(), right_delta);
--
-- app.db.put_file_version(left_ident, merged_ident, file_delta(left_delta));
-- app.db.put_file_version(right_ident, merged_ident, file_delta(right_delta));
-+ if (!(left_ident == merged_ident))
-+ {
-+ delta left_delta;
-+ diff(left_data.inner(), merged_data.inner(), left_delta);
-+ app.db.put_file_version(left_ident, merged_ident, file_delta(left_delta));
-+ }
-+ if (!(right_ident == merged_ident))
-+ {
-+ delta right_delta;
-+ diff(right_data.inner(), merged_data.inner(), right_delta);
-+ app.db.put_file_version(right_ident, merged_ident, file_delta(right_delta));
-+ }
- guard.commit();
- }
-
-@@ -574,6 +581,7 @@ content_merge_workspace_adaptor::record_
- file_id const & right_id,
- file_id const & merged_id,
- file_data const & left_data,
-+ file_data const & right_data,
- file_data const & merged_data)
- {
- L(FL("temporarily recording merge of %s <-> %s into %s")
-@@ -734,7 +742,7 @@ content_merger::try_to_merge_files(file_
-
- merged_id = merged_fid;
- adaptor.record_merge(left_id, right_id, merged_fid,
-- left_data, merge_data);
-+ left_data, right_data, merge_data);
-
- return true;
Home |
Main Index |
Thread Index |
Old Index