/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: Parth Malwankar
  • Date: 2010-05-05 16:00:46 UTC
  • mfrom: (5212 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5214.
  • Revision ID: parth.malwankar@gmail.com-20100505160046-o07b82avu84xj0jg
merged in changes from trunk and resolved NEWS conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
95
95
from bzrlib.filters import filtered_input_file
96
96
from bzrlib.trace import mutter, note
97
97
from bzrlib.transport.local import LocalTransport
98
 
from bzrlib.progress import ProgressPhase
99
98
from bzrlib.revision import CURRENT_REVISION
100
99
from bzrlib.rio import RioReader, rio_file, Stanza
101
100
from bzrlib.symbol_versioning import (
1957
1956
        def recurse_directory_to_add_files(directory):
1958
1957
            # Recurse directory and add all files
1959
1958
            # so we can check if they have changed.
1960
 
            for parent_info, file_infos in\
1961
 
                self.walkdirs(directory):
 
1959
            for parent_info, file_infos in self.walkdirs(directory):
1962
1960
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1963
1961
                    # Is it versioned or ignored?
1964
1962
                    if self.path2id(relpath) or self.is_ignored(relpath):
1999
1997
                            # ... but not ignored
2000
1998
                            has_changed_files = True
2001
1999
                            break
2002
 
                    elif content_change and (kind[1] is not None):
2003
 
                        # 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.
2004
2004
                        has_changed_files = True
2005
2005
                        break
2006
2006