/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 commit.py

Cope with files disappearing during commit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
112
112
            self._any_changes = True
113
113
            self._blobs[path[1].encode("utf-8")] = (mode, sha)
114
114
            file_sha1 = workingtree.get_file_sha1(file_id, path[1])
 
115
            if file_sha1 is None:
 
116
                # File no longer exists
 
117
                if path[0] is not None:
 
118
                    self.record_delete(path[0], file_id)
 
119
                continue
115
120
            _, st = workingtree.get_file_with_stat(file_id, path[1])
116
121
            yield file_id, path[1], (file_sha1, st)
117
122
        if not seen_root and len(self.parents) == 0: