22
22
from dulwich.index import (
29
29
config as _mod_config,
32
32
revision as _mod_revision,
34
from ..errors import (
34
from ...errors import (
37
37
UnsupportedOperation,
39
from ..repository import (
39
from ...repository import (
42
from ..sixish import (
46
43
from dulwich.objects import (
50
48
from dulwich.index import read_submodule_head
49
from dulwich.repo import Repo
53
52
from .mapping import (
55
55
fix_person_identifier,
57
57
from .tree import entry_factory
60
class SettingCustomFileIdsUnsupported(UnsupportedOperation):
62
_fmt = "Unable to store addition of file with custom file ids: %(file_ids)r"
64
def __init__(self, file_ids):
65
BzrError.__init__(self)
66
self.file_ids = file_ids
60
69
class GitCommitBuilder(CommitBuilder):
61
70
"""Commit builder for Git repositories."""
78
88
def record_iter_changes(self, workingtree, basis_revid, iter_changes):
80
for change in iter_changes:
81
if change.kind[1] in ("directory",):
82
self._inv_delta.append(
83
(change.path[0], change.path[1], change.file_id,
84
entry_factory[change.kind[1]](
85
change.file_id, change.name[1], change.parent_id[1])))
86
if change.kind[0] in ("file", "symlink"):
87
self._blobs[change.path[0].encode("utf-8")] = None
90
for (file_id, path, changed_content, versioned, parent, name, kind,
91
executable) in iter_changes:
92
if kind[1] in ("directory",):
93
self._inv_delta.append((path[0], path[1], file_id, entry_factory[kind[1]](file_id, name[1], parent[1])))
94
if kind[0] in ("file", "symlink"):
95
self._blobs[path[0].encode("utf-8")] = None
88
96
self._any_changes = True
89
if change.path[1] == "":
92
100
self._any_changes = True
93
if change.path[1] is None:
94
self._inv_delta.append((change.path[0], change.path[1], change.file_id, None))
95
self._blobs[change.path[0].encode("utf-8")] = None
102
self._inv_delta.append((path[0], path[1], file_id, None))
103
self._blobs[path[0].encode("utf-8")] = None
98
entry_kls = entry_factory[change.kind[1]]
106
entry_kls = entry_factory[kind[1]]
100
raise KeyError("unknown kind %s" % change.kind[1])
101
entry = entry_kls(change.file_id, change.name[1], change.parent_id[1])
102
if change.kind[1] == "file":
103
entry.executable = change.executable[1]
108
raise KeyError("unknown kind %s" % kind[1])
109
entry = entry_kls(file_id, name[1], parent[1])
110
if kind[1] == "file":
111
entry.executable = executable[1]
105
f, st = workingtree.get_file_with_stat(change.path[1])
113
f, st = workingtree.get_file_with_stat(path[1], file_id)
107
115
blob.data = f.read()
111
119
entry.text_sha1 = osutils.sha_string(blob.data)
112
120
self.store.add_object(blob)
114
elif change.kind[1] == "symlink":
115
symlink_target = workingtree.get_symlink_target(change.path[1])
122
elif kind[1] == "symlink":
123
symlink_target = workingtree.get_symlink_target(path[1], file_id)
117
125
blob.data = symlink_target.encode("utf-8")
118
126
self.store.add_object(blob)
120
128
entry.symlink_target = symlink_target
122
elif change.kind[1] == "tree-reference":
123
sha = read_submodule_head(workingtree.abspath(change.path[1]))
124
reference_revision = workingtree.get_reference_revision(change.path[1])
130
elif kind[1] == "tree-reference":
131
sha = read_submodule_head(workingtree.abspath(path[1]))
132
reference_revision = workingtree.get_reference_revision(path[1], file_id)
125
133
entry.reference_revision = reference_revision
128
raise AssertionError("Unknown kind %r" % change.kind[1])
129
mode = object_mode(change.kind[1], change.executable[1])
130
self._inv_delta.append((change.path[0], change.path[1], change.file_id, entry))
131
encoded_new_path = change.path[1].encode("utf-8")
136
raise AssertionError("Unknown kind %r" % kind[1])
137
mode = object_mode(kind[1], executable[1])
138
self._inv_delta.append((path[0], path[1], file_id, entry))
139
encoded_new_path = path[1].encode("utf-8")
132
140
self._blobs[encoded_new_path] = (mode, sha)
133
141
if st is not None:
134
yield change.path[1], (entry.text_sha1, st)
142
yield file_id, path[1], (entry.text_sha1, st)
143
if self._mapping.generate_file_id(encoded_new_path) != file_id:
144
self._override_fileids[encoded_new_path] = file_id
146
self._override_fileids[encoded_new_path] = None
135
147
if not seen_root and len(self.parents) == 0:
136
148
raise RootMissing()
137
149
if getattr(workingtree, "basis_tree", False):
147
159
if entry.path in self._blobs:
149
161
self._blobs[entry.path] = (entry.mode, entry.sha)
164
fileid_map = dict(basis_tree._fileid_map.file_ids)
165
except AttributeError:
167
for path, file_id in self._override_fileids.iteritems():
168
if type(path) is not str:
169
raise TypeError(path)
171
if path in fileid_map:
174
if type(file_id) is not str:
175
raise TypeError(file_id)
176
fileid_map[path] = file_id
178
fileid_blob = self._mapping.export_fileid_map(fileid_map)
181
if fileid_blob is not None:
182
if self._mapping.BZR_FILE_IDS_FILE is None:
183
raise SettingCustomFileIdsUnsupported(fileid_map)
184
self.store.add_object(fileid_blob)
185
self._blobs[self._mapping.BZR_FILE_IDS_FILE] = (stat.S_IFREG | 0o644, fileid_blob.id)
187
self._blobs[self._mapping.BZR_FILE_IDS_FILE] = None
150
188
self.new_inventory = None
152
190
def update_basis(self, tree):
156
194
def finish_inventory(self):
157
195
# eliminate blobs that were removed
158
self._blobs = {k: v for (k, v) in viewitems(
159
self._blobs) if v is not None}
196
for path, entry in iter(self._blobs.items()):
198
del self._blobs[path]
161
200
def _iterblobs(self):
162
return ((path, sha, mode) for (path, (mode, sha))
163
in viewitems(self._blobs))
201
return ((path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems())
165
203
def commit(self, message):
166
204
self._validate_unicode_text(message, 'commit message')
168
c.parents = [self.repository.lookup_bzr_revision_id(
169
revid)[0] for revid in self.parents]
206
c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
170
207
c.tree = commit_tree(self.store, self._iterblobs())
171
encoding = self._revprops.pop(u'git-explicit-encoding', 'utf-8')
172
c.encoding = encoding.encode('ascii')
173
c.committer = fix_person_identifier(self._committer.encode(encoding))
175
author = self._revprops.pop('author')
178
authors = self._revprops.pop('authors').splitlines()
180
author = self._committer
183
raise Exception("Unable to convert multiple authors")
184
elif len(authors) == 0:
185
author = self._committer
188
c.author = fix_person_identifier(author.encode(encoding))
189
bugstext = self._revprops.pop('bugs', None)
190
if bugstext is not None:
192
for url, status in bugtracker.decode_bug_urls(bugstext):
193
if status == bugtracker.FIXED:
194
message += "Fixes: %s\n" % url
195
elif status == bugtracker.RELATED:
196
message += "Bug: %s\n" % url
198
raise bugtracker.InvalidBugStatus(status)
208
c.encoding = self._revprops.pop('git-explicit-encoding', 'utf-8')
209
c.committer = fix_person_identifier(self._committer.encode(c.encoding))
210
c.author = fix_person_identifier(self._revprops.pop('author', self._committer).encode(c.encoding))
199
211
if self._revprops:
200
212
raise NotImplementedError(self._revprops)
201
213
c.commit_time = int(self._timestamp)
202
214
c.author_time = int(self._timestamp)
203
215
c.commit_timezone = self._timezone
204
216
c.author_timezone = self._timezone
205
c.message = message.encode(encoding)
206
if (self._config_stack.get('create_signatures') ==
207
_mod_config.SIGN_ALWAYS):
217
c.message = message.encode(c.encoding)
218
if self._config_stack.get('create_signatures') == _mod_config.SIGN_ALWAYS:
208
219
strategy = gpg.GPGStrategy(self._config_stack)
209
220
c.gpgsig = strategy.sign(c.as_raw_string(), gpg.MODE_DETACH)
210
221
self.store.add_object(c)
220
231
return self.repository.revision_tree(self._new_revision_id)
222
233
def get_basis_delta(self):
234
# TODO(jelmer): remove this logic when lp:~jelmer/brz/remaining lands
235
for (oldpath, newpath, file_id, entry) in self._inv_delta:
236
if entry is not None:
237
entry.revision = self._new_revision_id
223
238
return self._inv_delta
225
240
def update_basis_by_delta(self, revid, delta):
added
removed
breezy/plugins/git/commit.py
