1
# Copyright (C) 2008 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
"""An adapter between a Git index and a Bazaar Working Tree"""
21
from cStringIO import (
25
from dulwich.objects import (
28
from dulwich.protocol import (
45
from bzrlib.decorators import (
50
from bzrlib.plugins.git.inventory import (
53
from bzrlib.plugins.git.tree import (
54
changes_from_git_changes,
55
tree_delta_from_git_changes,
59
IGNORE_FILENAME = ".gitignore"
62
class GitWorkingTree(workingtree.WorkingTree):
63
"""A Git working tree."""
65
def __init__(self, bzrdir, repo, branch, index):
66
self.basedir = bzrdir.root_transport.local_abspath('.')
68
self.repository = repo
69
self.mapping = self.repository.get_mapping()
71
self._transport = bzrdir.transport
73
self.controldir = self.bzrdir.transport.local_abspath('bzr')
76
os.makedirs(self.controldir)
77
os.makedirs(os.path.join(self.controldir, 'lock'))
81
self._control_files = lockable_files.LockableFiles(
82
transport.get_transport(self.controldir), 'lock', lockdir.LockDir)
83
self._format = GitWorkingTreeFormat()
85
self.views = self._make_views()
86
self._detect_case_handling()
89
"""Yield all unversioned files in this WorkingTree.
91
for (dirpath, dirnames, filenames) in os.walk(self.basedir):
92
if self.bzrdir.is_control_filename(dirpath[len(self.basedir):].strip("/")):
94
for filename in filenames:
95
relpath = os.path.join(dirpath[len(self.basedir):].strip("/"), filename)
96
if not relpath in self.index:
101
# non-implementation specific cleanup
104
# reverse order of locking.
106
return self._control_files.unlock()
110
def is_control_filename(self, path):
111
return os.path.basename(path) == ".git"
113
def _rewrite_index(self):
115
for path, entry in self._inventory.iter_entries():
116
if entry.kind == "directory":
117
# Git indexes don't contain directories
119
if entry.kind == "file":
122
file, stat_val = self.get_file_with_stat(entry.file_id, path)
123
except (errors.NoSuchFile, IOError):
124
# TODO: Rather than come up with something here, use the old index
126
from posix import stat_result
127
stat_val = stat_result((stat.S_IFREG | 0644, 0, 0, 0, 0, 0, 0, 0, 0, 0))
128
blob.set_raw_string(file.read())
129
elif entry.kind == "symlink":
132
stat_val = os.lstat(self.abspath(path))
133
except (errors.NoSuchFile, OSError):
134
# TODO: Rather than come up with something here, use the
136
from posix import stat_result
137
stat_val = stat_result((stat.S_IFLNK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
138
blob.set_raw_string(entry.symlink_target)
140
raise AssertionError("unknown kind '%s'" % entry.kind)
141
# Add object to the repository if it didn't exist yet
142
if not blob.id in self.repository._git.object_store:
143
self.repository._git.object_store.add_object(blob)
144
# Add an entry to the index or update the existing entry
146
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)
149
# TODO: Maybe this should only write on dirty ?
150
if self._control_files._lock_mode != 'w':
151
raise errors.NotWriteLocked(self)
152
self._rewrite_index()
154
self._inventory_is_modified = False
156
def get_ignore_list(self):
157
ignoreset = getattr(self, '_ignoreset', None)
158
if ignoreset is not None:
162
ignore_globs.update(ignores.get_runtime_ignores())
163
ignore_globs.update(ignores.get_user_ignores())
164
if self.has_filename(IGNORE_FILENAME):
165
f = self.get_file_byname(IGNORE_FILENAME)
167
ignore_globs.update(ignores.parse_ignore_file(f))
170
self._ignoreset = ignore_globs
173
def set_last_revision(self, revid):
174
self._change_last_revision(revid)
176
def _reset_data(self):
177
self._inventory_is_modified = False
179
head = self.repository._git.head()
180
except KeyError, name:
181
raise errors.NotBranchError("branch %s at %s" % (name, self.repository.base))
182
basis_inv = self.repository.get_inventory(self.branch.lookup_foreign_revision_id(head))
183
store = self.repository._git.object_store
186
result = inventory.Inventory(root_id=None)
188
fileid_map = self.mapping.get_fileid_map(store.__getitem__,
190
result = GitIndexInventory(basis_inv, fileid_map, self.index, store)
191
self._set_inventory(result, dirty=False)
194
def get_file_sha1(self, file_id, path=None, stat_value=None):
196
path = self._inventory.id2path(file_id)
198
return osutils.sha_file_by_name(self.abspath(path).encode(osutils._fs_enc))
199
except OSError, (num, msg):
200
if num in (errno.EISDIR, errno.ENOENT):
204
def revision_tree(self, revid):
205
return self.repository.revision_tree(revid)
213
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):
216
def _matchingbzrdir(self):
217
from bzrlib.plugins.git import LocalGitBzrDirFormat
218
return LocalGitBzrDirFormat()
220
def get_format_description(self):
221
return "Git Working Tree"
224
class InterIndexGitTree(tree.InterTree):
225
"""InterTree that works between a Git revision tree and an index."""
227
def __init__(self, source, target):
228
super(InterIndexGitTree, self).__init__(source, target)
229
self._index = target.index
232
def is_compatible(cls, source, target):
233
from bzrlib.plugins.git.repository import GitRevisionTree
234
return (isinstance(source, GitRevisionTree) and
235
isinstance(target, GitWorkingTree))
237
def compare(self, want_unchanged=False, specific_files=None,
238
extra_trees=None, require_versioned=False, include_root=False,
239
want_unversioned=False):
240
changes = self._index.changes_from_tree(
241
self.source._repository._git.object_store, self.source.tree,
242
want_unchanged=want_unchanged)
243
source_fileid_map = self.source.mapping.get_fileid_map(
244
self.source._repository._git.object_store.__getitem__,
246
if self.target.mapping.BZR_FILE_IDS_FILE is not None:
248
file_id = self.target.path2id(
249
self.target.mapping.BZR_FILE_IDS_FILE)
250
except errors.NoSuchId:
251
target_fileid_map = {}
253
target_fileid_map = self.import_fileid_map(Blob.from_string(self.target.file_text(file_id)))
255
target_fileid_map = {}
256
ret = tree_delta_from_git_changes(changes, self.target.mapping,
257
(source_fileid_map, target_fileid_map),
258
specific_file=specific_files, require_versioned=require_versioned)
260
for e in self.target.extras():
261
ret.unversioned.append((e, None, osutils.file_kind(self.target.abspath(e))))
264
def iter_changes(self, include_unchanged=False, specific_files=None,
265
pb=None, extra_trees=[], require_versioned=True, want_unversioned=False):
266
changes = self._index.changes_from_tree(
267
self.source._repository._git.object_store, self.source.tree,
268
want_unchanged=include_unchanged)
269
# FIXME: Handle want_unversioned
270
return changes_from_git_changes(changes, self.target.mapping,
271
specific_file=specific_files)
273
tree.InterTree.register_optimiser(InterIndexGitTree)
added
removed
workingtree.py
