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 (
48
class GitCommitBuilder(CommitBuilder):
49
"""Commit builder for Git repositories."""
51
supports_record_entry_contents = False
53
def __init__(self, *args, **kwargs):
54
super(GitCommitBuilder, self).__init__(*args, **kwargs)
55
self.store = self.repository._git.object_store
57
self._any_changes = False
59
def any_changes(self):
60
return self._any_changes
62
def record_entry_contents(self, ie, parent_invs, path, tree,
64
raise NotImplementedError(self.record_entry_contents)
66
def record_delete(self, path, file_id):
67
self._blobs[path] = None
68
self._any_changes = True
70
def record_iter_changes(self, workingtree, basis_revid, iter_changes):
71
index = getattr(workingtree, "index", None)
73
def index_sha1(path, file_id):
74
return index.get_sha1(path.encode("utf-8"))
75
text_sha1 = link_sha1 = index_sha1
77
def link_sha1(path, file_id):
79
blob.data = workingtree.get_symlink_target(file_id)
81
def text_sha1(path, file_id):
83
blob.data = workingtree.get_file_text(file_id, path)
86
for (file_id, path, changed_content, versioned, parent, name, kind,
87
executable) in iter_changes:
88
if kind[1] in ("directory",):
89
if kind[0] in ("file", "symlink"):
90
self.record_delete(path[0], file_id)
95
self.record_delete(path[0], file_id)
99
sha = text_sha1(path[1], file_id)
100
elif kind[1] == "symlink":
102
sha = link_sha1(path[1], file_id)
103
elif kind[1] == "tree-reference":
105
sha = "FIXME" # FIXME
107
raise AssertionError("Unknown kind %r" % kind[1])
110
self._any_changes = True
111
self._blobs[path[1].encode("utf-8")] = (mode, sha)
112
file_sha1 = workingtree.get_file_sha1(file_id, path[1])
113
_, st = workingtree.get_file_with_stat(file_id, path[1])
114
yield file_id, path[1], (file_sha1, st)
115
if not seen_root and len(self.parents) == 0:
117
if getattr(workingtree, "basis_tree", False):
118
basis_tree = workingtree.basis_tree()
120
if len(self.parents) == 0:
121
basis_revid = _mod_revision.NULL_REVISION
123
basis_revid = self.parents[0]
124
basis_tree = self.repository.revision_tree(basis_revid)
125
# Fill in entries that were not changed
126
for path, entry in basis_tree.iter_entries_by_dir():
127
if entry.kind not in ("file", "symlink"):
129
if not path in self._blobs:
131
if entry.kind == "symlink":
132
blob.data = basis_tree.get_symlink_target(entry.file_id)
134
blob.data = basis_tree.get_file_text(entry.file_id)
135
self._blobs[path.encode("utf-8")] = (entry_mode(entry), blob.id)
136
self.new_inventory = None
138
def get_basis_delta(self):
142
def finish_inventory(self):
143
# eliminate blobs that were removed
144
for path, entry in iter(self._blobs.items()):
146
del self._blobs[path]
148
def _iterblobs(self):
149
return ((path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems())
151
def commit(self, message):
152
self._validate_unicode_text(message, 'commit message')
154
c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
155
c.tree = commit_tree(self.store, self._iterblobs())
156
c.committer = self._committer
157
c.author = self._revprops.get('author', self._committer)
158
c.commit_time = int(self._timestamp)
159
c.author_time = int(self._timestamp)
160
c.commit_timezone = self._timezone
161
c.author_timezone = self._timezone
163
c.message = message.encode("utf-8")
164
self.store.add_object(c)
165
assert len(c.id) == 40
166
self._new_revision_id = self.repository.get_mapping().revision_id_foreign_to_bzr(c.id)
167
self.repository.commit_write_group()
168
return self._new_revision_id
171
self.repository.abort_write_group()
173
def will_record_deletes(self):
176
def revision_tree(self):
177
return self.repository.revision_tree(self._new_revision_id)
added
removed
commit.py
