Upgrade to 2.1.1, from Jan Danielsson in private email.

Work has gone in to reducing memory usage in the 2.1 series.

This is a small bugfix release. Upgrading is recommended for anyone
running 2.1.0 or earlier.

Bugfixes:
* Avoid malloc(0) in patiencediff, which is non-portable.
* Fix stub sftp test server to call os.getcwdu().
* Merge correctly when this_tree is not a WorkingTree.
* Warn if pyrex is too old to compile the new SimpleSet and StaticTuple
  extensions, rather than having the build fail randomly.

5 files changed, 86 insertions, 22 deletions

diff --git a/devel/bzr/MESSAGE b/devel/bzr/MESSAGE
index dedda376eb4..757f164c8cd 100644
--- a/devel/bzr/MESSAGE
+++ b/devel/bzr/MESSAGE
@@ -1,7 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2009/01/19 21:41:48 epg Exp $
+$NetBSD: MESSAGE,v 1.4 2010/12/04 01:21:06 gdt Exp $
 
 bzr requires security/py-paramiko in order to push branches over sftp
-and www/py-curl to verify https certificates.
+and www/py-curl to verify https certificates. For the "shelve" command
+devel/py-curses is required.
 
 ===========================================================================
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index b76a357cf09..66a0b89ff50 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.49 2010/06/01 13:31:40 tnn Exp $
+# $NetBSD: Makefile,v 1.50 2010/12/04 01:21:06 gdt Exp $
 
 DISTNAME=		bzr-${VER}
 CATEGORIES=		devel scm
-MASTER_SITES=		http://launchpad.net/bzr/2.0/${VER}/+download/
-VER=			2.0.3
+MASTER_SITES=		http://launchpad.net/bzr/2.1/${VER}/+download/
+VER=			2.1.1
 
 MAINTAINER=		epg@NetBSD.org
 HOMEPAGE=		http://bazaar-vcs.org/
diff --git a/devel/bzr/PLIST b/devel/bzr/PLIST
index e442e0b4d6d..1006592a87b 100644
--- a/devel/bzr/PLIST
+++ b/devel/bzr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2010/02/16 11:27:27 wiz Exp $
+@comment $NetBSD: PLIST,v 1.33 2010/12/04 01:21:06 gdt Exp $
 bin/bzr
 ${PYSITELIB}/bzrlib/__init__.py
 ${PYSITELIB}/bzrlib/__init__.pyc
@@ -48,6 +48,11 @@ ${PYSITELIB}/bzrlib/_rio_py.py
 ${PYSITELIB}/bzrlib/_rio_py.pyc
 ${PYSITELIB}/bzrlib/_rio_py.pyo
 ${PYSITELIB}/bzrlib/_rio_pyx.so
+${PYSITELIB}/bzrlib/_simple_set_pyx.so
+${PYSITELIB}/bzrlib/_static_tuple_c.so
+${PYSITELIB}/bzrlib/_static_tuple_py.py
+${PYSITELIB}/bzrlib/_static_tuple_py.pyc
+${PYSITELIB}/bzrlib/_static_tuple_py.pyo
 ${PYSITELIB}/bzrlib/add.py
 ${PYSITELIB}/bzrlib/add.pyc
 ${PYSITELIB}/bzrlib/add.pyo
@@ -210,6 +215,9 @@ ${PYSITELIB}/bzrlib/chunk_writer.pyo
 ${PYSITELIB}/bzrlib/clean_tree.py
 ${PYSITELIB}/bzrlib/clean_tree.pyc
 ${PYSITELIB}/bzrlib/clean_tree.pyo
+${PYSITELIB}/bzrlib/cleanup.py
+${PYSITELIB}/bzrlib/cleanup.pyc
+${PYSITELIB}/bzrlib/cleanup.pyo
 ${PYSITELIB}/bzrlib/cmd_version_info.py
 ${PYSITELIB}/bzrlib/cmd_version_info.pyc
 ${PYSITELIB}/bzrlib/cmd_version_info.pyo
@@ -337,11 +345,12 @@ ${PYSITELIB}/bzrlib/help_topics/__init__.pyc
 ${PYSITELIB}/bzrlib/help_topics/__init__.pyo
 ${PYSITELIB}/bzrlib/help_topics/en/authentication.txt
 ${PYSITELIB}/bzrlib/help_topics/en/configuration.txt
-${PYSITELIB}/bzrlib/help_topics/en/conflicts.txt
+${PYSITELIB}/bzrlib/help_topics/en/conflict-types.txt
 ${PYSITELIB}/bzrlib/help_topics/en/content-filters.txt
 ${PYSITELIB}/bzrlib/help_topics/en/debug-flags.txt
 ${PYSITELIB}/bzrlib/help_topics/en/diverged-branches.txt
 ${PYSITELIB}/bzrlib/help_topics/en/eol.txt
+${PYSITELIB}/bzrlib/help_topics/en/location-alias.txt
 ${PYSITELIB}/bzrlib/help_topics/en/log-formats.txt
 ${PYSITELIB}/bzrlib/help_topics/en/patterns.txt
 ${PYSITELIB}/bzrlib/help_topics/en/rules.txt
@@ -462,6 +471,9 @@ ${PYSITELIB}/bzrlib/plugins/launchpad/__init__.pyo
 ${PYSITELIB}/bzrlib/plugins/launchpad/account.py
 ${PYSITELIB}/bzrlib/plugins/launchpad/account.pyc
 ${PYSITELIB}/bzrlib/plugins/launchpad/account.pyo
+${PYSITELIB}/bzrlib/plugins/launchpad/lp_api.py
+${PYSITELIB}/bzrlib/plugins/launchpad/lp_api.pyc
+${PYSITELIB}/bzrlib/plugins/launchpad/lp_api.pyo
 ${PYSITELIB}/bzrlib/plugins/launchpad/lp_directory.py
 ${PYSITELIB}/bzrlib/plugins/launchpad/lp_directory.pyc
 ${PYSITELIB}/bzrlib/plugins/launchpad/lp_directory.pyo
@@ -471,6 +483,9 @@ ${PYSITELIB}/bzrlib/plugins/launchpad/lp_registration.pyo
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_account.py
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_account.pyc
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_account.pyo
+${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_api.py
+${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_api.pyc
+${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_api.pyo
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_directory.py
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_directory.pyc
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_directory.pyo
@@ -495,6 +510,21 @@ ${PYSITELIB}/bzrlib/plugins/netrc_credential_store/tests/__init__.pyo
 ${PYSITELIB}/bzrlib/plugins/netrc_credential_store/tests/test_netrc.py
 ${PYSITELIB}/bzrlib/plugins/netrc_credential_store/tests/test_netrc.pyc
 ${PYSITELIB}/bzrlib/plugins/netrc_credential_store/tests/test_netrc.pyo
+${PYSITELIB}/bzrlib/plugins/news_merge/__init__.py
+${PYSITELIB}/bzrlib/plugins/news_merge/__init__.pyc
+${PYSITELIB}/bzrlib/plugins/news_merge/__init__.pyo
+${PYSITELIB}/bzrlib/plugins/news_merge/news_merge.py
+${PYSITELIB}/bzrlib/plugins/news_merge/news_merge.pyc
+${PYSITELIB}/bzrlib/plugins/news_merge/news_merge.pyo
+${PYSITELIB}/bzrlib/plugins/news_merge/parser.py
+${PYSITELIB}/bzrlib/plugins/news_merge/parser.pyc
+${PYSITELIB}/bzrlib/plugins/news_merge/parser.pyo
+${PYSITELIB}/bzrlib/plugins/news_merge/tests/__init__.py
+${PYSITELIB}/bzrlib/plugins/news_merge/tests/__init__.pyc
+${PYSITELIB}/bzrlib/plugins/news_merge/tests/__init__.pyo
+${PYSITELIB}/bzrlib/plugins/news_merge/tests/test_news_merge.py
+${PYSITELIB}/bzrlib/plugins/news_merge/tests/test_news_merge.pyc
+${PYSITELIB}/bzrlib/plugins/news_merge/tests/test_news_merge.pyo
 ${PYSITELIB}/bzrlib/progress.py
 ${PYSITELIB}/bzrlib/progress.pyc
 ${PYSITELIB}/bzrlib/progress.pyo
@@ -606,6 +636,9 @@ ${PYSITELIB}/bzrlib/smart/vfs.pyo
 ${PYSITELIB}/bzrlib/smtp_connection.py
 ${PYSITELIB}/bzrlib/smtp_connection.pyc
 ${PYSITELIB}/bzrlib/smtp_connection.pyo
+${PYSITELIB}/bzrlib/static_tuple.py
+${PYSITELIB}/bzrlib/static_tuple.pyc
+${PYSITELIB}/bzrlib/static_tuple.pyo
 ${PYSITELIB}/bzrlib/status.py
 ${PYSITELIB}/bzrlib/status.pyc
 ${PYSITELIB}/bzrlib/status.pyo
@@ -1056,6 +1089,15 @@ ${PYSITELIB}/bzrlib/tests/per_bzrdir/test_bzrdir.pyo
 ${PYSITELIB}/bzrlib/tests/per_bzrdir/test_push.py
 ${PYSITELIB}/bzrlib/tests/per_bzrdir/test_push.pyc
 ${PYSITELIB}/bzrlib/tests/per_bzrdir/test_push.pyo
+${PYSITELIB}/bzrlib/tests/per_foreign_vcs/__init__.py
+${PYSITELIB}/bzrlib/tests/per_foreign_vcs/__init__.pyc
+${PYSITELIB}/bzrlib/tests/per_foreign_vcs/__init__.pyo
+${PYSITELIB}/bzrlib/tests/per_foreign_vcs/test_branch.py
+${PYSITELIB}/bzrlib/tests/per_foreign_vcs/test_branch.pyc
+${PYSITELIB}/bzrlib/tests/per_foreign_vcs/test_branch.pyo
+${PYSITELIB}/bzrlib/tests/per_foreign_vcs/test_repository.py
+${PYSITELIB}/bzrlib/tests/per_foreign_vcs/test_repository.pyc
+${PYSITELIB}/bzrlib/tests/per_foreign_vcs/test_repository.pyo
 ${PYSITELIB}/bzrlib/tests/per_interbranch/__init__.py
 ${PYSITELIB}/bzrlib/tests/per_interbranch/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/per_interbranch/__init__.pyo
@@ -1098,6 +1140,9 @@ ${PYSITELIB}/bzrlib/tests/per_lock/test_lock.pyo
 ${PYSITELIB}/bzrlib/tests/per_lock/test_temporary_write_lock.py
 ${PYSITELIB}/bzrlib/tests/per_lock/test_temporary_write_lock.pyc
 ${PYSITELIB}/bzrlib/tests/per_lock/test_temporary_write_lock.pyo
+${PYSITELIB}/bzrlib/tests/per_merger.py
+${PYSITELIB}/bzrlib/tests/per_merger.pyc
+${PYSITELIB}/bzrlib/tests/per_merger.pyo
 ${PYSITELIB}/bzrlib/tests/per_pack_repository.py
 ${PYSITELIB}/bzrlib/tests/per_pack_repository.pyc
 ${PYSITELIB}/bzrlib/tests/per_pack_repository.pyo
@@ -1269,6 +1314,9 @@ ${PYSITELIB}/bzrlib/tests/per_tree/test_tree.pyo
 ${PYSITELIB}/bzrlib/tests/per_tree/test_walkdirs.py
 ${PYSITELIB}/bzrlib/tests/per_tree/test_walkdirs.pyc
 ${PYSITELIB}/bzrlib/tests/per_tree/test_walkdirs.pyo
+${PYSITELIB}/bzrlib/tests/per_uifactory/__init__.py
+${PYSITELIB}/bzrlib/tests/per_uifactory/__init__.pyc
+${PYSITELIB}/bzrlib/tests/per_uifactory/__init__.pyo
 ${PYSITELIB}/bzrlib/tests/per_versionedfile.py
 ${PYSITELIB}/bzrlib/tests/per_versionedfile.pyc
 ${PYSITELIB}/bzrlib/tests/per_versionedfile.pyo
@@ -1392,6 +1440,9 @@ ${PYSITELIB}/bzrlib/tests/per_workingtree/test_walkdirs.pyo
 ${PYSITELIB}/bzrlib/tests/per_workingtree/test_workingtree.py
 ${PYSITELIB}/bzrlib/tests/per_workingtree/test_workingtree.pyc
 ${PYSITELIB}/bzrlib/tests/per_workingtree/test_workingtree.pyo
+${PYSITELIB}/bzrlib/tests/script.py
+${PYSITELIB}/bzrlib/tests/script.pyc
+${PYSITELIB}/bzrlib/tests/script.pyo
 ${PYSITELIB}/bzrlib/tests/ssl_certs/__init__.py
 ${PYSITELIB}/bzrlib/tests/ssl_certs/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/ssl_certs/__init__.pyo
@@ -1407,6 +1458,9 @@ ${PYSITELIB}/bzrlib/tests/stub_sftp.pyo
 ${PYSITELIB}/bzrlib/tests/test__annotator.py
 ${PYSITELIB}/bzrlib/tests/test__annotator.pyc
 ${PYSITELIB}/bzrlib/tests/test__annotator.pyo
+${PYSITELIB}/bzrlib/tests/test__bencode.py
+${PYSITELIB}/bzrlib/tests/test__bencode.pyc
+${PYSITELIB}/bzrlib/tests/test__bencode.pyo
 ${PYSITELIB}/bzrlib/tests/test__chk_map.py
 ${PYSITELIB}/bzrlib/tests/test__chk_map.pyc
 ${PYSITELIB}/bzrlib/tests/test__chk_map.pyo
@@ -1425,6 +1479,12 @@ ${PYSITELIB}/bzrlib/tests/test__known_graph.pyo
 ${PYSITELIB}/bzrlib/tests/test__rio.py
 ${PYSITELIB}/bzrlib/tests/test__rio.pyc
 ${PYSITELIB}/bzrlib/tests/test__rio.pyo
+${PYSITELIB}/bzrlib/tests/test__simple_set.py
+${PYSITELIB}/bzrlib/tests/test__simple_set.pyc
+${PYSITELIB}/bzrlib/tests/test__simple_set.pyo
+${PYSITELIB}/bzrlib/tests/test__static_tuple.py
+${PYSITELIB}/bzrlib/tests/test__static_tuple.pyc
+${PYSITELIB}/bzrlib/tests/test__static_tuple.pyo
 ${PYSITELIB}/bzrlib/tests/test__walkdirs_win32.py
 ${PYSITELIB}/bzrlib/tests/test__walkdirs_win32.pyc
 ${PYSITELIB}/bzrlib/tests/test__walkdirs_win32.pyo
@@ -1443,9 +1503,6 @@ ${PYSITELIB}/bzrlib/tests/test_atomicfile.pyo
 ${PYSITELIB}/bzrlib/tests/test_bad_files.py
 ${PYSITELIB}/bzrlib/tests/test_bad_files.pyc
 ${PYSITELIB}/bzrlib/tests/test_bad_files.pyo
-${PYSITELIB}/bzrlib/tests/test_bencode.py
-${PYSITELIB}/bzrlib/tests/test_bencode.pyc
-${PYSITELIB}/bzrlib/tests/test_bencode.pyo
 ${PYSITELIB}/bzrlib/tests/test_bisect_multi.py
 ${PYSITELIB}/bzrlib/tests/test_bisect_multi.pyc
 ${PYSITELIB}/bzrlib/tests/test_bisect_multi.pyo
@@ -1482,6 +1539,9 @@ ${PYSITELIB}/bzrlib/tests/test_chunk_writer.pyo
 ${PYSITELIB}/bzrlib/tests/test_clean_tree.py
 ${PYSITELIB}/bzrlib/tests/test_clean_tree.pyc
 ${PYSITELIB}/bzrlib/tests/test_clean_tree.pyo
+${PYSITELIB}/bzrlib/tests/test_cleanup.py
+${PYSITELIB}/bzrlib/tests/test_cleanup.pyc
+${PYSITELIB}/bzrlib/tests/test_cleanup.pyo
 ${PYSITELIB}/bzrlib/tests/test_commands.py
 ${PYSITELIB}/bzrlib/tests/test_commands.pyc
 ${PYSITELIB}/bzrlib/tests/test_commands.pyo
@@ -1762,6 +1822,9 @@ ${PYSITELIB}/bzrlib/tests/test_rules.pyo
 ${PYSITELIB}/bzrlib/tests/test_sampler.py
 ${PYSITELIB}/bzrlib/tests/test_sampler.pyc
 ${PYSITELIB}/bzrlib/tests/test_sampler.pyo
+${PYSITELIB}/bzrlib/tests/test_script.py
+${PYSITELIB}/bzrlib/tests/test_script.pyc
+${PYSITELIB}/bzrlib/tests/test_script.pyo
 ${PYSITELIB}/bzrlib/tests/test_selftest.py
 ${PYSITELIB}/bzrlib/tests/test_selftest.pyc
 ${PYSITELIB}/bzrlib/tests/test_selftest.pyo
@@ -1918,9 +1981,6 @@ ${PYSITELIB}/bzrlib/textinv.pyo
 ${PYSITELIB}/bzrlib/textmerge.py
 ${PYSITELIB}/bzrlib/textmerge.pyc
 ${PYSITELIB}/bzrlib/textmerge.pyo
-${PYSITELIB}/bzrlib/textui.py
-${PYSITELIB}/bzrlib/textui.pyc
-${PYSITELIB}/bzrlib/textui.pyo
 ${PYSITELIB}/bzrlib/timestamp.py
 ${PYSITELIB}/bzrlib/timestamp.pyc
 ${PYSITELIB}/bzrlib/timestamp.pyo
@@ -1990,6 +2050,9 @@ ${PYSITELIB}/bzrlib/transport/memory.pyo
 ${PYSITELIB}/bzrlib/transport/nosmart.py
 ${PYSITELIB}/bzrlib/transport/nosmart.pyc
 ${PYSITELIB}/bzrlib/transport/nosmart.pyo
+${PYSITELIB}/bzrlib/transport/pathfilter.py
+${PYSITELIB}/bzrlib/transport/pathfilter.pyc
+${PYSITELIB}/bzrlib/transport/pathfilter.pyo
 ${PYSITELIB}/bzrlib/transport/readonly.py
 ${PYSITELIB}/bzrlib/transport/readonly.pyc
 ${PYSITELIB}/bzrlib/transport/readonly.pyo
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index 1f5318e4dd4..91b45eaf650 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.36 2010/02/16 11:27:27 wiz Exp $
+$NetBSD: distinfo,v 1.37 2010/12/04 01:21:06 gdt Exp $
 
-SHA1 (bzr-2.0.3.tar.gz) = 178fe6546d32a1752a9e9abca57db128463bb1e6
-RMD160 (bzr-2.0.3.tar.gz) = 3b33e5148ff47e66b0315e964d2b8e565d056675
-Size (bzr-2.0.3.tar.gz) = 6616470 bytes
+SHA1 (bzr-2.1.1.tar.gz) = f8628ef1a9e9b7a397a8d673cef677e5449f6e95
+RMD160 (bzr-2.1.1.tar.gz) = a1c6e91907954d2bbaa117eafccaa69d70d0c337
+Size (bzr-2.1.1.tar.gz) = 6786377 bytes
 SHA1 (patch-aa) = 8eda90885b3127525330cd3432538fb2b4df98c1
-SHA1 (patch-ab) = 042761dede5533cefbfa25ba548c3bb13236dce5
+SHA1 (patch-ab) = ea67de3b217fb5106b17d129a84f9024a60890e2
diff --git a/devel/bzr/patches/patch-ab b/devel/bzr/patches/patch-ab
index 3e9e69e5b52..e53968a92eb 100644
--- a/devel/bzr/patches/patch-ab
+++ b/devel/bzr/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2009/08/08 15:52:09 wiz Exp $
+$NetBSD: patch-ab,v 1.7 2010/12/04 01:21:06 gdt Exp $
 
---- setup.py.orig	2009-08-06 10:40:13.000000000 +0200
-+++ setup.py	2009-08-06 10:41:02.000000000 +0200
-@@ -659,7 +659,7 @@
+--- setup.py.orig	2010-03-24 07:18:08.000000000 +0000
++++ setup.py
+@@ -709,7 +709,7 @@ else:
      if not 'bdist_egg' in sys.argv:
          # generate and install bzr.1 only with plain install, not the
          # easy_install one