← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Parth Malwankar
  • Date: 2010-05-06 11:22:28 UTC
  • mfrom: (5214 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5241.
  • Revision ID: parth.malwankar@gmail.com-20100506112228-oswa6eknx7rmztyv
merged in changes from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1956
1956
        def recurse_directory_to_add_files(directory):
1957
1957
            # Recurse directory and add all files
1958
1958
            # so we can check if they have changed.
1959
 
            for parent_info, file_infos in\
1960
 
                self.walkdirs(directory):
 
1959
            for parent_info, file_infos in self.walkdirs(directory):
1961
1960
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1962
1961
                    # Is it versioned or ignored?
1963
1962
                    if self.path2id(relpath) or self.is_ignored(relpath):
1998
1997
                            # ... but not ignored
1999
1998
                            has_changed_files = True
2000
1999
                            break
2001
 
                    elif content_change and (kind[1] is not None):
2002
 
                        # Versioned and changed, but not deleted
 
2000
                    elif (content_change and (kind[1] is not None) and
 
2001
                            osutils.is_inside_any(files, path[1])):
 
2002
                        # Versioned and changed, but not deleted, and still
 
2003
                        # in one of the dirs to be deleted.
2003
2004
                        has_changed_files = True
2004
2005
                        break
2005
2006