/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 roundtrip push 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
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
    )
46
41
 
47
42
 
48
43
class GitCommitBuilder(CommitBuilder):
49
 
    """Commit builder for Git repositories."""
50
 
 
51
 
    supports_record_entry_contents = False
52
44
 
53
45
    def __init__(self, *args, **kwargs):
54
46
        super(GitCommitBuilder, self).__init__(*args, **kwargs)
55
 
        self._validate_revprops(self._revprops)
56
47
        self.store = self.repository._git.object_store
57
48
        self._blobs = {}
58
 
        self._any_changes = False
59
 
        self._will_record_deletes = False
60
 
 
61
 
    def any_changes(self):
62
 
        return self._any_changes
63
49
 
64
50
    def record_entry_contents(self, ie, parent_invs, path, tree,
65
51
        content_summary):
84
70
                blob = Blob()
85
71
                blob.data = workingtree.get_file_text(file_id, path)
86
72
                return blob.id
87
 
        seen_root = False
88
73
        for (file_id, path, changed_content, versioned, parent, name, kind,
89
74
             executable) in iter_changes:
90
75
            if kind[1] in ("directory",):
91
76
                if kind[0] in ("file", "symlink"):
92
77
                    self.record_delete(path[0], file_id)
93
 
                if path[1] == "":
94
 
                    seen_root = True
95
78
                continue
96
79
            if path[1] is None:
97
80
                self.record_delete(path[0], file_id)
104
87
                sha = link_sha1(path[1], file_id)
105
88
            elif kind[1] == "tree-reference":
106
89
                mode = S_IFGITLINK
107
 
                sha = "FIXME" # FIXME
 
90
                sha = "FIXME"
108
91
            else:
109
92
                raise AssertionError("Unknown kind %r" % kind[1])
110
93
            if executable[1]:
112
95
            self._any_changes = True
113
96
            self._blobs[path[1].encode("utf-8")] = (mode, sha)
114
97
            file_sha1 = workingtree.get_file_sha1(file_id, 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)
 
98
            yield file_id, path[1], (file_sha1, os.lstat(workingtree.abspath(path[1])))
132
99
        # Fill in entries that were not changed
 
100
        basis_tree = workingtree.basis_tree()
 
101
        assert basis_tree.get_revision_id() == basis_revid
133
102
        for path, entry in basis_tree.iter_entries_by_dir():
134
103
            if entry.kind not in ("file", "symlink"):
135
104
                continue
140
109
                else:
141
110
                    blob.data = basis_tree.get_file_text(entry.file_id)
142
111
                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 []
150
112
 
151
113
    def finish_inventory(self):
152
114
        # eliminate blobs that were removed
158
120
        return ((path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems())
159
121
 
160
122
    def commit(self, message):
161
 
        self._validate_unicode_text(message, 'commit message')
162
123
        c = Commit()
163
124
        c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
164
125
        c.tree = commit_tree(self.store, self._iterblobs())
171
132
        c.encoding = 'utf-8'
172
133
        c.message = message.encode("utf-8")
173
134
        self.store.add_object(c)
174
 
        assert len(c.id) == 40
175
135
        self._new_revision_id = self.repository.get_mapping().revision_id_foreign_to_bzr(c.id)
176
136
        self.repository.commit_write_group()
177
137
        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)