/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 breezy/git/commit.py

  • Committer: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/commit.py
1
 
# Copyright (C) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
2
 
#
3
 
# This program is free software; you can redistribute it and/or modify
4
 
# it under the terms of the GNU General Public License as published by
5
 
# the Free Software Foundation; either version 2 of the License, or
6
 
# (at your option) any later version.
7
 
#
8
 
# This program is distributed in the hope that it will be useful,
9
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
 
# GNU General Public License for more details.
12
 
#
13
 
# You should have received a copy of the GNU General Public License
14
 
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
 
18
 
"""Support for committing in native Git working trees."""
19
 
 
20
 
from __future__ import absolute_import
21
 
 
22
 
from dulwich.index import (
23
 
    commit_tree,
24
 
    )
25
 
import stat
26
 
 
27
 
from .. import (
28
 
    config as _mod_config,
29
 
    gpg,
30
 
    osutils,
31
 
    revision as _mod_revision,
32
 
    )
33
 
from ..errors import (
34
 
    BzrError,
35
 
    RootMissing,
36
 
    UnsupportedOperation,
37
 
    )
38
 
from ..repository import (
39
 
    CommitBuilder,
40
 
    )
41
 
from ..sixish import (
42
 
    viewitems,
43
 
    )
44
 
 
45
 
from dulwich.objects import (
46
 
    Blob,
47
 
    Commit,
48
 
    )
49
 
from dulwich.index import read_submodule_head
50
 
 
51
 
 
52
 
from .mapping import (
53
 
    object_mode,
54
 
    fix_person_identifier,
55
 
    )
56
 
from .tree import entry_factory
57
 
 
58
 
 
59
 
class SettingCustomFileIdsUnsupported(UnsupportedOperation):
60
 
 
61
 
    _fmt = "Unable to store addition of file with custom file ids: %(file_ids)r"
62
 
 
63
 
    def __init__(self, file_ids):
64
 
        BzrError.__init__(self)
65
 
        self.file_ids = file_ids
66
 
 
67
 
 
68
 
class GitCommitBuilder(CommitBuilder):
69
 
    """Commit builder for Git repositories."""
70
 
 
71
 
    supports_record_entry_contents = False
72
 
 
73
 
    def __init__(self, *args, **kwargs):
74
 
        super(GitCommitBuilder, self).__init__(*args, **kwargs)
75
 
        self.random_revid = True
76
 
        self._validate_revprops(self._revprops)
77
 
        self.store = self.repository._git.object_store
78
 
        self._blobs = {}
79
 
        self._inv_delta = []
80
 
        self._any_changes = False
81
 
        self._override_fileids = {}
82
 
        self._mapping = self.repository.get_mapping()
83
 
 
84
 
    def any_changes(self):
85
 
        return self._any_changes
86
 
 
87
 
    def record_iter_changes(self, workingtree, basis_revid, iter_changes):
88
 
        seen_root = False
89
 
        for (file_id, path, changed_content, versioned, parent, name, kind,
90
 
             executable) in iter_changes:
91
 
            if kind[1] in ("directory",):
92
 
                self._inv_delta.append((path[0], path[1], file_id, entry_factory[kind[1]](file_id, name[1], parent[1])))
93
 
                if kind[0] in ("file", "symlink"):
94
 
                    self._blobs[path[0].encode("utf-8")] = None
95
 
                    self._any_changes = True
96
 
                if path[1] == "":
97
 
                    seen_root = True
98
 
                continue
99
 
            self._any_changes = True
100
 
            if path[1] is None:
101
 
                self._inv_delta.append((path[0], path[1], file_id, None))
102
 
                self._blobs[path[0].encode("utf-8")] = None
103
 
                continue
104
 
            try:
105
 
                entry_kls = entry_factory[kind[1]]
106
 
            except KeyError:
107
 
                raise KeyError("unknown kind %s" % kind[1])
108
 
            entry = entry_kls(file_id, name[1], parent[1])
109
 
            if kind[1] == "file":
110
 
                entry.executable = executable[1]
111
 
                blob = Blob()
112
 
                f, st = workingtree.get_file_with_stat(path[1], file_id)
113
 
                try:
114
 
                    blob.data = f.read()
115
 
                finally:
116
 
                    f.close()
117
 
                entry.text_size = len(blob.data)
118
 
                entry.text_sha1 = osutils.sha_string(blob.data)
119
 
                self.store.add_object(blob)
120
 
                sha = blob.id
121
 
            elif kind[1] == "symlink":
122
 
                symlink_target = workingtree.get_symlink_target(path[1], file_id)
123
 
                blob = Blob()
124
 
                blob.data = symlink_target.encode("utf-8")
125
 
                self.store.add_object(blob)
126
 
                sha = blob.id
127
 
                entry.symlink_target = symlink_target
128
 
                st = None
129
 
            elif kind[1] == "tree-reference":
130
 
                sha = read_submodule_head(workingtree.abspath(path[1]))
131
 
                reference_revision = workingtree.get_reference_revision(path[1], file_id)
132
 
                entry.reference_revision = reference_revision
133
 
                st = None
134
 
            else:
135
 
                raise AssertionError("Unknown kind %r" % kind[1])
136
 
            mode = object_mode(kind[1], executable[1])
137
 
            self._inv_delta.append((path[0], path[1], file_id, entry))
138
 
            encoded_new_path = path[1].encode("utf-8")
139
 
            self._blobs[encoded_new_path] = (mode, sha)
140
 
            if st is not None:
141
 
                yield file_id, path[1], (entry.text_sha1, st)
142
 
            if self._mapping.generate_file_id(encoded_new_path) != file_id:
143
 
                self._override_fileids[encoded_new_path] = file_id
144
 
            else:
145
 
                self._override_fileids[encoded_new_path] = None
146
 
        if not seen_root and len(self.parents) == 0:
147
 
            raise RootMissing()
148
 
        if getattr(workingtree, "basis_tree", False):
149
 
            basis_tree = workingtree.basis_tree()
150
 
        else:
151
 
            if len(self.parents) == 0:
152
 
                basis_revid = _mod_revision.NULL_REVISION
153
 
            else:
154
 
                basis_revid = self.parents[0]
155
 
            basis_tree = self.repository.revision_tree(basis_revid)
156
 
        # Fill in entries that were not changed
157
 
        for entry in basis_tree._iter_tree_contents(include_trees=False):
158
 
            if entry.path in self._blobs:
159
 
                continue
160
 
            self._blobs[entry.path] = (entry.mode, entry.sha)
161
 
        if not self._lossy:
162
 
            try:
163
 
                fileid_map = dict(basis_tree._fileid_map.file_ids)
164
 
            except AttributeError:
165
 
                fileid_map = {}
166
 
            for path, file_id in viewitems(self._override_fileids):
167
 
                if not isinstance(path, bytes):
168
 
                    raise TypeError(path)
169
 
                if file_id is None:
170
 
                    if path in fileid_map:
171
 
                        del fileid_map[path]
172
 
                else:
173
 
                    if not isinstance(file_id, bytes):
174
 
                        raise TypeError(file_id)
175
 
                    fileid_map[path] = file_id
176
 
            if fileid_map:
177
 
                fileid_blob = self._mapping.export_fileid_map(fileid_map)
178
 
            else:
179
 
                fileid_blob = None
180
 
            if fileid_blob is not None:
181
 
                if self._mapping.BZR_FILE_IDS_FILE is None:
182
 
                    raise SettingCustomFileIdsUnsupported(fileid_map)
183
 
                self.store.add_object(fileid_blob)
184
 
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = (stat.S_IFREG | 0o644, fileid_blob.id)
185
 
            else:
186
 
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = None
187
 
        self.new_inventory = None
188
 
 
189
 
    def update_basis(self, tree):
190
 
        # Nothing to do here
191
 
        pass
192
 
 
193
 
    def finish_inventory(self):
194
 
        # eliminate blobs that were removed
195
 
        self._blobs = {k: v for (k, v) in viewitems(self._blobs) if v is not None}
196
 
 
197
 
    def _iterblobs(self):
198
 
        return ((path, sha, mode) for (path, (mode, sha)) in viewitems(self._blobs))
199
 
 
200
 
    def commit(self, message):
201
 
        self._validate_unicode_text(message, 'commit message')
202
 
        c = Commit()
203
 
        c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
204
 
        c.tree = commit_tree(self.store, self._iterblobs())
205
 
        encoding = self._revprops.pop(u'git-explicit-encoding', 'utf-8')
206
 
        c.encoding = encoding.encode('ascii')
207
 
        c.committer = fix_person_identifier(self._committer.encode(encoding))
208
 
        try:
209
 
            author = self._revprops.pop('author')
210
 
        except KeyError:
211
 
            try:
212
 
                authors = self._revprops.pop('authors').splitlines()
213
 
            except KeyError:
214
 
                author = self._committer
215
 
            else:
216
 
                if len(authors) > 1:
217
 
                    raise Exception("Unable to convert multiple authors")
218
 
                elif len(authors) == 0:
219
 
                    author = self._committer
220
 
                else:
221
 
                    author = authors[0]
222
 
        c.author = fix_person_identifier(author.encode(encoding))
223
 
        if self._revprops:
224
 
            raise NotImplementedError(self._revprops)
225
 
        c.commit_time = int(self._timestamp)
226
 
        c.author_time = int(self._timestamp)
227
 
        c.commit_timezone = self._timezone
228
 
        c.author_timezone = self._timezone
229
 
        c.message = message.encode(encoding)
230
 
        if self._config_stack.get('create_signatures') == _mod_config.SIGN_ALWAYS:
231
 
            strategy = gpg.GPGStrategy(self._config_stack)
232
 
            c.gpgsig = strategy.sign(c.as_raw_string(), gpg.MODE_DETACH)
233
 
        self.store.add_object(c)
234
 
        self.repository.commit_write_group()
235
 
        self._new_revision_id = self._mapping.revision_id_foreign_to_bzr(c.id)
236
 
        return self._new_revision_id
237
 
 
238
 
    def abort(self):
239
 
        if self.repository.is_in_write_group():
240
 
            self.repository.abort_write_group()
241
 
 
242
 
    def revision_tree(self):
243
 
        return self.repository.revision_tree(self._new_revision_id)
244
 
 
245
 
    def get_basis_delta(self):
246
 
        # TODO(jelmer): remove this logic when lp:~jelmer/brz/remaining lands
247
 
        for (oldpath, newpath, file_id, entry) in self._inv_delta:
248
 
            if entry is not None:
249
 
                entry.revision = self._new_revision_id
250
 
        return self._inv_delta
251
 
 
252
 
    def update_basis_by_delta(self, revid, delta):
253
 
        pass