← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Robert Collins
  • Date: 2010-05-11 08:44:59 UTC
  • mfrom: (5221 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511084459-pb0uinna9zs3wu59
Merge trunk - resolve conflicts.

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\
1975
 
                self.walkdirs(directory):
 
1974
            for parent_info, file_infos in self.walkdirs(directory):
1976
1975
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1977
1976
                    # Is it versioned or ignored?
1978
1977
                    if self.path2id(relpath) or self.is_ignored(relpath):
2013
2012
                            # ... but not ignored
2014
2013
                            has_changed_files = True
2015
2014
                            break
2016
 
                    elif content_change and (kind[1] is not None):
2017
 
                        # Versioned and changed, but not deleted
 
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.
2018
2019
                        has_changed_files = True
2019
2020
                        break
2020
2021