1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
|
# Copyright (C) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
"""Support for committing in native Git working trees."""
from dulwich.index import (
commit_tree,
)
import stat
from .. import (
bugtracker,
config as _mod_config,
gpg,
osutils,
revision as _mod_revision,
)
from ..errors import (
BzrError,
RootMissing,
UnsupportedOperation,
)
from ..repository import (
CommitBuilder,
)
from dulwich.objects import (
Blob,
Commit,
)
from dulwich.index import read_submodule_head
from .mapping import (
object_mode,
fix_person_identifier,
)
from .tree import entry_factory
class GitCommitBuilder(CommitBuilder):
"""Commit builder for Git repositories."""
supports_record_entry_contents = False
def __init__(self, *args, **kwargs):
super(GitCommitBuilder, self).__init__(*args, **kwargs)
self.random_revid = True
self._validate_revprops(self._revprops)
self.store = self.repository._git.object_store
self._blobs = {}
self._inv_delta = []
self._any_changes = False
self._mapping = self.repository.get_mapping()
def any_changes(self):
return self._any_changes
def record_iter_changes(self, workingtree, basis_revid, iter_changes):
seen_root = False
for change in iter_changes:
if change.kind[1] in ("directory",):
self._inv_delta.append(
(change.path[0], change.path[1], change.file_id,
entry_factory[change.kind[1]](
change.file_id, change.name[1], change.parent_id[1])))
if change.kind[0] in ("file", "symlink"):
self._blobs[change.path[0].encode("utf-8")] = None
self._any_changes = True
if change.path[1] == "":
seen_root = True
continue
self._any_changes = True
if change.path[1] is None:
self._inv_delta.append((change.path[0], change.path[1], change.file_id, None))
self._blobs[change.path[0].encode("utf-8")] = None
continue
try:
entry_kls = entry_factory[change.kind[1]]
except KeyError:
raise KeyError("unknown kind %s" % change.kind[1])
entry = entry_kls(change.file_id, change.name[1], change.parent_id[1])
if change.kind[1] == "file":
entry.executable = change.executable[1]
blob = Blob()
f, st = workingtree.get_file_with_stat(change.path[1])
try:
blob.data = f.read()
finally:
f.close()
entry.text_size = len(blob.data)
entry.text_sha1 = osutils.sha_string(blob.data)
self.store.add_object(blob)
sha = blob.id
elif change.kind[1] == "symlink":
symlink_target = workingtree.get_symlink_target(change.path[1])
blob = Blob()
blob.data = symlink_target.encode("utf-8")
self.store.add_object(blob)
sha = blob.id
entry.symlink_target = symlink_target
st = None
elif change.kind[1] == "tree-reference":
sha = read_submodule_head(workingtree.abspath(change.path[1]))
reference_revision = workingtree.get_reference_revision(change.path[1])
entry.reference_revision = reference_revision
st = None
else:
raise AssertionError("Unknown kind %r" % change.kind[1])
mode = object_mode(change.kind[1], change.executable[1])
self._inv_delta.append((change.path[0], change.path[1], change.file_id, entry))
encoded_new_path = change.path[1].encode("utf-8")
self._blobs[encoded_new_path] = (mode, sha)
if st is not None:
yield change.path[1], (entry.text_sha1, st)
if not seen_root and len(self.parents) == 0:
raise RootMissing()
if getattr(workingtree, "basis_tree", False):
basis_tree = workingtree.basis_tree()
else:
if len(self.parents) == 0:
basis_revid = _mod_revision.NULL_REVISION
else:
basis_revid = self.parents[0]
basis_tree = self.repository.revision_tree(basis_revid)
# Fill in entries that were not changed
for entry in basis_tree._iter_tree_contents(include_trees=False):
if entry.path in self._blobs:
continue
self._blobs[entry.path] = (entry.mode, entry.sha)
self.new_inventory = None
def update_basis(self, tree):
# Nothing to do here
pass
def finish_inventory(self):
# eliminate blobs that were removed
self._blobs = {k: v for (k, v) in self._blobs.items() if v is not None}
def _iterblobs(self):
return ((path, sha, mode) for (path, (mode, sha))
in self._blobs.items())
def commit(self, message):
self._validate_unicode_text(message, 'commit message')
c = Commit()
c.parents = [self.repository.lookup_bzr_revision_id(
revid)[0] for revid in self.parents]
c.tree = commit_tree(self.store, self._iterblobs())
encoding = self._revprops.pop(u'git-explicit-encoding', 'utf-8')
c.encoding = encoding.encode('ascii')
c.committer = fix_person_identifier(self._committer.encode(encoding))
try:
author = self._revprops.pop('author')
except KeyError:
try:
authors = self._revprops.pop('authors').splitlines()
except KeyError:
author = self._committer
else:
if len(authors) > 1:
raise Exception("Unable to convert multiple authors")
elif len(authors) == 0:
author = self._committer
else:
author = authors[0]
c.author = fix_person_identifier(author.encode(encoding))
bugstext = self._revprops.pop('bugs', None)
if bugstext is not None:
message += "\n"
for url, status in bugtracker.decode_bug_urls(bugstext):
if status == bugtracker.FIXED:
message += "Fixes: %s\n" % url
elif status == bugtracker.RELATED:
message += "Bug: %s\n" % url
else:
raise bugtracker.InvalidBugStatus(status)
if self._revprops:
raise NotImplementedError(self._revprops)
c.commit_time = int(self._timestamp)
c.author_time = int(self._timestamp)
c.commit_timezone = self._timezone
c.author_timezone = self._timezone
c.message = message.encode(encoding)
if (self._config_stack.get('create_signatures') ==
_mod_config.SIGN_ALWAYS):
strategy = gpg.GPGStrategy(self._config_stack)
c.gpgsig = strategy.sign(c.as_raw_string(), gpg.MODE_DETACH)
self.store.add_object(c)
self.repository.commit_write_group()
self._new_revision_id = self._mapping.revision_id_foreign_to_bzr(c.id)
return self._new_revision_id
def abort(self):
if self.repository.is_in_write_group():
self.repository.abort_write_group()
def revision_tree(self):
return self.repository.revision_tree(self._new_revision_id)
def get_basis_delta(self):
return self._inv_delta
def update_basis_by_delta(self, revid, delta):
pass
|