← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Marius Kruger
  • Date: 2007-08-13 20:00:03 UTC
  • mto: (2778.1.1 rm.marius)
  • mto: This revision was merged to the branch mainline in revision 2782.
  • Revision ID: amanic@gmail.com-20070813200003-llmiom64a9sqj4gl
Apply Alexander's comments:
* Rename getTree => get_tree.
* Rename getCommittedTree => get_committed_tree.
* Extracted helper asserts: assertRemovedAndDeleted and
  assertRemovedAndNotDeleted
* Fixed some docs.
* Fixed my set to list conversion.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1807
1807
                    directory):
1808
1808
                for relpath, basename, kind, lstat, abspath in file_infos:
1809
1809
                    if kind == 'file':
1810
 
                        #is it versioned or ignored?
 
1810
                        # is it versioned or ignored?
1811
1811
                        if self.path2id(relpath) or self.is_ignored(relpath):
1812
1812
                            # add subtree content for deletion
1813
1813
                            new_files.add(relpath)
1827
1827
                if osutils.isdir(abspath):
1828
1828
                    recurse_directory_to_add_files(filename)
1829
1829
 
1830
 
        files = [f for f in new_files]
 
1830
        files = list(new_files)
1831
1831
 
1832
1832
        if len(files) == 0:
1833
1833
            return # nothing to do