/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: Ian Clatworthy
  • Date: 2008-08-07 07:32:11 UTC
  • mfrom: (3606 +trunk)
  • mto: (3586.1.18 views-ui)
  • mto: This revision was merged to the branch mainline in revision 4030.
  • Revision ID: ian.clatworthy@canonical.com-20080807073211-4i119lpbfdz2qjw6
merge bzr.dev r3606

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1869
1869
            # Recurse directory and add all files
1870
1870
            # so we can check if they have changed.
1871
1871
            for parent_info, file_infos in\
1872
 
                osutils.walkdirs(self.abspath(directory),
1873
 
                    directory):
1874
 
                for relpath, basename, kind, lstat, abspath in file_infos:
 
1872
                self.walkdirs(directory):
 
1873
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1875
1874
                    # Is it versioned or ignored?
1876
1875
                    if self.path2id(relpath) or self.is_ignored(relpath):
1877
1876
                        # Add nested content for deletion.
1887
1886
            filename = self.relpath(abspath)
1888
1887
            if len(filename) > 0:
1889
1888
                new_files.add(filename)
1890
 
                if osutils.isdir(abspath):
1891
 
                    recurse_directory_to_add_files(filename)
 
1889
                recurse_directory_to_add_files(filename)
1892
1890
 
1893
1891
        files = list(new_files)
1894
1892
 
2428
2426
                relroot = ""
2429
2427
            # FIXME: stash the node in pending
2430
2428
            entry = inv[top_id]
2431
 
            for name, child in entry.sorted_children():
2432
 
                dirblock.append((relroot + name, name, child.kind, None,
2433
 
                    child.file_id, child.kind
2434
 
                    ))
 
2429
            if entry.kind == 'directory':
 
2430
                for name, child in entry.sorted_children():
 
2431
                    dirblock.append((relroot + name, name, child.kind, None,
 
2432
                        child.file_id, child.kind
 
2433
                        ))
2435
2434
            yield (currentdir[0], entry.file_id), dirblock
2436
2435
            # push the user specified dirs from dirblock
2437
2436
            for dir in reversed(dirblock):