/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 repeeling objects when determining what to send.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
21
21
from dulwich.index import (
22
22
    commit_tree,
23
23
    )
24
 
import os
25
24
import stat
26
25
 
 
26
from bzrlib import (
 
27
    revision as _mod_revision,
 
28
    )
 
29
from bzrlib.errors import (
 
30
    RootMissing,
 
31
    )
27
32
from bzrlib.repository import (
28
33
    CommitBuilder,
29
34
    )
41
46
 
42
47
 
43
48
class GitCommitBuilder(CommitBuilder):
 
49
    """Commit builder for Git repositories."""
 
50
 
 
51
    supports_record_entry_contents = False
44
52
 
45
53
    def __init__(self, *args, **kwargs):
46
54
        super(GitCommitBuilder, self).__init__(*args, **kwargs)
 
55
        self._validate_revprops(self._revprops)
47
56
        self.store = self.repository._git.object_store
48
57
        self._blobs = {}
 
58
        self._any_changes = False
 
59
        self._will_record_deletes = False
 
60
 
 
61
    def any_changes(self):
 
62
        return self._any_changes
49
63
 
50
64
    def record_entry_contents(self, ie, parent_invs, path, tree,
51
65
        content_summary):
70
84
                blob = Blob()
71
85
                blob.data = workingtree.get_file_text(file_id, path)
72
86
                return blob.id
 
87
        seen_root = False
73
88
        for (file_id, path, changed_content, versioned, parent, name, kind,
74
89
             executable) in iter_changes:
75
90
            if kind[1] in ("directory",):
76
91
                if kind[0] in ("file", "symlink"):
77
92
                    self.record_delete(path[0], file_id)
 
93
                if path[1] == "":
 
94
                    seen_root = True
78
95
                continue
79
96
            if path[1] is None:
80
97
                self.record_delete(path[0], file_id)
87
104
                sha = link_sha1(path[1], file_id)
88
105
            elif kind[1] == "tree-reference":
89
106
                mode = S_IFGITLINK
90
 
                sha = "FIXME"
 
107
                sha = "FIXME" # FIXME
91
108
            else:
92
109
                raise AssertionError("Unknown kind %r" % kind[1])
93
110
            if executable[1]:
95
112
            self._any_changes = True
96
113
            self._blobs[path[1].encode("utf-8")] = (mode, sha)
97
114
            file_sha1 = workingtree.get_file_sha1(file_id, path[1])
98
 
            yield file_id, path[1], (file_sha1, os.lstat(workingtree.abspath(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
 
120
            _, st = workingtree.get_file_with_stat(file_id, path[1])
 
121
            yield file_id, path[1], (file_sha1, st)
 
122
        if not seen_root and len(self.parents) == 0:
 
123
            raise RootMissing()
 
124
        if getattr(workingtree, "basis_tree", False):
 
125
            basis_tree = workingtree.basis_tree()
 
126
        else:
 
127
            if len(self.parents) == 0:
 
128
                basis_revid = _mod_revision.NULL_REVISION
 
129
            else:
 
130
                basis_revid = self.parents[0]
 
131
            basis_tree = self.repository.revision_tree(basis_revid)
99
132
        # Fill in entries that were not changed
100
 
        basis_tree = workingtree.basis_tree()
101
 
        assert basis_tree.get_revision_id() == basis_revid
102
133
        for path, entry in basis_tree.iter_entries_by_dir():
103
134
            if entry.kind not in ("file", "symlink"):
104
135
                continue
109
140
                else:
110
141
                    blob.data = basis_tree.get_file_text(entry.file_id)
111
142
                self._blobs[path.encode("utf-8")] = (entry_mode(entry), blob.id)
 
143
        self.new_inventory = None
 
144
 
 
145
    def get_basis_delta(self):
 
146
        if not self._will_record_deletes:
 
147
            raise AssertionError
 
148
        # FIXME
 
149
        return []
112
150
 
113
151
    def finish_inventory(self):
114
152
        # eliminate blobs that were removed
120
158
        return ((path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems())
121
159
 
122
160
    def commit(self, message):
 
161
        self._validate_unicode_text(message, 'commit message')
123
162
        c = Commit()
124
163
        c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
125
164
        c.tree = commit_tree(self.store, self._iterblobs())
132
171
        c.encoding = 'utf-8'
133
172
        c.message = message.encode("utf-8")
134
173
        self.store.add_object(c)
 
174
        assert len(c.id) == 40
135
175
        self._new_revision_id = self.repository.get_mapping().revision_id_foreign_to_bzr(c.id)
136
176
        self.repository.commit_write_group()
137
177
        return self._new_revision_id
 
178
 
 
179
    def abort(self):
 
180
        self.repository.abort_write_group()
 
181
 
 
182
    def will_record_deletes(self):
 
183
        self._will_record_deletes = True
 
184
 
 
185
    def revision_tree(self):
 
186
        return self.repository.revision_tree(self._new_revision_id)