/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 tuples in refs dictionary.

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
24
25
import stat
25
26
 
26
 
from bzrlib import (
27
 
    revision as _mod_revision,
28
 
    )
29
 
from bzrlib.errors import (
30
 
    RootMissing,
31
 
    )
32
27
from bzrlib.repository import (
33
28
    CommitBuilder,
34
29
    )
43
38
from bzrlib.plugins.git.mapping import (
44
39
    entry_mode,
45
40
    )
46
 
from bzrlib.plugins.git.roundtrip import (
47
 
    CommitSupplement,
48
 
    inject_bzr_metadata,
49
 
    )
50
41
 
51
42
 
52
43
class GitCommitBuilder(CommitBuilder):
53
 
    """Commit builder for Git repositories."""
54
 
 
55
 
    supports_record_entry_contents = False
56
44
 
57
45
    def __init__(self, *args, **kwargs):
58
46
        super(GitCommitBuilder, self).__init__(*args, **kwargs)
59
 
        self._validate_revprops(self._revprops)
60
47
        self.store = self.repository._git.object_store
61
48
        self._blobs = {}
62
 
        self._any_changes = False
63
 
        self._will_record_deletes = False
64
 
        self._override_fileids = {}
65
 
        self._mapping = self.repository.get_mapping()
66
 
 
67
 
    def any_changes(self):
68
 
        return self._any_changes
69
49
 
70
50
    def record_entry_contents(self, ie, parent_invs, path, tree,
71
51
        content_summary):
72
52
        raise NotImplementedError(self.record_entry_contents)
73
53
 
74
54
    def record_delete(self, path, file_id):
75
 
        self._override_fileids[path] = None
76
55
        self._blobs[path] = None
77
56
        self._any_changes = True
78
57
 
85
64
        else:
86
65
            def link_sha1(path, file_id):
87
66
                blob = Blob()
88
 
                blob.data = workingtree.get_symlink_target(file_id, path)
 
67
                blob.data = workingtree.get_symlink_target(file_id)
89
68
                return blob.id
90
69
            def text_sha1(path, file_id):
91
70
                blob = Blob()
92
71
                blob.data = workingtree.get_file_text(file_id, path)
93
72
                return blob.id
94
 
        seen_root = False
95
73
        for (file_id, path, changed_content, versioned, parent, name, kind,
96
74
             executable) in iter_changes:
97
75
            if kind[1] in ("directory",):
98
76
                if kind[0] in ("file", "symlink"):
99
77
                    self.record_delete(path[0], file_id)
100
 
                if path[1] == "":
101
 
                    seen_root = True
102
78
                continue
103
79
            if path[1] is None:
104
80
                self.record_delete(path[0], file_id)
111
87
                sha = link_sha1(path[1], file_id)
112
88
            elif kind[1] == "tree-reference":
113
89
                mode = S_IFGITLINK
114
 
                sha = "FIXME" # FIXME
 
90
                sha = "FIXME"
115
91
            else:
116
92
                raise AssertionError("Unknown kind %r" % kind[1])
117
93
            if executable[1]:
119
95
            self._any_changes = True
120
96
            self._blobs[path[1].encode("utf-8")] = (mode, sha)
121
97
            file_sha1 = workingtree.get_file_sha1(file_id, path[1])
122
 
            if file_sha1 is None:
123
 
                # File no longer exists
124
 
                if path[0] is not None:
125
 
                    self.record_delete(path[0], file_id)
126
 
                continue
127
 
            _, st = workingtree.get_file_with_stat(file_id, path[1])
128
 
            yield file_id, path[1], (file_sha1, st)
129
 
            self._override_fileids[path[1]] = file_id
130
 
        if not seen_root and len(self.parents) == 0:
131
 
            raise RootMissing()
132
 
        if getattr(workingtree, "basis_tree", False):
133
 
            basis_tree = workingtree.basis_tree()
134
 
        else:
135
 
            if len(self.parents) == 0:
136
 
                basis_revid = _mod_revision.NULL_REVISION
137
 
            else:
138
 
                basis_revid = self.parents[0]
139
 
            basis_tree = self.repository.revision_tree(basis_revid)
 
98
            yield file_id, path[1], (file_sha1, os.lstat(workingtree.abspath(path[1])))
140
99
        # Fill in entries that were not changed
 
100
        basis_tree = workingtree.basis_tree()
 
101
        assert basis_tree.get_revision_id() == basis_revid
141
102
        for path, entry in basis_tree.iter_entries_by_dir():
142
103
            if entry.kind not in ("file", "symlink"):
143
104
                continue
144
105
            if not path in self._blobs:
145
106
                blob = Blob()
146
107
                if entry.kind == "symlink":
147
 
                    blob.data = basis_tree.get_symlink_target(entry.file_id,
148
 
                        path)
 
108
                    blob.data = basis_tree.get_symlink_target(entry.file_id)
149
109
                else:
150
 
                    blob.data = basis_tree.get_file_text(entry.file_id, path)
 
110
                    blob.data = basis_tree.get_file_text(entry.file_id)
151
111
                self._blobs[path.encode("utf-8")] = (entry_mode(entry), blob.id)
152
 
        if not self._lossy and self._mapping.BZR_FILE_IDS_FILE is not None:
153
 
            try:
154
 
                fileid_map = dict(basis_tree._fileid_map.file_ids)
155
 
            except AttributeError:
156
 
                fileid_map = {}
157
 
            fileid_map.update(self._override_fileids)
158
 
            if fileid_map:
159
 
                fileid_blob = self._mapping.export_fileid_map(fileid_map)
160
 
                self.store.add_object(fileid_blob)
161
 
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = (stat.S_IFREG | 0644, fileid_blob.id)
162
 
            else:
163
 
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = None
164
 
        self.new_inventory = None
165
 
 
166
 
    def get_basis_delta(self):
167
 
        if not self._will_record_deletes:
168
 
            raise AssertionError
169
 
        # FIXME
170
 
        return []
171
112
 
172
113
    def finish_inventory(self):
173
114
        # eliminate blobs that were removed
179
120
        return ((path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems())
180
121
 
181
122
    def commit(self, message):
182
 
        self._validate_unicode_text(message, 'commit message')
183
123
        c = Commit()
184
124
        c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
185
125
        c.tree = commit_tree(self.store, self._iterblobs())
186
126
        c.committer = self._committer
187
127
        c.author = self._revprops.get('author', self._committer)
188
 
        if c.author != c.committer:
189
 
            self._revprops.remove("author")
190
128
        c.commit_time = int(self._timestamp)
191
129
        c.author_time = int(self._timestamp)
192
130
        c.commit_timezone = self._timezone
193
131
        c.author_timezone = self._timezone
194
132
        c.encoding = 'utf-8'
195
133
        c.message = message.encode("utf-8")
196
 
        if not self._lossy:
197
 
            commit_supplement = CommitSupplement()
198
 
            commit_supplement.revision_id = self._new_revision_id
199
 
            commit_supplement.properties = self._revprops
200
 
            commit_supplement.explicit_parent_ids = self.parents
201
 
            if commit_supplement:
202
 
                c.message = inject_bzr_metadata(c.message, commit_supplement, "utf-8")
203
 
 
204
 
        assert len(c.id) == 40
205
 
        if self._new_revision_id is None:
206
 
            self._new_revision_id = self.mapping.revision_id_foreign_to_bzr(c.id)
207
134
        self.store.add_object(c)
 
135
        self._new_revision_id = self.repository.get_mapping().revision_id_foreign_to_bzr(c.id)
208
136
        self.repository.commit_write_group()
209
137
        return self._new_revision_id
210
 
 
211
 
    def abort(self):
212
 
        self.repository.abort_write_group()
213
 
 
214
 
    def will_record_deletes(self):
215
 
        self._will_record_deletes = True
216
 
 
217
 
    def revision_tree(self):
218
 
        return self.repository.revision_tree(self._new_revision_id)