/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 breezy/tests/per_workingtree/test_walkdirs.py

  • Committer: Jelmer Vernooij
  • Date: 2017-12-03 21:05:52 UTC
  • mfrom: (6829.2.1 misc-foreign3)
  • Revision ID: jelmer@jelmer.uk-20171203210552-wb4kounujqybxui5
Merge lp:~jelmer/brz/misc-foreign3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_walkdirs.py
84
84
        def add_dirblock(path, kind):
85
85
            dirblock = DirBlock(tree, path)
86
86
            if file_status != self.unknown:
87
 
                dirblock.id = 'a ' + str(path).replace('/', '-') + '-id'
88
87
                dirblock.inventory_kind = kind
89
88
            if file_status != self.missing:
90
89
                dirblock.disk_kind = kind
97
96
        add_dirblock(paths[3], 'directory')
98
97
 
99
98
        if file_status != self.unknown:
100
 
            tree.add(paths, [db.id for db in dirblocks])
 
99
            tree.add(paths)
 
100
            for dirblock in dirblocks:
 
101
                if file_status != self.unknown:
 
102
                    dirblock.id = tree.path2id(dirblock.relpath)
101
103
 
102
104
        if file_status == self.missing:
103
105
            # now make the files be missing