Rev 2333: Merge HEAD and dirstate 2 improvements in file:///home/robertc/source/baz/pathinfo/

[Robert Collins]

At file:///home/robertc/source/baz/pathinfo/

------------------------------------------------------------
revno: 2333
revision-id: robertc at robertcollins.net-20070310050319-60t1xo5oi1sb1ube
parent: robertc at robertcollins.net-20070310041007-m7yjkrn52e9utv6j
parent: robertc at robertcollins.net-20070310045030-gse5bj0dshxlfgox
committer: Robert Collins <robertc at robertcollins.net>
branch nick: pathinfo
timestamp: Sat 2007-03-10 16:03:19 +1100
message:
  Merge HEAD and dirstate 2 improvements
modified:
  bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
  bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/path_info_c.c           path_info_c.c-20070309072643-pox974xfyuw278hs-1
  bzrlib/path_info_c.pyx         path_info_c.pyx-20070309072643-pox974xfyuw278hs-2
  bzrlib/path_info_python.py     path_info_python.py-20070309041626-f8val8ukxzzzyudi-2
  bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
  bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
  bzrlib/tests/workingtree_implementations/test_add.py test_add.py-20070226165239-4vo178spkrnhavc7-1
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
    ------------------------------------------------------------
    revno: 2326.1.5
    merged: robertc at robertcollins.net-20070310045030-gse5bj0dshxlfgox
    parent: robertc at robertcollins.net-20070310042406-uou98sc146xbva7n
    parent: robertc at robertcollins.net-20070309015201-18fbvytw3qi0fh09
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate2
    timestamp: Sat 2007-03-10 15:50:30 +1100
    message:
      Merge 0.15 HEAD.
        ------------------------------------------------------------
        revno: 2324.1.2
        merged: robertc at robertcollins.net-20070309015201-18fbvytw3qi0fh09
        parent: robertc at robertcollins.net-20070308235512-ubrfi3dy7qb52zz0
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate.0.15
        timestamp: Fri 2007-03-09 12:52:01 +1100
        message:
          Fix the behaviour of dirstate optimised iter_changes recursing its disk iterator into subtrees inappropriately.
        ------------------------------------------------------------
        revno: 2324.1.1
        merged: robertc at robertcollins.net-20070308235512-ubrfi3dy7qb52zz0
        parent: pqm at pqm.ubuntu.com-20070307115404-732b59c3532cf919
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate.0.15
        timestamp: Fri 2007-03-09 10:55:12 +1100
        message:
          dirstate correctness: allow adding paths present in the basis.
    ------------------------------------------------------------
    revno: 2326.1.4
    merged: robertc at robertcollins.net-20070310042406-uou98sc146xbva7n
    parent: robertc at robertcollins.net-20070309213148-mmgmddc0a2yheitu
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate2
    timestamp: Sat 2007-03-10 15:24:06 +1100
    message:
      Use path_info tuples unaltered rather than recombining all the time.
    ------------------------------------------------------------
    revno: 2326.1.3
    merged: robertc at robertcollins.net-20070309213148-mmgmddc0a2yheitu
    parent: robertc at robertcollins.net-20070309155213-fciselcj7bjb6swy
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate2
    timestamp: Sat 2007-03-10 08:31:48 +1100
    message:
      Tune the pack_stat step to not go through as many layers of indirection when possible.

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