Bazaar

Merge lp://staging/~jelmer/bzr/rmbranch-colo into lp://staging/bzr

rmbranch-colo
Merge into bzr.dev

Proposed by Jelmer Vernooij on 2012-02-24

Status:

Superseded

Proposed branch:

lp://staging/~jelmer/bzr/rmbranch-colo

Merge into:

lp://staging/bzr

Diff against target:

158 lines (+63/-17) (has conflicts)

4 files modified

bzrlib/builtins.py (+37/-14)
bzrlib/tests/blackbox/test_rmbranch.py (+12/-2)
bzrlib/tests/blackbox/test_switch.py (+1/-1)
doc/en/release-notes/bzr-2.5.txt (+13/-0)

Text conflict in doc/en/release-notes/bzr-2.5.txt

To merge this branch:

bzr merge lp://staging/~jelmer/bzr/rmbranch-colo

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Martin Packman (community)		2012-02-24	Needs Information on 2012-02-26
Review via email: mp+94553@code.staging.launchpad.net

This proposal supersedes a proposal from 2012-02-23.

This proposal has been superseded by a proposal from 2012-02-28.

Description of the change

Support removing colocated branches in 'bzr rmbranch'.

Also includes a drive-by fix to reduce the number of HPSS connections for 'bzr switch' in lightweight checkouts by one.

Revision history for this message

Martin Packman (gz) wrote on 2012-02-26:

Substative changes all seems fine.

Is this intended to go on 2.5 or dev? Either needs retargetting or release notes need moving (and conflict to resolve there anyway).

-def lookup_sibling_branch(control_dir, location, possible_transports=None):
- """Lookup sibling branch.
-
+def open_sibling_branch(control_dir, location, possible_transports=None):
+ """Open a branch, possibly a sibling.

This looks technically like an api change if it's what's in 2.5.0 but as it's pretty new I guess it's okay to do.

- self.assertLength(2, self.hpss_calls)
+ self.assertLength(5, self.hpss_calls)

Sneaking this up is from looking at more possible branch locations?

review: Needs Information

Revision history for this message

Jelmer Vernooij (jelmer) wrote on 2012-02-26:

On 02/26/2012 11:17 PM, Martin Packman wrote:
> Review: Needs Information
>
> Substative changes all seems fine.
>
> Is this intended to go on 2.5 or dev? Either needs retargetting or release notes need moving (and conflict to resolve there anyway).
Yeah, mostly because it's a bug that people can remove active colocated
branches.

Alternatively, I could propose it against bzr.dev. colo support in 2.5
isn't fully polished anyway. That would mean fewer (risky) changes in
2.5. What do you think?
>
> -def lookup_sibling_branch(control_dir, location, possible_transports=None):
> - """Lookup sibling branch.
> -
> +def open_sibling_branch(control_dir, location, possible_transports=None):
> + """Open a branch, possibly a sibling.
>
> This looks technically like an api change if it's what's in 2.5.0 but as it's pretty new I guess it's okay to do.
I think that should be fine considering it's a fairly recent change,
indeed - and it's something that can't really be something that's used
by outsiders yet.
>
> - self.assertLength(2, self.hpss_calls)
> + self.assertLength(5, self.hpss_calls)
>
> Sneaking this up is from looking at more possible branch locations?
Yeah.