Rev 2416: merge some of dirstate, update comparison tests to keep tree roots the same unless they're meant to differ in file:///home/mbp/bzr/Work/dirstate-plus-subtree/

Martin Pool mbp at sourcefrog.net
Thu Mar 1 03:44:59 GMT 2007


------------------------------------------------------------
revno: 2416
revision-id: mbp at sourcefrog.net-20070301034456-ck62y1icsmsp1a8n
parent: mbp at sourcefrog.net-20070227055136-6y8ueffopkd59lzf
parent: john at arbash-meinel.com-20070228233639-kt8judz9w3x27ve4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Thu 2007-03-01 14:44:56 +1100
message:
  merge some of dirstate, update comparison tests to keep tree roots the same unless they're meant to differ
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
  bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
  bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
  bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
    ------------------------------------------------------------
    revno: 2406.1.35
    merged: john at arbash-meinel.com-20070228233639-kt8judz9w3x27ve4
    parent: john at arbash-meinel.com-20070228224054-11e83q8puulllfuh
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Wed 2007-02-28 17:36:39 -0600
    message:
      Handle the case when a directory has been removed, and isn't the last entry.
    ------------------------------------------------------------
    revno: 2406.1.34
    merged: john at arbash-meinel.com-20070228224054-11e83q8puulllfuh
    parent: john at arbash-meinel.com-20070228221101-c3szee94o5h3uvt7
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Wed 2007-02-28 16:40:54 -0600
    message:
      Clean up test_bad_files, and fix a bug in _iter_changes when
      we get to an unknown file.
    ------------------------------------------------------------
    revno: 2406.1.33
    merged: john at arbash-meinel.com-20070228221101-c3szee94o5h3uvt7
    parent: john at arbash-meinel.com-20070228215011-hfmfc13mswbubn18
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Wed 2007-02-28 16:11:01 -0600
    message:
      More inner loop tuning of walkdirs, can save as much as 5%
      (drops time on LP tree from 100-105ms, to 95-100ms)
      Also, unify all walkdirs variants to have minimal variation.
    ------------------------------------------------------------
    revno: 2406.1.32
    merged: john at arbash-meinel.com-20070228215011-hfmfc13mswbubn18
    parent: john at arbash-meinel.com-20070228203936-skucbq8g04qutc2p
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Wed 2007-02-28 15:50:11 -0600
    message:
      Add tests that the walkdirs variants work on unicode paths.
    ------------------------------------------------------------
    revno: 2406.1.31
    merged: john at arbash-meinel.com-20070228203936-skucbq8g04qutc2p
    parent: john at arbash-meinel.com-20070228203208-tgsw917qz1xresjx
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Wed 2007-02-28 14:39:36 -0600
    message:
      Minor cleanup.
      rather than indexing a tuple all the time, save it as source/target_minikind
      use the cached decoder rather than looking it up all the time
      drops 'bzr status' on lp tree from 1.34s => 1.2s
    ------------------------------------------------------------
    revno: 2406.1.30
    merged: john at arbash-meinel.com-20070228203208-tgsw917qz1xresjx
    parent: john at arbash-meinel.com-20070228193528-nvb31ekrgk046cv2
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Wed 2007-02-28 14:32:08 -0600
    message:
      Don't cache the parent entry for root, since it is different than all other entries.
    ------------------------------------------------------------
    revno: 2406.1.29
    merged: john at arbash-meinel.com-20070228193528-nvb31ekrgk046cv2
    parent: john at arbash-meinel.com-20070228192244-uknltx7urh1mur2o
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Wed 2007-02-28 13:35:28 -0600
    message:
      approx 300ms of 'time bzr status' in lp tree by caching last parent info
    ------------------------------------------------------------
    revno: 2406.1.28
    merged: john at arbash-meinel.com-20070228192244-uknltx7urh1mur2o
    parent: john at arbash-meinel.com-20070228181300-3hpf53zdxpz16bjg
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Wed 2007-02-28 13:22:44 -0600
    message:
      shave about 10% of the time by switching to _walkdirs_utf8
    ------------------------------------------------------------
    revno: 2406.1.27
    merged: john at arbash-meinel.com-20070228181300-3hpf53zdxpz16bjg
    parent: john at arbash-meinel.com-20070228165719-3q5bxnad9klg5tzz
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Wed 2007-02-28 12:13:00 -0600
    message:
      Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems
    ------------------------------------------------------------
    revno: 2406.1.26
    merged: john at arbash-meinel.com-20070228165719-3q5bxnad9klg5tzz
    parent: john at arbash-meinel.com-20070228160032-nt148nm9c1rrhopj
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Wed 2007-02-28 10:57:19 -0600
    message:
      correct the docstring for walkdirs.
    ------------------------------------------------------------
    revno: 2406.1.25
    merged: john at arbash-meinel.com-20070228160032-nt148nm9c1rrhopj
    parent: john at arbash-meinel.com-20070228154412-3pwfza0d3839qpsg
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Wed 2007-02-28 10:00:32 -0600
    message:
      Shave off 200+ ms of 'time bzr status' in lp tree
      We don't need to look up source and target parents of an entry if
      we know it hasn't moved, and we already have one, then we have the other.
    ------------------------------------------------------------
    revno: 2406.1.24
    merged: john at arbash-meinel.com-20070228154412-3pwfza0d3839qpsg
    parent: john at arbash-meinel.com-20070228154101-ht3tfhe0s7d5k3ds
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Wed 2007-02-28 09:44:12 -0600
    message:
      Rework cmd_inventory so that it uses paths2ids and locks the trees for read.
    ------------------------------------------------------------
    revno: 2406.1.23
    merged: john at arbash-meinel.com-20070228154101-ht3tfhe0s7d5k3ds
    parent: john at arbash-meinel.com-20070227220753-bdvb7lo8fu5yhqg9
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Wed 2007-02-28 09:41:01 -0600
    message:
      remove out-dated doc test in inventory
    ------------------------------------------------------------
    revno: 2406.1.22
    merged: john at arbash-meinel.com-20070227220753-bdvb7lo8fu5yhqg9
    parent: john at arbash-meinel.com-20070227213216-a6kogwpq49j6dgpm
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Tue 2007-02-27 16:07:53 -0600
    message:
      add a test that shows _iter_changes works when only contents have changed, and nothing is considered newly added.
    ------------------------------------------------------------
    revno: 2406.1.21
    merged: john at arbash-meinel.com-20070227213216-a6kogwpq49j6dgpm
    parent: john at arbash-meinel.com-20070227030928-bkhmkqvf3mbymqge
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Tue 2007-02-27 15:32:16 -0600
    message:
      Get iter_changes working again, by fixing set_parent_trees to
      create trees with the correct block order.

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



More information about the bazaar-commits mailing list