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 (
42
from bzrlib.decorators import (
47
from bzrlib.plugins.git.inventory import (
50
from bzrlib.plugins.git.tree import (
51
changes_from_git_changes,
52
tree_delta_from_git_changes,
56
IGNORE_FILENAME = ".gitignore"
59
class GitWorkingTree(workingtree.WorkingTree):
60
"""A Git working tree."""
62
def __init__(self, bzrdir, repo, branch):
63
self.basedir = bzrdir.root_transport.local_abspath('.')
65
self.repository = repo
66
self.mapping = self.repository.get_mapping()
68
self._transport = bzrdir.transport
70
self.controldir = urlutils.join(self.repository._git._controldir, 'bzr')
73
os.makedirs(self.controldir)
74
os.makedirs(os.path.join(self.controldir, 'lock'))
78
self._control_files = lockable_files.LockableFiles(
79
transport.get_transport(self.controldir), 'lock', lockdir.LockDir)
80
self._format = GitWorkingTreeFormat()
81
self.index = self.repository._git.open_index()
82
self.views = self._make_views()
83
self._detect_case_handling()
86
"""Yield all unversioned files in this WorkingTree.
88
for (dirpath, dirnames, filenames) in os.walk(self.basedir):
89
if self.bzrdir.is_control_filename(dirpath[len(self.basedir):].strip("/")):
91
for filename in filenames:
92
relpath = os.path.join(dirpath[len(self.basedir):].strip("/"), filename)
93
if not relpath in self.index:
98
# non-implementation specific cleanup
101
# reverse order of locking.
103
return self._control_files.unlock()
107
def is_control_filename(self, path):
108
return os.path.basename(path) == ".git"
110
def _rewrite_index(self):
112
for path, entry in self._inventory.iter_entries():
113
if entry.kind == "directory":
114
# Git indexes don't contain directories
116
if entry.kind == "file":
119
file, stat_val = self.get_file_with_stat(entry.file_id, path)
120
except (errors.NoSuchFile, IOError):
121
# TODO: Rather than come up with something here, use the old index
123
from posix import stat_result
124
stat_val = stat_result((stat.S_IFREG | 0644, 0, 0, 0, 0, 0, 0, 0, 0, 0))
125
blob.set_raw_string(file.read())
126
elif entry.kind == "symlink":
129
stat_val = os.lstat(self.abspath(path))
130
except (errors.NoSuchFile, OSError):
131
# TODO: Rather than come up with something here, use the
133
from posix import stat_result
134
stat_val = stat_result((stat.S_IFLNK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
135
blob.set_raw_string(entry.symlink_target)
137
raise AssertionError("unknown kind '%s'" % entry.kind)
138
# Add object to the repository if it didn't exist yet
139
if not blob.id in self.repository._git.object_store:
140
self.repository._git.object_store.add_object(blob)
141
# Add an entry to the index or update the existing entry
143
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)
146
# TODO: Maybe this should only write on dirty ?
147
if self._control_files._lock_mode != 'w':
148
raise errors.NotWriteLocked(self)
149
self._rewrite_index()
151
self._inventory_is_modified = False
153
def get_ignore_list(self):
154
ignoreset = getattr(self, '_ignoreset', None)
155
if ignoreset is not None:
159
ignore_globs.update(ignores.get_runtime_ignores())
160
ignore_globs.update(ignores.get_user_ignores())
161
if self.has_filename(IGNORE_FILENAME):
162
f = self.get_file_byname(IGNORE_FILENAME)
164
ignore_globs.update(ignores.parse_ignore_file(f))
167
self._ignoreset = ignore_globs
170
def set_last_revision(self, revid):
171
self._change_last_revision(revid)
173
def _reset_data(self):
174
self._inventory_is_modified = False
175
basis_inv = self.repository.get_inventory(self.mapping.revision_id_foreign_to_bzr(self.repository._git.head()))
176
result = GitIndexInventory(basis_inv, self.mapping, self.index,
177
self.repository._git.object_store)
178
self._set_inventory(result, dirty=False)
181
def get_file_sha1(self, file_id, path=None, stat_value=None):
183
path = self._inventory.id2path(file_id)
185
return osutils.sha_file_by_name(self.abspath(path).encode(osutils._fs_enc))
186
except OSError, (num, msg):
187
if num in (errno.EISDIR, errno.ENOENT):
191
def revision_tree(self, revid):
192
return self.repository.revision_tree(revid)
200
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):
203
def _matchingbzrdir(self):
204
from bzrlib.plugins.git import LocalGitBzrDirFormat
205
return LocalGitBzrDirFormat()
207
def get_format_description(self):
208
return "Git Working Tree"
211
class InterIndexGitTree(tree.InterTree):
212
"""InterTree that works between a Git revision tree and an index."""
214
def __init__(self, source, target):
215
super(InterIndexGitTree, self).__init__(source, target)
216
self._index = target.index
219
def is_compatible(cls, source, target):
220
from bzrlib.plugins.git.repository import GitRevisionTree
221
return (isinstance(source, GitRevisionTree) and
222
isinstance(target, GitWorkingTree))
224
def compare(self, want_unchanged=False, specific_files=None,
225
extra_trees=None, require_versioned=False, include_root=False,
226
want_unversioned=False):
227
changes = self._index.changes_from_tree(
228
self.source._repository._git.object_store, self.source.tree,
229
want_unchanged=want_unchanged)
230
ret = tree_delta_from_git_changes(changes, self.target.mapping,
231
specific_file=specific_files, require_versioned=require_versioned)
233
for e in self.target.extras():
234
ret.unversioned.append((e, None, osutils.file_kind(self.target.abspath(e))))
237
def iter_changes(self, include_unchanged=False, specific_files=None,
238
pb=None, extra_trees=[], require_versioned=True, want_unversioned=False):
239
changes = self._index.changes_from_tree(
240
self.source._repository._git.object_store, self.source.tree,
241
want_unchanged=include_unchanged)
242
# FIXME: Handle want_unversioned
243
return changes_from_git_changes(changes, self.target.mapping,
244
specific_file=specific_files)
246
tree.InterTree.register_optimiser(InterIndexGitTree)
added
removed
workingtree.py
