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
|
# Copyright (C) 2009-2010 Jelmer Vernooij <jelmer@samba.org>
#
# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Support for committing in native Git working trees."""
from dulwich.index import (
commit_tree,
)
import stat
from bzrlib.errors import (
RootMissing,
)
from bzrlib.repository import (
CommitBuilder,
)
from dulwich.objects import (
S_IFGITLINK,
Blob,
Commit,
)
from bzrlib.plugins.git.mapping import (
entry_mode,
)
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.store = self.repository._git.object_store
self._blobs = {}
def record_entry_contents(self, ie, parent_invs, path, tree,
content_summary):
raise NotImplementedError(self.record_entry_contents)
def record_delete(self, path, file_id):
self._blobs[path] = None
self._any_changes = True
def record_iter_changes(self, workingtree, basis_revid, iter_changes):
index = getattr(workingtree, "index", None)
if index is not None:
def index_sha1(path, file_id):
return index.get_sha1(path.encode("utf-8"))
text_sha1 = link_sha1 = index_sha1
else:
def link_sha1(path, file_id):
blob = Blob()
blob.data = workingtree.get_symlink_target(file_id)
return blob.id
def text_sha1(path, file_id):
blob = Blob()
blob.data = workingtree.get_file_text(file_id, path)
return blob.id
seen_root = False
for (file_id, path, changed_content, versioned, parent, name, kind,
executable) in iter_changes:
if kind[1] in ("directory",):
if kind[0] in ("file", "symlink"):
self.record_delete(path[0], file_id)
if path[1] == "":
seen_root = True
continue
if path[1] is None:
self.record_delete(path[0], file_id)
continue
if kind[1] == "file":
mode = stat.S_IFREG
sha = text_sha1(path[1], file_id)
elif kind[1] == "symlink":
mode = stat.S_IFLNK
sha = link_sha1(path[1], file_id)
elif kind[1] == "tree-reference":
mode = S_IFGITLINK
sha = "FIXME" # FIXME
else:
raise AssertionError("Unknown kind %r" % kind[1])
if executable[1]:
mode |= 0111
self._any_changes = True
self._blobs[path[1].encode("utf-8")] = (mode, sha)
file_sha1 = workingtree.get_file_sha1(file_id, path[1])
_, st = workingtree.get_file_with_stat(file_id, path[1])
yield file_id, path[1], (file_sha1, st)
if not seen_root and len(self.parents) == 0:
raise RootMissing()
# Fill in entries that were not changed
basis_tree = workingtree.basis_tree()
assert basis_tree.get_revision_id() == basis_revid, "expected %r == %r" % (
basis_tree.get_revision_id(), basis_revid)
for path, entry in basis_tree.iter_entries_by_dir():
if entry.kind not in ("file", "symlink"):
continue
if not path in self._blobs:
blob = Blob()
if entry.kind == "symlink":
blob.data = basis_tree.get_symlink_target(entry.file_id)
else:
blob.data = basis_tree.get_file_text(entry.file_id)
self._blobs[path.encode("utf-8")] = (entry_mode(entry), blob.id)
self.new_inventory = None
def finish_inventory(self):
# eliminate blobs that were removed
for path, entry in iter(self._blobs.items()):
if entry is None:
del self._blobs[path]
def _iterblobs(self):
return ((path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems())
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())
c.committer = self._committer
c.author = self._revprops.get('author', self._committer)
c.commit_time = int(self._timestamp)
c.author_time = int(self._timestamp)
c.commit_timezone = self._timezone
c.author_timezone = self._timezone
c.encoding = 'utf-8'
c.message = message.encode("utf-8")
self.store.add_object(c)
assert len(c.id) == 40
self._new_revision_id = self.repository.get_mapping().revision_id_foreign_to_bzr(c.id)
self.repository.commit_write_group()
return self._new_revision_id
def revision_tree(self):
return self.repository.revision_tree(self._new_revision_id)
|