/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

Somewhat fix commit in git working trees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
64
64
                if kind[0] in ("file", "symlink"):
65
65
                    self.record_delete(path[0], file_id)
66
66
                continue
 
67
            if path[1] is None:
 
68
                self.record_delete(path[0], file_id)
 
69
                continue
67
70
            if kind == "file":
68
71
                mode = stat.S_IFREG
69
72
                sha = text_sha1(path[1], file_id)
72
75
                sha = link_sha1(path[1], file_id)
73
76
            if executable:
74
77
                mode |= 0111
75
 
            self._blobs[path[1].encode("utf-8")] = (mode, sha))
 
78
            self._blobs[path[1].encode("utf-8")] = (mode, sha)
76
79
            yield file_id, path, (None, None)
77
80
        # FIXME: Import all blobs not set yet, and eliminate blobs set to None
78
81