/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
 
    bugtracker,
29
 
    config as _mod_config,
30
 
    gpg,
31
 
    osutils,
32
 
    revision as _mod_revision,
33
 
    )
34
 
from ..errors import (
35
 
    BzrError,
36
 
    RootMissing,
37
 
    UnsupportedOperation,
38
 
    )
39
 
from ..repository import (
40
 
    CommitBuilder,
41
 
    )
42
 
from ..sixish import (
43
 
    viewitems,
44
 
    )
45
 
 
46
 
from dulwich.objects import (
47
 
    Blob,
48
 
    Commit,
49
 
    )
50
 
from dulwich.index import read_submodule_head
51
 
 
52
 
 
53
 
from .mapping import (
54
 
    object_mode,
55
 
    fix_person_identifier,
56
 
    )
57
 
from .tree import entry_factory
58
 
 
59
 
 
60
 
class SettingCustomFileIdsUnsupported(UnsupportedOperation):
61
 
 
62
 
    _fmt = ("Unable to store addition of file with custom file ids: "
63
 
            "%(file_ids)r")
64
 
 
65
 
    def __init__(self, file_ids):
66
 
        BzrError.__init__(self)
67
 
        self.file_ids = file_ids
68
 
 
69
 
 
70
 
class GitCommitBuilder(CommitBuilder):
71
 
    """Commit builder for Git repositories."""
72
 
 
73
 
    supports_record_entry_contents = False
74
 
 
75
 
    def __init__(self, *args, **kwargs):
76
 
        super(GitCommitBuilder, self).__init__(*args, **kwargs)
77
 
        self.random_revid = True
78
 
        self._validate_revprops(self._revprops)
79
 
        self.store = self.repository._git.object_store
80
 
        self._blobs = {}
81
 
        self._inv_delta = []
82
 
        self._any_changes = False
83
 
        self._override_fileids = {}
84
 
        self._mapping = self.repository.get_mapping()
85
 
 
86
 
    def any_changes(self):
87
 
        return self._any_changes
88
 
 
89
 
    def record_iter_changes(self, workingtree, basis_revid, iter_changes):
90
 
        seen_root = False
91
 
        for (file_id, path, changed_content, versioned, parent, name, kind,
92
 
             executable) in iter_changes:
93
 
            if kind[1] in ("directory",):
94
 
                self._inv_delta.append(
95
 
                    (path[0], path[1], file_id, entry_factory[kind[1]](
96
 
                        file_id, name[1], parent[1])))
97
 
                if kind[0] in ("file", "symlink"):
98
 
                    self._blobs[path[0].encode("utf-8")] = None
99
 
                    self._any_changes = True
100
 
                if path[1] == "":
101
 
                    seen_root = True
102
 
                continue
103
 
            self._any_changes = True
104
 
            if path[1] is None:
105
 
                self._inv_delta.append((path[0], path[1], file_id, None))
106
 
                self._blobs[path[0].encode("utf-8")] = None
107
 
                continue
108
 
            try:
109
 
                entry_kls = entry_factory[kind[1]]
110
 
            except KeyError:
111
 
                raise KeyError("unknown kind %s" % kind[1])
112
 
            entry = entry_kls(file_id, name[1], parent[1])
113
 
            if kind[1] == "file":
114
 
                entry.executable = executable[1]
115
 
                blob = Blob()
116
 
                f, st = workingtree.get_file_with_stat(path[1])
117
 
                try:
118
 
                    blob.data = f.read()
119
 
                finally:
120
 
                    f.close()
121
 
                entry.text_size = len(blob.data)
122
 
                entry.text_sha1 = osutils.sha_string(blob.data)
123
 
                self.store.add_object(blob)
124
 
                sha = blob.id
125
 
            elif kind[1] == "symlink":
126
 
                symlink_target = workingtree.get_symlink_target(path[1])
127
 
                blob = Blob()
128
 
                blob.data = symlink_target.encode("utf-8")
129
 
                self.store.add_object(blob)
130
 
                sha = blob.id
131
 
                entry.symlink_target = symlink_target
132
 
                st = None
133
 
            elif kind[1] == "tree-reference":
134
 
                sha = read_submodule_head(workingtree.abspath(path[1]))
135
 
                reference_revision = workingtree.get_reference_revision(path[1])
136
 
                entry.reference_revision = reference_revision
137
 
                st = None
138
 
            else:
139
 
                raise AssertionError("Unknown kind %r" % kind[1])
140
 
            mode = object_mode(kind[1], executable[1])
141
 
            self._inv_delta.append((path[0], path[1], file_id, entry))
142
 
            encoded_new_path = path[1].encode("utf-8")
143
 
            self._blobs[encoded_new_path] = (mode, sha)
144
 
            if st is not None:
145
 
                yield path[1], (entry.text_sha1, st)
146
 
            if self._mapping.generate_file_id(encoded_new_path) != file_id:
147
 
                self._override_fileids[encoded_new_path] = file_id
148
 
            else:
149
 
                self._override_fileids[encoded_new_path] = None
150
 
        if not seen_root and len(self.parents) == 0:
151
 
            raise RootMissing()
152
 
        if getattr(workingtree, "basis_tree", False):
153
 
            basis_tree = workingtree.basis_tree()
154
 
        else:
155
 
            if len(self.parents) == 0:
156
 
                basis_revid = _mod_revision.NULL_REVISION
157
 
            else:
158
 
                basis_revid = self.parents[0]
159
 
            basis_tree = self.repository.revision_tree(basis_revid)
160
 
        # Fill in entries that were not changed
161
 
        for entry in basis_tree._iter_tree_contents(include_trees=False):
162
 
            if entry.path in self._blobs:
163
 
                continue
164
 
            self._blobs[entry.path] = (entry.mode, entry.sha)
165
 
        if not self._lossy:
166
 
            try:
167
 
                fileid_map = dict(basis_tree._fileid_map.file_ids)
168
 
            except AttributeError:
169
 
                fileid_map = {}
170
 
            for path, file_id in viewitems(self._override_fileids):
171
 
                if not isinstance(path, bytes):
172
 
                    raise TypeError(path)
173
 
                if file_id is None:
174
 
                    if path in fileid_map:
175
 
                        del fileid_map[path]
176
 
                else:
177
 
                    if not isinstance(file_id, bytes):
178
 
                        raise TypeError(file_id)
179
 
                    fileid_map[path] = file_id
180
 
            if fileid_map:
181
 
                fileid_blob = self._mapping.export_fileid_map(fileid_map)
182
 
            else:
183
 
                fileid_blob = None
184
 
            if fileid_blob is not None:
185
 
                if self._mapping.BZR_FILE_IDS_FILE is None:
186
 
                    raise SettingCustomFileIdsUnsupported(fileid_map)
187
 
                self.store.add_object(fileid_blob)
188
 
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = (
189
 
                    stat.S_IFREG | 0o644, fileid_blob.id)
190
 
            else:
191
 
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = None
192
 
        self.new_inventory = None
193
 
 
194
 
    def update_basis(self, tree):
195
 
        # Nothing to do here
196
 
        pass
197
 
 
198
 
    def finish_inventory(self):
199
 
        # eliminate blobs that were removed
200
 
        self._blobs = {k: v for (k, v) in viewitems(
201
 
            self._blobs) if v is not None}
202
 
 
203
 
    def _iterblobs(self):
204
 
        return ((path, sha, mode) for (path, (mode, sha))
205
 
                in viewitems(self._blobs))
206
 
 
207
 
    def commit(self, message):
208
 
        self._validate_unicode_text(message, 'commit message')
209
 
        c = Commit()
210
 
        c.parents = [self.repository.lookup_bzr_revision_id(
211
 
            revid)[0] for revid in self.parents]
212
 
        c.tree = commit_tree(self.store, self._iterblobs())
213
 
        encoding = self._revprops.pop(u'git-explicit-encoding', 'utf-8')
214
 
        c.encoding = encoding.encode('ascii')
215
 
        c.committer = fix_person_identifier(self._committer.encode(encoding))
216
 
        try:
217
 
            author = self._revprops.pop('author')
218
 
        except KeyError:
219
 
            try:
220
 
                authors = self._revprops.pop('authors').splitlines()
221
 
            except KeyError:
222
 
                author = self._committer
223
 
            else:
224
 
                if len(authors) > 1:
225
 
                    raise Exception("Unable to convert multiple authors")
226
 
                elif len(authors) == 0:
227
 
                    author = self._committer
228
 
                else:
229
 
                    author = authors[0]
230
 
        c.author = fix_person_identifier(author.encode(encoding))
231
 
        bugstext = self._revprops.pop('bugs', None)
232
 
        if bugstext is not None:
233
 
            message += "\n"
234
 
            for url, status in bugtracker.decode_bug_urls(bugstext):
235
 
                if status == bugtracker.FIXED:
236
 
                    message += "Fixes: %s\n" % url
237
 
                elif status == bugtracker.RELATED:
238
 
                    message += "Bug: %s\n" % url
239
 
                else:
240
 
                    raise bugtracker.InvalidBugStatus(status)
241
 
        if self._revprops:
242
 
            raise NotImplementedError(self._revprops)
243
 
        c.commit_time = int(self._timestamp)
244
 
        c.author_time = int(self._timestamp)
245
 
        c.commit_timezone = self._timezone
246
 
        c.author_timezone = self._timezone
247
 
        c.message = message.encode(encoding)
248
 
        if (self._config_stack.get('create_signatures') ==
249
 
                _mod_config.SIGN_ALWAYS):
250
 
            strategy = gpg.GPGStrategy(self._config_stack)
251
 
            c.gpgsig = strategy.sign(c.as_raw_string(), gpg.MODE_DETACH)
252
 
        self.store.add_object(c)
253
 
        self.repository.commit_write_group()
254
 
        self._new_revision_id = self._mapping.revision_id_foreign_to_bzr(c.id)
255
 
        return self._new_revision_id
256
 
 
257
 
    def abort(self):
258
 
        if self.repository.is_in_write_group():
259
 
            self.repository.abort_write_group()
260
 
 
261
 
    def revision_tree(self):
262
 
        return self.repository.revision_tree(self._new_revision_id)
263
 
 
264
 
    def get_basis_delta(self):
265
 
        # TODO(jelmer): remove this logic when lp:~jelmer/brz/remaining lands
266
 
        for (oldpath, newpath, file_id, entry) in self._inv_delta:
267
 
            if entry is not None:
268
 
                entry.revision = self._new_revision_id
269
 
        return self._inv_delta
270
 
 
271
 
    def update_basis_by_delta(self, revid, delta):
272
 
        pass