Colocated branch progress

[Jelmer Vernooij]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 17/08/11 11:58, Jelmer Vernooij wrote:
> On 03/08/11 02:14, Jelmer Vernooij wrote:
> > The ability to address colocated branches using URLs has long been in
> > progress (https://bugs.launchpad.net/bugs/380871). After brainstorming a
> > bit with John and Martin at the recent Launchpad sprint, I'm finally
> > back on track hacking on it.
>
> > There are basically four things left to do now:
>
> > 1) Avoid URLescaping comma's when converting local paths to URLs.
> > (lp:~jelmer/bzr/escape-comments)
> > 2) Preserve the distinction between literal and delimiting comma's in
> > URLs when they are parsed in e.g. ConnectedTransport (2)
> > 3) Parse the subsegment parameters for Transports and make them
> > accessible (done, lp:~jelmer/bzr/transport-segments)
> > 4) Look at the transport segment parameters in ControlDir and use them
> > to determine the default branch (this should be fairly easy)
> All this has now finally happened, and is currently pending for landing
> on bzr.dev.
>
> This means that with control directory formats that support it, you can
> now do things like:
>
> $ bzr log "file:///path/to/repo,branch=foo
>
> We might add shorter forms of this available in the future, but will
> have to be careful to not break other use cases. For example, supporting
> "/tmp/repo,branch=foo" will break things for people who actually have
> branches with a comma in their name.
>
> There are also two pending branches that make it possible to list
> colocated branches ("bzr branches") and switch between them using "bzr
> switch".
There is now also a branch up that adds support for colocated branches
to the standard bzrdir format, in a backwards compatible manner:

https://code.launchpad.net/~jelmer/bzr/metadir-goes-colo/+merge/72451

Once that lands it should be possible to use colocated branches in bzr
core, without the use of any plugins. The UI still needs some work
though, and there is a bug about having bzr-colo's commands support the
in-core colocated branches:

https://bugs.launchpad.net/bzr-colo/+bug/830799

We should also improve various bits in the core UI to deal better with
colocated branches:

 * Have some way to clone a control directory including *all* colocated
branches (bug 831939)
 * Ability to remove colocated branches easily (bug 831464)
 * Ability to easily switch to new or existing colocated branches in
"bzr switch" (bug 826814)
 * Anything else?

For all colocated-related bugs, see also the "colocated" tag in Launchpad:

https://bugs.launchpad.net/bzr/+bugs?field.tag=colocated

Cheers,

Jelmer
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJOU5lnAAoJEACAbyvXKaRXh/8QAJDpLw0EYrfwL3xgfNlV/KS9
iazar5rj1jUeEXCJ178/QEcko7BGq64dzRq7vlb/qKywh2aQoEoHtl10dYUq1CVd
J1mr771WRmsQC+q2l0uzVBeFgf5kF/Q7JiL6whP7tyJL/3wXfoYOwq1+hdc2pXEj
T78zJ/gntoLHkPO4N9GV9PgUjAN3Dal7vZDqHq4zWDjGu9+iSjfYbSJ9fLzBs4cs
j9WDxjMec1UmtdQ0gSSRNyqr/8vd0uLIPVi8bzqgD9pRPP903shpm4Ir9Y0vck4b
rOxJHd4fFxwHfONIbz+ShFfieYuYjB6mwdfey9n3QCSaucJQINHUsG6ZS42vajCq
jjEPbkgG5vyTmRnBwUNywMwX/X3tbnTISo8qGV4e6nnXnoFoDPCqMeiJ8tiMjj/G
xUFA4Ufo5im5O6GDD0SI/LwfhAynXedIkVhhFPo1QE0+8fZsIy9jNweWsHDf6Eot
oYBOFBfuEinaPSprkH+Z2Ny43FiuWHsh/AdRDCa4uf4Wxjxl7IjIPWfjqWkV+FmA
JURu1/XsUjMqlaI1lfA9E5Lev/UVg9mUHzkwM1PLBsM97WhM0olVBqQpVq9wq0D/
fFjsLL7oc7hNjIjOQIEqECRZr0gPiGQVJvHMu0PVJT6plTu1aqsiSBGG3J8h8xQf
CYCIzQmrFXFphPi6953b
=6wMA
-----END PGP SIGNATURE-----