Bazaar

"bzr branch lp:proj lp:~user/proj/aaa" downloads and uploads full history

Bug #597942 reported by Andrew Bennetts
8
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Bazaar
Fix Released
High
Andrew Bennetts
Bazaar 2.2b4

Bug Description

The specific issue here seems to be that BzrDir.sprout wrongly assumes that if a repository is newly created by sprout then it cannot be stacked. That of course is not true, as Launchpad demonstrates.

The fix is probably to check if result_repo._fallback_repositories is non-empty in BzrDir.sprout before making the PendingAncestryResult.

(See the original question this bug was created from for more context.)

Tags: stacking

Related branches

lp://staging/~spiv/bzr/new-repo-stacking-bug-597942
Robert Collins (community): Approve
Diff: 62 lines (+29/-1)
3 files modified
NEWS (+4/-0)
bzrlib/bzrdir.py (+2/-1)
bzrlib/tests/per_bzrdir/test_bzrdir.py (+23/-0)
Revision history for this message
Andrew Bennetts (spiv) wrote :

I'm marking High as although this is not the common case, the fix looks simple and the benefit for that case should be dramatic.

Changed in bzr:
importance: Undecided → High
status: New → Confirmed
tags: added: stacking
summary: - "bzr branch lp:proj lp:~user/proj/aaa" downloads and uploads fully
+ "bzr branch lp:proj lp:~user/proj/aaa" downloads and uploads full
history
Revision history for this message
Andrew Bennetts (spiv) wrote :

With my patch, this works as intended:

$ bzr branch lp:bzr lp:~spiv/bzr/test-please-ignore
Using default stacking branch /~bzr-pqm/bzr/bzr.dev at bzr+ssh://bazaar.launchpad.net/~spiv/bzr/
Created new stacked branch referring to /~bzr-pqm/bzr/bzr.dev.
Transferred: 252kB (4.1kB/s r:230kB w:22kB)

There's still some improvement we could make to the network conversation, but this is pretty good for such a small patch :)

Changed in bzr:
assignee: nobody → Andrew Bennetts (spiv)
Andrew Bennetts (spiv)
Changed in bzr:
status: Confirmed → In Progress
Andrew Bennetts (spiv)
Changed in bzr:
milestone: none → 2.2b4
status: In Progress → Fix Released
Revision history for this message
Javier Collado (javier.collado) wrote :

Thanks a lot for fixing this bug. I'm sure this change will make many people more productive.

Just one quick question, fix released means that it's available through a PPA or through source code?

Revision history for this message
Andrew Bennetts (spiv) wrote :

The short answer is: it's only in the lp:bzr branch at the moment.

The long answer:

For bzr Fix Released is used to mean the fix has landed in the official branch. In this case, it will be part of 2.2b4 (and I'm about to backport it to the 2.0 and 2.1 branches too, so it'll be in 2.1.3 and 2.0.6 whenever those happen).

I don't think there's a PPA with this fix in it yet. Ideally it would appear in <https://launchpad.net/~bzr-nightly-ppa/+archive/ppa> but that doesn't seem to have updated for a couple of weeks. As releases happen it should appear in the bzr-beta-ppa PPA and eventually the stable bzr PPA (see the links on <https://launchpad.net/bzr>).

Vincent Ladeuil (vila)
no longer affects: bzr/2.0
no longer affects: bzr/2.1
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.