bzr 1.18

########

:Codename: little traveller
:1.18:    2009-08-20
:1.18rc1: 2009-08-10

This release of Bazaar marches on towards the 2.0 release in which the 2a
'brisbane-core' format becomes generally recommended.  Most of the work in
this release now focusses on bug fixes and stabilization, covering both 2a
and previous formats.  There is a new text-mode interactive merge feature,
a new guide to migration to 2a format in the user documentation, and
pushing branches to a smart server is now much faster.

The Bazaar team decided that 2.0 will be a long-term supported release,
with bugfix-only releases based on it continuing for at least six months
or until the following stable release.

There are no changes from 1.18rc1 to 1.18.

New Features
************

* ``bzr merge --interactive`` applies a user-selected portion of the
  merge.  The UI is similar to ``shelve``.  (Aaron Bentley)

* ``bzr reconfigure`` now takes options ``--stacked-on URL`` and
  ``--unstacked`` to change stacking of a branch.
  (Martin Pool, #391411)

Bug Fixes
*********

* Annotating on a stacked branch will now succeed in simple scenarios.
  There are still some complex scenarios where it will fail (bug #399884)
  (John Arbash Meinel, #393366)

* A progress bar is no longer left dangling when ``bzr selftest``
  completes, and the progress bar updates with zero latency so the
  displayed test name is always the one that's actually running.
  (Martin Pool, #123688)

* Authenticating against an ssh server now uses ``auth_none`` to determine
  if password authentication is even supported. This fixes a bug where
  users would be prompted for a launchpad password, even though launchpad
  only supports publickey authentication. (John Arbash Meinel, #375867)

* BranchBuilder now accepts timezone to avoid test failures in countries far
  from GMT. (Vincent Ladeuil, #397716)

* ``bzr commit`` no longer saves the unversioning of missing files until
  the commit has completed on the branch. This means that aborting a
  commit that found a missing file will leave the tree unedited.
  (Robert Collins, #282402)

* ``bzr mv`` no longer takes out branch locks, which allows it to work
  when the branch is readonly. (Robert Collins, #216541)

* ``bzr revert .`` no longer generates an InconsistentDelta error when
  there are missing subtrees. (Robert Collins, #367632)

* ``bzr send`` now generates valid bundles with ``--2a`` formats. However,
  do to internal changes necessary to support this, older clients will
  fail when trying to insert them. For newer clients, the bundle can be
  used to apply the changes to any rich-root compatible format.
  (John Arbash Meinel, #393349)

* Cope with FTP servers that don't support restart/append by falling back
  to reading and then rewriting the whole file, such as TahoeLAFS.  (This
  fallback may be slow for some access patterns.)  (Nils Durner, #294709)

* Encode the paths in ``mbcs`` encoding on Windows when spawning an
  external diff client. This at least allows supporting filenames that are
  not ascii, but are present in the current locale. Ideally we would be
  able to pass the Unicode path, but that would be client dependent.
  (John Arbash Meinel, #382709)

* Fix a compile bug on Solaris having to do with const and
  pointer-to-pointers. (John Arbash Meinel, #408441)

* Fixed a NameError that occurs when merging or pulling from a URL that
  causes a redirection loop when bzr tries to read a URL as a bundle.
  (Andrew Bennetts, #400847)

* Fix ``AttributeError: 'TestUIFactory' object has no attribute 'tick'``
  running send and similar commands on 2a formats.
  (Martin Pool, #408201)

* Fixed export to existing directory: if directory is empty then export
  will succeed, otherwise it fails with error.
  (Alexander Belchenko, #406174)

* Fixed spurious "Source branch does not support stacking" warning when
  pushing. (Andrew Bennetts, #388908)

* Fixed spurious transport activity indicator appearing while tests are
  running.  (Martin Pool, #343532)

* Merge now correctly handles empty right-hand revision specs.
  (Aaron Bentley, #333961)

* Renames to lexographically lower basenames in trees that have never been
  committed to will no longer corrupt the dirstate. This was caused by an
  bug in the dirstate update_minimal method. (Robert Collins, #395556)

* Requests for unknown methods no longer cause the smart server to log
  lots of backtraces about ``UnknownSmartMethod``, ``do_chunk`` or
  ``do_end``.  (Andrew Bennetts, #338561)

* Streaming from bzr servers where there is a chain of stacked branches
  (A stacked on B stacked on C) will now work. (Robert Collins, #406597)

* The environment variable ``BZR_PROGRESS_BAR`` set to either ``text`` or ``none``
  always forces progress bars either on or off respectively.  Otherwise,
  they're turned on if ``TERM`` is not ``dumb`` and stderr is a terminal.
  bzr always uses the 'text' user interface when run as a command, so
  ``BZR_USE_TEXT_UI`` is no longer needed.
  (Martin Pool, #339385, #387717)

* The optional ``_knit_load_data_pyx`` C extension was never being
  imported.  This caused significant slowdowns when reading data from
  repositories.  (Andrew Bennetts, #405653)

* The ``--hardlink`` option to ``branch`` and ``checkout`` is not
  supported at the moment on workingtree formats that can do content
  filtering.  (See <https://bugs.edge.launchpad.net/bzr/+bug/408193>.)
  bzr now says so, rather than just ignoring the option.  (Martin Pool)

* There was a bug in ``osutils.relpath`` that was only triggered on
  Windows. Essentially if you were at the root of a drive, and did
  something to a branch/repo on another drive, we would go into an
  infinite loop while trying to find a 'relative path'.
  (John Arbash Meinel, #394227)

* ``WorkingTree4.unversion`` will no longer fail to unversion ids which
  were present in a parent tree but renamed in the working tree.
  (Robert Collins, #187207)

Improvements
************

* Can now rename/move files even if they have been removed from the inventory.
  (Marius Kruger)

* Pushing branches with tags via ``bzr://`` and ``bzr+ssh://`` is much
  faster, using a new ``Branch.set_tags_bytes`` smart server verb rather
  than VFS methods.  For example, pushes of small branches with tags take
  11 rather than 18 smart server requests.  (Andrew Bennetts, #398608)

* Sending Ctrl-Break on Windows will now drop you into the debugger, in
  the same way that sending Ctrl-\\ does on other platforms.
  (John Arbash Meinel)

Documentation
*************

* Added Bazaar 2.0 Upgrade Guide. (Ian Clatworthy)

API Changes
***********

* ``CLIUIFactory`` is deprecated; use ``TextUIFactory`` instead if you
  need to subclass or create a specific class, or better yet the existing
  ``make_ui_for_terminal``.  ``SilentUIFactory`` is clarified to do no
  user interaction at all, rather than trying to read from stdin but not
  writing any output, which would be strange if reading prompts or
  passwords.  (Martin Pool)

* New TransformPreview.commit() allows committing without a working tree.
  (Aaron Bentley)

* ``pb`` parameter to ``TextTestResult`` is deprecated and ignored.
  (Martin Pool)

* ProgressTasks now prefer to talk direct to their ProgressView not to the
  UIFactory.
  (Martin Pool)

* ``WorkingTree._check`` now requires a references dict with keys matching
  those returned by ``WorkingTree._get_check_refs``. (Robert Collins)

Internals
*********

* ``CHKInventory.path2id`` uses the parent_id to basename hash to avoid
  reading the entries along the path, reducing work to lookup ids from
  paths. (Robert Collins)

* ``CHKMap.apply_delta`` now raises ``InconsistentDelta`` if a delta adds
  as new a key which was already mapped. (Robert Collins)

* Inventory delta application catches more cases of corruption and can
  prevent corrupt deltas from affecting consistency of data structures on
  disk. (Robert Collins)

* --subunit support now adds timestamps if the subunit version supports
  it. (Robert Collins)

* The Windows all-in-one installer now bundles the PyQt image format
  plugins, which allows previewing more images as part of 'qdiff'.
  (Alexander Belchenko)


Testing
*******

* Merge directive cherrypick tests must use the same root id.
  (Martin Pool, #409684)

* Spurious failure in ``check`` tests on rich-root formats fixed.
  (Martin Pool, #408199)

* The ``bzrlib.tests.TextTestRunner`` will no longer call
  ``countTestsCases`` on the test being run. Progress information is
  instead handled by having the test passed in call ``result.progress``
  before running its contents. This improves the behaviour when using
  ``TextTestRunner`` with test suites that don't support
  ``countTestsCases``. (Robert Collins)

3 files changed, 18 insertions, 8 deletions

diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index a668ae285b0..ff430be7d97 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.40 2009/08/08 15:52:08 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2009/09/09 05:43:11 epg Exp $
 
 DISTNAME=		bzr-${VER}
 #PKGREVISION=		1
 CATEGORIES=		devel scm
-MASTER_SITES=		http://launchpad.net/bzr/1.17/${VER}/+download/
-VER=			1.17
+MASTER_SITES=		http://launchpad.net/bzr/1.18/${VER}/+download/
+VER=			1.18
 
 MAINTAINER=		epg@NetBSD.org
 HOMEPAGE=		http://bazaar-vcs.org/
 COMMENT=		Bazaar open source distributed version control system
+LICENSE=		gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/devel/bzr/PLIST b/devel/bzr/PLIST
index c79349aeefb..6c25566aa5a 100644
--- a/devel/bzr/PLIST
+++ b/devel/bzr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2009/08/08 15:52:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.30 2009/09/09 05:43:11 epg Exp $
 bin/bzr
 ${PYSITELIB}/bzrlib/__init__.py
 ${PYSITELIB}/bzrlib/__init__.pyc
@@ -1140,6 +1140,9 @@ ${PYSITELIB}/bzrlib/tests/per_repository/test_is_write_locked.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository/test_iter_reverse_revision_history.py
 ${PYSITELIB}/bzrlib/tests/per_repository/test_iter_reverse_revision_history.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository/test_iter_reverse_revision_history.pyo
+${PYSITELIB}/bzrlib/tests/per_repository/test_merge_directive.py
+${PYSITELIB}/bzrlib/tests/per_repository/test_merge_directive.pyc
+${PYSITELIB}/bzrlib/tests/per_repository/test_merge_directive.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository/test_pack.py
 ${PYSITELIB}/bzrlib/tests/per_repository/test_pack.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository/test_pack.pyo
@@ -1197,6 +1200,9 @@ ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_default_stacking.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_fetch.py
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_fetch.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_fetch.pyo
+${PYSITELIB}/bzrlib/tests/per_repository_reference/test_get_record_stream.py
+${PYSITELIB}/bzrlib/tests/per_repository_reference/test_get_record_stream.pyc
+${PYSITELIB}/bzrlib/tests/per_repository_reference/test_get_record_stream.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_get_rev_id_for_revno.py
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_get_rev_id_for_revno.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_get_rev_id_for_revno.pyo
@@ -1275,6 +1281,9 @@ ${PYSITELIB}/bzrlib/tests/per_workingtree/test_break_lock.pyo
 ${PYSITELIB}/bzrlib/tests/per_workingtree/test_changes_from.py
 ${PYSITELIB}/bzrlib/tests/per_workingtree/test_changes_from.pyc
 ${PYSITELIB}/bzrlib/tests/per_workingtree/test_changes_from.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_check.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_check.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_check.pyo
 ${PYSITELIB}/bzrlib/tests/per_workingtree/test_commit.py
 ${PYSITELIB}/bzrlib/tests/per_workingtree/test_commit.pyc
 ${PYSITELIB}/bzrlib/tests/per_workingtree/test_commit.pyo
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index d504b1119f8..03920360d78 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.32 2009/08/08 15:52:09 wiz Exp $
+$NetBSD: distinfo,v 1.33 2009/09/09 05:43:11 epg Exp $
 
-SHA1 (bzr-1.17.tar.gz) = 32dce4d48768c32c4a62595249fe37534179a116
-RMD160 (bzr-1.17.tar.gz) = 422d4c5b47b003fe35491ce01ea55bae2f28f004
-Size (bzr-1.17.tar.gz) = 5913890 bytes
+SHA1 (bzr-1.18.tar.gz) = 0e738c089ad769eeea6f67befd3de93a402200a7
+RMD160 (bzr-1.18.tar.gz) = 307fe8770b96b1cc67c97ec7bc62ba915a0238bb
+Size (bzr-1.18.tar.gz) = 5977774 bytes
 SHA1 (patch-aa) = 8eda90885b3127525330cd3432538fb2b4df98c1
 SHA1 (patch-ab) = 042761dede5533cefbfa25ba548c3bb13236dce5