Rev 2502: merge dirstate in file:///home/mbp/bzr/Work/dirstate/

[Martin Pool]

------------------------------------------------------------
revno: 2502
revision-id: 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
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/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/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
    ------------------------------------------------------------
    revno: 2498.1.5
    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: 2498.1.4
    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: 2498.1.3
    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

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