Update to 0.9

bzr 0.9.0  2006-08-11

  SURPRISES:

   * The hard-coded built-in ignore rules have been removed. There are
     now two rulesets which are enforced. A user global one in
     ~/.bazaar/ignore which will apply to every tree, and the tree
     specific one '.bzrignore'.
     ~/.bazaar/ignore will be created if it does not exist, but with
     a more conservative list than the old default.
     This fixes bugs with default rules being enforced no matter what.
     The old list of ignore rules from bzr is available by
     running 'bzr ignore --old-default-rules'.
     (Robert Collins, Martin Pool, John Arbash Meinel)

   * 'branches.conf' has been changed to 'locations.conf', since it can apply
     to more locations than just branch locations.
     (Aaron Bentley)

  IMPROVEMENTS:

   * The revision specifier "revno:" is extended to accept the syntax
     revno:N:branch. For example,
     revno:42:http://bazaar-vcs.org/bzr/bzr.dev/ means revision 42 in
     bzr.dev.  (Matthieu Moy)

   * Tests updates to ensure proper URL handling, UNICODE support, and
     proper printing when the user's terminal encoding cannot display
     the path of a file that has been versioned.
     ``bzr branch`` can take a target URL rather than only a local directory.
     Branch.get_parent()/set_parent() now save a relative path if possible,
     and normalize the parent based on root, allowing access across
     different transports. (John Arbash Meinel, Wouter van Heyst, Martin Pool)
     (Malone #48906, #42699, #40675, #5281, #3980, #36363, #43689,
      #42517, #42514)

   * On Unix, detect terminal width using an ioctl not just $COLUMNS.
     Use terminal width for single-line logs from ``bzr log --line`` and
     pending-merge display.  (Robert Widhopf-Fenk, Gustavo Niemeyer)
     (Malone #3507)

   * On Windows, detect terminal width using GetConsoleScreenBufferInfo.
     (Alexander Belchenko)

   * Speedup improvement for 'date:'-revision search. (Guillaume Pinot).

   * Show the correct number of revisions pushed when pushing a new branch.
     (Robert Collins).

   * 'bzr selftest' now shows a progress bar with the number of tests, and
     progress made. 'make check' shows tests in -v mode, to be more useful
     for the PQM status window. (Robert Collins).
     When using a progress bar, failed tests are printed out, rather than
     being overwritten by the progress bar until the suite finishes.
     (John Arbash Meinel)

   * 'bzr selftest --benchmark' will run a new benchmarking selftest.
     'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
     profile data for the individual profiled calls, allowing for fine
     grained analysis of performance.
     (Robert Collins, Martin Pool).

   * 'bzr commit' shows a progress bar. This is useful for commits over sftp
     where commit can take an appreciable time. (Robert Collins)

   * 'bzr add' is now less verbose in telling you what ignore globs were
     matched by files being ignored. Instead it just tells you how many
     were ignored (because you might reasonably be expecting none to be
     ignored). 'bzr add -v' is unchanged and will report every ignored
     file. (Robert Collins).

   * ftp now has a test server if medusa is installed. As part of testing,
     ftp support has been improved, including support for supplying a
     non-standard port. (John Arbash Meinel).

   * 'bzr log --line' shows the revision number, and uses only the
     first line of the log message (#5162, Alexander Belchenko;
     Matthieu Moy)

   * 'bzr status' has had the --all option removed. The 'bzr ls' command
     should be used to retrieve all versioned files. (Robert Collins)

   * 'bzr bundle OTHER/BRANCH' will create a bundle which can be sent
     over email, and applied on the other end, while maintaining ancestry.
     This bundle can be applied with either 'bzr merge' or 'bzr pull',
     the same way you would apply another branch.
     (John Arbash Meinel, Aaron Bentley)

   * 'bzr whoami' can now be used to set your identity from the command line,
     for a branch or globally.  (Robey Pointer)

   * 'bzr checkout' now aliased to 'bzr co', and 'bzr annotate' to 'bzr ann'.
     (Michael Ellerman)

   * 'bzr revert DIRECTORY' now reverts the contents of the directory as well.
     (Aaron Bentley)

   * 'bzr get sftp://foo' gives a better error when paramiko is not present.
     Also updates things like 'http+pycurl://' if pycurl is not present.
     (John Arbash Meinel) (Malone #47821, #52204)

   * New env variable BZR_PROGRESS_BAR, sets the default progress bar type.
     Can be set to 'none' or 'dummy' to disable the progress bar, 'dots' or
     'tty' to create the respective type. (John Arbash Meinel, #42197, #51107)

   * Improve the help text for 'bzr diff' to explain what various options do.
     (John Arbash Meinel, #6391)

   * 'bzr uncommit -r 10' now uncommits revisions 11.. rather than uncommitting
     revision 10. This makes -r10 more in line with what other commands do.
     'bzr uncommit' also now saves the pending merges of the revisions that
     were removed. So it is safe to uncommit after a merge, fix something,
     and commit again. (John Arbash Meinel, #32526, #31426)

   * 'bzr init' now also works on remote locations.
     (Wouter van Heyst, #48904)

   * HTTP support has been updated. When using pycurl we now support
     connection keep-alive, which reduces dns requests and round trips.
     And for both urllib and pycurl we support multi-range requests,
     which decreases the number of round-trips. Performance results for
     ``bzr branch http://bazaar-vcs.org/bzr/bzr.dev/`` indicate
     http branching is now 2-3x faster, and ``bzr pull`` in an existing
     branch is as much as 4x faster.
     (Michael Ellerman, Johan Rydberg, John Arbash Meinel, #46768)

   * Performance improvements for sftp. Branching and pulling are now up to
     2x faster. Utilize paramiko.readv() support for async requests if it
     is available (paramiko > 1.6) (John Arbash Meinel)

  BUG FIXES:

    * Fix shadowed definition of TestLocationConfig that caused some
      tests not to run.  (#32587, Erik Bågfors, Michael Ellerman,
      Martin Pool)

    * Fix unnecessary requirement of sign-my-commits that it be run from
      a working directory.  (Martin Pool, Robert Collins)

    * 'bzr push location' will only remember the push location if it succeeds
      in connecting to the remote location. (#49742, John Arbash Meinel)

    * 'bzr revert' no longer toggles the executable bit on win32
      (#45010, John Arbash Meinel)

    * Handle broken pipe under win32 correctly. (John Arbash Meinel)

    * sftp tests now work correctly on win32 if you have a newer paramiko
      (John Arbash Meinel)

    * Cleanup win32 test suite, and general cleanup of places where
      file handles were being held open. (John Arbash Meinel)

    * When specifying filenames for 'diff -r x..y', the name of the file in the
      working directory can be used, even if its name is different in both x
      and y.

    * File-ids containing single- or double-quotes are handled correctly by
      push.  (#52227, Aaron Bentley)

    * Normalize unicode filenames to ensure cross-platform consistency.
      (John Arbash Meinel, #43689)

    * The argument parser can now handle '-' as an argument. Currently
      no code interprets it specially (it is mostly handled as a file named
      '-'). But plugins, and future operations can use it.
      (John Arbash meinel, #50984)

    * Bundles can properly read binary files with a plain '\r' in them.
      (John Arbash Meinel, #51927)

    * Tuning iter_entries() to be more efficient (John Arbash Meinel, #5444)

    * Lots of win32 fixes (the test suite passes again).
      (John Arbash Meinel, #50155)

    * Handle openbsd returning None for sys.getfilesystemencoding() (#41183)

    * Support ftp APPE (append) to allow Knits to be used over ftp (#42592)

    * Removals are only committed if they match the filespec (or if there is
      no filespec).  (#46635, Aaron Bentley)

    * smart-add recurses through all supplied directories
      (John Arbash Meinel, #52578)

    * Make the bundle reader extra lines before and after the bundle text.
      This allows you to parse an email with the bundle inline.
      (John Arbash Meinel, #49182)

    * Change the file id generator to squash a little bit more. Helps when
      working with long filenames on windows. (Also helps for unicode filenames
      not generating hidden files). (John Arbash Meinel, #43801)

    * Restore terminal mode on C-c while reading sftp password.  (#48923,
      Nicholas Allen, Martin Pool)

    * Timestamps are rounded to 1ms, and revision entries can be recreated
      exactly. (John Arbash Meinel, Jamie Wilkinson, #40693)

    * Branch.base has changed to a URL, but ~/.bazaar/locations.conf should
      use local paths, since it is user visible (John Arbash Meinel, #53653)

    * ``bzr status foo`` when foo was unversioned used to cause a full delta
      to be generated (John Arbash Meinel, #53638)

    * When reading revision properties, an empty value should be considered
      the empty string, not None (John Arbash Meinel, #47782)

    * ``bzr diff --diff-options`` can now handle binary files being changed.
      Also, the output is consistent when --diff-options is not supplied.
      (John Arbash Meinel, #54651, #52930)

    * Use the right suffixes for loading plugins (John Arbash Meinel, #51810)

    * Fix Branch.get_parent() to handle the case when the parent is not
      accessible (John Arbash Meinel, #52976)

XXX: 5 self tests fail, see
https://launchpad.net/products/bzr/+bug/56290

3 files changed, 207 insertions, 14 deletions

diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index 57b2251b6db..f78dc169ae5 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2006/07/12 14:30:55 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2006/08/13 23:47:38 wiz Exp $
 #
 
-DISTNAME=		bzr-0.8.2
+DISTNAME=		bzr-0.9
 CATEGORIES=		devel
 MASTER_SITES=		http://www.bazaar-ng.org/pkg/
 
diff --git a/devel/bzr/PLIST b/devel/bzr/PLIST
index ef4c2986567..a23859e2cdc 100644
--- a/devel/bzr/PLIST
+++ b/devel/bzr/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2006/07/12 14:30:55 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/08/13 23:47:38 wiz Exp $
 bin/bzr
-man/man1/bzr.1
 ${PYSITELIB}/bzrlib/__init__.py
 ${PYSITELIB}/bzrlib/__init__.pyc
 ${PYSITELIB}/bzrlib/__init__.pyo
@@ -13,12 +12,69 @@ ${PYSITELIB}/bzrlib/annotate.pyo
 ${PYSITELIB}/bzrlib/atomicfile.py
 ${PYSITELIB}/bzrlib/atomicfile.pyc
 ${PYSITELIB}/bzrlib/atomicfile.pyo
+${PYSITELIB}/bzrlib/benchmarks/__init__.py
+${PYSITELIB}/bzrlib/benchmarks/__init__.pyc
+${PYSITELIB}/bzrlib/benchmarks/__init__.pyo
+${PYSITELIB}/bzrlib/benchmarks/bench_add.py
+${PYSITELIB}/bzrlib/benchmarks/bench_add.pyc
+${PYSITELIB}/bzrlib/benchmarks/bench_add.pyo
+${PYSITELIB}/bzrlib/benchmarks/bench_bench.py
+${PYSITELIB}/bzrlib/benchmarks/bench_bench.pyc
+${PYSITELIB}/bzrlib/benchmarks/bench_bench.pyo
+${PYSITELIB}/bzrlib/benchmarks/bench_checkout.py
+${PYSITELIB}/bzrlib/benchmarks/bench_checkout.pyc
+${PYSITELIB}/bzrlib/benchmarks/bench_checkout.pyo
+${PYSITELIB}/bzrlib/benchmarks/bench_commit.py
+${PYSITELIB}/bzrlib/benchmarks/bench_commit.pyc
+${PYSITELIB}/bzrlib/benchmarks/bench_commit.pyo
+${PYSITELIB}/bzrlib/benchmarks/bench_inventory.py
+${PYSITELIB}/bzrlib/benchmarks/bench_inventory.pyc
+${PYSITELIB}/bzrlib/benchmarks/bench_inventory.pyo
+${PYSITELIB}/bzrlib/benchmarks/bench_log.py
+${PYSITELIB}/bzrlib/benchmarks/bench_log.pyc
+${PYSITELIB}/bzrlib/benchmarks/bench_log.pyo
+${PYSITELIB}/bzrlib/benchmarks/bench_osutils.py
+${PYSITELIB}/bzrlib/benchmarks/bench_osutils.pyc
+${PYSITELIB}/bzrlib/benchmarks/bench_osutils.pyo
+${PYSITELIB}/bzrlib/benchmarks/bench_rocks.py
+${PYSITELIB}/bzrlib/benchmarks/bench_rocks.pyc
+${PYSITELIB}/bzrlib/benchmarks/bench_rocks.pyo
+${PYSITELIB}/bzrlib/benchmarks/bench_status.py
+${PYSITELIB}/bzrlib/benchmarks/bench_status.pyc
+${PYSITELIB}/bzrlib/benchmarks/bench_status.pyo
+${PYSITELIB}/bzrlib/benchmarks/bench_transform.py
+${PYSITELIB}/bzrlib/benchmarks/bench_transform.pyc
+${PYSITELIB}/bzrlib/benchmarks/bench_transform.pyo
+${PYSITELIB}/bzrlib/benchmarks/bench_workingtree.py
+${PYSITELIB}/bzrlib/benchmarks/bench_workingtree.pyc
+${PYSITELIB}/bzrlib/benchmarks/bench_workingtree.pyo
 ${PYSITELIB}/bzrlib/branch.py
 ${PYSITELIB}/bzrlib/branch.pyc
 ${PYSITELIB}/bzrlib/branch.pyo
 ${PYSITELIB}/bzrlib/builtins.py
 ${PYSITELIB}/bzrlib/builtins.pyc
 ${PYSITELIB}/bzrlib/builtins.pyo
+${PYSITELIB}/bzrlib/bundle/__init__.py
+${PYSITELIB}/bzrlib/bundle/__init__.pyc
+${PYSITELIB}/bzrlib/bundle/__init__.pyo
+${PYSITELIB}/bzrlib/bundle/apply_bundle.py
+${PYSITELIB}/bzrlib/bundle/apply_bundle.pyc
+${PYSITELIB}/bzrlib/bundle/apply_bundle.pyo
+${PYSITELIB}/bzrlib/bundle/bundle_data.py
+${PYSITELIB}/bzrlib/bundle/bundle_data.pyc
+${PYSITELIB}/bzrlib/bundle/bundle_data.pyo
+${PYSITELIB}/bzrlib/bundle/commands.py
+${PYSITELIB}/bzrlib/bundle/commands.pyc
+${PYSITELIB}/bzrlib/bundle/commands.pyo
+${PYSITELIB}/bzrlib/bundle/common.py
+${PYSITELIB}/bzrlib/bundle/common.pyc
+${PYSITELIB}/bzrlib/bundle/common.pyo
+${PYSITELIB}/bzrlib/bundle/serializer/__init__.py
+${PYSITELIB}/bzrlib/bundle/serializer/__init__.pyc
+${PYSITELIB}/bzrlib/bundle/serializer/__init__.pyo
+${PYSITELIB}/bzrlib/bundle/serializer/v08.py
+${PYSITELIB}/bzrlib/bundle/serializer/v08.pyc
+${PYSITELIB}/bzrlib/bundle/serializer/v08.pyo
 ${PYSITELIB}/bzrlib/bzrdir.py
 ${PYSITELIB}/bzrlib/bzrdir.pyc
 ${PYSITELIB}/bzrlib/bzrdir.pyo
@@ -88,6 +144,9 @@ ${PYSITELIB}/bzrlib/help.pyo
 ${PYSITELIB}/bzrlib/identitymap.py
 ${PYSITELIB}/bzrlib/identitymap.pyc
 ${PYSITELIB}/bzrlib/identitymap.pyo
+${PYSITELIB}/bzrlib/ignores.py
+${PYSITELIB}/bzrlib/ignores.pyc
+${PYSITELIB}/bzrlib/ignores.pyo
 ${PYSITELIB}/bzrlib/info.py
 ${PYSITELIB}/bzrlib/info.pyc
 ${PYSITELIB}/bzrlib/info.pyo
@@ -142,6 +201,12 @@ ${PYSITELIB}/bzrlib/osutils.pyo
 ${PYSITELIB}/bzrlib/patch.py
 ${PYSITELIB}/bzrlib/patch.pyc
 ${PYSITELIB}/bzrlib/patch.pyo
+${PYSITELIB}/bzrlib/patches.py
+${PYSITELIB}/bzrlib/patches.pyc
+${PYSITELIB}/bzrlib/patches.pyo
+${PYSITELIB}/bzrlib/patiencediff.py
+${PYSITELIB}/bzrlib/patiencediff.pyc
+${PYSITELIB}/bzrlib/patiencediff.pyo
 ${PYSITELIB}/bzrlib/plugin.py
 ${PYSITELIB}/bzrlib/plugin.pyc
 ${PYSITELIB}/bzrlib/plugin.pyo
@@ -172,6 +237,9 @@ ${PYSITELIB}/bzrlib/revision.pyo
 ${PYSITELIB}/bzrlib/revisionspec.py
 ${PYSITELIB}/bzrlib/revisionspec.pyc
 ${PYSITELIB}/bzrlib/revisionspec.pyo
+${PYSITELIB}/bzrlib/revisiontree.py
+${PYSITELIB}/bzrlib/revisiontree.pyc
+${PYSITELIB}/bzrlib/revisiontree.pyo
 ${PYSITELIB}/bzrlib/rio.py
 ${PYSITELIB}/bzrlib/rio.pyc
 ${PYSITELIB}/bzrlib/rio.pyo
@@ -208,6 +276,9 @@ ${PYSITELIB}/bzrlib/symbol_versioning.pyo
 ${PYSITELIB}/bzrlib/testament.py
 ${PYSITELIB}/bzrlib/testament.pyc
 ${PYSITELIB}/bzrlib/testament.pyo
+${PYSITELIB}/bzrlib/tests/EncodingAdapter.py
+${PYSITELIB}/bzrlib/tests/EncodingAdapter.pyc
+${PYSITELIB}/bzrlib/tests/EncodingAdapter.pyo
 ${PYSITELIB}/bzrlib/tests/HTTPTestUtil.py
 ${PYSITELIB}/bzrlib/tests/HTTPTestUtil.pyc
 ${PYSITELIB}/bzrlib/tests/HTTPTestUtil.pyo
@@ -220,6 +291,9 @@ ${PYSITELIB}/bzrlib/tests/__init__.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/__init__.py
 ${PYSITELIB}/bzrlib/tests/blackbox/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/__init__.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_add.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_add.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_add.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_added.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_added.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_added.pyo
@@ -235,15 +309,24 @@ ${PYSITELIB}/bzrlib/tests/blackbox/test_annotate.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_bound_branches.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_bound_branches.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_bound_branches.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_branch.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_branch.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_branch.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_break_lock.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_break_lock.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_break_lock.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_bundle.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_bundle.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_bundle.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_cat.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_cat.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_cat.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_checkout.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_checkout.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_checkout.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_command_encoding.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_command_encoding.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_command_encoding.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_commit.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_commit.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_commit.pyo
@@ -253,6 +336,9 @@ ${PYSITELIB}/bzrlib/tests/blackbox/test_conflicts.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_diff.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_diff.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_diff.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_exceptions.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_exceptions.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_exceptions.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_export.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_export.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_export.pyo
@@ -262,6 +348,12 @@ ${PYSITELIB}/bzrlib/tests/blackbox/test_find_merge_base.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_help.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_help.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_help.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_ignore.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_ignore.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_ignore.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_ignored.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_ignored.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_ignored.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_info.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_info.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_info.pyo
@@ -274,12 +366,21 @@ ${PYSITELIB}/bzrlib/tests/blackbox/test_log.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_logformats.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_logformats.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_logformats.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_ls.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_ls.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_ls.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_merge.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_merge.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_merge.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_missing.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_missing.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_missing.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_mv.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_mv.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_mv.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_non_ascii.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_non_ascii.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_non_ascii.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_outside_wt.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_outside_wt.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_outside_wt.pyo
@@ -295,9 +396,18 @@ ${PYSITELIB}/bzrlib/tests/blackbox/test_re_sign.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_reconcile.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_reconcile.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_reconcile.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_remerge.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_remerge.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_remerge.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_remove.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_remove.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_remove.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_revert.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_revert.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_revert.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_revision_history.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_revision_history.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_revision_history.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_revision_info.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_revision_info.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_revision_info.pyo
@@ -331,6 +441,9 @@ ${PYSITELIB}/bzrlib/tests/blackbox/test_upgrade.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_versioning.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_versioning.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_versioning.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_whoami.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_whoami.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_whoami.pyo
 ${PYSITELIB}/bzrlib/tests/branch_implementations/__init__.py
 ${PYSITELIB}/bzrlib/tests/branch_implementations/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/branch_implementations/__init__.pyo
@@ -343,6 +456,12 @@ ${PYSITELIB}/bzrlib/tests/branch_implementations/test_branch.pyo
 ${PYSITELIB}/bzrlib/tests/branch_implementations/test_break_lock.py
 ${PYSITELIB}/bzrlib/tests/branch_implementations/test_break_lock.pyc
 ${PYSITELIB}/bzrlib/tests/branch_implementations/test_break_lock.pyo
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_http.py
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_http.pyc
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_http.pyo
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_locking.py
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_locking.pyc
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_locking.pyo
 ${PYSITELIB}/bzrlib/tests/branch_implementations/test_parent.py
 ${PYSITELIB}/bzrlib/tests/branch_implementations/test_parent.pyc
 ${PYSITELIB}/bzrlib/tests/branch_implementations/test_parent.pyo
@@ -367,18 +486,30 @@ ${PYSITELIB}/bzrlib/tests/interrepository_implementations/__init__.pyo
 ${PYSITELIB}/bzrlib/tests/interrepository_implementations/test_interrepository.py
 ${PYSITELIB}/bzrlib/tests/interrepository_implementations/test_interrepository.pyc
 ${PYSITELIB}/bzrlib/tests/interrepository_implementations/test_interrepository.pyo
+${PYSITELIB}/bzrlib/tests/intertree_implementations/__init__.py
+${PYSITELIB}/bzrlib/tests/intertree_implementations/__init__.pyc
+${PYSITELIB}/bzrlib/tests/intertree_implementations/__init__.pyo
+${PYSITELIB}/bzrlib/tests/intertree_implementations/test_compare.py
+${PYSITELIB}/bzrlib/tests/intertree_implementations/test_compare.pyc
+${PYSITELIB}/bzrlib/tests/intertree_implementations/test_compare.pyo
 ${PYSITELIB}/bzrlib/tests/interversionedfile_implementations/__init__.py
 ${PYSITELIB}/bzrlib/tests/interversionedfile_implementations/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/interversionedfile_implementations/__init__.pyo
 ${PYSITELIB}/bzrlib/tests/interversionedfile_implementations/test_join.py
 ${PYSITELIB}/bzrlib/tests/interversionedfile_implementations/test_join.pyc
 ${PYSITELIB}/bzrlib/tests/interversionedfile_implementations/test_join.pyo
+${PYSITELIB}/bzrlib/tests/lock_helpers.py
+${PYSITELIB}/bzrlib/tests/lock_helpers.pyc
+${PYSITELIB}/bzrlib/tests/lock_helpers.pyo
 ${PYSITELIB}/bzrlib/tests/repository_implementations/__init__.py
 ${PYSITELIB}/bzrlib/tests/repository_implementations/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/repository_implementations/__init__.pyo
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_break_lock.py
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_break_lock.pyc
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_break_lock.pyo
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_commit_builder.py
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_commit_builder.pyc
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_commit_builder.pyo
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_fileid_involved.py
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_fileid_involved.pyc
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_fileid_involved.pyo
@@ -388,6 +519,9 @@ ${PYSITELIB}/bzrlib/tests/repository_implementations/test_reconcile.pyo
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_repository.py
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_repository.pyc
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_repository.pyo
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_revprops.py
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_revprops.pyc
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_revprops.pyo
 ${PYSITELIB}/bzrlib/tests/revisionstore_implementations/__init__.py
 ${PYSITELIB}/bzrlib/tests/revisionstore_implementations/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/revisionstore_implementations/__init__.pyo
@@ -409,6 +543,9 @@ ${PYSITELIB}/bzrlib/tests/test_bad_files.pyo
 ${PYSITELIB}/bzrlib/tests/test_branch.py
 ${PYSITELIB}/bzrlib/tests/test_branch.pyc
 ${PYSITELIB}/bzrlib/tests/test_branch.pyo
+${PYSITELIB}/bzrlib/tests/test_bundle.py
+${PYSITELIB}/bzrlib/tests/test_bundle.pyc
+${PYSITELIB}/bzrlib/tests/test_bundle.pyo
 ${PYSITELIB}/bzrlib/tests/test_bzrdir.py
 ${PYSITELIB}/bzrlib/tests/test_bzrdir.pyc
 ${PYSITELIB}/bzrlib/tests/test_bzrdir.pyo
@@ -457,9 +594,15 @@ ${PYSITELIB}/bzrlib/tests/test_hashcache.pyo
 ${PYSITELIB}/bzrlib/tests/test_http.py
 ${PYSITELIB}/bzrlib/tests/test_http.pyc
 ${PYSITELIB}/bzrlib/tests/test_http.pyo
+${PYSITELIB}/bzrlib/tests/test_http_response.py
+${PYSITELIB}/bzrlib/tests/test_http_response.pyc
+${PYSITELIB}/bzrlib/tests/test_http_response.pyo
 ${PYSITELIB}/bzrlib/tests/test_identitymap.py
 ${PYSITELIB}/bzrlib/tests/test_identitymap.pyc
 ${PYSITELIB}/bzrlib/tests/test_identitymap.pyo
+${PYSITELIB}/bzrlib/tests/test_ignores.py
+${PYSITELIB}/bzrlib/tests/test_ignores.pyc
+${PYSITELIB}/bzrlib/tests/test_ignores.pyo
 ${PYSITELIB}/bzrlib/tests/test_inv.py
 ${PYSITELIB}/bzrlib/tests/test_inv.pyc
 ${PYSITELIB}/bzrlib/tests/test_inv.pyo
@@ -502,6 +645,9 @@ ${PYSITELIB}/bzrlib/tests/test_osutils.pyo
 ${PYSITELIB}/bzrlib/tests/test_patch.py
 ${PYSITELIB}/bzrlib/tests/test_patch.pyc
 ${PYSITELIB}/bzrlib/tests/test_patch.pyo
+${PYSITELIB}/bzrlib/tests/test_patches.py
+${PYSITELIB}/bzrlib/tests/test_patches.pyc
+${PYSITELIB}/bzrlib/tests/test_patches.pyo
 ${PYSITELIB}/bzrlib/tests/test_permissions.py
 ${PYSITELIB}/bzrlib/tests/test_permissions.pyc
 ${PYSITELIB}/bzrlib/tests/test_permissions.pyo
@@ -511,6 +657,9 @@ ${PYSITELIB}/bzrlib/tests/test_plugins.pyo
 ${PYSITELIB}/bzrlib/tests/test_progress.py
 ${PYSITELIB}/bzrlib/tests/test_progress.pyc
 ${PYSITELIB}/bzrlib/tests/test_progress.pyo
+${PYSITELIB}/bzrlib/tests/test_read_bundle.py
+${PYSITELIB}/bzrlib/tests/test_read_bundle.pyc
+${PYSITELIB}/bzrlib/tests/test_read_bundle.pyo
 ${PYSITELIB}/bzrlib/tests/test_reconcile.py
 ${PYSITELIB}/bzrlib/tests/test_reconcile.pyc
 ${PYSITELIB}/bzrlib/tests/test_reconcile.pyo
@@ -523,9 +672,9 @@ ${PYSITELIB}/bzrlib/tests/test_revision.pyo
 ${PYSITELIB}/bzrlib/tests/test_revisionnamespaces.py
 ${PYSITELIB}/bzrlib/tests/test_revisionnamespaces.pyc
 ${PYSITELIB}/bzrlib/tests/test_revisionnamespaces.pyo
-${PYSITELIB}/bzrlib/tests/test_revprops.py
-${PYSITELIB}/bzrlib/tests/test_revprops.pyc
-${PYSITELIB}/bzrlib/tests/test_revprops.pyo
+${PYSITELIB}/bzrlib/tests/test_revisiontree.py
+${PYSITELIB}/bzrlib/tests/test_revisiontree.pyc
+${PYSITELIB}/bzrlib/tests/test_revisiontree.pyo
 ${PYSITELIB}/bzrlib/tests/test_rio.py
 ${PYSITELIB}/bzrlib/tests/test_rio.pyc
 ${PYSITELIB}/bzrlib/tests/test_rio.pyo
@@ -547,6 +696,9 @@ ${PYSITELIB}/bzrlib/tests/test_smart_add.pyo
 ${PYSITELIB}/bzrlib/tests/test_source.py
 ${PYSITELIB}/bzrlib/tests/test_source.pyc
 ${PYSITELIB}/bzrlib/tests/test_source.pyo
+${PYSITELIB}/bzrlib/tests/test_status.py
+${PYSITELIB}/bzrlib/tests/test_status.pyc
+${PYSITELIB}/bzrlib/tests/test_status.pyo
 ${PYSITELIB}/bzrlib/tests/test_store.py
 ${PYSITELIB}/bzrlib/tests/test_store.pyc
 ${PYSITELIB}/bzrlib/tests/test_store.pyo
@@ -577,6 +729,9 @@ ${PYSITELIB}/bzrlib/tests/test_transport.pyo
 ${PYSITELIB}/bzrlib/tests/test_transport_implementations.py
 ${PYSITELIB}/bzrlib/tests/test_transport_implementations.pyc
 ${PYSITELIB}/bzrlib/tests/test_transport_implementations.pyo
+${PYSITELIB}/bzrlib/tests/test_tree.py
+${PYSITELIB}/bzrlib/tests/test_tree.pyc
+${PYSITELIB}/bzrlib/tests/test_tree.pyo
 ${PYSITELIB}/bzrlib/tests/test_tsort.py
 ${PYSITELIB}/bzrlib/tests/test_tsort.pyc
 ${PYSITELIB}/bzrlib/tests/test_tsort.pyo
@@ -589,6 +744,9 @@ ${PYSITELIB}/bzrlib/tests/test_ui.pyo
 ${PYSITELIB}/bzrlib/tests/test_upgrade.py
 ${PYSITELIB}/bzrlib/tests/test_upgrade.pyc
 ${PYSITELIB}/bzrlib/tests/test_upgrade.pyo
+${PYSITELIB}/bzrlib/tests/test_urlutils.py
+${PYSITELIB}/bzrlib/tests/test_urlutils.pyc
+${PYSITELIB}/bzrlib/tests/test_urlutils.pyo
 ${PYSITELIB}/bzrlib/tests/test_versionedfile.py
 ${PYSITELIB}/bzrlib/tests/test_versionedfile.pyc
 ${PYSITELIB}/bzrlib/tests/test_versionedfile.pyo
@@ -604,6 +762,12 @@ ${PYSITELIB}/bzrlib/tests/test_workingtree.pyo
 ${PYSITELIB}/bzrlib/tests/test_xml.py
 ${PYSITELIB}/bzrlib/tests/test_xml.pyc
 ${PYSITELIB}/bzrlib/tests/test_xml.pyo
+${PYSITELIB}/bzrlib/tests/tree_implementations/__init__.py
+${PYSITELIB}/bzrlib/tests/tree_implementations/__init__.pyc
+${PYSITELIB}/bzrlib/tests/tree_implementations/__init__.pyo
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_test_trees.py
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_test_trees.pyc
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_test_trees.pyo
 ${PYSITELIB}/bzrlib/tests/treeshape.py
 ${PYSITELIB}/bzrlib/tests/treeshape.pyc
 ${PYSITELIB}/bzrlib/tests/treeshape.pyo
@@ -616,9 +780,27 @@ ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_basis_inventory.pyo
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_break_lock.py
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_break_lock.pyc
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_break_lock.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_changes_from.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_changes_from.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_changes_from.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_commit.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_commit.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_commit.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_executable.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_executable.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_executable.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_get_parent_ids.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyo
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_is_control_filename.py
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyc
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_is_ignored.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_is_ignored.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_is_ignored.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_locking.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_locking.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_locking.pyo
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_pull.py
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_pull.pyc
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_pull.pyo
@@ -667,9 +849,15 @@ ${PYSITELIB}/bzrlib/transport/http/__init__.pyo
 ${PYSITELIB}/bzrlib/transport/http/_pycurl.py
 ${PYSITELIB}/bzrlib/transport/http/_pycurl.pyc
 ${PYSITELIB}/bzrlib/transport/http/_pycurl.pyo
+${PYSITELIB}/bzrlib/transport/http/_pycurl_errors.py
+${PYSITELIB}/bzrlib/transport/http/_pycurl_errors.pyc
+${PYSITELIB}/bzrlib/transport/http/_pycurl_errors.pyo
 ${PYSITELIB}/bzrlib/transport/http/_urllib.py
 ${PYSITELIB}/bzrlib/transport/http/_urllib.pyc
 ${PYSITELIB}/bzrlib/transport/http/_urllib.pyo
+${PYSITELIB}/bzrlib/transport/http/response.py
+${PYSITELIB}/bzrlib/transport/http/response.pyc
+${PYSITELIB}/bzrlib/transport/http/response.pyo
 ${PYSITELIB}/bzrlib/transport/local.py
 ${PYSITELIB}/bzrlib/transport/local.pyc
 ${PYSITELIB}/bzrlib/transport/local.pyo
@@ -703,6 +891,9 @@ ${PYSITELIB}/bzrlib/uncommit.pyo
 ${PYSITELIB}/bzrlib/upgrade.py
 ${PYSITELIB}/bzrlib/upgrade.pyc
 ${PYSITELIB}/bzrlib/upgrade.pyo
+${PYSITELIB}/bzrlib/urlutils.py
+${PYSITELIB}/bzrlib/urlutils.pyc
+${PYSITELIB}/bzrlib/urlutils.pyo
 ${PYSITELIB}/bzrlib/util/__init__.py
 ${PYSITELIB}/bzrlib/util/__init__.pyc
 ${PYSITELIB}/bzrlib/util/__init__.pyo
@@ -712,9 +903,6 @@ ${PYSITELIB}/bzrlib/util/configobj/__init__.pyo
 ${PYSITELIB}/bzrlib/util/configobj/configobj.py
 ${PYSITELIB}/bzrlib/util/configobj/configobj.pyc
 ${PYSITELIB}/bzrlib/util/configobj/configobj.pyo
-${PYSITELIB}/bzrlib/util/configobj/validate.py
-${PYSITELIB}/bzrlib/util/configobj/validate.pyc
-${PYSITELIB}/bzrlib/util/configobj/validate.pyo
 ${PYSITELIB}/bzrlib/util/effbot/org/__init__.py
 ${PYSITELIB}/bzrlib/util/effbot/org/__init__.pyc
 ${PYSITELIB}/bzrlib/util/effbot/org/__init__.pyo
@@ -777,9 +965,11 @@ share/doc/bzr/using_aliases.txt
 @dirrm ${PYSITELIB}/bzrlib/transport/http
 @dirrm ${PYSITELIB}/bzrlib/transport
 @dirrm ${PYSITELIB}/bzrlib/tests/workingtree_implementations
+@dirrm ${PYSITELIB}/bzrlib/tests/tree_implementations
 @dirrm ${PYSITELIB}/bzrlib/tests/revisionstore_implementations
 @dirrm ${PYSITELIB}/bzrlib/tests/repository_implementations
 @dirrm ${PYSITELIB}/bzrlib/tests/interversionedfile_implementations
+@dirrm ${PYSITELIB}/bzrlib/tests/intertree_implementations
 @dirrm ${PYSITELIB}/bzrlib/tests/interrepository_implementations
 @dirrm ${PYSITELIB}/bzrlib/tests/bzrdir_implementations
 @dirrm ${PYSITELIB}/bzrlib/tests/branch_implementations
@@ -793,4 +983,7 @@ share/doc/bzr/using_aliases.txt
 @dirrm ${PYSITELIB}/bzrlib/export
 @dirrm ${PYSITELIB}/bzrlib/doc/api
 @dirrm ${PYSITELIB}/bzrlib/doc
+@dirrm ${PYSITELIB}/bzrlib/bundle/serializer
+@dirrm ${PYSITELIB}/bzrlib/bundle
+@dirrm ${PYSITELIB}/bzrlib/benchmarks
 @dirrm ${PYSITELIB}/bzrlib
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index c6740e30d50..178a4dc2cae 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2006/07/12 14:30:55 wiz Exp $
+$NetBSD: distinfo,v 1.4 2006/08/13 23:47:38 wiz Exp $
 
-SHA1 (bzr-0.8.2.tar.gz) = 1aea6e0783219f0c2d074c9407ad09cb36b4ade2
-RMD160 (bzr-0.8.2.tar.gz) = 5cdbfa3f9a87fc1b999e1bef187f1e83fc7cb251
-Size (bzr-0.8.2.tar.gz) = 720152 bytes
+SHA1 (bzr-0.9.tar.gz) = 6150ce2b814a738a72e3aab6d081769f9d2e14fe
+RMD160 (bzr-0.9.tar.gz) = e01328785bae9d275cc71311627a11edb5a89224
+Size (bzr-0.9.tar.gz) = 935724 bytes