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
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
|
# Copyright (C) 2008 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
"""An adapter between a Git index and a Bazaar Working Tree"""
from cStringIO import (
StringIO,
)
import errno
from dulwich.objects import (
Blob,
)
from dulwich.protocol import (
ZERO_SHA,
)
import os
import stat
from bzrlib import (
errors,
ignores,
lockable_files,
lockdir,
osutils,
transport,
tree,
workingtree,
)
from bzrlib.decorators import (
needs_read_lock,
)
from bzrlib.plugins.git.inventory import (
GitIndexInventory,
)
from bzrlib.plugins.git.tree import (
changes_from_git_changes,
tree_delta_from_git_changes,
)
from bzrlib.plugins.git.mapping import (
GitFileIdMap,
)
IGNORE_FILENAME = ".gitignore"
class GitWorkingTree(workingtree.WorkingTree):
"""A Git working tree."""
def __init__(self, bzrdir, repo, branch, index):
self.basedir = bzrdir.root_transport.local_abspath('.')
self.bzrdir = bzrdir
self.repository = repo
self.mapping = self.repository.get_mapping()
self._branch = branch
self._transport = bzrdir.transport
self.controldir = self.bzrdir.transport.local_abspath('bzr')
try:
os.makedirs(self.controldir)
os.makedirs(os.path.join(self.controldir, 'lock'))
except OSError:
pass
self._control_files = lockable_files.LockableFiles(
transport.get_transport(self.controldir), 'lock', lockdir.LockDir)
self._format = GitWorkingTreeFormat()
self.index = index
self.views = self._make_views()
self._detect_case_handling()
def extras(self):
"""Yield all unversioned files in this WorkingTree.
"""
for (dirpath, dirnames, filenames) in os.walk(self.basedir):
if self.bzrdir.is_control_filename(dirpath[len(self.basedir):].strip("/")):
continue
for filename in filenames:
relpath = os.path.join(dirpath[len(self.basedir):].strip("/"), filename)
if not relpath in self.index:
yield relpath
def unlock(self):
# non-implementation specific cleanup
self._cleanup()
# reverse order of locking.
try:
return self._control_files.unlock()
finally:
self.branch.unlock()
def is_control_filename(self, path):
return os.path.basename(path) == ".git"
def _rewrite_index(self):
self.index.clear()
for path, entry in self._inventory.iter_entries():
if entry.kind == "directory":
# Git indexes don't contain directories
continue
if entry.kind == "file":
blob = Blob()
try:
file, stat_val = self.get_file_with_stat(entry.file_id, path)
except (errors.NoSuchFile, IOError):
# TODO: Rather than come up with something here, use the old index
file = StringIO()
from posix import stat_result
stat_val = stat_result((stat.S_IFREG | 0644, 0, 0, 0, 0, 0, 0, 0, 0, 0))
blob.set_raw_string(file.read())
elif entry.kind == "symlink":
blob = Blob()
try:
stat_val = os.lstat(self.abspath(path))
except (errors.NoSuchFile, OSError):
# TODO: Rather than come up with something here, use the
# old index
from posix import stat_result
stat_val = stat_result((stat.S_IFLNK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
blob.set_raw_string(entry.symlink_target)
else:
raise AssertionError("unknown kind '%s'" % entry.kind)
# Add object to the repository if it didn't exist yet
if not blob.id in self.repository._git.object_store:
self.repository._git.object_store.add_object(blob)
# Add an entry to the index or update the existing entry
flags = 0 # FIXME
self.index[path.encode("utf-8")] = (stat_val.st_ctime, stat_val.st_mtime, stat_val.st_dev, stat_val.st_ino, stat_val.st_mode, stat_val.st_uid, stat_val.st_gid, stat_val.st_size, blob.id, flags)
def flush(self):
# TODO: Maybe this should only write on dirty ?
if self._control_files._lock_mode != 'w':
raise errors.NotWriteLocked(self)
self._rewrite_index()
self.index.write()
self._inventory_is_modified = False
def get_ignore_list(self):
ignoreset = getattr(self, '_ignoreset', None)
if ignoreset is not None:
return ignoreset
ignore_globs = set()
ignore_globs.update(ignores.get_runtime_ignores())
ignore_globs.update(ignores.get_user_ignores())
if self.has_filename(IGNORE_FILENAME):
f = self.get_file_byname(IGNORE_FILENAME)
try:
ignore_globs.update(ignores.parse_ignore_file(f))
finally:
f.close()
self._ignoreset = ignore_globs
return ignore_globs
def set_last_revision(self, revid):
self._change_last_revision(revid)
def _reset_data(self):
self._inventory_is_modified = False
try:
head = self.repository._git.head()
except KeyError, name:
raise errors.NotBranchError("branch %s at %s" % (name, self.repository.base))
basis_inv = self.repository.get_inventory(self.branch.lookup_foreign_revision_id(head))
store = self.repository._git.object_store
if head == ZERO_SHA:
fileid_map = GitFileIdMap({}, self.mapping)
basis_inv = None
else:
fileid_map = self.mapping.get_fileid_map(store.__getitem__,
store[head].tree)
result = GitIndexInventory(basis_inv, fileid_map, self.index, store)
self._set_inventory(result, dirty=False)
@needs_read_lock
def get_file_sha1(self, file_id, path=None, stat_value=None):
if not path:
path = self._inventory.id2path(file_id)
try:
return osutils.sha_file_by_name(self.abspath(path).encode(osutils._fs_enc))
except OSError, (num, msg):
if num in (errno.EISDIR, errno.ENOENT):
return None
raise
def revision_tree(self, revid):
return self.repository.revision_tree(revid)
@needs_read_lock
def conflicts(self):
# FIXME:
return []
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):
@property
def _matchingbzrdir(self):
from bzrlib.plugins.git import LocalGitControlDirFormat
return LocalGitControlDirFormat()
def get_format_description(self):
return "Git Working Tree"
class InterIndexGitTree(tree.InterTree):
"""InterTree that works between a Git revision tree and an index."""
def __init__(self, source, target):
super(InterIndexGitTree, self).__init__(source, target)
self._index = target.index
@classmethod
def is_compatible(cls, source, target):
from bzrlib.plugins.git.repository import GitRevisionTree
return (isinstance(source, GitRevisionTree) and
isinstance(target, GitWorkingTree))
def compare(self, want_unchanged=False, specific_files=None,
extra_trees=None, require_versioned=False, include_root=False,
want_unversioned=False):
changes = self._index.changes_from_tree(
self.source._repository._git.object_store, self.source.tree,
want_unchanged=want_unchanged)
source_fileid_map = self.source.mapping.get_fileid_map(
self.source._repository._git.object_store.__getitem__,
self.source.tree)
if self.target.mapping.BZR_FILE_IDS_FILE is not None:
file_id = self.target.path2id(
self.target.mapping.BZR_FILE_IDS_FILE)
if file_id is None:
target_fileid_map = {}
else:
target_fileid_map = self.target.mapping.import_fileid_map(Blob.from_string(self.target.get_file_text(file_id)))
else:
target_fileid_map = {}
target_fileid_map = GitFileIdMap(target_fileid_map, self.target.mapping)
ret = tree_delta_from_git_changes(changes, self.target.mapping,
(source_fileid_map, target_fileid_map),
specific_file=specific_files, require_versioned=require_versioned)
if want_unversioned:
for e in self.target.extras():
ret.unversioned.append((e, None, osutils.file_kind(self.target.abspath(e))))
return ret
def iter_changes(self, include_unchanged=False, specific_files=None,
pb=None, extra_trees=[], require_versioned=True, want_unversioned=False):
changes = self._index.changes_from_tree(
self.source._repository._git.object_store, self.source.tree,
want_unchanged=include_unchanged)
# FIXME: Handle want_unversioned
return changes_from_git_changes(changes, self.target.mapping,
specific_file=specific_files)
tree.InterTree.register_optimiser(InterIndexGitTree)
|