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."""
21
from dulwich.index import (
27
revision as _mod_revision,
29
from bzrlib.errors import (
32
from bzrlib.repository import (
36
from dulwich.objects import (
43
from bzrlib.plugins.git.mapping import (
46
from bzrlib.plugins.git.roundtrip import (
52
class GitCommitBuilder(CommitBuilder):
53
"""Commit builder for Git repositories."""
55
supports_record_entry_contents = False
57
def __init__(self, *args, **kwargs):
58
super(GitCommitBuilder, self).__init__(*args, **kwargs)
59
self._validate_revprops(self._revprops)
60
self.store = self.repository._git.object_store
62
self._any_changes = False
63
self._will_record_deletes = False
65
def any_changes(self):
66
return self._any_changes
68
def record_entry_contents(self, ie, parent_invs, path, tree,
70
raise NotImplementedError(self.record_entry_contents)
72
def record_delete(self, path, file_id):
73
self._blobs[path] = None
74
self._any_changes = True
76
def record_iter_changes(self, workingtree, basis_revid, iter_changes):
77
index = getattr(workingtree, "index", None)
79
def index_sha1(path, file_id):
80
return index.get_sha1(path.encode("utf-8"))
81
text_sha1 = link_sha1 = index_sha1
83
def link_sha1(path, file_id):
85
blob.data = workingtree.get_symlink_target(file_id, path)
87
def text_sha1(path, file_id):
89
blob.data = workingtree.get_file_text(file_id, path)
92
for (file_id, path, changed_content, versioned, parent, name, kind,
93
executable) in iter_changes:
94
if kind[1] in ("directory",):
95
if kind[0] in ("file", "symlink"):
96
self.record_delete(path[0], file_id)
101
self.record_delete(path[0], file_id)
103
if kind[1] == "file":
105
sha = text_sha1(path[1], file_id)
106
elif kind[1] == "symlink":
108
sha = link_sha1(path[1], file_id)
109
elif kind[1] == "tree-reference":
111
sha = "FIXME" # FIXME
113
raise AssertionError("Unknown kind %r" % kind[1])
116
self._any_changes = True
117
self._blobs[path[1].encode("utf-8")] = (mode, sha)
118
file_sha1 = workingtree.get_file_sha1(file_id, path[1])
119
if file_sha1 is None:
120
# File no longer exists
121
if path[0] is not None:
122
self.record_delete(path[0], file_id)
124
_, st = workingtree.get_file_with_stat(file_id, path[1])
125
yield file_id, path[1], (file_sha1, st)
126
if not seen_root and len(self.parents) == 0:
128
if getattr(workingtree, "basis_tree", False):
129
basis_tree = workingtree.basis_tree()
131
if len(self.parents) == 0:
132
basis_revid = _mod_revision.NULL_REVISION
134
basis_revid = self.parents[0]
135
basis_tree = self.repository.revision_tree(basis_revid)
136
# Fill in entries that were not changed
137
for path, entry in basis_tree.iter_entries_by_dir():
138
if entry.kind not in ("file", "symlink"):
140
if not path in self._blobs:
142
if entry.kind == "symlink":
143
blob.data = basis_tree.get_symlink_target(entry.file_id,
146
blob.data = basis_tree.get_file_text(entry.file_id, path)
147
self._blobs[path.encode("utf-8")] = (entry_mode(entry), blob.id)
148
self.new_inventory = None
150
def get_basis_delta(self):
151
if not self._will_record_deletes:
156
def finish_inventory(self):
157
# eliminate blobs that were removed
158
for path, entry in iter(self._blobs.items()):
160
del self._blobs[path]
162
def _iterblobs(self):
163
return ((path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems())
165
def commit(self, message):
166
self._validate_unicode_text(message, 'commit message')
168
c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
169
c.tree = commit_tree(self.store, self._iterblobs())
170
c.committer = self._committer
171
c.author = self._revprops.get('author', self._committer)
172
if c.author != c.committer:
173
self._revprops.remove("author")
174
c.commit_time = int(self._timestamp)
175
c.author_time = int(self._timestamp)
176
c.commit_timezone = self._timezone
177
c.author_timezone = self._timezone
179
c.message = message.encode("utf-8")
181
commit_supplement = CommitSupplement()
182
commit_supplement.revision_id = self._new_revision_id
183
commit_supplement.properties = self._revprops
184
commit_supplement.explicit_parent_ids = self.parents
185
if commit_supplement:
186
c.message = inject_bzr_metadata(c.message, commit_supplement, "utf-8")
188
assert len(c.id) == 40
189
if self._new_revision_id is None:
190
self._new_revision_id = self.repository.get_mapping().revision_id_foreign_to_bzr(c.id)
191
self.store.add_object(c)
192
self.repository.commit_write_group()
193
return self._new_revision_id
196
self.repository.abort_write_group()
198
def will_record_deletes(self):
199
self._will_record_deletes = True
201
def revision_tree(self):
202
return self.repository.revision_tree(self._new_revision_id)
added
removed
commit.py
