[MERGE] 1.14 formats

[John Arbash Meinel]

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

Ian Clatworthy wrote:
> John Arbash Meinel wrote:
>> Ian Clatworthy wrote:
>>> Lack of EOL conversion support is blocking adoption of
>>> Bazaar in some key projects we're keen to see move across.
>>> There are two essential pieces needed to remove this blocker:
>>> 1. Integrated eol conversion support
>>> 2. A production-quality format supporting content filtering.
>> I think it is reasonable to push views back a bit, rather than delaying
>> content filtering for them being more polished.
> 
> Done in the updated patch attached.
> 
> Ian C.
> 


+            if (isinstance(tree, workingtree_4.DirStateWorkingTree) and
+                not isinstance(tree, workingtree_4.WorkingTree6) and
+                isinstance(self.target_format.workingtree_format,
+                    workingtree_4.WorkingTreeFormat6)):
+                workingtree_4.Converter4or5to6().convert(tree)

^- I wonder if we would want to use:

if (type(tree) is workingtree_4.DirStateWorkingTree)

rather than having isinstance mixed with 'not isinstance'.

Just a thought.

It seems a shame to have a bunch more formats for this, when we are
bringing out yet more, but certainly the content filtering is more
stable than the brisbane code (as yet).

BB:approve

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

iEYEARECAAYFAknSJ0MACgkQJdeBCYSNAANi8ACgrEVLdmlCZcBG+1Zm43bBlGcY
xyoAn3K4mB/WlIHUKvSAYyh50qpWOJJd
=Hdar
-----END PGP SIGNATURE-----