[MERGE] [BUG #165290] inter-pack fetch should make sure we aren't missing a compression parent

John Arbash Meinel john at arbash-meinel.com
Fri Nov 30 22:19:51 GMT 2007


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

Robert Collins wrote:
> Robert Collins has voted tweak.
> Status is now: Conditionally approved
> Comment:
> the _external_compression... method - on Pack I wouldn't mention 'new'
> texts - its all texts for that pack.
> 
> You check for missing texts outside Packer.pack(); I think it would be
> better to do this within Packer.pack; after it's this logic that will
> change to fetch arbitrary delta parents eventually etc.

At first, I thought it nicer to raise a nicer exception that talked about at
least the repository. However, the current knit code just says "revision id not
present in file_id" which we can do from packs.

So I went ahead and moved this check into Packer.pack (actually called from
_create_pack_from_packs).


> 
> This hunk looks suspect
> === modified file
> 'bzrlib/tests/interrepository_implementations/__init__.py'
> --- bzrlib/tests/interrepository_implementations/__init__.py 2007-11-17
> 00:14:55 +0000
> +++ bzrlib/tests/interrepository_implementations/__init__.py 2007-11-29
> 22:27:29 +0000
> @@ -103,9 +103,6 @@
>                         knitrepo.RepositoryFormatKnit3()))
>          result.append((InterKnitRepo,
>                         knitrepo.RepositoryFormatKnit1(),
> -                       knitrepo.RepositoryFormatKnit1()))
> -        result.append((InterKnitRepo,
> -                       knitrepo.RepositoryFormatKnit1(),
> 
> 

ُThat is just a poor diff.

I removed an extra Knit1->Knit1 test, since that should already be tested. (I
had added it earlier because I didn't see the implicit tests.)

Cleaned up and submitted.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHUIyHJdeBCYSNAAMRAl8oAKDJGf+y5r5rleZLasOcNdWOGsH0TQCeK5aX
CHNFrP21YMCaTatczepiBKM=
=TwnB
-----END PGP SIGNATURE-----



More information about the bazaar mailing list