1
# Copyright (C) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
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.
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.
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
18
"""Support for committing in native Git working trees."""
20
from __future__ import absolute_import
22
from dulwich.index import (
29
config as _mod_config,
32
revision as _mod_revision,
34
from ...errors import (
39
from ...repository import (
43
from dulwich.objects import (
48
from dulwich.repo import Repo
51
from .mapping import (
54
fix_person_identifier,
56
from .tree import entry_factory
59
class SettingCustomFileIdsUnsupported(UnsupportedOperation):
61
_fmt = "Unable to store addition of file with custom file ids: %(file_ids)r"
63
def __init__(self, file_ids):
64
BzrError.__init__(self)
65
self.file_ids = file_ids
68
class GitCommitBuilder(CommitBuilder):
69
"""Commit builder for Git repositories."""
71
supports_record_entry_contents = False
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
80
self._any_changes = False
81
self._override_fileids = {}
82
self._mapping = self.repository.get_mapping()
84
def any_changes(self):
85
return self._any_changes
87
def record_iter_changes(self, workingtree, basis_revid, iter_changes):
88
def treeref_sha1(path, file_id):
89
return Repo.open(os.path.join(workingtree.basedir, path)).head()
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((path[0], path[1], file_id, entry_factory[kind[1]](file_id, name[1], parent[1])))
95
if kind[0] in ("file", "symlink"):
96
self._blobs[path[0].encode("utf-8")] = None
97
self._any_changes = True
101
self._any_changes = True
103
self._inv_delta.append((path[0], path[1], file_id, None))
104
self._blobs[path[0].encode("utf-8")] = None
107
entry_kls = entry_factory[kind[1]]
109
raise KeyError("unknown kind %s" % kind[1])
110
entry = entry_kls(file_id, name[1], parent[1])
111
if kind[1] == "file":
112
entry.executable = executable[1]
114
f, st = workingtree.get_file_with_stat(path[1], file_id)
119
entry.text_size = len(blob.data)
120
entry.text_sha1 = osutils.sha_string(blob.data)
121
self.store.add_object(blob)
123
elif kind[1] == "symlink":
124
symlink_target = workingtree.get_symlink_target(path[1], file_id)
126
blob.data = symlink_target.encode("utf-8")
127
self.store.add_object(blob)
129
entry.symlink_target = symlink_target
131
elif kind[1] == "tree-reference":
132
sha = treeref_sha1(path[1], file_id)
133
reference_revision = workingtree.get_reference_revision(path[1], file_id)
134
entry.reference_revision = reference_revision
137
raise AssertionError("Unknown kind %r" % kind[1])
138
mode = object_mode(kind[1], executable[1])
139
self._inv_delta.append((path[0], path[1], file_id, entry))
140
encoded_new_path = path[1].encode("utf-8")
141
self._blobs[encoded_new_path] = (mode, sha)
143
yield file_id, path[1], (entry.text_sha1, st)
144
if self._mapping.generate_file_id(encoded_new_path) != file_id:
145
self._override_fileids[encoded_new_path] = file_id
147
self._override_fileids[encoded_new_path] = None
148
if not seen_root and len(self.parents) == 0:
150
if getattr(workingtree, "basis_tree", False):
151
basis_tree = workingtree.basis_tree()
153
if len(self.parents) == 0:
154
basis_revid = _mod_revision.NULL_REVISION
156
basis_revid = self.parents[0]
157
basis_tree = self.repository.revision_tree(basis_revid)
158
# Fill in entries that were not changed
159
for entry in basis_tree._iter_tree_contents(include_trees=False):
160
if entry.path in self._blobs:
162
self._blobs[entry.path] = (entry.mode, entry.sha)
165
fileid_map = dict(basis_tree._fileid_map.file_ids)
166
except AttributeError:
168
for path, file_id in self._override_fileids.iteritems():
169
if type(path) is not str:
170
raise TypeError(path)
172
if path in fileid_map:
175
if type(file_id) is not str:
176
raise TypeError(file_id)
177
fileid_map[path] = file_id
179
fileid_blob = self._mapping.export_fileid_map(fileid_map)
182
if fileid_blob is not None:
183
if self._mapping.BZR_FILE_IDS_FILE is None:
184
raise SettingCustomFileIdsUnsupported(fileid_map)
185
self.store.add_object(fileid_blob)
186
self._blobs[self._mapping.BZR_FILE_IDS_FILE] = (stat.S_IFREG | 0644, fileid_blob.id)
188
self._blobs[self._mapping.BZR_FILE_IDS_FILE] = None
189
self.new_inventory = None
191
def update_basis(self, tree):
195
def finish_inventory(self):
196
# eliminate blobs that were removed
197
for path, entry in iter(self._blobs.items()):
199
del self._blobs[path]
201
def _iterblobs(self):
202
return ((path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems())
204
def commit(self, message):
205
self._validate_unicode_text(message, 'commit message')
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
c.encoding = self._revprops.pop('git-explicit-encoding', 'utf-8')
210
c.committer = fix_person_identifier(self._committer.encode(c.encoding))
211
c.author = fix_person_identifier(self._revprops.pop('author', self._committer).encode(c.encoding))
213
raise NotImplementedError(self._revprops)
214
c.commit_time = int(self._timestamp)
215
c.author_time = int(self._timestamp)
216
c.commit_timezone = self._timezone
217
c.author_timezone = self._timezone
218
c.message = message.encode(c.encoding)
219
if self._config_stack.get('create_signatures') == _mod_config.SIGN_ALWAYS:
220
strategy = gpg.GPGStrategy(self._config_stack)
221
c.gpgsig = strategy.sign(c.as_raw_string(), gpg.MODE_DETACH)
222
self.store.add_object(c)
223
self.repository.commit_write_group()
224
self._new_revision_id = self._mapping.revision_id_foreign_to_bzr(c.id)
225
return self._new_revision_id
228
if self.repository.is_in_write_group():
229
self.repository.abort_write_group()
231
def revision_tree(self):
232
return self.repository.revision_tree(self._new_revision_id)
234
def get_basis_delta(self):
235
# TODO(jelmer): remove this logic when lp:~jelmer/brz/remaining lands
236
for (oldpath, newpath, file_id, entry) in self._inv_delta:
237
if entry is not None:
238
entry.revision = self._new_revision_id
239
return self._inv_delta
241
def update_basis_by_delta(self, revid, delta):
added
removed
commit.py
