Update to 1.2 from Nick Goffee.

bzr 1.2 2008-02-15 (BUGFIXES and INTERNALS omitted)
------------------

bzr 1.2rc1 2008-02-13
---------------------

  NOTES WHEN UPGRADING:

    * Fetching via the smart protocol may need to reconnect once during a fetch
      if the remote server is running Bazaar 1.1 or earlier, because the client
      attempts to use more efficient requests that confuse older servers.  You
      may be required to re-enter a password or passphrase when this happens.
      This won't happen if the server is upgraded to Bazaar 1.2.
      (Andrew Bennetts)

  CHANGES:

    * Fetching via bzr+ssh will no longer fill ghosts by default (this is
      consistent with pack-0.92 fetching over SFTP). (Robert Collins)

    * Formatting of ``bzr plugins`` output is changed to be more human-
      friendly. Full path of plugins locations will be shown only with
      ``--verbose`` command-line option. (Alexander Belchenko)

    * ``merge`` now prefers to use the submit branch, but will fall back to
      parent branch.  For many users, this has no effect.  But some users who
      pull and merge on the same branch will notice a change.  This change
      makes it easier to work on a branch on two different machines, pulling
      between the machines, while merging from the upstream.
      ``merge --remember`` can now be used to set the submit_branch.
      (Aaron Bentley)

  FEATURES:

    * ``merge --preview`` produces a diff of the changes merge would make,
      but does not actually perform the merge.  (Aaron Bentley)

    * New smart method ``Repository.get_parent_map`` for getting revision
      parent data. This returns additional parent information topologically
      adjacent to the requested data to reduce round trip latency impacts.
      (Robert Collins)

    * New smart method, ``Repository.stream_revisions_chunked``, for fetching
      revision data that streams revision data via a chunked encoding.  This
      avoids buffering large amounts of revision data on the server and on the
      client, and sends less data to the server to request the revisions.
      (Andrew Bennetts, Robert Collins, #178353)

    * The launchpad plugin now handles lp urls of the form
      ``lp://staging/``, ``lp://demo/``, ``lp://dev/`` to use the appropriate
      launchpad instance to do the resolution of the branch identities.
      This is primarily of use to Launchpad developers, but can also
      be used by other users who want to try out Launchpad as
      a branch location without messing up their public Launchpad
      account.  Branches that are pushed to the staging environment
      have an expected lifetime of one day. (Tim Penhey)

  IMPROVEMENTS:

    * Creating a new branch no longer tries to read the entire revision-history
      unnecessarily over smart server operations. (Robert Collins)

    * Fetching between different repository formats with compatible models now
      takes advantage of the smart method to stream revisions.  (Andrew Bennetts)

    * The ``--coverage`` option is now global, rather specific to ``bzr
      selftest``.  (Andrew Bennetts)

    * The ``register-branch`` command will now use the public url of the branch
      containing the current directory, if one has been set and no explicit
      branch is provided.  (Robert Collins)

    * Tweak the ``reannotate`` code path to optimize the 2-parent case.
      Speeds up ``bzr annotate`` with a pack repository by approx 3:2.
      (John Arbash Meinel)

  API BREAKS:

    * Classes implementing Merge types like Merge3Merger must now accept (and
      honour) a do_merge flag in their constructor.  (Aaron Bentley)

    * ``Repository.add_inventory`` and ``add_revision`` now require the caller
      to previously take a write lock (and start a write group.)
      (Martin Pool)

  TESTING:

    * selftest now accepts --load-list <file> to load a test id list. This
      speeds up running the test suite on a limited set of tests.
      (Vincent Ladeuil)

3 files changed, 15 insertions, 13 deletions

diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index aa0411dc224..24329f55675 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2008/01/22 00:49:16 gdt Exp $
+# $NetBSD: Makefile,v 1.20 2008/02/15 16:46:20 gdt Exp $
 #
 
-DISTNAME=		bzr-1.1
+DISTNAME=		bzr-1.2
 CATEGORIES=		devel scm
 MASTER_SITES=		http://bazaar-vcs.org/releases/src/
 
diff --git a/devel/bzr/PLIST b/devel/bzr/PLIST
index 089683603ac..e91484591de 100644
--- a/devel/bzr/PLIST
+++ b/devel/bzr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2008/01/22 00:49:16 gdt Exp $
+@comment $NetBSD: PLIST,v 1.15 2008/02/15 16:46:20 gdt Exp $
 bin/bzr
 ${PYSITELIB}/bzrlib/__init__.py
 ${PYSITELIB}/bzrlib/__init__.pyc
@@ -245,10 +245,10 @@ ${PYSITELIB}/bzrlib/help.pyo
 ${PYSITELIB}/bzrlib/help_topics/__init__.py
 ${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/hooks.txt
-${PYSITELIB}/bzrlib/help_topics/en/configuration.txt
-${PYSITELIB}/bzrlib/help_topics/en/authentication.txt
 ${PYSITELIB}/bzrlib/hooks.py
 ${PYSITELIB}/bzrlib/hooks.pyc
 ${PYSITELIB}/bzrlib/hooks.pyo
@@ -375,12 +375,12 @@ ${PYSITELIB}/bzrlib/plugins/launchpad/test_account.pyo
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_indirect.py
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_indirect.pyc
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_indirect.pyo
+${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_service.py
+${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_service.pyc
+${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_service.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
@@ -909,6 +909,9 @@ ${PYSITELIB}/bzrlib/tests/repository_implementations/test_fileid_involved.pyo
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_find_text_key_references.py
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_find_text_key_references.pyc
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_find_text_key_references.pyo
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_has_revisions.py
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_has_revisions.pyc
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_has_revisions.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
@@ -1671,7 +1674,6 @@ ${PYSITELIB}/bzrlib/versionedfile.py
 ${PYSITELIB}/bzrlib/versionedfile.pyc
 ${PYSITELIB}/bzrlib/versionedfile.pyo
 ${PYSITELIB}/bzrlib/weave.py
-${PYSITELIB}/bzrlib/weave.py
 ${PYSITELIB}/bzrlib/weave.pyc
 ${PYSITELIB}/bzrlib/weave.pyo
 ${PYSITELIB}/bzrlib/weave_commands.py
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index 00c00856407..a4d3876edcd 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2008/01/22 00:49:16 gdt Exp $
+$NetBSD: distinfo,v 1.17 2008/02/15 16:46:20 gdt Exp $
 
-SHA1 (bzr-1.1.tar.gz) = a34af746c6c9fef5c8d063fab892e368aa7e74ab
-RMD160 (bzr-1.1.tar.gz) = 1a57f127bb452aa842d6c1a41578cea964bc1bf3
-Size (bzr-1.1.tar.gz) = 3425781 bytes
+SHA1 (bzr-1.2.tar.gz) = 9d10c3a0ca51dd33a22aaf12a5292eecedd95610
+RMD160 (bzr-1.2.tar.gz) = ec7fc2744f2e52783e95fc4789c13869d2862527
+Size (bzr-1.2.tar.gz) = 3453071 bytes
 SHA1 (patch-aa) = 8eda90885b3127525330cd3432538fb2b4df98c1
 SHA1 (patch-ab) = 2213a002f9bc0f5baba0554b6b375becf4d98d9c