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 (
41
from bzrlib.decorators import (
46
from bzrlib.plugins.git.inventory import (
49
from bzrlib.plugins.git.tree import (
50
changes_from_git_changes,
51
tree_delta_from_git_changes,
55
IGNORE_FILENAME = ".gitignore"
58
class GitWorkingTree(workingtree.WorkingTree):
59
"""A Git working tree."""
61
def __init__(self, bzrdir, repo, branch, index):
62
self.basedir = bzrdir.root_transport.local_abspath('.')
64
self.repository = repo
65
self.mapping = self.repository.get_mapping()
67
self._transport = bzrdir.transport
69
self.controldir = self.bzrdir.transport.local_abspath('bzr')
72
os.makedirs(self.controldir)
73
os.makedirs(os.path.join(self.controldir, 'lock'))
77
self._control_files = lockable_files.LockableFiles(
78
transport.get_transport(self.controldir), 'lock', lockdir.LockDir)
79
self._format = GitWorkingTreeFormat()
81
self.views = self._make_views()
82
self._detect_case_handling()
85
"""Yield all unversioned files in this WorkingTree.
87
for (dirpath, dirnames, filenames) in os.walk(self.basedir):
88
if self.bzrdir.is_control_filename(dirpath[len(self.basedir):].strip("/")):
90
for filename in filenames:
91
relpath = os.path.join(dirpath[len(self.basedir):].strip("/"), filename)
92
if not relpath in self.index:
97
# non-implementation specific cleanup
100
# reverse order of locking.
102
return self._control_files.unlock()
106
def is_control_filename(self, path):
107
return os.path.basename(path) == ".git"
109
def _rewrite_index(self):
111
for path, entry in self._inventory.iter_entries():
112
if entry.kind == "directory":
113
# Git indexes don't contain directories
115
if entry.kind == "file":
118
file, stat_val = self.get_file_with_stat(entry.file_id, path)
119
except (errors.NoSuchFile, IOError):
120
# TODO: Rather than come up with something here, use the old index
122
from posix import stat_result
123
stat_val = stat_result((stat.S_IFREG | 0644, 0, 0, 0, 0, 0, 0, 0, 0, 0))
124
blob.set_raw_string(file.read())
125
elif entry.kind == "symlink":
128
stat_val = os.lstat(self.abspath(path))
129
except (errors.NoSuchFile, OSError):
130
# TODO: Rather than come up with something here, use the
132
from posix import stat_result
133
stat_val = stat_result((stat.S_IFLNK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
134
blob.set_raw_string(entry.symlink_target)
136
raise AssertionError("unknown kind '%s'" % entry.kind)
137
# Add object to the repository if it didn't exist yet
138
if not blob.id in self.repository._git.object_store:
139
self.repository._git.object_store.add_object(blob)
140
# Add an entry to the index or update the existing entry
142
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)
145
# TODO: Maybe this should only write on dirty ?
146
if self._control_files._lock_mode != 'w':
147
raise errors.NotWriteLocked(self)
148
self._rewrite_index()
150
self._inventory_is_modified = False
152
def get_ignore_list(self):
153
ignoreset = getattr(self, '_ignoreset', None)
154
if ignoreset is not None:
158
ignore_globs.update(ignores.get_runtime_ignores())
159
ignore_globs.update(ignores.get_user_ignores())
160
if self.has_filename(IGNORE_FILENAME):
161
f = self.get_file_byname(IGNORE_FILENAME)
163
ignore_globs.update(ignores.parse_ignore_file(f))
166
self._ignoreset = ignore_globs
169
def set_last_revision(self, revid):
170
self._change_last_revision(revid)
172
def _reset_data(self):
173
self._inventory_is_modified = False
175
head = self.repository._git.head()
176
except KeyError, name:
177
raise errors.NotBranchError("branch %s at %s" % (name, self.repository.base))
178
basis_inv = self.repository.get_inventory(self.branch.lookup_foreign_revision_id(head))
179
store = self.repository._git.object_store
180
fileid_map = self.mapping.get_fileid_map(store.__getitem__,
182
result = GitIndexInventory(basis_inv, fileid_map, self.index, store)
183
self._set_inventory(result, dirty=False)
186
def get_file_sha1(self, file_id, path=None, stat_value=None):
188
path = self._inventory.id2path(file_id)
190
return osutils.sha_file_by_name(self.abspath(path).encode(osutils._fs_enc))
191
except OSError, (num, msg):
192
if num in (errno.EISDIR, errno.ENOENT):
196
def revision_tree(self, revid):
197
return self.repository.revision_tree(revid)
205
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):
208
def _matchingbzrdir(self):
209
from bzrlib.plugins.git import LocalGitBzrDirFormat
210
return LocalGitBzrDirFormat()
212
def get_format_description(self):
213
return "Git Working Tree"
216
class InterIndexGitTree(tree.InterTree):
217
"""InterTree that works between a Git revision tree and an index."""
219
def __init__(self, source, target):
220
super(InterIndexGitTree, self).__init__(source, target)
221
self._index = target.index
224
def is_compatible(cls, source, target):
225
from bzrlib.plugins.git.repository import GitRevisionTree
226
return (isinstance(source, GitRevisionTree) and
227
isinstance(target, GitWorkingTree))
229
def compare(self, want_unchanged=False, specific_files=None,
230
extra_trees=None, require_versioned=False, include_root=False,
231
want_unversioned=False):
232
changes = self._index.changes_from_tree(
233
self.source._repository._git.object_store, self.source.tree,
234
want_unchanged=want_unchanged)
235
source_fileid_map = self.source.mapping.get_fileid_map(
236
self.source._repository._git.object_store.__getitem__,
238
if self.target.mapping.BZR_FILE_IDS_FILE is not None:
240
file_id = self.target.path2id(
241
self.target.mapping.BZR_FILE_IDS_FILE)
242
except errors.NoSuchId:
243
target_fileid_map = {}
245
target_fileid_map = self.import_fileid_map(Blob.from_string(self.target.file_text(file_id)))
247
target_fileid_map = {}
248
ret = tree_delta_from_git_changes(changes, self.target.mapping,
249
(source_fileid_map, target_fileid_map),
250
specific_file=specific_files, require_versioned=require_versioned)
252
for e in self.target.extras():
253
ret.unversioned.append((e, None, osutils.file_kind(self.target.abspath(e))))
256
def iter_changes(self, include_unchanged=False, specific_files=None,
257
pb=None, extra_trees=[], require_versioned=True, want_unversioned=False):
258
changes = self._index.changes_from_tree(
259
self.source._repository._git.object_store, self.source.tree,
260
want_unchanged=include_unchanged)
261
# FIXME: Handle want_unversioned
262
return changes_from_git_changes(changes, self.target.mapping,
263
specific_file=specific_files)
265
tree.InterTree.register_optimiser(InterIndexGitTree)
added
removed
workingtree.py
