/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 typo in git-svn-id parser, return revnum as integer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
1
 
# Copyright (C) 2009-2010 Jelmer Vernooij <jelmer@samba.org>
 
1
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
 
18
18
"""Support for committing in native Git working trees."""
19
19
 
20
 
from __future__ import absolute_import
21
20
 
22
21
from dulwich.index import (
23
22
    commit_tree,
24
23
    )
25
 
import os
26
24
import stat
27
25
 
28
 
from ... import (
29
 
    revision as _mod_revision,
30
 
    )
31
 
from ...errors import (
32
 
    RootMissing,
33
 
    )
34
 
from ...repository import (
 
26
from bzrlib.repository import (
35
27
    CommitBuilder,
36
28
    )
37
29
 
40
32
    Blob,
41
33
    Commit,
42
34
    )
43
 
from dulwich.repo import Repo
44
 
 
45
 
 
46
 
from .mapping import (
 
35
 
 
36
 
 
37
from bzrlib.plugins.git.mapping import (
47
38
    entry_mode,
48
39
    )
49
 
from .roundtrip import (
50
 
    CommitSupplement,
51
 
    inject_bzr_metadata,
52
 
    )
53
40
 
54
41
 
55
42
class GitCommitBuilder(CommitBuilder):
56
 
    """Commit builder for Git repositories."""
57
 
 
58
 
    supports_record_entry_contents = False
59
43
 
60
44
    def __init__(self, *args, **kwargs):
61
45
        super(GitCommitBuilder, self).__init__(*args, **kwargs)
62
 
        self._validate_revprops(self._revprops)
63
46
        self.store = self.repository._git.object_store
64
47
        self._blobs = {}
65
 
        self._any_changes = False
66
 
        self._will_record_deletes = False
67
 
        self._override_fileids = {}
68
 
        self._mapping = self.repository.get_mapping()
69
 
 
70
 
    def any_changes(self):
71
 
        return self._any_changes
72
48
 
73
49
    def record_entry_contents(self, ie, parent_invs, path, tree,
74
50
        content_summary):
75
 
        raise NotImplementedError(self.record_entry_contents)
 
51
        raise NotImplementedError(self.record_entry_contents)        
76
52
 
77
 
    def record_delete(self, kind, path, file_id):
78
 
        assert type(path) == str
79
 
        if kind != 'directory':
80
 
            self._override_fileids[path] = None
81
 
            self._blobs[path] = None
 
53
    def record_delete(self, path, file_id):
 
54
        self._blobs[path] = None
82
55
        self._any_changes = True
83
56
 
84
57
    def record_iter_changes(self, workingtree, basis_revid, iter_changes):
85
 
        def link_sha1(path, file_id):
86
 
            blob = Blob()
87
 
            blob.data = workingtree.get_symlink_target(file_id, path).encode("utf-8")
88
 
            self.store.add_object(blob)
89
 
            return blob.id
90
 
        def text_sha1(path, file_id):
91
 
            blob = Blob()
92
 
            blob.data = workingtree.get_file_text(file_id, path)
93
 
            self.store.add_object(blob)
94
 
            return blob.id
95
 
        def treeref_sha1(path, file_id):
96
 
            return Repo.open(os.path.join(workingtree.basedir, path)).head()
97
 
        seen_root = False
98
 
        for (file_id, path, changed_content, versioned, parent, name, kind,
 
58
        index = getattr(workingtree, "index", None)
 
59
        if index is not None:
 
60
            def index_sha1(path, file_id):
 
61
                return index.get_sha1(path.encode("utf-8"))
 
62
            text_sha1 = link_sha1 = index_sha1
 
63
        else:
 
64
            def link_sha1(path, file_id):
 
65
                blob = Blob()
 
66
                blob.data = workingtree.get_symlink_target(file_id)
 
67
                return blob.id
 
68
            def text_sha1(path, file_id):
 
69
                blob = Blob()
 
70
                blob.data = workingtree.get_file_text(file_id, path)
 
71
                return blob.id
 
72
        for (file_id, path, changed_content, versioned, parent, name, kind, 
99
73
             executable) in iter_changes:
100
74
            if kind[1] in ("directory",):
101
75
                if kind[0] in ("file", "symlink"):
102
 
                    self.record_delete(kind[0], path[0].encode("utf-8"), file_id)
103
 
                if path[1] == "":
104
 
                    seen_root = True
 
76
                    self.record_delete(path[0], file_id)
105
77
                continue
106
78
            if path[1] is None:
107
 
                self.record_delete(kind[0], path[0].encode("utf-8"), file_id)
 
79
                self.record_delete(path[0], file_id)
108
80
                continue
109
81
            if kind[1] == "file":
110
82
                mode = stat.S_IFREG
114
86
                sha = link_sha1(path[1], file_id)
115
87
            elif kind[1] == "tree-reference":
116
88
                mode = S_IFGITLINK
117
 
                sha = treeref_sha1(path[1], file_id)
 
89
                sha = "FIXME"
118
90
            else:
119
91
                raise AssertionError("Unknown kind %r" % kind[1])
120
92
            if executable[1]:
121
93
                mode |= 0111
122
94
            self._any_changes = True
123
 
            encoded_new_path = path[1].encode("utf-8")
124
 
            self._blobs[encoded_new_path] = (mode, sha)
125
 
            file_sha1 = workingtree.get_file_sha1(file_id, path[1])
126
 
            if file_sha1 is None:
127
 
                # File no longer exists
128
 
                if path[0] is not None:
129
 
                    self.record_delete(kind[0], path[0].encode("utf-8"), file_id)
130
 
                continue
131
 
            _, st = workingtree.get_file_with_stat(file_id, path[1])
132
 
            yield file_id, path[1], (file_sha1, st)
133
 
            self._override_fileids[encoded_new_path] = file_id
134
 
        if not seen_root and len(self.parents) == 0:
135
 
            raise RootMissing()
136
 
        if getattr(workingtree, "basis_tree", False):
137
 
            basis_tree = workingtree.basis_tree()
138
 
        else:
139
 
            if len(self.parents) == 0:
140
 
                basis_revid = _mod_revision.NULL_REVISION
141
 
            else:
142
 
                basis_revid = self.parents[0]
143
 
            basis_tree = self.repository.revision_tree(basis_revid)
 
95
            self._blobs[path[1].encode("utf-8")] = (mode, sha)
 
96
            yield file_id, path, (None, None)
144
97
        # Fill in entries that were not changed
 
98
        basis_tree = workingtree.basis_tree()
 
99
        assert basis_tree.get_revision_id() == basis_revid
145
100
        for path, entry in basis_tree.iter_entries_by_dir():
146
 
            if entry.kind not in ("file", "symlink", "tree-reference"):
 
101
            if entry.kind not in ("file", "symlink"):
147
102
                continue
148
103
            if not path in self._blobs:
 
104
                blob = Blob()
149
105
                if entry.kind == "symlink":
150
 
                    blob = Blob()
151
 
                    blob.data = basis_tree.get_symlink_target(entry.file_id,
152
 
                        path)
153
 
                    self._blobs[path.encode("utf-8")] = (entry_mode(entry), blob.id)
154
 
                elif entry.kind == "file":
155
 
                    blob = Blob()
156
 
                    blob.data = basis_tree.get_file_text(entry.file_id, path)
157
 
                    self._blobs[path.encode("utf-8")] = (entry_mode(entry), blob.id)
158
 
                else:
159
 
                    (mode, sha) = workingtree._lookup_entry(path.encode("utf-8"), update_index=True)
160
 
                    self._blobs[path.encode("utf-8")] = (sha, mode)
161
 
        if not self._lossy and self._mapping.BZR_FILE_IDS_FILE is not None:
162
 
            try:
163
 
                fileid_map = dict(basis_tree._fileid_map.file_ids)
164
 
            except AttributeError:
165
 
                fileid_map = {}
166
 
            for path, file_id in self._override_fileids.iteritems():
167
 
                assert type(path) == str
168
 
                if file_id is None:
169
 
                    del fileid_map[path]
170
 
                else:
171
 
                    assert type(file_id) == str
172
 
                    fileid_map[path] = file_id
173
 
            if fileid_map:
174
 
                fileid_blob = self._mapping.export_fileid_map(fileid_map)
175
 
                self.store.add_object(fileid_blob)
176
 
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = (stat.S_IFREG | 0644, fileid_blob.id)
177
 
            else:
178
 
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = None
179
 
        self.new_inventory = None
180
 
 
181
 
    def get_basis_delta(self):
182
 
        if not self._will_record_deletes:
183
 
            raise AssertionError
184
 
        # FIXME
185
 
        return []
 
106
                    blob.data = basis_tree.get_symlink_target(entry.file_id)
 
107
                else:
 
108
                    blob.data = basis_tree.get_file_text(entry.file_id)
 
109
                self._blobs[path.encode("utf-8")] = (entry_mode(entry), blob.id)
186
110
 
187
111
    def finish_inventory(self):
188
112
        # eliminate blobs that were removed
189
 
        for path, entry in iter(self._blobs.items()):
 
113
        for path, entry in self._blobs.iteritems():
190
114
            if entry is None:
191
115
                del self._blobs[path]
192
116
 
193
 
    def _iterblobs(self):
194
 
        return ((path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems())
195
 
 
196
117
    def commit(self, message):
197
 
        self._validate_unicode_text(message, 'commit message')
198
118
        c = Commit()
199
119
        c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
200
 
        c.tree = commit_tree(self.store, self._iterblobs())
201
 
        c.encoding = 'utf-8'
202
 
        c.committer = self._committer.encode(c.encoding)
203
 
        c.author = self._revprops.get('author', self._committer).encode(c.encoding)
204
 
        if c.author != c.committer:
205
 
            self._revprops.remove("author")
 
120
        c.tree = commit_tree(self.store, 
 
121
                [(path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems()])
 
122
        c.committer = self._committer
 
123
        c.author = self._revprops.get('author', self._committer)
206
124
        c.commit_time = int(self._timestamp)
207
125
        c.author_time = int(self._timestamp)
208
126
        c.commit_timezone = self._timezone
209
127
        c.author_timezone = self._timezone
210
 
        c.message = message.encode(c.encoding)
211
 
        if not self._lossy:
212
 
            commit_supplement = CommitSupplement()
213
 
            commit_supplement.revision_id = self._new_revision_id
214
 
            commit_supplement.properties = self._revprops
215
 
            commit_supplement.explicit_parent_ids = self.parents
216
 
            if commit_supplement:
217
 
                c.message = inject_bzr_metadata(c.message, commit_supplement, "utf-8")
218
 
 
219
 
        assert len(c.id) == 40
220
 
        if self._new_revision_id is None or self._lossy:
221
 
            self._new_revision_id = self._mapping.revision_id_foreign_to_bzr(c.id)
 
128
        c.message = message.encode("utf-8")
222
129
        self.store.add_object(c)
223
 
        self.repository.commit_write_group()
224
 
        return self._new_revision_id
225
 
 
226
 
    def abort(self):
227
 
        self.repository.abort_write_group()
228
 
 
229
 
    def will_record_deletes(self):
230
 
        self._will_record_deletes = True
231
 
 
232
 
    def revision_tree(self):
233
 
        return self.repository.revision_tree(self._new_revision_id)
 
130
        return self.repository.get_mapping().revision_id_foreign_to_bzr(c.id)