Rev 2435: merge dirstate in file:///home/mbp/bzr/Work/subtree/

[Martin Pool]

------------------------------------------------------------
revno: 2435
revision-id: mbp at sourcefrog.net-20070305041538-x4iybeq8u6tuvscx
parent: mbp at sourcefrog.net-20070305035848-xs1fgcwovuthekyq
parent: mbp at sourcefrog.net-20070305035531-1t1wn6oy526vrb0q
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Mon 2007-03-05 15:15:38 +1100
message:
  merge dirstate
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/cache_utf8.py           cache_utf8.py-20060810004311-x4cph46la06h9azm-1
  bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
  bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
  bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
  bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
  bzrlib/tests/test_cache_utf8.py test_cache_utf8.py-20060810004311-x4cph46la06h9azm-2
  bzrlib/tests/test_delta.py     test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
  bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
    ------------------------------------------------------------
    revno: 2406.1.92.1.5
    merged: mbp at sourcefrog.net-20070305035531-1t1wn6oy526vrb0q
    parent: mbp at sourcefrog.net-20070305034510-w28mfl0bv7qxlbvo
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate
    timestamp: Mon 2007-03-05 14:55:31 +1100
    message:
      Tree.id2path should raise NoSuchId, not return None.
      
      Add tree implementation test for this and update WorkingTree_4.
    ------------------------------------------------------------
    revno: 2406.1.92.1.4
    merged: mbp at sourcefrog.net-20070305034510-w28mfl0bv7qxlbvo
    parent: mbp at sourcefrog.net-20070305033420-xsiqka8sl08lb0q6
    parent: robertc at robertcollins.net-20070305031021-ypbakvagbivyw5mu
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate
    timestamp: Mon 2007-03-05 14:45:10 +1100
    message:
      merge dirstate
        ------------------------------------------------------------
        revno: 2406.1.97
        merged: robertc at robertcollins.net-20070305031021-ypbakvagbivyw5mu
        parent: robertc at robertcollins.net-20070305011525-fakb9irlbxyxaukb
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Mon 2007-03-05 14:10:21 +1100
        message:
          Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
        ------------------------------------------------------------
        revno: 2406.1.96
        merged: robertc at robertcollins.net-20070305011525-fakb9irlbxyxaukb
        parent: robertc at robertcollins.net-20070304221043-gxthr6yo2w4yy6mx
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Mon 2007-03-05 12:15:25 +1100
        message:
          Change _iter_changes interface to yield both old and new paths.
        ------------------------------------------------------------
        revno: 2406.1.95
        merged: robertc at robertcollins.net-20070304221043-gxthr6yo2w4yy6mx
        parent: mbp at sourcefrog.net-20070304080909-xjsidexprse2bar5
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Mon 2007-03-05 09:10:43 +1100
        message:
          Add convenience utf8 decode routine for handling strings that might be None
    ------------------------------------------------------------
    revno: 2406.1.92.1.3
    merged: mbp at sourcefrog.net-20070305033420-xsiqka8sl08lb0q6
    parent: mbp at sourcefrog.net-20070303022125-m66a0pccahokfj2k
    parent: mbp at sourcefrog.net-20070304080909-xjsidexprse2bar5
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate
    timestamp: Mon 2007-03-05 14:34:20 +1100
    message:
      cherrypick support for tree-references in dirstate
    ------------------------------------------------------------
    revno: 2406.1.92.1.2
    merged: mbp at sourcefrog.net-20070303022125-m66a0pccahokfj2k
    parent: mbp at sourcefrog.net-20070303014729-27moafq7ozd00101
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate
    timestamp: Sat 2007-03-03 13:21:25 +1100
    message:
      Add more dirstate root-id-changing tests
    ------------------------------------------------------------
    revno: 2406.1.92.1.1
    merged: mbp at sourcefrog.net-20070303014729-27moafq7ozd00101
    parent: mbp at sourcefrog.net-20070302075754-mc4x24a06swkc6f2
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate
    timestamp: Sat 2007-03-03 12:47:29 +1100
    message:
      fix missing import

Diff too large for email (1216, the limit is 1000).