Rev 1785: Merge cleanups to patches. in file:///home/robertc/source/baz/dd/

[Robert Collins]

------------------------------------------------------------
revno: 1785
revision-id: robertc at robertcollins.net-20060714051905-e7ce9949fab0f42e
parent: robertc at robertcollins.net-20060713084938-e1f20896444219a2
parent: robertc at robertcollins.net-20060714051512-a7cb4146aacfc563
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dd
timestamp: Fri 2006-07-14 15:19:05 +1000
message:
  Merge cleanups to patches.
modified:
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060714051512-a7cb4146aacfc563
    parent: robertc at robertcollins.net-20060714050508-ac44f7b9fb4a0273
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: workingtree-unlock-tests
    timestamp: Fri 2006-07-14 15:15:12 +1000
    message:
      Refactor workingtree.unlock to be cleaner, adding a trivial test for unlock. Introduces an explicit Format2 tree type, making the base WorkingTree cleaner to derive from.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060714050508-ac44f7b9fb4a0273
    parent: robertc at robertcollins.net-20060714042710-86dc0cbaeaf4ea24
    parent: robertc at robertcollins.net-20060714050254-9db2372cc5a7237b
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: workingtree-unlock-tests
    timestamp: Fri 2006-07-14 15:05:08 +1000
    message:
      Pull in misc cleanups.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060714050254-9db2372cc5a7237b
        parent: robertc at robertcollins.net-20060714042710-86dc0cbaeaf4ea24
        parent: robertc at robertcollins.net-20060714050237-5890683add8b2d57
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Cleanup workingtree.
        timestamp: Fri 2006-07-14 15:02:54 +1000
        message:
          Merge in new cleanups thread.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060714050237-5890683add8b2d57
        parent: pqm at pqm.ubuntu.com-20060711204542-8e872becb9b4caf9
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Misc cleanups.
        timestamp: Fri 2006-07-14 15:02:37 +1000
        message:
          General cleanups - status, add a status test with two revision trees, and commands.py importing of bzrlib.trace.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060714042710-86dc0cbaeaf4ea24
    parent: pqm at pqm.ubuntu.com-20060711204542-8e872becb9b4caf9
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: Cleanup workingtree.
    timestamp: Fri 2006-07-14 14:27:10 +1000
    message:
      Trivial cleanups to workingtree.py