/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

Fix handling of empty trees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
1
 
# Copyright (C) 2009-2010 Jelmer Vernooij <jelmer@samba.org>
 
1
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
21
21
from dulwich.index import (
22
22
    commit_tree,
23
23
    )
24
 
import os
25
24
import stat
26
25
 
27
26
from bzrlib.repository import (
49
48
 
50
49
    def record_entry_contents(self, ie, parent_invs, path, tree,
51
50
        content_summary):
52
 
        raise NotImplementedError(self.record_entry_contents)
 
51
        raise NotImplementedError(self.record_entry_contents)        
53
52
 
54
53
    def record_delete(self, path, file_id):
55
54
        self._blobs[path] = None
70
69
                blob = Blob()
71
70
                blob.data = workingtree.get_file_text(file_id, path)
72
71
                return blob.id
73
 
        for (file_id, path, changed_content, versioned, parent, name, kind,
 
72
        for (file_id, path, changed_content, versioned, parent, name, kind, 
74
73
             executable) in iter_changes:
75
74
            if kind[1] in ("directory",):
76
75
                if kind[0] in ("file", "symlink"):
94
93
                mode |= 0111
95
94
            self._any_changes = True
96
95
            self._blobs[path[1].encode("utf-8")] = (mode, sha)
97
 
            file_sha1 = workingtree.get_file_sha1(file_id, path[1])
98
 
            yield file_id, path[1], (file_sha1, os.lstat(workingtree.abspath(path[1])))
 
96
            yield file_id, path, (None, None)
99
97
        # Fill in entries that were not changed
100
98
        basis_tree = workingtree.basis_tree()
101
99
        assert basis_tree.get_revision_id() == basis_revid
112
110
 
113
111
    def finish_inventory(self):
114
112
        # eliminate blobs that were removed
115
 
        for path, entry in iter(self._blobs.items()):
 
113
        for path, entry in self._blobs.iteritems():
116
114
            if entry is None:
117
115
                del self._blobs[path]
118
116
 
119
 
    def _iterblobs(self):
120
 
        return ((path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems())
121
 
 
122
117
    def commit(self, message):
123
118
        c = Commit()
124
 
        c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
125
 
        c.tree = commit_tree(self.store, self._iterblobs())
 
119
        c.parents = [self.repository.lookup_git_revid(revid)[0] for revid in self.parents]
 
120
        c.tree = commit_tree(self.store, 
 
121
                [(path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems()])
126
122
        c.committer = self._committer
127
123
        c.author = self._revprops.get('author', self._committer)
128
124
        c.commit_time = int(self._timestamp)
129
125
        c.author_time = int(self._timestamp)
130
126
        c.commit_timezone = self._timezone
131
127
        c.author_timezone = self._timezone
132
 
        c.encoding = 'utf-8'
133
128
        c.message = message.encode("utf-8")
134
129
        self.store.add_object(c)
135
 
        self._new_revision_id = self.repository.get_mapping().revision_id_foreign_to_bzr(c.id)
136
 
        self.repository.commit_write_group()
137
 
        return self._new_revision_id
 
130
        return self.repository.get_mapping().revision_id_foreign_to_bzr(c.id)