VersionedFile.walk deprecated?
Aaron Bentley
aaron.bentley at utoronto.ca
Tue Apr 11 04:43:32 BST 2006
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Martin Pool wrote:
| I don't think [VersionedFile.walk] should be considered generally
deprecated.
|
| iter_lines_added_or_present_in_versions was added so that the code that
| scans the inventory for changes was less weave-specific.
|
| Knits can't provide exactly the same output as walk(), since they
| (intentionally) don't reference all the obsolete or killed lines.
So it sounds like we can't provide VersionedFile.walk in the public API,
then. So it should be deprecated on VersionedFile, but not on Weave.
| What
| they can give is an iteration of the lines still present in each side,
| and the annotation of when they came in. So a line present on the left
| side can be judged to be either unborn, still living, or killed on the
| right side, and vice versa.
So, it sounds to me like both knit and weave can support plan_merge, but
weave will implement it one way, and knit another. If so, VersionedFile
shouldn't implement plan_merge(WeaveFile should), and my patch that
moves it into PlanWeaveMerge is also wrong.
Have I got it straight?
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFEOyXk0F+nu1YWqI0RAmgeAJ44hoKoxOdkob6N/ifgDHdeqosD+gCfZu2o
Hk0ujCXF3hhWK7wUKTjUkMU=
=1MJp
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list