/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: Jelmer Vernooij
  • Date: 2018-09-30 00:33:53 UTC
  • mto: This revision was merged to the branch mainline in revision 7134.
  • Revision ID: jelmer@jelmer.uk-20180930003353-2z5sugalbxfxfiru
When opening working trees with .git files, open the right control transport.

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 os
 
26
import stat
 
27
 
 
28
from .. import (
 
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
    S_IFGITLINK,
 
48
    Blob,
 
49
    Commit,
 
50
    )
 
51
from dulwich.index import read_submodule_head
 
52
from dulwich.repo import Repo
 
53
 
 
54
 
 
55
from .mapping import (
 
56
    entry_mode,
 
57
    object_mode,
 
58
    fix_person_identifier,
 
59
    )
 
60
from .tree import entry_factory
 
61
 
 
62
 
 
63
class SettingCustomFileIdsUnsupported(UnsupportedOperation):
 
64
 
 
65
    _fmt = "Unable to store addition of file with custom file ids: %(file_ids)r"
 
66
 
 
67
    def __init__(self, file_ids):
 
68
        BzrError.__init__(self)
 
69
        self.file_ids = file_ids
 
70
 
 
71
 
 
72
class GitCommitBuilder(CommitBuilder):
 
73
    """Commit builder for Git repositories."""
 
74
 
 
75
    supports_record_entry_contents = False
 
76
 
 
77
    def __init__(self, *args, **kwargs):
 
78
        super(GitCommitBuilder, self).__init__(*args, **kwargs)
 
79
        self.random_revid = True
 
80
        self._validate_revprops(self._revprops)
 
81
        self.store = self.repository._git.object_store
 
82
        self._blobs = {}
 
83
        self._inv_delta = []
 
84
        self._any_changes = False
 
85
        self._override_fileids = {}
 
86
        self._mapping = self.repository.get_mapping()
 
87
 
 
88
    def any_changes(self):
 
89
        return self._any_changes
 
90
 
 
91
    def record_iter_changes(self, workingtree, basis_revid, iter_changes):
 
92
        seen_root = False
 
93
        for (file_id, path, changed_content, versioned, parent, name, kind,
 
94
             executable) in iter_changes:
 
95
            if kind[1] in ("directory",):
 
96
                self._inv_delta.append((path[0], path[1], file_id, entry_factory[kind[1]](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], file_id)
 
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], file_id)
 
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], file_id)
 
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 file_id, 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] = (stat.S_IFREG | 0o644, fileid_blob.id)
 
189
            else:
 
190
                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = None
 
191
        self.new_inventory = None
 
192
 
 
193
    def update_basis(self, tree):
 
194
        # Nothing to do here
 
195
        pass
 
196
 
 
197
    def finish_inventory(self):
 
198
        # eliminate blobs that were removed
 
199
        self._blobs = {k: v for (k, v) in viewitems(self._blobs) if v is not None}
 
200
 
 
201
    def _iterblobs(self):
 
202
        return ((path, sha, mode) for (path, (mode, sha)) in viewitems(self._blobs))
 
203
 
 
204
    def commit(self, message):
 
205
        self._validate_unicode_text(message, 'commit message')
 
206
        c = Commit()
 
207
        c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
 
208
        c.tree = commit_tree(self.store, self._iterblobs())
 
209
        encoding = self._revprops.pop(u'git-explicit-encoding', 'utf-8')
 
210
        c.encoding = encoding.encode('ascii')
 
211
        c.committer = fix_person_identifier(self._committer.encode(encoding))
 
212
        c.author = fix_person_identifier(self._revprops.pop('author', self._committer).encode(encoding))
 
213
        if self._revprops:
 
214
            raise NotImplementedError(self._revprops)
 
215
        c.commit_time = int(self._timestamp)
 
216
        c.author_time = int(self._timestamp)
 
217
        c.commit_timezone = self._timezone
 
218
        c.author_timezone = self._timezone
 
219
        c.message = message.encode(encoding)
 
220
        if self._config_stack.get('create_signatures') == _mod_config.SIGN_ALWAYS:
 
221
            strategy = gpg.GPGStrategy(self._config_stack)
 
222
            c.gpgsig = strategy.sign(c.as_raw_string(), gpg.MODE_DETACH)
 
223
        self.store.add_object(c)
 
224
        self.repository.commit_write_group()
 
225
        self._new_revision_id = self._mapping.revision_id_foreign_to_bzr(c.id)
 
226
        return self._new_revision_id
 
227
 
 
228
    def abort(self):
 
229
        if self.repository.is_in_write_group():
 
230
            self.repository.abort_write_group()
 
231
 
 
232
    def revision_tree(self):
 
233
        return self.repository.revision_tree(self._new_revision_id)
 
234
 
 
235
    def get_basis_delta(self):
 
236
        # TODO(jelmer): remove this logic when lp:~jelmer/brz/remaining lands
 
237
        for (oldpath, newpath, file_id, entry) in self._inv_delta:
 
238
            if entry is not None:
 
239
                entry.revision = self._new_revision_id
 
240
        return self._inv_delta
 
241
 
 
242
    def update_basis_by_delta(self, revid, delta):
 
243
        pass