[RFC] metaweave format

[John Arbash Meinel]

Olaf Conradi wrote:
> Hi
> 
> Partly because of https://launchpad.net/products/bzr/+bug/41885
> and for compatability with 0.8rc1, I would like to see a
> --format=metaweave.
> 
> I also modified the help of bzr init-repo. We could, just like bzr
> help init, only notify metadir as supported format. And hide all the
> other formats in help.
> 
> http://deschacht.student.utwente.nl/bzr/bazaar-vcs/bzr.olaf.metaweave/
> 
> -Olaf
> 

I think the real fix is to have "metadir" do what you have defined as
"metaweave".

That is what it used to do, and I think what was intended.

However, "metaweave" might be a better name for it.

If we use "metaweave" I would probably get rid of "metadir" entirely. We
have "knit" which is a Metadir + knits, and "metaweave" which is
metadir+weaves, and "weave" which is the old all-in-one format.

John
=:->

> 
> ------------------------------------------------------------------------
> 
> === modified file 'a/NEWS'
> --- a/NEWS	
> +++ b/NEWS	
> @@ -109,6 +109,9 @@
>  
>      * Make 'pull' and 'push' remember location on failure using --remember.
>        (Olaf Conradi)
> +
> +    * For compatability, make old format for weave repository inside metadir
> +      available as 'metaweave' format.  (Olaf Conradi)
>  
>    INTERNALS:
>    
> 
> === modified file 'a/bzrlib/builtins.py'
> --- a/bzrlib/builtins.py	
> +++ b/bzrlib/builtins.py	
> @@ -87,12 +87,16 @@
>          return bzrdir.BzrDirFormat6()
>      if typestring == "metadir":
>          return bzrdir.BzrDirMetaFormat1()
> +    if typestring == "metaweave":
> +        format = bzrdir.BzrDirMetaFormat1()
> +        format.repository_format = bzrlib.repository.RepositoryFormat7()
> +        return format
>      if typestring == "knit":
>          format = bzrdir.BzrDirMetaFormat1()
>          format.repository_format = bzrlib.repository.RepositoryFormatKnit1()
>          return format
> -    msg = "No known bzr-dir format %s. Supported types are: weave, metadir\n" %\
> -        (typestring)
> +    msg = "No known bzr-dir format %s.\n" \
> +          "Supported types are: metadir, knit, metaweave and weave\n" % typestring
>      raise BzrCommandError(msg)
>  
>  
> @@ -951,8 +955,8 @@
>      takes_args = ["location"] 
>      takes_options = [Option('format', 
>                              help='Use a specific format rather than the'
> -                            ' current default format. Currently this'
> -                            ' option accepts "weave", "metadir" and "knit"',
> +                            ' current default format. Currently this option'
> +                            ' accepts "metadir" (default), "knit" and "metaweave"',
>                              type=get_format_type),
>                       Option('trees',
>                               help='Allows branches in repository to have'
> 
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060428/32382319/attachment.pgp