/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

Detect smart servers.

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
    )
38
43
from bzrlib.plugins.git.mapping import (
39
44
    entry_mode,
40
45
    )
 
46
from bzrlib.plugins.git.roundtrip import (
 
47
    CommitSupplement,
 
48
    inject_bzr_metadata,
 
49
    )
41
50
 
42
51
 
43
52
class GitCommitBuilder(CommitBuilder):
 
53
    """Commit builder for Git repositories."""
 
54
 
 
55
    supports_record_entry_contents = False
44
56
 
45
57
    def __init__(self, *args, **kwargs):
46
58
        super(GitCommitBuilder, self).__init__(*args, **kwargs)
 
59
        self._validate_revprops(self._revprops)
47
60
        self.store = self.repository._git.object_store
48
61
        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
49
69
 
50
70
    def record_entry_contents(self, ie, parent_invs, path, tree,
51
71
        content_summary):
52
72
        raise NotImplementedError(self.record_entry_contents)
53
73
 
54
74
    def record_delete(self, path, file_id):
 
75
        self._override_fileids[path] = None
55
76
        self._blobs[path] = None
56
77
        self._any_changes = True
57
78
 
64
85
        else:
65
86
            def link_sha1(path, file_id):
66
87
                blob = Blob()
67
 
                blob.data = workingtree.get_symlink_target(file_id)
 
88
                blob.data = workingtree.get_symlink_target(file_id, path)
68
89
                return blob.id
69
90
            def text_sha1(path, file_id):
70
91
                blob = Blob()
71
92
                blob.data = workingtree.get_file_text(file_id, path)
72
93
                return blob.id
 
94
        seen_root = False
73
95
        for (file_id, path, changed_content, versioned, parent, name, kind,
74
96
             executable) in iter_changes:
75
97
            if kind[1] in ("directory",):
76
98
                if kind[0] in ("file", "symlink"):
77
99
                    self.record_delete(path[0], file_id)
 
100
                if path[1] == "":
 
101
                    seen_root = True
78
102
                continue
79
103
            if path[1] is None:
80
104
                self.record_delete(path[0], file_id)
87
111
                sha = link_sha1(path[1], file_id)
88
112
            elif kind[1] == "tree-reference":
89
113
                mode = S_IFGITLINK
90
 
                sha = "FIXME"
 
114
                sha = "FIXME" # FIXME
91
115
            else:
92
116
                raise AssertionError("Unknown kind %r" % kind[1])
93
117
            if executable[1]:
95
119
            self._any_changes = True
96
120
            self._blobs[path[1].encode("utf-8")] = (mode, sha)
97
121
            file_sha1 = workingtree.get_file_sha1(file_id, path[1])
98
 
            yield file_id, path[1], (file_sha1, os.lstat(workingtree.abspath(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)
99
140
        # Fill in entries that were not changed
100
 
        basis_tree = workingtree.basis_tree()
101
 
        assert basis_tree.get_revision_id() == basis_revid
102
141
        for path, entry in basis_tree.iter_entries_by_dir():
103
142
            if entry.kind not in ("file", "symlink"):
104
143
                continue
105
144
            if not path in self._blobs:
106
145
                blob = Blob()
107
146
                if entry.kind == "symlink":
108
 
                    blob.data = basis_tree.get_symlink_target(entry.file_id)
 
147
                    blob.data = basis_tree.get_symlink_target(entry.file_id,
 
148
                        path)
109
149
                else:
110
 
                    blob.data = basis_tree.get_file_text(entry.file_id)
 
150
                    blob.data = basis_tree.get_file_text(entry.file_id, path)
111
151
                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 []
112
171
 
113
172
    def finish_inventory(self):
114
173
        # eliminate blobs that were removed
120
179
        return ((path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems())
121
180
 
122
181
    def commit(self, message):
 
182
        self._validate_unicode_text(message, 'commit message')
123
183
        c = Commit()
124
184
        c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
125
185
        c.tree = commit_tree(self.store, self._iterblobs())
126
186
        c.committer = self._committer
127
187
        c.author = self._revprops.get('author', self._committer)
 
188
        if c.author != c.committer:
 
189
            self._revprops.remove("author")
128
190
        c.commit_time = int(self._timestamp)
129
191
        c.author_time = int(self._timestamp)
130
192
        c.commit_timezone = self._timezone
131
193
        c.author_timezone = self._timezone
132
194
        c.encoding = 'utf-8'
133
195
        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)
134
207
        self.store.add_object(c)
135
 
        self._new_revision_id = self.repository.get_mapping().revision_id_foreign_to_bzr(c.id)
136
208
        self.repository.commit_write_group()
137
209
        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)