/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: Robert Collins
  • Date: 2010-05-11 08:36:16 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511083616-b8fjb19zomwupid0
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1971
1971
        def recurse_directory_to_add_files(directory):
1972
1972
            # Recurse directory and add all files
1973
1973
            # so we can check if they have changed.
1974
 
            for parent_info, file_infos in self.walkdirs(directory):
 
1974
            for parent_info, file_infos in\
 
1975
                self.walkdirs(directory):
1975
1976
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1976
1977
                    # Is it versioned or ignored?
1977
1978
                    if self.path2id(relpath) or self.is_ignored(relpath):
2012
2013
                            # ... but not ignored
2013
2014
                            has_changed_files = True
2014
2015
                            break
2015
 
                    elif (content_change and (kind[1] is not None) and
2016
 
                            osutils.is_inside_any(files, path[1])):
2017
 
                        # Versioned and changed, but not deleted, and still
2018
 
                        # in one of the dirs to be deleted.
 
2016
                    elif content_change and (kind[1] is not None):
 
2017
                        # Versioned and changed, but not deleted
2019
2018
                        has_changed_files = True
2020
2019
                        break
2021
2020