/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Dmitry Vasiliev
  • Date: 2007-04-13 15:51:14 UTC
  • mto: (2417.1.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 2418.
  • Revision ID: dima@hlabs.spb.ru-20070413155114-rln7u6xqod14m7uu
Used one-line conditional expression instead of the multi-line one

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1601
1601
            mode = stat_value.st_mode
1602
1602
            kind = osutils.file_kind_from_stat_mode(mode)
1603
1603
            if not supports_executable():
1604
 
                if entry is not None:
1605
 
                    executable = entry.executable
1606
 
                else:
1607
 
                    executable = False
 
1604
                executable = entry is not None and entry.executable
1608
1605
            else:
1609
1606
                executable = bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
1610
1607
        return kind, executable, stat_value