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 (
30
revision as _mod_revision,
32
from ...errors import (
37
from ...repository import (
41
from dulwich.objects import (
46
from dulwich.repo import Repo
49
from .mapping import (
52
fix_person_identifier,
54
from .tree import entry_factory
57
class SettingCustomFileIdsUnsupported(UnsupportedOperation):
59
_fmt = "Unable to store addition of file with custom file ids: %(file_ids)r"
61
def __init__(self, file_ids):
62
BzrError.__init__(self)
63
self.file_ids = file_ids
66
class GitCommitBuilder(CommitBuilder):
67
"""Commit builder for Git repositories."""
69
supports_record_entry_contents = False
71
def __init__(self, *args, **kwargs):
72
super(GitCommitBuilder, self).__init__(*args, **kwargs)
73
self.random_revid = True
74
self._validate_revprops(self._revprops)
75
self.store = self.repository._git.object_store
78
self._any_changes = False
79
self._override_fileids = {}
80
self._mapping = self.repository.get_mapping()
82
def any_changes(self):
83
return self._any_changes
85
def record_iter_changes(self, workingtree, basis_revid, iter_changes):
86
def treeref_sha1(path, file_id):
87
return Repo.open(os.path.join(workingtree.basedir, path)).head()
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
99
self._any_changes = True
101
self._inv_delta.append((path[0], path[1], file_id, None))
102
self._blobs[path[0].encode("utf-8")] = None
105
entry_kls = entry_factory[kind[1]]
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]
112
f, st = workingtree.get_file_with_stat(path[1], file_id)
117
entry.text_size = len(blob.data)
118
entry.text_sha1 = osutils.sha_string(blob.data)
119
self.store.add_object(blob)
121
elif kind[1] == "symlink":
122
symlink_target = workingtree.get_symlink_target(path[1], file_id)
124
blob.data = symlink_target.encode("utf-8")
125
self.store.add_object(blob)
127
entry.symlink_target = symlink_target
129
elif kind[1] == "tree-reference":
130
sha = treeref_sha1(path[1], file_id)
131
reference_revision = workingtree.get_reference_revision(path[1], file_id)
132
entry.reference_revision = reference_revision
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)
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
145
self._override_fileids[encoded_new_path] = None
146
if not seen_root and len(self.parents) == 0:
148
if getattr(workingtree, "basis_tree", False):
149
basis_tree = workingtree.basis_tree()
151
if len(self.parents) == 0:
152
basis_revid = _mod_revision.NULL_REVISION
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 path, entry in basis_tree.iter_entries_by_dir():
158
if type(path) is not unicode:
159
raise TypeError(path)
160
if entry.kind == 'directory':
162
encoded_path = path.encode('utf-8')
163
if encoded_path not in self._blobs:
164
if entry.kind == "symlink":
166
blob.data = basis_tree.get_symlink_target(path, entry.file_id).encode('utf-8')
167
self._blobs[encoded_path] = (entry_mode(entry), blob.id)
168
elif entry.kind == "file":
170
blob.data = basis_tree.get_file_text(path, entry.file_id)
171
self._blobs[encoded_path] = (entry_mode(entry), blob.id)
173
raise NotImplementedError
176
fileid_map = dict(basis_tree._fileid_map.file_ids)
177
except AttributeError:
179
for path, file_id in self._override_fileids.iteritems():
180
if type(path) is not str:
181
raise TypeError(path)
183
if path in fileid_map:
186
if type(file_id) is not str:
187
raise TypeError(file_id)
188
fileid_map[path] = file_id
190
fileid_blob = self._mapping.export_fileid_map(fileid_map)
193
if fileid_blob is not None:
194
if self._mapping.BZR_FILE_IDS_FILE is None:
195
raise SettingCustomFileIdsUnsupported(fileid_map)
196
self.store.add_object(fileid_blob)
197
self._blobs[self._mapping.BZR_FILE_IDS_FILE] = (stat.S_IFREG | 0644, fileid_blob.id)
199
self._blobs[self._mapping.BZR_FILE_IDS_FILE] = None
200
self.new_inventory = None
202
def update_basis(self, tree):
206
def finish_inventory(self):
207
# eliminate blobs that were removed
208
for path, entry in iter(self._blobs.items()):
210
del self._blobs[path]
212
def _iterblobs(self):
213
return ((path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems())
215
def commit(self, message):
216
self._validate_unicode_text(message, 'commit message')
218
c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
219
c.tree = commit_tree(self.store, self._iterblobs())
220
c.encoding = self._revprops.pop('git-explicit-encoding', 'utf-8')
221
c.committer = fix_person_identifier(self._committer.encode(c.encoding))
222
c.author = fix_person_identifier(self._revprops.pop('author', self._committer).encode(c.encoding))
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(c.encoding)
230
self.store.add_object(c)
231
self.repository.commit_write_group()
232
self._new_revision_id = self._mapping.revision_id_foreign_to_bzr(c.id)
233
return self._new_revision_id
236
if self.repository.is_in_write_group():
237
self.repository.abort_write_group()
239
def revision_tree(self):
240
return self.repository.revision_tree(self._new_revision_id)
242
def get_basis_delta(self):
243
for (oldpath, newpath, file_id, entry) in self._inv_delta:
244
if entry is not None:
245
entry.revision = self._new_revision_id
246
return self._inv_delta
248
def update_basis_by_delta(self, revid, delta):
added
removed
commit.py
