[ANN] bzr 2.5b6 released

Hi,

This is the sixth (and last (really)) beta of the 2.5 series: 2.5b6

Bazaar <http://bazaar.canonical.com/> is a Canonical project and part of
the GNU project <http://gnu.org/> to produce a free operating system.

2.5.0 is planned to be released in March 2012.

This introduces the support for colocated branches into the '2a' format in a
backward compatible way, fix more glitches in the colocated UI, verify https
certificates for the urllib https client implementation, fix some more
unicode issues and more.

All bugs fixed in previous series known at the time of this release are
included.

The 2.5 API is now frozen as are the strings for translations.

Since this is our very last beta, I'd like to remind packagers and
plugin authors that a special care should be taken to precisely identify
which revisions of which plugins are targeted at the 2.5 series and
ensure that the plugins are compatible with 2.5b6 (and keep paying
attention during the early days of 2.5.0 ;).

A warm thank you to all of you sending feedback, suggestions, even merge
proposals making bzr better !

Bazaar is now available for download from
https://launchpad.net/bzr/2.5/2.5b6/ as a source tarball.

Bazaar and online code review.

bzrlib / loggerhead version binding? (and, well, other plugins version binding)

diff without printing added files?

bzr diff will print the entirety of all added files.  Is there a way to
just get it to print diffs of existing files, and just print "added
foo.c" or whatever for new files, kind of like diff without -N?

Thanks,
Chris

Error with Bazaar through FTP: Unrecognised container format

Hi,

For more than one year, we've had a fully functionnal Bazaar
repository, centralized at a FTP server.

Suddenly, we all got the following error when we try to commit:

*bzr: ERROR: Unrecognised container format: 'B246'*

If I try to recreate another setup by scratch now, I get the same error:

$ bzr init-repo --verbose --no-trees ftp://user <at> ftp.domain.tld/repository2
Shared repository (format: 2a)
Location:
  shared repository: ftp://user <at> ftp.domain.tld/repository2/
$ bzr init ftp://user <at> ftp.domain.ch/repository2/site
Created a repository branch (format: 2a)
Using shared repository: ftp://user <at> ftp.domain.tld/repository2/
$ cd .bzr checkout ftp://user <at> ftp.domain.tld/repository2/branch branch
$ cd branch
$ bzr mkdir www
added www
$ bzr commit -m " "
Committing to: ftp://user <at> ftp.domain.tld/repository2/branch/
added www
bzr: ERROR: Unrecognised container format: 'B246'

The FTP is hosted in a mutualized hosting (at OVH.com), so it is
unlikely that something has changed in its configuration (or is it?).

Does anyone has an idea of where these errors could come from ? Our
workflow is totally paralized until we fix that :(

Thanks a lot,
Frank

any way to ignore current unknown files?

Without writing a little shell script to do it with bzr st?

Seems like bzr ignore should have an --unknown flag to do this
automatically?

Chris

dns-cache plugin?

Patch pilot report for the week of 2012-01-30

Want to try hacking on bzr but not sure where to start? There are
several recently filed bugs with good steps to reproduce:

<https://bugs.launchpad.net/bzr/+bug/850594>
<https://bugs.launchpad.net/bzr/+bug/880298>
<https://bugs.launchpad.net/bzr/+bug/910002>
<https://bugs.launchpad.net/bzr/+bug/921666>

A couple of these may be hard to fix, but writing a failing unittest
is a great way to get started.

On the bzr code front this week:

Vincent landed some configuration changes to the new SSL certificate
checking code, this is something we'll really want feedback when the
installers for 2.5b6 are released.
<https://code.launchpad.net/~vila/bzr/920455-ssl-defaults/+merge/90693>

Jelmer updated several more things to the new config stacks onver the weekend.
<https://code.launchpad.net/~jelmer/bzr/config-registry-option/+merge/90534>
<https://code.launchpad.net/~jelmer/bzr/working-tree-config-stack/+merge/90525>
<https://code.launchpad.net/~jelmer/bzr/config-validate-signatures-in-log/+merge/90581>
<https://code.launchpad.net/~jelmer/bzr/config-mail-client/+merge/90536>

Wouter has been making more progress on getting the test suite passing on pypy.
<https://code.launchpad.net/~larstiq/bzr/bzr-pypy/+merge/91428>

Sam demonstrates it's easy to just fix something in bzr.
<https://code.launchpad.net/~naesten/bzr/2011-02-27-typo-fix/+merge/91354>

Couple of neat things in the wider bazaar world:

Hidetaka added cool new overview of changes bar to qblame and qdiff.
<https://code.launchpad.net/~hid-iwata/qbzr/textedit-guidebar/+merge/91126>

Curtis has been fixing various fallout from the move to gtk3. The
proposals from last week are particularly worth looking at for the
testing added despite being one line fixes to a gui application.
<https://code.launchpad.net/~sinzui/bzr-gtk/precise-commit-0/+merge/89586>
<https://code.launchpad.net/~sinzui/bzr-gtk/precise-commit-1/+merge/89608>
<https://code.launchpad.net/~sinzui/bzr-gtk/precise-diff-0/+merge/89759>
<https://code.launchpad.net/~sinzui/bzr-gtk/notify-gtk-import/+merge/91497>

FOSDEM is on this weekend, if you're going say hi to Jelmer who'll be
there, snow willing.

Martin

[ANN] bzr-2.5b6 has been frozen !

This is our last (really) beta for the 2.5 series: 2.5b6 has been frozen
and tagged. We delayed 2.5.0 for an additional month and introduce this
last beta to ensure we get a rock solid new stable series.

Only bugfixes can now land on the lp:bzr/2.5 branch, API and strings
being frozen.

Packagers and installer builders, we need your help again so we can get
the beta release announcement out and more importantly allow our beta
users to enjoy the latest features and bug fixes.

I'd like to make the announcement on Tuesday morning with whatever
installers are available at this point.

The tarball has been uploaded at https://launchpad.net/bzr/2.5/2.5b6

       Vincent

merge then revert doesn't fully delete directories? (bzr 2.1.4)

I have branches A and B.  A has been merged into B before, with some
directories deleted in B.  If B/foo was deleted, but A/foo/bar.c
changes, and then I merge A->B then on the merge bzr freaks out with
conflicts and creates B/foo/bar.c.  Then, I bzr revert foo in B and
instead of just completely toasting the dir, it kills the files (all
.OTHER), but errors on any nested directories with:

Conflict: can't delete foo/bar/baz because it is not empty.  Not deleting.

It looks like if it just worked from leaves to root it would be fine,
but it finds the child dirs before it kills them.

This is with bzr 2.1.4, so maybe this has been fixed?

Chris

PS.  It's actually slightly more subtle than this because of the way I
created the two branches, but I don't think that matters.

WorkingTree.wt.get_config_stack and BzrDirConfig

Hi there,

I've actually just started getting familiar with config stacks this
week, fixing a bug in bzr-pqm caused by the cutover.

I see that you've added a way of getting a config from a WorkingTree,
with hints that per-working-tree configs might be supported in the future.

I think it's worth considering using the per-bzrdir config for this,
rather than implementing something that only works for working trees.

The BzrDirConfig is pretty obscure right now, because we only use it
to configure the default stacking location.  We needed a way to
configure a location that allowed remote configuration (so
locations.conf and bazaar.conf were out), but that location could have
no branch or repository (so branch.conf was out).

But it would be possible to use it for branches, trees and
repositories, too, since they all have control directories.  And I
think that collecting all that configuration in one place would be a
nice simplification.

The only thing is that this is a behaviour change, so it could require
format changes.  But adding a per-working-tree config would also be a
behaviour change.

Aaron