Rev 2418: (Dmitry Vasiliev) Fix win32 executable checks for unknown files and _iter_changes with WT3. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2418
revision-id: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
parent: pqm at pqm.ubuntu.com-20070413160237-0weampli2rrmzjht
parent: john at arbash-meinel.com-20070413163747-sje4hwskt2esvry5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-04-13 18:41:00 +0100
message:
  (Dmitry Vasiliev) Fix win32 executable checks for unknown files and _iter_changes with WT3.
modified:
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    revno: 2417.1.1
    merged: john at arbash-meinel.com-20070413163747-sje4hwskt2esvry5
    parent: pqm at pqm.ubuntu.com-20070413160237-0weampli2rrmzjht
    parent: dima at hlabs.spb.ru-20070413155114-rln7u6xqod14m7uu
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Fri 2007-04-13 11:37:47 -0500
    message:
      (Dmitry Vasiliev) Fix win32 executable checks for unknown files and _iter_changes with WT3.
    ------------------------------------------------------------
    revno: 2409.1.2
    merged: dima at hlabs.spb.ru-20070413155114-rln7u6xqod14m7uu
    parent: dima at hlabs.spb.ru-20070412114748-49tt18zdwzmodcbh
    committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
    branch nick: Small fixes
    timestamp: Fri 2007-04-13 19:51:14 +0400
    message:
      Used one-line conditional expression instead of the multi-line one
    ------------------------------------------------------------
    revno: 2409.1.1
    merged: dima at hlabs.spb.ru-20070412114748-49tt18zdwzmodcbh
    parent: pqm at pqm.ubuntu.com-20070412063453-ogf089v98ktaopbk
    committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
    branch nick: Small fixes
    timestamp: Thu 2007-04-12 15:47:48 +0400
    message:
      Fixed _comparison_data() on Windows in case of the entry is None
=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py	2007-04-01 06:19:16 +0000
+++ b/bzrlib/workingtree.py	2007-04-13 15:51:14 +0000
@@ -1601,7 +1601,7 @@
             mode = stat_value.st_mode
             kind = osutils.file_kind_from_stat_mode(mode)
             if not supports_executable():
-                executable = entry.executable
+                executable = entry is not None and entry.executable
             else:
                 executable = bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
         return kind, executable, stat_value