Rev 2375: [merge] in work for adding DirState.lock_* methods in http://bazaar.launchpad.net/%7Ebzr/bzr/dirstate

[John Arbash Meinel]

At http://bazaar.launchpad.net/%7Ebzr/bzr/dirstate

------------------------------------------------------------
revno: 2375
revision-id: john at arbash-meinel.com-20070223025058-dw62sga95cx45hvg
parent: robertc at robertcollins.net-20070223020403-ojzvhu79itqx004a
parent: john at arbash-meinel.com-20070223022410-1i5d131dir9ds30w
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-22 20:50:58 -0600
message:
  [merge] in work for adding DirState.lock_* methods
modified:
  bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
  bzrlib/lock.py                 lock.py-20050527050856-ec090bb51bc03349
  bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
  bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
  bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
    ------------------------------------------------------------
    revno: 2371.1.3
    merged: john at arbash-meinel.com-20070223022410-1i5d131dir9ds30w
    parent: john at arbash-meinel.com-20070223021644-7hp2p2f3rjvkmx4s
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 20:24:10 -0600
    message:
      XXX Workaround the DirStateRevisionTree bug until we get a proper fix, tests pass again
    ------------------------------------------------------------
    revno: 2371.1.2
    merged: john at arbash-meinel.com-20070223021644-7hp2p2f3rjvkmx4s
    parent: john at arbash-meinel.com-20070223011122-eyncc8ny0hchp0qc
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 20:16:44 -0600
    message:
      (broken) lock and unlock the DirState object when locking and unlocking the Tree itself
      broken because we have timing issues with parent ids disappearing on us
    ------------------------------------------------------------
    revno: 2371.1.1
    merged: john at arbash-meinel.com-20070223011122-eyncc8ny0hchp0qc
    parent: john at arbash-meinel.com-20070222232615-46n3rjdpfrsbmu3b
    parent: jw+debian at jameswestby.net-20070222224549-16u0yxrdrqg3vgpg
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 19:11:22 -0600
    message:
      Update the dirstate tests to lock and unlock properly.
      Change the lock.WriteLock functions so that they open in 'rb+' mode instead
      of automatically truncating the file.
      test_dirstate.py now passes, but we need to figure out or locking mechanism for
      WorkingTree4. (does it just lock at the same time as Tree.lock_write()?)
    ------------------------------------------------------------
    revno: 2370.1.2
    merged: jw+debian at jameswestby.net-20070222224549-16u0yxrdrqg3vgpg
    parent: jw+debian at jameswestby.net-20070222212253-lacx7ppcjunahmio
    committer: James Westby <jw+debian at jameswestby.net>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 22:45:49 +0000
    message:
      (broken) Add the locking methods.
      
        * Callers should now use lock_read and lock_write before they do
          anything with dirstate.
        * You can only grab a single lock on the object, and can't unlock it
          if not locked.
        * initialize now returns a writelocked object to the caller.
        * This breaks the tests massively, sorry, as they need to do locking now.
          - Currently the main problem is the dirstate never being flushed to disk,
            so all tests trip the assertion that the header is incorrect.
    ------------------------------------------------------------
    revno: 2370.1.1
    merged: jw+debian at jameswestby.net-20070222212253-lacx7ppcjunahmio
    parent: john at arbash-meinel.com-20070222202320-k3x9ozxjj2ugnygc
    committer: James Westby <jw+debian at jameswestby.net>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 21:22:53 +0000
    message:
      Store the filename of the dirstate in an attribute.
      
        * Store the filename so that it can be more adventurous in what it does
          with the file.
        * Callers of the constructor should now pass the path to it, and any
          methods that want to access the path should do so through self._filename.
-------------- next part --------------

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