1
# Copyright (C) 2009-2010 Jelmer Vernooij <jelmer@samba.org>
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
"""Support for committing in native Git working trees."""
20
from __future__ import absolute_import
22
from dulwich.index import (
29
revision as _mod_revision,
31
from ...errors import (
34
from ...repository import (
38
from dulwich.objects import (
43
from dulwich.repo import Repo
46
from .mapping import (
49
from .roundtrip import (
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._validate_revprops(self._revprops)
63
self.store = self.repository._git.object_store
65
self._any_changes = False
66
self._will_record_deletes = False
67
self._override_fileids = {}
68
self._mapping = self.repository.get_mapping()
70
def any_changes(self):
71
return self._any_changes
73
def record_entry_contents(self, ie, parent_invs, path, tree,
75
raise NotImplementedError(self.record_entry_contents)
77
def record_delete(self, kind, path, file_id):
78
assert type(path) == str
79
if kind != 'directory':
80
self._override_fileids[path] = None
81
self._blobs[path] = None
82
self._any_changes = True
84
def record_iter_changes(self, workingtree, basis_revid, iter_changes):
85
def link_sha1(path, file_id):
87
blob.data = workingtree.get_symlink_target(file_id, path).encode("utf-8")
88
self.store.add_object(blob)
90
def text_sha1(path, file_id):
92
blob.data = workingtree.get_file_text(file_id, path)
93
self.store.add_object(blob)
95
def treeref_sha1(path, file_id):
96
return Repo.open(os.path.join(workingtree.basedir, path)).head()
98
for (file_id, path, changed_content, versioned, parent, name, kind,
99
executable) in iter_changes:
100
if kind[1] in ("directory",):
101
if kind[0] in ("file", "symlink"):
102
self.record_delete(kind[0], path[0].encode("utf-8"), file_id)
107
self.record_delete(kind[0], path[0].encode("utf-8"), file_id)
109
if kind[1] == "file":
111
sha = text_sha1(path[1], file_id)
112
elif kind[1] == "symlink":
114
sha = link_sha1(path[1], file_id)
115
elif kind[1] == "tree-reference":
117
sha = treeref_sha1(path[1], file_id)
119
raise AssertionError("Unknown kind %r" % kind[1])
122
self._any_changes = True
123
encoded_new_path = path[1].encode("utf-8")
124
self._blobs[encoded_new_path] = (mode, sha)
125
file_sha1 = workingtree.get_file_sha1(file_id, path[1])
126
if file_sha1 is None:
127
# File no longer exists
128
if path[0] is not None:
129
self.record_delete(kind[0], path[0].encode("utf-8"), file_id)
131
_, st = workingtree.get_file_with_stat(file_id, path[1])
132
yield file_id, path[1], (file_sha1, st)
133
self._override_fileids[encoded_new_path] = file_id
134
if not seen_root and len(self.parents) == 0:
136
if getattr(workingtree, "basis_tree", False):
137
basis_tree = workingtree.basis_tree()
139
if len(self.parents) == 0:
140
basis_revid = _mod_revision.NULL_REVISION
142
basis_revid = self.parents[0]
143
basis_tree = self.repository.revision_tree(basis_revid)
144
# Fill in entries that were not changed
145
for path, entry in basis_tree.iter_entries_by_dir():
146
if entry.kind not in ("file", "symlink", "tree-reference"):
148
if not path in self._blobs:
149
if entry.kind == "symlink":
151
blob.data = basis_tree.get_symlink_target(entry.file_id,
153
self._blobs[path.encode("utf-8")] = (entry_mode(entry), blob.id)
154
elif entry.kind == "file":
156
blob.data = basis_tree.get_file_text(entry.file_id, path)
157
self._blobs[path.encode("utf-8")] = (entry_mode(entry), blob.id)
159
(mode, sha) = workingtree._lookup_entry(path.encode("utf-8"), update_index=True)
160
self._blobs[path.encode("utf-8")] = (sha, mode)
161
if not self._lossy and self._mapping.BZR_FILE_IDS_FILE is not None:
163
fileid_map = dict(basis_tree._fileid_map.file_ids)
164
except AttributeError:
166
for path, file_id in self._override_fileids.iteritems():
167
assert type(path) == str
171
assert type(file_id) == str
172
fileid_map[path] = file_id
174
fileid_blob = self._mapping.export_fileid_map(fileid_map)
175
self.store.add_object(fileid_blob)
176
self._blobs[self._mapping.BZR_FILE_IDS_FILE] = (stat.S_IFREG | 0644, fileid_blob.id)
178
self._blobs[self._mapping.BZR_FILE_IDS_FILE] = None
179
self.new_inventory = None
181
def get_basis_delta(self):
182
if not self._will_record_deletes:
187
def finish_inventory(self):
188
# eliminate blobs that were removed
189
for path, entry in iter(self._blobs.items()):
191
del self._blobs[path]
193
def _iterblobs(self):
194
return ((path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems())
196
def commit(self, message):
197
self._validate_unicode_text(message, 'commit message')
199
c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
200
c.tree = commit_tree(self.store, self._iterblobs())
202
c.committer = self._committer.encode(c.encoding)
203
c.author = self._revprops.get('author', self._committer).encode(c.encoding)
204
if c.author != c.committer:
205
self._revprops.remove("author")
206
c.commit_time = int(self._timestamp)
207
c.author_time = int(self._timestamp)
208
c.commit_timezone = self._timezone
209
c.author_timezone = self._timezone
210
c.message = message.encode(c.encoding)
212
commit_supplement = CommitSupplement()
213
commit_supplement.revision_id = self._new_revision_id
214
commit_supplement.properties = self._revprops
215
commit_supplement.explicit_parent_ids = self.parents
216
if commit_supplement:
217
c.message = inject_bzr_metadata(c.message, commit_supplement, "utf-8")
219
assert len(c.id) == 40
220
if self._new_revision_id is None or self._lossy:
221
self._new_revision_id = self._mapping.revision_id_foreign_to_bzr(c.id)
222
self.store.add_object(c)
223
self.repository.commit_write_group()
224
return self._new_revision_id
227
self.repository.abort_write_group()
229
def will_record_deletes(self):
230
self._will_record_deletes = True
232
def revision_tree(self):
233
return self.repository.revision_tree(self._new_revision_id)
added
removed
commit.py
