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 (
44
from bzrlib.decorators import (
49
from bzrlib.plugins.git.inventory import (
52
from bzrlib.plugins.git.tree import (
53
changes_from_git_changes,
54
tree_delta_from_git_changes,
56
from bzrlib.plugins.git.mapping import (
60
IGNORE_FILENAME = ".gitignore"
63
class GitWorkingTree(workingtree.WorkingTree):
64
"""A Git working tree."""
66
def __init__(self, bzrdir, repo, branch, index):
67
self.basedir = bzrdir.root_transport.local_abspath('.')
69
self.repository = repo
70
self.mapping = self.repository.get_mapping()
72
self._transport = bzrdir.transport
74
self.controldir = self.bzrdir.transport.local_abspath('bzr')
77
os.makedirs(self.controldir)
78
os.makedirs(os.path.join(self.controldir, 'lock'))
82
self._control_files = lockable_files.LockableFiles(
83
transport.get_transport(self.controldir), 'lock', lockdir.LockDir)
84
self._format = GitWorkingTreeFormat()
86
self.views = self._make_views()
87
self._detect_case_handling()
90
"""Yield all unversioned files in this WorkingTree.
92
for (dirpath, dirnames, filenames) in os.walk(self.basedir):
93
if self.bzrdir.is_control_filename(dirpath[len(self.basedir):].strip("/")):
95
for filename in filenames:
96
relpath = os.path.join(dirpath[len(self.basedir):].strip("/"), filename)
97
if not relpath in self.index:
102
# non-implementation specific cleanup
105
# reverse order of locking.
107
return self._control_files.unlock()
111
def is_control_filename(self, path):
112
return os.path.basename(path) == ".git"
114
def _rewrite_index(self):
116
for path, entry in self._inventory.iter_entries():
117
if entry.kind == "directory":
118
# Git indexes don't contain directories
120
if entry.kind == "file":
123
file, stat_val = self.get_file_with_stat(entry.file_id, path)
124
except (errors.NoSuchFile, IOError):
125
# TODO: Rather than come up with something here, use the old index
127
from posix import stat_result
128
stat_val = stat_result((stat.S_IFREG | 0644, 0, 0, 0, 0, 0, 0, 0, 0, 0))
129
blob.set_raw_string(file.read())
130
elif entry.kind == "symlink":
133
stat_val = os.lstat(self.abspath(path))
134
except (errors.NoSuchFile, OSError):
135
# TODO: Rather than come up with something here, use the
137
from posix import stat_result
138
stat_val = stat_result((stat.S_IFLNK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
139
blob.set_raw_string(entry.symlink_target)
141
raise AssertionError("unknown kind '%s'" % entry.kind)
142
# Add object to the repository if it didn't exist yet
143
if not blob.id in self.repository._git.object_store:
144
self.repository._git.object_store.add_object(blob)
145
# Add an entry to the index or update the existing entry
147
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)
150
# TODO: Maybe this should only write on dirty ?
151
if self._control_files._lock_mode != 'w':
152
raise errors.NotWriteLocked(self)
153
self._rewrite_index()
155
self._inventory_is_modified = False
157
def get_ignore_list(self):
158
ignoreset = getattr(self, '_ignoreset', None)
159
if ignoreset is not None:
163
ignore_globs.update(ignores.get_runtime_ignores())
164
ignore_globs.update(ignores.get_user_ignores())
165
if self.has_filename(IGNORE_FILENAME):
166
f = self.get_file_byname(IGNORE_FILENAME)
168
ignore_globs.update(ignores.parse_ignore_file(f))
171
self._ignoreset = ignore_globs
174
def set_last_revision(self, revid):
175
self._change_last_revision(revid)
177
def _reset_data(self):
178
self._inventory_is_modified = False
180
head = self.repository._git.head()
181
except KeyError, name:
182
raise errors.NotBranchError("branch %s at %s" % (name, self.repository.base))
183
basis_inv = self.repository.get_inventory(self.branch.lookup_foreign_revision_id(head))
184
store = self.repository._git.object_store
186
fileid_map = GitFileIdMap({}, self.mapping)
189
fileid_map = self.mapping.get_fileid_map(store.__getitem__,
191
result = GitIndexInventory(basis_inv, fileid_map, self.index, store)
192
self._set_inventory(result, dirty=False)
195
def get_file_sha1(self, file_id, path=None, stat_value=None):
197
path = self._inventory.id2path(file_id)
199
return osutils.sha_file_by_name(self.abspath(path).encode(osutils._fs_enc))
200
except OSError, (num, msg):
201
if num in (errno.EISDIR, errno.ENOENT):
205
def revision_tree(self, revid):
206
return self.repository.revision_tree(revid)
214
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):
217
def _matchingbzrdir(self):
218
from bzrlib.plugins.git import LocalGitControlDirFormat
219
return LocalGitControlDirFormat()
221
def get_format_description(self):
222
return "Git Working Tree"
225
class InterIndexGitTree(tree.InterTree):
226
"""InterTree that works between a Git revision tree and an index."""
228
def __init__(self, source, target):
229
super(InterIndexGitTree, self).__init__(source, target)
230
self._index = target.index
233
def is_compatible(cls, source, target):
234
from bzrlib.plugins.git.repository import GitRevisionTree
235
return (isinstance(source, GitRevisionTree) and
236
isinstance(target, GitWorkingTree))
238
def compare(self, want_unchanged=False, specific_files=None,
239
extra_trees=None, require_versioned=False, include_root=False,
240
want_unversioned=False):
241
changes = self._index.changes_from_tree(
242
self.source._repository._git.object_store, self.source.tree,
243
want_unchanged=want_unchanged)
244
source_fileid_map = self.source.mapping.get_fileid_map(
245
self.source._repository._git.object_store.__getitem__,
247
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)
251
target_fileid_map = {}
253
target_fileid_map = self.target.mapping.import_fileid_map(Blob.from_string(self.target.get_file_text(file_id)))
255
target_fileid_map = {}
256
target_fileid_map = GitFileIdMap(target_fileid_map, self.target.mapping)
257
ret = tree_delta_from_git_changes(changes, self.target.mapping,
258
(source_fileid_map, target_fileid_map),
259
specific_file=specific_files, require_versioned=require_versioned)
261
for e in self.target.extras():
262
ret.unversioned.append((e, None, osutils.file_kind(self.target.abspath(e))))
265
def iter_changes(self, include_unchanged=False, specific_files=None,
266
pb=None, extra_trees=[], require_versioned=True, want_unversioned=False):
267
changes = self._index.changes_from_tree(
268
self.source._repository._git.object_store, self.source.tree,
269
want_unchanged=include_unchanged)
270
# FIXME: Handle want_unversioned
271
return changes_from_git_changes(changes, self.target.mapping,
272
specific_file=specific_files)
274
tree.InterTree.register_optimiser(InterIndexGitTree)
added
removed
workingtree.py
