[bug] Repository.copy() copies inventory first

[John A Meinel]

Robert Collins wrote:
> On Thu, 2006-02-16 at 01:09 -0600, John A Meinel wrote:
>> Robert Collins wrote:
> 
>> The code is a little bit different after merging your bzrdir work. I
>> eventually tracked the location where we actually create stuff. The path
>> seems a little bit convoluted, and we go through 3+ indirections, but it
>> is possible to follow. (It isn't helped by calling
>> BzrBranch.copy_content_into which doesn't copy any content, it just sets
>> the revision history, and parent, and it sets the parent to
>> source.get_parent() rather than setting it to source. That seems like a
>> bug to me.
>> But then again on closer inspection 'sprout()' calls copy_content_into,
>> and then afterwards overrides the fact that copy_content sets the
>> parent, by setting the parent itself. So I must ask 'why does
>> copy_content_into' set parent?
>> I suppose BzrBranch.clone() uses it. But if nobody else does, it seems
>> like setting the parent should be done inside clone() and sprout().
> 
> its used by clone and sprout. I'm not sure whether to move that out of
> copy_content_into to clone, as its useful for copying the content of a
> branch into another, and I expect that the generic 'updater' logic will
> want to do that. But we can move it and later put it back.
> 
>> Anyway, I can easily add the progress bars. I'm just a little concerned
>> because I'm not 100% positive when the inventory.weave is being copied
>> across....
>>
>> Found it!!! And the bug is still present. So I'll fix it. (revision.py
>> line 270, we still are copying the inventory weave before we copy the
>> rest of the weaves).
>>
>> So attached is the revised version, which I would like to commit to
>> jam-integration. Can someone look it over?
>>
>> John
>> =:->

Attached is the revised patch.

John
=:->

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: branch-progress.diff
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20060216/0c50dba8/attachment.diff 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060216/0c50dba8/attachment.pgp