/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

More work on roundtripping support.

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
 
 
65
    def any_changes(self):
 
66
        return self._any_changes
49
67
 
50
68
    def record_entry_contents(self, ie, parent_invs, path, tree,
51
69
        content_summary):
64
82
        else:
65
83
            def link_sha1(path, file_id):
66
84
                blob = Blob()
67
 
                blob.data = workingtree.get_symlink_target(file_id)
 
85
                blob.data = workingtree.get_symlink_target(file_id, path)
68
86
                return blob.id
69
87
            def text_sha1(path, file_id):
70
88
                blob = Blob()
71
89
                blob.data = workingtree.get_file_text(file_id, path)
72
90
                return blob.id
 
91
        seen_root = False
73
92
        for (file_id, path, changed_content, versioned, parent, name, kind,
74
93
             executable) in iter_changes:
75
94
            if kind[1] in ("directory",):
76
95
                if kind[0] in ("file", "symlink"):
77
96
                    self.record_delete(path[0], file_id)
 
97
                if path[1] == "":
 
98
                    seen_root = True
78
99
                continue
79
100
            if path[1] is None:
80
101
                self.record_delete(path[0], file_id)
87
108
                sha = link_sha1(path[1], file_id)
88
109
            elif kind[1] == "tree-reference":
89
110
                mode = S_IFGITLINK
90
 
                sha = "FIXME"
 
111
                sha = "FIXME" # FIXME
91
112
            else:
92
113
                raise AssertionError("Unknown kind %r" % kind[1])
93
114
            if executable[1]:
95
116
            self._any_changes = True
96
117
            self._blobs[path[1].encode("utf-8")] = (mode, sha)
97
118
            file_sha1 = workingtree.get_file_sha1(file_id, path[1])
98
 
            yield file_id, path[1], (file_sha1, os.lstat(workingtree.abspath(path[1])))
 
119
            if file_sha1 is None:
 
120
                # File no longer exists
 
121
                if path[0] is not None:
 
122
                    self.record_delete(path[0], file_id)
 
123
                continue
 
124
            _, st = workingtree.get_file_with_stat(file_id, path[1])
 
125
            yield file_id, path[1], (file_sha1, st)
 
126
        if not seen_root and len(self.parents) == 0:
 
127
            raise RootMissing()
 
128
        if getattr(workingtree, "basis_tree", False):
 
129
            basis_tree = workingtree.basis_tree()
 
130
        else:
 
131
            if len(self.parents) == 0:
 
132
                basis_revid = _mod_revision.NULL_REVISION
 
133
            else:
 
134
                basis_revid = self.parents[0]
 
135
            basis_tree = self.repository.revision_tree(basis_revid)
99
136
        # Fill in entries that were not changed
100
 
        basis_tree = workingtree.basis_tree()
101
 
        assert basis_tree.get_revision_id() == basis_revid
102
137
        for path, entry in basis_tree.iter_entries_by_dir():
103
138
            if entry.kind not in ("file", "symlink"):
104
139
                continue
105
140
            if not path in self._blobs:
106
141
                blob = Blob()
107
142
                if entry.kind == "symlink":
108
 
                    blob.data = basis_tree.get_symlink_target(entry.file_id)
 
143
                    blob.data = basis_tree.get_symlink_target(entry.file_id,
 
144
                        path)
109
145
                else:
110
 
                    blob.data = basis_tree.get_file_text(entry.file_id)
 
146
                    blob.data = basis_tree.get_file_text(entry.file_id, path)
111
147
                self._blobs[path.encode("utf-8")] = (entry_mode(entry), blob.id)
 
148
        self.new_inventory = None
 
149
 
 
150
    def get_basis_delta(self):
 
151
        if not self._will_record_deletes:
 
152
            raise AssertionError
 
153
        # FIXME
 
154
        return []
112
155
 
113
156
    def finish_inventory(self):
114
157
        # eliminate blobs that were removed
120
163
        return ((path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems())
121
164
 
122
165
    def commit(self, message):
 
166
        self._validate_unicode_text(message, 'commit message')
123
167
        c = Commit()
124
168
        c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
125
169
        c.tree = commit_tree(self.store, self._iterblobs())
126
170
        c.committer = self._committer
127
171
        c.author = self._revprops.get('author', self._committer)
 
172
        if c.author != c.committer:
 
173
            self._revprops.remove("author")
128
174
        c.commit_time = int(self._timestamp)
129
175
        c.author_time = int(self._timestamp)
130
176
        c.commit_timezone = self._timezone
131
177
        c.author_timezone = self._timezone
132
178
        c.encoding = 'utf-8'
133
179
        c.message = message.encode("utf-8")
 
180
        if not self._lossy:
 
181
            commit_supplement = CommitSupplement()
 
182
            commit_supplement.revision_id = self._new_revision_id
 
183
            commit_supplement.properties = self._revprops
 
184
            commit_supplement.explicit_parent_ids = self.parents
 
185
            if commit_supplement:
 
186
                c.message = inject_bzr_metadata(c.message, commit_supplement, "utf-8")
 
187
 
 
188
        assert len(c.id) == 40
 
189
        if self._new_revision_id is None:
 
190
            self._new_revision_id = self.repository.get_mapping().revision_id_foreign_to_bzr(c.id)
134
191
        self.store.add_object(c)
135
 
        self._new_revision_id = self.repository.get_mapping().revision_id_foreign_to_bzr(c.id)
136
192
        self.repository.commit_write_group()
137
193
        return self._new_revision_id
 
194
 
 
195
    def abort(self):
 
196
        self.repository.abort_write_group()
 
197
 
 
198
    def will_record_deletes(self):
 
199
        self._will_record_deletes = True
 
200
 
 
201
    def revision_tree(self):
 
202
        return self.repository.revision_tree(self._new_revision_id)