/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

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
270
270
            # the Format factory and creation methods that are
271
271
            # permitted to do this.
272
272
            self._set_inventory(_inventory, dirty=False)
 
273
        self._detect_case_handling()
 
274
 
 
275
    def _detect_case_handling(self):
 
276
        wt_trans = self.bzrdir.get_workingtree_transport(None)
 
277
        try:
 
278
            wt_trans.stat("FoRMaT")
 
279
        except errors.NoSuchFile:
 
280
            self.case_sensitive = True
 
281
        else:
 
282
            self.case_sensitive = False
273
283
 
274
284
    branch = property(
275
285
        fget=lambda self: self._branch,
1893
1903
                     kind, executable) in self._iter_changes(self.basis_tree(),
1894
1904
                         include_unchanged=True, require_versioned=False,
1895
1905
                         want_unversioned=True, specific_files=files):
1896
 
                    # Check if it's an unknown (but not ignored) OR
1897
 
                    # changed (but not deleted) :
1898
 
                    if ((versioned == (False, False) or
1899
 
                         content_change and kind[1] != None)
1900
 
                        and not self.is_ignored(path[1])):
 
1906
                    if versioned == (False, False):
 
1907
                        # The record is unknown ...
 
1908
                        if not self.is_ignored(path[1]):
 
1909
                            # ... but not ignored
 
1910
                            has_changed_files = True
 
1911
                            break
 
1912
                    elif content_change and (kind[1] != None):
 
1913
                        # Versioned and changed, but not deleted
1901
1914
                        has_changed_files = True
1902
1915
                        break
1903
1916