Update to 0.42:

Changes

- The output of 'automate show_conflicts' has been changed; a
  default resolution for file content conflicts and user resolutions
  for other conflict types has been added. 'directory_loop_created'
  changed to 'directory_loop'.

- The French, Brazilian-Portuguese and Japanese translations were
  outdated and thus have been removed from the distribution. In case
  you care about them and want them back, drop us a note at
  monotone-devel@nongnu.org.

Bugs fixed

- 'mtn db kill_rev_locally' did not update the inodeprint
  cache when executed from a workspace on which the
  revision's changes where applied.

- Some recent performance issues have been corrected:
  * since 0.40, there is much more use of hex encoding/decoding.
    These functions have been sped up considerably.
  * since 0.40, every command in an 'automate stdio' session
    would reinitialize the database. This was rather slow, so
    monotone will now keep the database open between commands.

- The Lua-based contributed Monotone extension introduced in
  0.38 haven't been added to the tarball; this has been fixed.

- Monotone died if _MTN/options contained an empty / not-existing
  'keydir' entry. This has been fixed. Also, invalid options are now
  better detected and give a more useful error message.

- Monotone crashed if it was called with more than 2048 command
  line arguments. This has been fixed.

- If vim is used as merger, it no longer prompts the user for an
  enter key press.

- Decoding errors f.e. through to garbage from the network no longer
  results in informative failures, but in warning. This was made
  possible by introducing the concept of origin-aware sanity checks.

- Monotone crashed if it was called with nested wildcards such as
  'a.{i.{x,y},j}'. This has been fixed.

- The standard implementation of the 'ignore_file' hook now accepts
  windows and unix line endings in .mtn-ignore files.

New features

- New 'mtn ls duplicates' command which lets you list
  duplicated files in a given revision or the workspace.

- New option --no-workspace, to make monotone ignore any
  workspace it might have been run in.

- New command group 'mtn conflicts *'; provides asynchronous
  conflict resolutions for merge and propagate.

- New 'automate file_merge' command which runs the internal line
  merger on two files from two revisions and outputs the result.

- New 'automate lua' command with which lua functions, like
  monotone hooks, can be called over automate. This is particularily
  useful to get user defaults, like ignorable files, branch keys and
  passwords, which are managed through one or more monotonerc files.

- New 'automate read_packets' command which reads data packets like
  public keys similar to 'mtn read'.

- 'merge' and 'propagate' accept user commit messages; the
  'merge rev rev' or 'propagate branch branch' message will be
  prefixed to the user message. --no-prefix removes the prefix.

Internal

- Update Botan to 1.7.12.

3 files changed, 16 insertions, 11 deletions

diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index 52f71fad038..e8269f084cf 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.56 2008/09/13 16:19:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.57 2009/01/18 21:24:12 jmmv Exp $
 #
 
-DISTNAME=	monotone-0.41
+DISTNAME=	monotone-0.42
 CATEGORIES=	devel scm
-MASTER_SITES=	http://monotone.ca/downloads/0.41/
+MASTER_SITES=	http://monotone.ca/downloads/0.42/
 
 MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://monotone.ca/
diff --git a/devel/monotone/PLIST b/devel/monotone/PLIST
index 51357f14a7e..44201027466 100644
--- a/devel/monotone/PLIST
+++ b/devel/monotone/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2008/09/05 20:48:46 bjs Exp $
+@comment $NetBSD: PLIST,v 1.17 2009/01/18 21:24:12 jmmv Exp $
 bin/mtn
 bin/mtnopt
 info/monotone.info
@@ -24,10 +24,7 @@ share/doc/monotone/figures/two-branches.png
 share/doc/monotone/monotone.html
 share/locale/de/LC_MESSAGES/monotone.mo
 share/locale/es/LC_MESSAGES/monotone.mo
-share/locale/fr/LC_MESSAGES/monotone.mo
 share/locale/it/LC_MESSAGES/monotone.mo
-share/locale/ja/LC_MESSAGES/monotone.mo
-share/locale/pt_BR/LC_MESSAGES/monotone.mo
 share/locale/sv/LC_MESSAGES/monotone.mo
 share/monotone/contrib/Monotone.pm
 share/monotone/contrib/README
@@ -37,6 +34,13 @@ share/monotone/contrib/ciabot_monotone_hookversion.py
 share/monotone/contrib/color-logs.conf
 share/monotone/contrib/color-logs.sh
 share/monotone/contrib/colorize
+share/monotone/contrib/command/README
+share/monotone/contrib/command/base.lua
+share/monotone/contrib/command/changed_files.lua
+share/monotone/contrib/command/conflicts.lua
+share/monotone/contrib/command/fuse.lua
+share/monotone/contrib/command/init.lua
+share/monotone/contrib/command/revision.lua
 share/monotone/contrib/edit_comment_from_changelog.lua
 share/monotone/contrib/extra-commands.lua
 share/monotone/contrib/get_passphrase_from_file.lua
@@ -57,6 +61,7 @@ share/monotone/contrib/monotone.bash_completion
 share/monotone/contrib/monotone.el
 share/monotone/contrib/monotone.zsh_completion
 share/monotone/contrib/mtbrowse.sh
+@dirrm share/monotone/contrib/command
 @dirrm share/monotone/contrib
 @dirrm share/monotone
 @dirrm share/doc/monotone/figures
diff --git a/devel/monotone/distinfo b/devel/monotone/distinfo
index 7cdf56b95ff..23b298eae1d 100644
--- a/devel/monotone/distinfo
+++ b/devel/monotone/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.39 2008/09/05 20:48:46 bjs Exp $
+$NetBSD: distinfo,v 1.40 2009/01/18 21:24:12 jmmv Exp $
 
-SHA1 (monotone-0.41.tar.gz) = 346e3d813fcd4f20ad2dcd61b57676ec90af8286
-RMD160 (monotone-0.41.tar.gz) = 4f818e13089d32a7edade7e8bb5ca191a379858e
-Size (monotone-0.41.tar.gz) = 5330052 bytes
+SHA1 (monotone-0.42.tar.gz) = f95be35a9bc823b35554d59a9a34bced7878bfb8
+RMD160 (monotone-0.42.tar.gz) = 7eebc79e0ffe19deac240499e5941774fcdf022c
+Size (monotone-0.42.tar.gz) = 5182313 bytes