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 dulwich.index import (
27
config as _mod_config,
30
revision as _mod_revision,
32
from ..errors import (
37
from ..repository import (
41
from dulwich.objects import (
45
from dulwich.index import read_submodule_head
48
from .mapping import (
50
fix_person_identifier,
52
from .tree import entry_factory
55
class GitCommitBuilder(CommitBuilder):
56
"""Commit builder for Git repositories."""
58
supports_record_entry_contents = False
60
def __init__(self, *args, **kwargs):
61
super(GitCommitBuilder, self).__init__(*args, **kwargs)
62
self.random_revid = True
63
self._validate_revprops(self._revprops)
64
self.store = self.repository._git.object_store
67
self._any_changes = False
68
self._mapping = self.repository.get_mapping()
70
def any_changes(self):
71
return self._any_changes
73
def record_iter_changes(self, workingtree, basis_revid, iter_changes):
75
for change in iter_changes:
76
if change.kind[1] in ("directory",):
77
self._inv_delta.append(
78
(change.path[0], change.path[1], change.file_id,
79
entry_factory[change.kind[1]](
80
change.file_id, change.name[1], change.parent_id[1])))
81
if change.kind[0] in ("file", "symlink"):
82
self._blobs[change.path[0].encode("utf-8")] = None
83
self._any_changes = True
84
if change.path[1] == "":
87
self._any_changes = True
88
if change.path[1] is None:
89
self._inv_delta.append((change.path[0], change.path[1], change.file_id, None))
90
self._blobs[change.path[0].encode("utf-8")] = None
93
entry_kls = entry_factory[change.kind[1]]
95
raise KeyError("unknown kind %s" % change.kind[1])
96
entry = entry_kls(change.file_id, change.name[1], change.parent_id[1])
97
if change.kind[1] == "file":
98
entry.executable = change.executable[1]
100
f, st = workingtree.get_file_with_stat(change.path[1])
105
entry.text_size = len(blob.data)
106
entry.text_sha1 = osutils.sha_string(blob.data)
107
self.store.add_object(blob)
109
elif change.kind[1] == "symlink":
110
symlink_target = workingtree.get_symlink_target(change.path[1])
112
blob.data = symlink_target.encode("utf-8")
113
self.store.add_object(blob)
115
entry.symlink_target = symlink_target
117
elif change.kind[1] == "tree-reference":
118
sha = read_submodule_head(workingtree.abspath(change.path[1]))
119
reference_revision = workingtree.get_reference_revision(change.path[1])
120
entry.reference_revision = reference_revision
123
raise AssertionError("Unknown kind %r" % change.kind[1])
124
mode = object_mode(change.kind[1], change.executable[1])
125
self._inv_delta.append((change.path[0], change.path[1], change.file_id, entry))
126
encoded_new_path = change.path[1].encode("utf-8")
127
self._blobs[encoded_new_path] = (mode, sha)
129
yield change.path[1], (entry.text_sha1, st)
130
if not seen_root and len(self.parents) == 0:
132
if getattr(workingtree, "basis_tree", False):
133
basis_tree = workingtree.basis_tree()
135
if len(self.parents) == 0:
136
basis_revid = _mod_revision.NULL_REVISION
138
basis_revid = self.parents[0]
139
basis_tree = self.repository.revision_tree(basis_revid)
140
# Fill in entries that were not changed
141
for entry in basis_tree._iter_tree_contents(include_trees=False):
142
if entry.path in self._blobs:
144
self._blobs[entry.path] = (entry.mode, entry.sha)
145
self.new_inventory = None
147
def update_basis(self, tree):
151
def finish_inventory(self):
152
# eliminate blobs that were removed
153
self._blobs = {k: v for (k, v) in self._blobs.items() if v is not None}
155
def _iterblobs(self):
156
return ((path, sha, mode) for (path, (mode, sha))
157
in self._blobs.items())
159
def commit(self, message):
160
self._validate_unicode_text(message, 'commit message')
162
c.parents = [self.repository.lookup_bzr_revision_id(
163
revid)[0] for revid in self.parents]
164
c.tree = commit_tree(self.store, self._iterblobs())
165
encoding = self._revprops.pop(u'git-explicit-encoding', 'utf-8')
166
c.encoding = encoding.encode('ascii')
167
c.committer = fix_person_identifier(self._committer.encode(encoding))
169
author = self._revprops.pop('author')
172
authors = self._revprops.pop('authors').splitlines()
174
author = self._committer
177
raise Exception("Unable to convert multiple authors")
178
elif len(authors) == 0:
179
author = self._committer
182
c.author = fix_person_identifier(author.encode(encoding))
183
bugstext = self._revprops.pop('bugs', None)
184
if bugstext is not None:
186
for url, status in bugtracker.decode_bug_urls(bugstext):
187
if status == bugtracker.FIXED:
188
message += "Fixes: %s\n" % url
189
elif status == bugtracker.RELATED:
190
message += "Bug: %s\n" % url
192
raise bugtracker.InvalidBugStatus(status)
194
raise NotImplementedError(self._revprops)
195
c.commit_time = int(self._timestamp)
196
c.author_time = int(self._timestamp)
197
c.commit_timezone = self._timezone
198
c.author_timezone = self._timezone
199
c.message = message.encode(encoding)
200
if (self._config_stack.get('create_signatures') ==
201
_mod_config.SIGN_ALWAYS):
202
strategy = gpg.GPGStrategy(self._config_stack)
203
c.gpgsig = strategy.sign(c.as_raw_string(), gpg.MODE_DETACH)
204
self.store.add_object(c)
205
self.repository.commit_write_group()
206
self._new_revision_id = self._mapping.revision_id_foreign_to_bzr(c.id)
207
return self._new_revision_id
210
if self.repository.is_in_write_group():
211
self.repository.abort_write_group()
213
def revision_tree(self):
214
return self.repository.revision_tree(self._new_revision_id)
216
def get_basis_delta(self):
217
return self._inv_delta
219
def update_basis_by_delta(self, revid, delta):
added
removed
breezy/git/commit.py
