Rev 1893: (robertc) Add InterTree and Tree.changes_from, a replacement API for delta.compare_trees. in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1893
revision-id: pqm at pqm.ubuntu.com-20060729042755-7a24d6edaaa13a32
parent: pqm at pqm.ubuntu.com-20060729041357-afd38d0f2ec38ae4
parent: robertc at robertcollins.net-20060729040955-086f701d000cab5b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-07-29 05:27:55 +0100
message:
  (robertc) Add InterTree and Tree.changes_from, a replacement API for delta.compare_trees.
renamed:
  bzrlib/tests/test_delta.py => bzrlib/tests/workingtree_implementations/test_changes_from.py test_delta.py-20060721145444-xlj6hoiipa8ekkwj-1
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/test_tree.py      test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
  bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  bzrlib/tests/workingtree_implementations/test_changes_from.py test_delta.py-20060721145444-xlj6hoiipa8ekkwj-1
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060729040955-086f701d000cab5b
    parent: robertc at robertcollins.net-20060726040126-5a1ceefdb818cd0a
    parent: robertc at robertcollins.net-20060729040212-c6d25e986e0af775
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: Tree.changes_from().
    timestamp: Sat 2006-07-29 14:09:55 +1000
    message:
      Merge bzr.dev.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060726040126-5a1ceefdb818cd0a
    parent: robertc at robertcollins.net-20060726011431-1211e1eb8fc8b617
    parent: robertc at robertcollins.net-20060726034020-06a4bee1b0056675
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: Tree.compare().
    timestamp: Wed 2006-07-26 14:01:26 +1000
    message:
      Merge the change from Tree.compare to Tree.changes_from.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060726011431-1211e1eb8fc8b617
    parent: robertc at robertcollins.net-20060726010603-20c784564dd8958c
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: Tree.compare().
    timestamp: Wed 2006-07-26 11:14:31 +1000
    message:
      Add tests for require_versioned to the InterTree.compare() test suite.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060726010603-20c784564dd8958c
    parent: robertc at robertcollins.net-20060726003431-ca68a859c3c68f22
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: Tree.compare().
    timestamp: Wed 2006-07-26 11:06:03 +1000
    message:
      Add minimal test for Tree.compare(extra_trees=...).
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060726003431-ca68a859c3c68f22
    parent: robertc at robertcollins.net-20060725073948-0deda949867ed375
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: Tree.compare().
    timestamp: Wed 2006-07-26 10:34:31 +1000
    message:
      Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060725073948-0deda949867ed375
    parent: robertc at robertcollins.net-20060725072127-cb8b009e037e9e1d
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: Tree.compare().
    timestamp: Tue 2006-07-25 17:39:48 +1000
    message:
      Convert stock delta tests to intertree_implementation tests of InterTree.compare.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060725072127-cb8b009e037e9e1d
    parent: robertc at robertcollins.net-20060717061459-f5e26c59c03c6507
    parent: robertc at robertcollins.net-20060725065012-564e2d0e113dcabf
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: Tree.compare().
    timestamp: Tue 2006-07-25 17:21:27 +1000
    message:
      Merge in test support work for Tree.compare().