Update to 0.91:

bzr 0.91 2007-09-26
===================

  BUG FIXES

bzr 0.91rc2 2007-09-11
======================

   * Replaced incorrect tarball for previous release; a debug statement was left
     in bzrlib/remote.py.

bzr 0.91rc1 2007-09-11
======================

  CHANGES:

   * The default branch and repository format has changed to
     ``dirstate-tags``, so tag commands are active by default.
     This format is compatible with Bazaar 0.15 and later.
     This incidentally fixes bug #126141.
     (Martin Pool)

   * ``--quiet`` or ``-q`` is no longer a global option. If present, it
     must now appear after the command name. Scripts doing things like
     ``bzr -q missing`` need to be rewritten as ``bzr missing -q``.
     (Ian Clatworthy)

  FEATURES:

   * New option ``--author`` in ``bzr commit`` to specify the author of the
     change, if it's different from the committer. ``bzr log`` and
     ``bzr annotate`` display the author instead of the committer.
     (Lukáš Lalinský)

   * In addition to global options and command specific options, a set of
     standard options are now supported. Standard options are legal for
     all commands. The initial set of standard options are:

     * ``--help`` or ``-h`` - display help message
     * ``--verbose`` or ``-v`` - display additional information
     * ``--quiet``  or ``-q`` - only output warnings and errors.

     Unlike global options, standard options can be used in aliases and
     may have command-specific help. (Ian Clatworthy)

   * Verbosity level processing has now been unified. If ``--verbose``
     or ``-v`` is specified on the command line multiple times, the
     verbosity level is made positive the first time then increased.
     If ``--quiet`` or ``-q`` is specified on the command line
     multiple times, the verbosity level is made negative the first
     time then decreased. To get the default verbosity level of zero,
     either specify none of the above , ``--no-verbose`` or ``--no-quiet``.
     Note that most commands currently ignore the magnitude of the
     verbosity level but do respect *quiet vs normal vs verbose* when
     generating output. (Ian Clatworthy)

   * ``Branch.hooks`` now supports ``pre_commit`` hook. The hook's signature
     is documented in BranchHooks constructor. (Nam T. Nguyen, #102747)

  BUG FIXES

  IMPROVEMENTS:

   * Add the option "--show-diff" to the commit command in order to display
     the diff during the commit log creation. (Goffredo Baroncelli)

   * ``pull`` and ``merge`` are much faster at installing bundle format 4.
     (Aaron Bentley)

   * ``pull -v`` no longer includes deltas, making it much faster.
     (Aaron Bentley)

   * ``send`` now sends the directive as an attachment by default.
     (Aaron Bentley, Lukáš Lalinský, Alexander Belchenko)

   * Documentation updates (Martin Albisetti)

   * Help on debug flags is now included in ``help global-options``.
     (Daniel Watkins, #124853)

   * Parameters passed on the command line are checked to ensure they are
     supported by the encoding in use. (Daniel Watkins)

   * The compression used within the bzr repository has changed from zlib
     level 9 to the zlib default level. This improves commit performance with
     only a small increase in space used (and in some cases a reduction in
     space). (Robert Collins)

   * Initial commit no longer SHAs files twice and now reuses the path
     rather than looking it up again, making it faster.
     (Ian Clatworthy)

   * New option ``-c``/``--change`` for ``diff`` and ``status`` to show
     changes in one revision.  (Lukáš Lalinský)

   * If versioned files match a given ignore pattern, a warning is now
     given. (Daniel Watkins, #48623)

   * ``bzr status`` now has -S as a short name for --short and -V as a
     short name for --versioned. These have been added to assist users
     migrating from Subversion: ``bzr status -SV`` is now like
     ``svn status -q``.  (Daniel Watkins, #115990)

   * Added C implementation of  ``PatienceSequenceMatcher``, which is about
     10x faster than the Python version. This speeds up commands that
     need file diffing, such as ``bzr commit`` or ``bzr diff``.
     (Lukáš Lalinský)

   * HACKING has been extended with a large section on core developer tasks.
     (Ian Clatworthy)

   * Add ``branches`` and ``standalone-trees`` as online help topics and
     include them as Concepts within the User Reference.
     (Paul Moore, Ian Clatworthy)

  API BREAKS:

   * ``Branch.append_revision`` is removed altogether; please use
     ``Branch.set_last_revision_info`` instead.  (Martin Pool)

   * CommitBuilder now advertises itself as requiring the root entry to be
     supplied. This only affects foreign repository implementations which reuse
     CommitBuilder directly and have changed record_entry_contents to require
     that the root not be supplied. This should be precisely zero plugins
     affected. (Robert Collins)

   * The ``add_lines`` methods on ``VersionedFile`` implementations has changed
     its return value to include the sha1 and length of the inserted text. This
     allows the avoidance of double-sha1 calculations during commit.
     (Robert Collins)

   * ``Transport.should_cache`` has been removed.  It was not called in the
     previous release.  (Martin Pool)

  TESTING:

   * Tests may now raise TestNotApplicable to indicate they shouldn't be
     run in a particular scenario.  (Martin Pool)

   * New function multiply_tests_from_modules to give a simpler interface
     to test parameterization.  (Martin Pool, Robert Collins)

   * ``Transport.should_cache`` has been removed.  It was not called in the
     previous release.  (Martin Pool)

   * NULL_REVISION is returned to indicate the null revision, not None.
     (Aaron Bentley)

   * Use UTF-8 encoded StringIO for log tests to avoid failures on
     non-ASCII committer names.  (Lukáš Lalinský)

bzr 0.90 2007-08-28
===================

  IMPROVEMENTS:

    * Documentation is now organized into multiple directories with a level
      added for different languages or locales. Added the Mini Tutorial
      and Quick Start Summary (en) documents from the Wiki, improving the
      content and readability of the former. Formatted NEWS as Release Notes
      complete with a Table of Conents, one heading per release. Moved the
      Developer Guide into the main document catalog and provided a link
      from the developer document catalog back to the main one.
      (Ian Clatworthy, Sabin Iacob, Alexander Belchenko)


  API CHANGES:

    * The static convenience method ``BzrDir.create_repository``
      is deprecated.  Callers should instead create a ``BzrDir`` instance
      and call ``create_repository`` on that.  (Martin Pool)


bzr 0.90rc1 2007-08-14
======================

  BUGFIXES:

    * ``bzr init`` should connect to the remote location one time only.  We
      have been connecting several times because we forget to pass around the
      Transport object. This modifies ``BzrDir.create_branch_convenience``,
      so that we can give it the Transport we already have.
      (John Arbash Meinel, Vincent Ladeuil, #111702)

    * Get rid of sftp connection cache (get rid of the FTP one too).
      (Vincent Ladeuil, #43731)

    * bzr branch {local|remote} remote don't try to create a working tree
      anymore.
      (Vincent Ladeuil, #112173)

    * All identified multiple connections for a single bzr command have been
      fixed. See bzrlib/tests/commands directory.
      (Vincent Ladeuil)

    * ``bzr rm`` now does not insist on ``--force`` to delete files that
      have been renamed but not otherwise modified.  (Marius Kruger,
      #111664)

    * ``bzr selftest --bench`` no longer emits deprecation warnings
      (Lukáš Lalinský)

    * ``bzr status`` now honours FILE parameters for conflict lists
      (Aaron Bentley, #127606)

    * ``bzr checkout`` now honours -r when reconstituting a working tree.
      It also honours -r 0.  (Aaron Bentley, #127708)

    * ``bzr add *`` no more fails on Windows if working tree contains
      non-ascii file names. (Kuno Meyer, #127361)

    * allow ``easy_install bzr`` runs without fatal errors.
      (Alexander Belchenko, #125521)

    * Graph._filter_candidate_lca does not raise KeyError if a candidate
      is eliminated just before it would normally be examined.  (Aaron Bentley)

    * SMTP connection failures produce a nice message, not a traceback.
      (Aaron Bentley)

  IMPROVEMENTS:

    * Don't show "dots" progress indicators when run non-interactively, such
      as from cron.  (Martin Pool)

    * ``info`` now formats locations more nicely and lists "submit" and
      "public" branches (Aaron Bentley)

    * New ``pack`` command that will trigger database compression within
      the repository (Robert Collins)

    * Implement ``_KnitIndex._load_data`` in a pyrex extension. The pyrex
      version is approximately 2-3x faster at parsing a ``.kndx`` file.
      Which yields a measurable improvement for commands which have to
      read from the repository, such as a 1s => 0.75s improvement in
      ``bzr diff`` when there are changes to be shown.  (John Arbash Meinel)

    * Merge is now faster.  Depending on the scenario, it can be more than 2x
      faster. (Aaron Bentley)

    * Give a clearer warning, and allow ``python setup.py install`` to
      succeed even if pyrex is not available.
      (John Arbash Meinel)

    * ``DirState._read_dirblocks`` now has an optional Pyrex
      implementation. This improves the speed of any command that has to
      read the entire DirState. (``diff``, ``status``, etc, improve by
      about 10%).
      ``bisect_dirblocks`` has also been improved, which helps all
      ``_get_entry`` type calls (whenever we are searching for a
      particular entry in the in-memory DirState).
      (John Arbash Meinel)

    * ``bzr pull`` and ``bzr push`` no longer do a complete walk of the
      branch revision history for ui display unless -v is supplied.
      (Robert Collins)

    * ``bzr log -rA..B`` output shifted to the left margin if the log only
      contains merge revisions. (Kent Gibson)

    * The ``plugins`` command is now public with improved help.
      (Ian Clatworthy)

    * New bundle and merge directive formats are faster to generate, and

    * Annotate merge now works when there are local changes. (Aaron Bentley)

    * Commit now only shows the progress in terms of directories instead of
      entries. (Ian Clatworthy)

    * Fix ``KnitRepository.get_revision_graph`` to not request the graph 2
      times. This makes ``get_revision_graph`` 2x faster. (John Arbash
      Meinel)

    * Fix ``VersionedFile.get_graph()`` to avoid using
      ``set.difference_update(other)``, which has bad scaling when
      ``other`` is large. This improves ``VF.get_graph([version_id])`` for
      a 12.5k graph from 2.9s down to 200ms. (John Arbash Meinel)

    * The ``--lsprof-file`` option now generates output for KCacheGrind if
      the file starts with ``callgrind.out``. This matches the default file
      filtering done by KCacheGrind's Open Dialog. (Ian Clatworthy)

    * Fix ``bzr update`` to avoid an unnecessary
      ``branch.get_master_branch`` call, which avoids 1 extra connection
      to the remote server. (Partial fix for #128076, John Arbash Meinel)

    * Log errors from the smart server in the trace file, to make debugging
      test failures (and live failures!) easier.  (Andrew Bennetts)

    * The HTML version of the man page has been superceded by a more
      comprehensive manual called the Bazaar User Reference. This manual
      is completed generated from the online help topics. As part of this
      change, limited reStructuredText is now explicitly supported in help
      topics and command help with 'unnatural' markup being removed prior
      to display by the online help or inclusion in the man page.
      (Ian Clatworthy)

    * HTML documentation now use files extension ``*.html``
      (Alexander Belchenko)

    * The cache of ignore definitions is now cleared in WorkingTree.unlock()
      so that changes to .bzrignore aren't missed. (#129694, Daniel Watkins)

    * ``bzr selftest --strict`` fails if there are any missing features or
      expected test failures. (Daniel Watkins, #111914)

    * Link to registration survey added to README. (Ian Clatworthy)

    * Windows standalone installer show link to registration survey
      when installation finished. (Alexander Belchenko)

  LIBRARY API BREAKS:

    * Deprecated dictionary ``bzrlib.option.SHORT_OPTIONS`` removed.
      Options are now required to provide a help string and it must
      comply with the style guide by being one or more sentences with an
      initial capital and final period. (Martin Pool)

    * KnitIndex.get_parents now returns tuples. (Robert Collins)

    * Ancient unused ``Repository.text_store`` attribute has been removed.
      (Robert Collins)

    * The ``bzrlib.pack`` interface has changed to use tuples of bytestrings
      rather than just bytestrings, making it easier to represent multiple
      element names. As this interface was not used by any internal facilities
      since it was introduced in 0.18 no API compatibility is being preserved.
      The serialised form of these packs is identical with 0.18 when a single
      element tuple is in use. (Robert Collins)

  TESTING:

    * Remove selftest ``--clean-output``, ``--numbered-dirs`` and
      ``--keep-output`` options, which are obsolete now that tests
      are done within directories in $TMPDIR.  (Martin Pool)

    * The SSH_AUTH_SOCK environment variable is now reset to avoid
      interaction with any running ssh agents.  (Jelmer Vernooij, #125955)

    * run_bzr_subprocess handles parameters the same way as run_bzr:
      either a string or a list of strings should be passed as the first
      parameter.  Varargs-style parameters are deprecated. (Aaron Bentley)

4 files changed, 155 insertions, 34 deletions

diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index fb11a9b3b42..6b8c4bd0cce 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2007/08/31 20:26:55 agc Exp $
+# $NetBSD: Makefile,v 1.17 2007/10/27 11:46:42 wiz Exp $
 #
 
-DISTNAME=		bzr-0.18
+DISTNAME=		bzr-0.91
 CATEGORIES=		devel scm
 MASTER_SITES=		http://bazaar-vcs.org/releases/src/
 
diff --git a/devel/bzr/PLIST b/devel/bzr/PLIST
index 8bf64c2c31a..cc5762f358d 100644
--- a/devel/bzr/PLIST
+++ b/devel/bzr/PLIST
@@ -1,8 +1,20 @@
-@comment $NetBSD: PLIST,v 1.11 2007/07/28 14:48:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2007/10/27 11:46:43 wiz Exp $
 bin/bzr
 ${PYSITELIB}/bzrlib/__init__.py
 ${PYSITELIB}/bzrlib/__init__.pyc
 ${PYSITELIB}/bzrlib/__init__.pyo
+${PYSITELIB}/bzrlib/_dirstate_helpers_c.so
+${PYSITELIB}/bzrlib/_dirstate_helpers_py.py
+${PYSITELIB}/bzrlib/_dirstate_helpers_py.pyc
+${PYSITELIB}/bzrlib/_dirstate_helpers_py.pyo
+${PYSITELIB}/bzrlib/_knit_load_data_c.so
+${PYSITELIB}/bzrlib/_knit_load_data_py.py
+${PYSITELIB}/bzrlib/_knit_load_data_py.pyc
+${PYSITELIB}/bzrlib/_knit_load_data_py.pyo
+${PYSITELIB}/bzrlib/_patiencediff_c.so
+${PYSITELIB}/bzrlib/_patiencediff_py.py
+${PYSITELIB}/bzrlib/_patiencediff_py.pyc
+${PYSITELIB}/bzrlib/_patiencediff_py.pyo
 ${PYSITELIB}/bzrlib/add.py
 ${PYSITELIB}/bzrlib/add.pyc
 ${PYSITELIB}/bzrlib/add.pyo
@@ -36,18 +48,27 @@ ${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_dirstate.py
+${PYSITELIB}/bzrlib/benchmarks/bench_dirstate.pyc
+${PYSITELIB}/bzrlib/benchmarks/bench_dirstate.pyo
 ${PYSITELIB}/bzrlib/benchmarks/bench_info.py
 ${PYSITELIB}/bzrlib/benchmarks/bench_info.pyc
 ${PYSITELIB}/bzrlib/benchmarks/bench_info.pyo
 ${PYSITELIB}/bzrlib/benchmarks/bench_inventory.py
 ${PYSITELIB}/bzrlib/benchmarks/bench_inventory.pyc
 ${PYSITELIB}/bzrlib/benchmarks/bench_inventory.pyo
+${PYSITELIB}/bzrlib/benchmarks/bench_knit.py
+${PYSITELIB}/bzrlib/benchmarks/bench_knit.pyc
+${PYSITELIB}/bzrlib/benchmarks/bench_knit.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_pack.py
+${PYSITELIB}/bzrlib/benchmarks/bench_pack.pyc
+${PYSITELIB}/bzrlib/benchmarks/bench_pack.pyo
 ${PYSITELIB}/bzrlib/benchmarks/bench_rocks.py
 ${PYSITELIB}/bzrlib/benchmarks/bench_rocks.pyc
 ${PYSITELIB}/bzrlib/benchmarks/bench_rocks.pyo
@@ -111,9 +132,6 @@ ${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
@@ -123,6 +141,9 @@ ${PYSITELIB}/bzrlib/bundle/serializer/v08.pyo
 ${PYSITELIB}/bzrlib/bundle/serializer/v09.py
 ${PYSITELIB}/bzrlib/bundle/serializer/v09.pyc
 ${PYSITELIB}/bzrlib/bundle/serializer/v09.pyo
+${PYSITELIB}/bzrlib/bundle/serializer/v4.py
+${PYSITELIB}/bzrlib/bundle/serializer/v4.pyc
+${PYSITELIB}/bzrlib/bundle/serializer/v4.pyo
 ${PYSITELIB}/bzrlib/bzrdir.py
 ${PYSITELIB}/bzrlib/bzrdir.pyc
 ${PYSITELIB}/bzrlib/bzrdir.pyo
@@ -176,6 +197,9 @@ ${PYSITELIB}/bzrlib/doc/api/__init__.pyc
 ${PYSITELIB}/bzrlib/doc/api/__init__.pyo
 ${PYSITELIB}/bzrlib/doc/api/branch.txt
 ${PYSITELIB}/bzrlib/doc/api/transport.txt
+${PYSITELIB}/bzrlib/email_message.py
+${PYSITELIB}/bzrlib/email_message.pyc
+${PYSITELIB}/bzrlib/email_message.pyo
 ${PYSITELIB}/bzrlib/errors.py
 ${PYSITELIB}/bzrlib/errors.pyc
 ${PYSITELIB}/bzrlib/errors.pyo
@@ -227,6 +251,9 @@ ${PYSITELIB}/bzrlib/identitymap.pyo
 ${PYSITELIB}/bzrlib/ignores.py
 ${PYSITELIB}/bzrlib/ignores.pyc
 ${PYSITELIB}/bzrlib/ignores.pyo
+${PYSITELIB}/bzrlib/index.py
+${PYSITELIB}/bzrlib/index.pyc
+${PYSITELIB}/bzrlib/index.pyo
 ${PYSITELIB}/bzrlib/info.py
 ${PYSITELIB}/bzrlib/info.pyc
 ${PYSITELIB}/bzrlib/info.pyo
@@ -269,6 +296,9 @@ ${PYSITELIB}/bzrlib/log.pyo
 ${PYSITELIB}/bzrlib/lsprof.py
 ${PYSITELIB}/bzrlib/lsprof.pyc
 ${PYSITELIB}/bzrlib/lsprof.pyo
+${PYSITELIB}/bzrlib/mail_client.py
+${PYSITELIB}/bzrlib/mail_client.pyc
+${PYSITELIB}/bzrlib/mail_client.pyo
 ${PYSITELIB}/bzrlib/memorytree.py
 ${PYSITELIB}/bzrlib/memorytree.pyc
 ${PYSITELIB}/bzrlib/memorytree.pyo
@@ -287,6 +317,9 @@ ${PYSITELIB}/bzrlib/missing.pyo
 ${PYSITELIB}/bzrlib/msgeditor.py
 ${PYSITELIB}/bzrlib/msgeditor.pyc
 ${PYSITELIB}/bzrlib/msgeditor.pyo
+${PYSITELIB}/bzrlib/multiparent.py
+${PYSITELIB}/bzrlib/multiparent.pyc
+${PYSITELIB}/bzrlib/multiparent.pyo
 ${PYSITELIB}/bzrlib/mutabletree.py
 ${PYSITELIB}/bzrlib/mutabletree.pyc
 ${PYSITELIB}/bzrlib/mutabletree.pyo
@@ -329,6 +362,9 @@ ${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_indirect.pyo
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_register.py
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_register.pyc
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_register.pyo
+${PYSITELIB}/bzrlib/plugins/multiparent.py
+${PYSITELIB}/bzrlib/plugins/multiparent.pyc
+${PYSITELIB}/bzrlib/plugins/multiparent.pyo
 ${PYSITELIB}/bzrlib/progress.py
 ${PYSITELIB}/bzrlib/progress.pyc
 ${PYSITELIB}/bzrlib/progress.pyo
@@ -482,9 +518,9 @@ ${PYSITELIB}/bzrlib/tests/blackbox/test_break_lock.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_breakin.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_breakin.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_breakin.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_bundle_info.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_bundle_info.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_bundle_info.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_cat.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_cat.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_cat.pyo
@@ -575,6 +611,9 @@ ${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
+${PYSITELIB}/bzrlib/tests/blackbox/test_pack.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_pack.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_pack.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_pull.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_pull.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_pull.pyo
@@ -611,6 +650,9 @@ ${PYSITELIB}/bzrlib/tests/blackbox/test_revno.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_selftest.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_selftest.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_selftest.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_send.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_send.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_send.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_serve.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_serve.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_serve.pyo
@@ -725,6 +767,39 @@ ${PYSITELIB}/bzrlib/tests/bzrdir_implementations/__init__.pyo
 ${PYSITELIB}/bzrlib/tests/bzrdir_implementations/test_bzrdir.py
 ${PYSITELIB}/bzrlib/tests/bzrdir_implementations/test_bzrdir.pyc
 ${PYSITELIB}/bzrlib/tests/bzrdir_implementations/test_bzrdir.pyo
+${PYSITELIB}/bzrlib/tests/commands/__init__.py
+${PYSITELIB}/bzrlib/tests/commands/__init__.pyc
+${PYSITELIB}/bzrlib/tests/commands/__init__.pyo
+${PYSITELIB}/bzrlib/tests/commands/test_branch.py
+${PYSITELIB}/bzrlib/tests/commands/test_branch.pyc
+${PYSITELIB}/bzrlib/tests/commands/test_branch.pyo
+${PYSITELIB}/bzrlib/tests/commands/test_cat.py
+${PYSITELIB}/bzrlib/tests/commands/test_cat.pyc
+${PYSITELIB}/bzrlib/tests/commands/test_cat.pyo
+${PYSITELIB}/bzrlib/tests/commands/test_checkout.py
+${PYSITELIB}/bzrlib/tests/commands/test_checkout.pyc
+${PYSITELIB}/bzrlib/tests/commands/test_checkout.pyo
+${PYSITELIB}/bzrlib/tests/commands/test_init.py
+${PYSITELIB}/bzrlib/tests/commands/test_init.pyc
+${PYSITELIB}/bzrlib/tests/commands/test_init.pyo
+${PYSITELIB}/bzrlib/tests/commands/test_init_repository.py
+${PYSITELIB}/bzrlib/tests/commands/test_init_repository.pyc
+${PYSITELIB}/bzrlib/tests/commands/test_init_repository.pyo
+${PYSITELIB}/bzrlib/tests/commands/test_merge.py
+${PYSITELIB}/bzrlib/tests/commands/test_merge.pyc
+${PYSITELIB}/bzrlib/tests/commands/test_merge.pyo
+${PYSITELIB}/bzrlib/tests/commands/test_missing.py
+${PYSITELIB}/bzrlib/tests/commands/test_missing.pyc
+${PYSITELIB}/bzrlib/tests/commands/test_missing.pyo
+${PYSITELIB}/bzrlib/tests/commands/test_pull.py
+${PYSITELIB}/bzrlib/tests/commands/test_pull.pyc
+${PYSITELIB}/bzrlib/tests/commands/test_pull.pyo
+${PYSITELIB}/bzrlib/tests/commands/test_push.py
+${PYSITELIB}/bzrlib/tests/commands/test_push.pyc
+${PYSITELIB}/bzrlib/tests/commands/test_push.pyo
+${PYSITELIB}/bzrlib/tests/commands/test_update.py
+${PYSITELIB}/bzrlib/tests/commands/test_update.pyc
+${PYSITELIB}/bzrlib/tests/commands/test_update.pyo
 ${PYSITELIB}/bzrlib/tests/interrepository_implementations/__init__.py
 ${PYSITELIB}/bzrlib/tests/interrepository_implementations/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/interrepository_implementations/__init__.pyo
@@ -743,6 +818,12 @@ ${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/inventory_implementations/__init__.py
+${PYSITELIB}/bzrlib/tests/inventory_implementations/__init__.pyc
+${PYSITELIB}/bzrlib/tests/inventory_implementations/__init__.pyo
+${PYSITELIB}/bzrlib/tests/inventory_implementations/basics.py
+${PYSITELIB}/bzrlib/tests/inventory_implementations/basics.pyc
+${PYSITELIB}/bzrlib/tests/inventory_implementations/basics.pyo
 ${PYSITELIB}/bzrlib/tests/lock_helpers.py
 ${PYSITELIB}/bzrlib/tests/lock_helpers.pyc
 ${PYSITELIB}/bzrlib/tests/lock_helpers.pyo
@@ -764,12 +845,21 @@ ${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_fetch.py
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_fetch.pyc
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_fetch.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
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_has_same_location.py
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_has_same_location.pyc
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_has_same_location.pyo
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.pyc
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.pyo
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_pack.py
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_pack.pyc
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_pack.pyo
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_reconcile.py
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_reconcile.pyc
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_reconcile.pyo
@@ -782,6 +872,9 @@ ${PYSITELIB}/bzrlib/tests/repository_implementations/test_revision.pyo
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_statistics.py
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_statistics.pyc
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_statistics.pyo
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_write_group.py
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_write_group.pyc
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_write_group.pyo
 ${PYSITELIB}/bzrlib/tests/revisionstore_implementations/__init__.py
 ${PYSITELIB}/bzrlib/tests/revisionstore_implementations/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/revisionstore_implementations/__init__.pyo
@@ -791,6 +884,9 @@ ${PYSITELIB}/bzrlib/tests/revisionstore_implementations/test_all.pyo
 ${PYSITELIB}/bzrlib/tests/stub_sftp.py
 ${PYSITELIB}/bzrlib/tests/stub_sftp.pyc
 ${PYSITELIB}/bzrlib/tests/stub_sftp.pyo
+${PYSITELIB}/bzrlib/tests/test__dirstate_helpers.py
+${PYSITELIB}/bzrlib/tests/test__dirstate_helpers.pyc
+${PYSITELIB}/bzrlib/tests/test__dirstate_helpers.pyo
 ${PYSITELIB}/bzrlib/tests/test_ancestry.py
 ${PYSITELIB}/bzrlib/tests/test_ancestry.pyc
 ${PYSITELIB}/bzrlib/tests/test_ancestry.pyo
@@ -857,6 +953,9 @@ ${PYSITELIB}/bzrlib/tests/test_diff.pyo
 ${PYSITELIB}/bzrlib/tests/test_dirstate.py
 ${PYSITELIB}/bzrlib/tests/test_dirstate.pyc
 ${PYSITELIB}/bzrlib/tests/test_dirstate.pyo
+${PYSITELIB}/bzrlib/tests/test_email_message.py
+${PYSITELIB}/bzrlib/tests/test_email_message.pyc
+${PYSITELIB}/bzrlib/tests/test_email_message.pyo
 ${PYSITELIB}/bzrlib/tests/test_errors.py
 ${PYSITELIB}/bzrlib/tests/test_errors.pyc
 ${PYSITELIB}/bzrlib/tests/test_errors.pyo
@@ -911,6 +1010,9 @@ ${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_index.py
+${PYSITELIB}/bzrlib/tests/test_index.pyc
+${PYSITELIB}/bzrlib/tests/test_index.pyo
 ${PYSITELIB}/bzrlib/tests/test_info.py
 ${PYSITELIB}/bzrlib/tests/test_info.pyc
 ${PYSITELIB}/bzrlib/tests/test_info.pyo
@@ -938,6 +1040,9 @@ ${PYSITELIB}/bzrlib/tests/test_log.pyo
 ${PYSITELIB}/bzrlib/tests/test_lsprof.py
 ${PYSITELIB}/bzrlib/tests/test_lsprof.pyc
 ${PYSITELIB}/bzrlib/tests/test_lsprof.pyo
+${PYSITELIB}/bzrlib/tests/test_mail_client.py
+${PYSITELIB}/bzrlib/tests/test_mail_client.pyc
+${PYSITELIB}/bzrlib/tests/test_mail_client.pyo
 ${PYSITELIB}/bzrlib/tests/test_memorytree.py
 ${PYSITELIB}/bzrlib/tests/test_memorytree.pyc
 ${PYSITELIB}/bzrlib/tests/test_memorytree.pyo
@@ -959,6 +1064,9 @@ ${PYSITELIB}/bzrlib/tests/test_missing.pyo
 ${PYSITELIB}/bzrlib/tests/test_msgeditor.py
 ${PYSITELIB}/bzrlib/tests/test_msgeditor.pyc
 ${PYSITELIB}/bzrlib/tests/test_msgeditor.pyo
+${PYSITELIB}/bzrlib/tests/test_multiparent.py
+${PYSITELIB}/bzrlib/tests/test_multiparent.pyc
+${PYSITELIB}/bzrlib/tests/test_multiparent.pyo
 ${PYSITELIB}/bzrlib/tests/test_nonascii.py
 ${PYSITELIB}/bzrlib/tests/test_nonascii.pyc
 ${PYSITELIB}/bzrlib/tests/test_nonascii.pyo
@@ -1150,6 +1258,9 @@ ${PYSITELIB}/bzrlib/tests/test_weave.pyo
 ${PYSITELIB}/bzrlib/tests/test_whitebox.py
 ${PYSITELIB}/bzrlib/tests/test_whitebox.pyc
 ${PYSITELIB}/bzrlib/tests/test_whitebox.pyo
+${PYSITELIB}/bzrlib/tests/test_win32utils.py
+${PYSITELIB}/bzrlib/tests/test_win32utils.pyc
+${PYSITELIB}/bzrlib/tests/test_win32utils.pyo
 ${PYSITELIB}/bzrlib/tests/test_workingtree.py
 ${PYSITELIB}/bzrlib/tests/test_workingtree.pyc
 ${PYSITELIB}/bzrlib/tests/test_workingtree.pyo
@@ -1162,6 +1273,9 @@ ${PYSITELIB}/bzrlib/tests/test_wsgi.pyo
 ${PYSITELIB}/bzrlib/tests/test_xml.py
 ${PYSITELIB}/bzrlib/tests/test_xml.pyc
 ${PYSITELIB}/bzrlib/tests/test_xml.pyo
+${PYSITELIB}/bzrlib/tests/transport_util.py
+${PYSITELIB}/bzrlib/tests/transport_util.pyc
+${PYSITELIB}/bzrlib/tests/transport_util.pyo
 ${PYSITELIB}/bzrlib/tests/tree_implementations/__init__.py
 ${PYSITELIB}/bzrlib/tests/tree_implementations/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/tree_implementations/__init__.pyo
@@ -1285,6 +1399,9 @@ ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_set_root_id.pyo
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_smart_add.py
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_smart_add.pyc
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_smart_add.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_uncommit.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_uncommit.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_uncommit.pyo
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_unversion.py
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_unversion.pyc
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_unversion.pyo
@@ -1381,6 +1498,9 @@ ${PYSITELIB}/bzrlib/transport/sftp.pyo
 ${PYSITELIB}/bzrlib/transport/ssh.py
 ${PYSITELIB}/bzrlib/transport/ssh.pyc
 ${PYSITELIB}/bzrlib/transport/ssh.pyo
+${PYSITELIB}/bzrlib/transport/unlistable.py
+${PYSITELIB}/bzrlib/transport/unlistable.pyc
+${PYSITELIB}/bzrlib/transport/unlistable.pyo
 ${PYSITELIB}/bzrlib/tree.py
 ${PYSITELIB}/bzrlib/tree.pyc
 ${PYSITELIB}/bzrlib/tree.pyo
@@ -1441,6 +1561,15 @@ ${PYSITELIB}/bzrlib/util/elementtree/ElementTree.pyo
 ${PYSITELIB}/bzrlib/util/elementtree/__init__.py
 ${PYSITELIB}/bzrlib/util/elementtree/__init__.pyc
 ${PYSITELIB}/bzrlib/util/elementtree/__init__.pyo
+${PYSITELIB}/bzrlib/util/simplemapi.py
+${PYSITELIB}/bzrlib/util/simplemapi.pyc
+${PYSITELIB}/bzrlib/util/simplemapi.pyo
+${PYSITELIB}/bzrlib/util/tests/__init__.py
+${PYSITELIB}/bzrlib/util/tests/__init__.pyc
+${PYSITELIB}/bzrlib/util/tests/__init__.pyo
+${PYSITELIB}/bzrlib/util/tests/test_bencode.py
+${PYSITELIB}/bzrlib/util/tests/test_bencode.pyc
+${PYSITELIB}/bzrlib/util/tests/test_bencode.pyo
 ${PYSITELIB}/bzrlib/version.py
 ${PYSITELIB}/bzrlib/version.pyc
 ${PYSITELIB}/bzrlib/version.pyo
@@ -1490,20 +1619,10 @@ ${PYSITELIB}/bzrlib/xml_serializer.py
 ${PYSITELIB}/bzrlib/xml_serializer.pyc
 ${PYSITELIB}/bzrlib/xml_serializer.pyo
 man/man1/bzr.1
-share/doc/bzr/centralized_workflow.txt
-share/doc/bzr/configuration.txt
-share/doc/bzr/http_smart_server.txt
 share/doc/bzr/index.txt
-share/doc/bzr/plugins.txt
-share/doc/bzr/server.txt
-share/doc/bzr/setting_up_email.txt
-share/doc/bzr/shared_repository_layouts.txt
-share/doc/bzr/specifying_revisions.txt
-share/doc/bzr/tutorial.txt
-share/doc/bzr/using_aliases.txt
-share/doc/bzr/version_info.txt
 @dirrm share/doc/bzr
 @dirrm ${PYSITELIB}/bzrlib/version_info_formats
+@dirrm ${PYSITELIB}/bzrlib/util/tests
 @dirrm ${PYSITELIB}/bzrlib/util/elementtree
 @dirrm ${PYSITELIB}/bzrlib/util/effbot/org
 @dirrm ${PYSITELIB}/bzrlib/util/effbot
@@ -1518,9 +1637,11 @@ share/doc/bzr/version_info.txt
 @dirrm ${PYSITELIB}/bzrlib/tests/revisionstore_implementations
 @dirrm ${PYSITELIB}/bzrlib/tests/repository_implementations
 @dirrm ${PYSITELIB}/bzrlib/tests/per_lock
+@dirrm ${PYSITELIB}/bzrlib/tests/inventory_implementations
 @dirrm ${PYSITELIB}/bzrlib/tests/interversionedfile_implementations
 @dirrm ${PYSITELIB}/bzrlib/tests/intertree_implementations
 @dirrm ${PYSITELIB}/bzrlib/tests/interrepository_implementations
+@dirrm ${PYSITELIB}/bzrlib/tests/commands
 @dirrm ${PYSITELIB}/bzrlib/tests/bzrdir_implementations
 @dirrm ${PYSITELIB}/bzrlib/tests/branch_implementations
 @dirrm ${PYSITELIB}/bzrlib/tests/blackbox
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index 380c56a4a49..7b1b7e329d9 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2007/07/28 14:48:17 wiz Exp $
+$NetBSD: distinfo,v 1.14 2007/10/27 11:46:43 wiz Exp $
 
-SHA1 (bzr-0.18.tar.gz) = 71a71f6079ab22d0fa6296132dcbfa2dbc1f9756
-RMD160 (bzr-0.18.tar.gz) = 67b58c7ec07757bea36a822b92062e79c8b367dc
-Size (bzr-0.18.tar.gz) = 1552961 bytes
+SHA1 (bzr-0.91.tar.gz) = 40a4f9a8224873b68f9c4e81daff4b1dec59d650
+RMD160 (bzr-0.91.tar.gz) = 890a1abf0b0848186ea491b6375b955a590a2ba2
+Size (bzr-0.91.tar.gz) = 1781688 bytes
 SHA1 (patch-aa) = 8eda90885b3127525330cd3432538fb2b4df98c1
-SHA1 (patch-ab) = 6b4621cf71d0f0f9061d34cf954d18c8d0fbc0b4
+SHA1 (patch-ab) = 2213a002f9bc0f5baba0554b6b375becf4d98d9c
diff --git a/devel/bzr/patches/patch-ab b/devel/bzr/patches/patch-ab
index f1aa8871657..f84792187f9 100644
--- a/devel/bzr/patches/patch-ab
+++ b/devel/bzr/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.4 2007/07/08 19:53:21 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2007/10/27 11:46:43 wiz Exp $
 
---- setup.py.orig	2007-06-18 05:09:04.000000000 +0000
+--- setup.py.orig	2007-09-26 02:47:54.000000000 +0000
 +++ setup.py
-@@ -239,7 +239,7 @@ elif 'py2exe' in sys.argv:
- else:
+@@ -320,7 +320,7 @@ else:
+     DATA_FILES = []
+     if not 'bdist_egg' in sys.argv:
+         # generate and install bzr.1 only with plain install, not easy_install one
+-        DATA_FILES = [('man/man1', ['bzr.1'])]
++        DATA_FILES = [(os.getenv('PKGMANDIR', 'man') + '/man1', ['bzr.1'])]
+ 
      # std setup
      ARGS = {'scripts': ['bzr'],
--            'data_files': [('man/man1', ['bzr.1'])],
-+            'data_files': [(os.getenv('PKGMANDIR', 'man') + '/man1', ['bzr.1'])],
-             'cmdclass': command_classes,
-             'ext_modules': ext_modules,
-            }