Rev 2351: (John Arbash Meinel) Some small fixes for win32 and dirstate. in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2351
revision-id: pqm at pqm.ubuntu.com-20070313133834-ff8514538f6b02f7
parent: pqm at pqm.ubuntu.com-20070313120134-ddd44b75e5a2639c
parent: john at arbash-meinel.com-20070309211422-uoiy80goncfqwr5j
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 13:38:34 +0000
message:
  (John Arbash Meinel) Some small fixes for win32 and dirstate.
modified:
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070309211422-uoiy80goncfqwr5j
    parent: john at arbash-meinel.com-20070309005252-4heez38fmg2qsfqy
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: win32
    timestamp: Fri 2007-03-09 15:14:22 -0600
    message:
      is_executable needs a read lock.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070309005252-4heez38fmg2qsfqy
    parent: john at arbash-meinel.com-20070308235059-bi2pipjkmdf8q4m0
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: win32
    timestamp: Thu 2007-03-08 18:52:52 -0600
    message:
      Rather than setting the executable bit for every file, properly create the working inventory to include it.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070308235059-bi2pipjkmdf8q4m0
    parent: john at arbash-meinel.com-20070308215801-pr998i7nfbihrf1w
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: win32
    timestamp: Thu 2007-03-08 17:50:59 -0600
    message:
      We need to set 'executability' for all files, because on win32, executability=None => executability=False, not executability=nochange
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070308215801-pr998i7nfbihrf1w
    parent: john at arbash-meinel.com-20070308213236-zt1tp45j9tocyp86
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: win32
    timestamp: Thu 2007-03-08 15:58:01 -0600
    message:
      Implement is_executable for WorkingTree4 and win32
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070308213236-zt1tp45j9tocyp86
    parent: pqm at pqm.ubuntu.com-20070307233124-ad2724bf65e09035
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: win32
    timestamp: Thu 2007-03-08 15:32:36 -0600
    message:
      New helper function for merge, which allows us to re-use the existing workingtree, rather than opening it again.