/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
1
# Copyright (C) 2008 Jelmer Vernooij <jelmer@samba.org>
2
#
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.
7
#
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.
12
#
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
16
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
17
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
18
"""An adapter between a Git index and a Bazaar Working Tree"""
19
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
20
0.200.385 by Jelmer Vernooij
Cope with removed files.
21
from cStringIO import (
22
    StringIO,
23
    )
0.239.4 by Jelmer Vernooij
Cope with nonexistent files and directories in get_file_sha1.
24
import errno
0.200.1096 by Jelmer Vernooij
Implement GitWorkingTreeFormat.initialize.
25
from dulwich.index import (
26
    Index,
27
    )
0.200.383 by Jelmer Vernooij
Simplify, support rewriting index based on inventory.
28
from dulwich.objects import (
29
    Blob,
0.200.948 by Jelmer Vernooij
Cope with empty inventories.
30
    ZERO_SHA,
31
    )
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
32
import os
0.200.384 by Jelmer Vernooij
Fix reading of inventory from index.
33
import stat
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
34
35
from bzrlib import (
0.200.382 by Jelmer Vernooij
Support flushing index.
36
    errors,
0.200.409 by Jelmer Vernooij
Support parsing .gitignore.
37
    ignores,
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
38
    lockable_files,
39
    lockdir,
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
40
    osutils,
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
41
    transport,
0.200.519 by Jelmer Vernooij
Move imports down, might not be available in older bzr-git versions.
42
    tree,
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
43
    workingtree,
44
    )
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
45
from bzrlib.decorators import (
46
    needs_read_lock,
47
    )
48
49
0.200.1096 by Jelmer Vernooij
Implement GitWorkingTreeFormat.initialize.
50
from bzrlib.plugins.git.dir import (
51
    LocalGitDir,
52
    )
0.200.401 by Jelmer Vernooij
Move working tree inventory code to inventory.
53
from bzrlib.plugins.git.inventory import (
54
    GitIndexInventory,
55
    )
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
56
from bzrlib.plugins.git.tree import (
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
57
    changes_from_git_changes,
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
58
    tree_delta_from_git_changes,
59
    )
0.200.971 by Chadrik
Fix 'bzr status' after 'bzr add' in native git working trees.
60
from bzrlib.plugins.git.mapping import (
61
    GitFileIdMap,
62
    )
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
63
0.200.409 by Jelmer Vernooij
Support parsing .gitignore.
64
IGNORE_FILENAME = ".gitignore"
65
66
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
67
class GitWorkingTree(workingtree.WorkingTree):
68
    """A Git working tree."""
69
0.200.803 by Jelmer Vernooij
Default to non-bare repositories when initializing a control directory.
70
    def __init__(self, bzrdir, repo, branch, index):
0.200.379 by Jelmer Vernooij
Re-enable working tree support.
71
        self.basedir = bzrdir.root_transport.local_abspath('.')
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
72
        self.bzrdir = bzrdir
73
        self.repository = repo
0.200.384 by Jelmer Vernooij
Fix reading of inventory from index.
74
        self.mapping = self.repository.get_mapping()
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
75
        self._branch = branch
76
        self._transport = bzrdir.transport
77
0.246.3 by Jelmer Vernooij
Simplify call to abspath, without involving private variables.
78
        self.controldir = self.bzrdir.transport.local_abspath('bzr')
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
79
80
        try:
81
            os.makedirs(self.controldir)
82
            os.makedirs(os.path.join(self.controldir, 'lock'))
83
        except OSError:
84
            pass
85
86
        self._control_files = lockable_files.LockableFiles(
87
            transport.get_transport(self.controldir), 'lock', lockdir.LockDir)
88
        self._format = GitWorkingTreeFormat()
0.200.803 by Jelmer Vernooij
Default to non-bare repositories when initializing a control directory.
89
        self.index = index
0.200.239 by Jelmer Vernooij
Provide views.
90
        self.views = self._make_views()
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
91
        self._detect_case_handling()
0.200.173 by Jelmer Vernooij
Merge changes, open index.
92
0.200.605 by Jelmer Vernooij
Ignore directories in WorkingTree.extras().
93
    def extras(self):
94
        """Yield all unversioned files in this WorkingTree.
95
        """
0.200.615 by Jelmer Vernooij
Optimize WorkingTree.extras().
96
        for (dirpath, dirnames, filenames) in os.walk(self.basedir):
97
            if self.bzrdir.is_control_filename(dirpath[len(self.basedir):].strip("/")):
0.200.605 by Jelmer Vernooij
Ignore directories in WorkingTree.extras().
98
                continue
0.200.615 by Jelmer Vernooij
Optimize WorkingTree.extras().
99
            for filename in filenames:
100
                relpath = os.path.join(dirpath[len(self.basedir):].strip("/"), filename)
101
                if not relpath in self.index:
0.200.605 by Jelmer Vernooij
Ignore directories in WorkingTree.extras().
102
                    yield relpath
103
104
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
105
    def unlock(self):
0.200.224 by Jelmer Vernooij
Fix working tree locking.
106
        # non-implementation specific cleanup
107
        self._cleanup()
108
109
        # reverse order of locking.
110
        try:
111
            return self._control_files.unlock()
112
        finally:
113
            self.branch.unlock()
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
114
0.200.383 by Jelmer Vernooij
Simplify, support rewriting index based on inventory.
115
    def _rewrite_index(self):
116
        self.index.clear()
117
        for path, entry in self._inventory.iter_entries():
118
            if entry.kind == "directory":
119
                # Git indexes don't contain directories
120
                continue
121
            if entry.kind == "file":
122
                blob = Blob()
0.200.385 by Jelmer Vernooij
Cope with removed files.
123
                try:
124
                    file, stat_val = self.get_file_with_stat(entry.file_id, path)
125
                except (errors.NoSuchFile, IOError):
126
                    # TODO: Rather than come up with something here, use the old index
127
                    file = StringIO()
0.239.4 by Jelmer Vernooij
Cope with nonexistent files and directories in get_file_sha1.
128
                    from posix import stat_result
129
                    stat_val = stat_result((stat.S_IFREG | 0644, 0, 0, 0, 0, 0, 0, 0, 0, 0))
0.200.502 by Jelmer Vernooij
Fill in sha1s in inventory.
130
                blob.set_raw_string(file.read())
0.200.383 by Jelmer Vernooij
Simplify, support rewriting index based on inventory.
131
            elif entry.kind == "symlink":
132
                blob = Blob()
0.200.502 by Jelmer Vernooij
Fill in sha1s in inventory.
133
                try:
134
                    stat_val = os.lstat(self.abspath(path))
135
                except (errors.NoSuchFile, OSError):
136
                    # TODO: Rather than come up with something here, use the 
137
                    # old index
0.239.4 by Jelmer Vernooij
Cope with nonexistent files and directories in get_file_sha1.
138
                    from posix import stat_result
139
                    stat_val = stat_result((stat.S_IFLNK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
0.200.1124 by Jelmer Vernooij
Cope inventory entries in working trees not having a symlink target.
140
                blob.set_raw_string(self.get_symlink_target(entry.file_id).encode("utf-8"))
0.200.664 by Jelmer Vernooij
Support submodules during fetch.
141
            else:
142
                raise AssertionError("unknown kind '%s'" % entry.kind)
0.200.383 by Jelmer Vernooij
Simplify, support rewriting index based on inventory.
143
            # Add object to the repository if it didn't exist yet
144
            if not blob.id in self.repository._git.object_store:
145
                self.repository._git.object_store.add_object(blob)
146
            # Add an entry to the index or update the existing entry
0.200.522 by Jelmer Vernooij
Simplify index handling a bit more.
147
            flags = 0 # FIXME
148
            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)
0.200.383 by Jelmer Vernooij
Simplify, support rewriting index based on inventory.
149
0.200.382 by Jelmer Vernooij
Support flushing index.
150
    def flush(self):
151
        # TODO: Maybe this should only write on dirty ?
152
        if self._control_files._lock_mode != 'w':
153
            raise errors.NotWriteLocked(self)
0.200.983 by Jelmer Vernooij
Use support opening index of first revision.
154
        self._rewrite_index()
0.200.385 by Jelmer Vernooij
Cope with removed files.
155
        self.index.write()
0.200.382 by Jelmer Vernooij
Support flushing index.
156
        self._inventory_is_modified = False
157
0.200.409 by Jelmer Vernooij
Support parsing .gitignore.
158
    def get_ignore_list(self):
159
        ignoreset = getattr(self, '_ignoreset', None)
160
        if ignoreset is not None:
161
            return ignoreset
162
163
        ignore_globs = set()
164
        ignore_globs.update(ignores.get_runtime_ignores())
165
        ignore_globs.update(ignores.get_user_ignores())
166
        if self.has_filename(IGNORE_FILENAME):
167
            f = self.get_file_byname(IGNORE_FILENAME)
168
            try:
169
                ignore_globs.update(ignores.parse_ignore_file(f))
170
            finally:
171
                f.close()
172
        self._ignoreset = ignore_globs
173
        return ignore_globs
174
0.200.508 by Jelmer Vernooij
Skip inventory caching bits.
175
    def set_last_revision(self, revid):
176
        self._change_last_revision(revid)
177
0.200.379 by Jelmer Vernooij
Re-enable working tree support.
178
    def _reset_data(self):
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
179
        self._inventory_is_modified = False
0.248.3 by Jelmer Vernooij
Handle working trees without valid HEAD branch.
180
        try:
181
            head = self.repository._git.head()
182
        except KeyError, name:
183
            raise errors.NotBranchError("branch %s at %s" % (name, self.repository.base))
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
184
        basis_inv = self.repository.get_inventory(self.branch.lookup_foreign_revision_id(head))
0.252.33 by Jelmer Vernooij
Fix file id map lookups.
185
        store = self.repository._git.object_store
0.200.948 by Jelmer Vernooij
Cope with empty inventories.
186
        if head == ZERO_SHA:
0.200.983 by Jelmer Vernooij
Use support opening index of first revision.
187
            fileid_map = GitFileIdMap({}, self.mapping)
188
            basis_inv = None
0.200.948 by Jelmer Vernooij
Cope with empty inventories.
189
        else:
190
            fileid_map = self.mapping.get_fileid_map(store.__getitem__,
191
                store[head].tree)
0.200.983 by Jelmer Vernooij
Use support opening index of first revision.
192
        result = GitIndexInventory(basis_inv, fileid_map, self.index, store)
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
193
        self._set_inventory(result, dirty=False)
0.200.379 by Jelmer Vernooij
Re-enable working tree support.
194
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
195
    @needs_read_lock
196
    def get_file_sha1(self, file_id, path=None, stat_value=None):
197
        if not path:
198
            path = self._inventory.id2path(file_id)
0.239.4 by Jelmer Vernooij
Cope with nonexistent files and directories in get_file_sha1.
199
        try:
200
            return osutils.sha_file_by_name(self.abspath(path).encode(osutils._fs_enc))
201
        except OSError, (num, msg):
202
            if num in (errno.EISDIR, errno.ENOENT):
203
                return None
204
            raise
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
205
0.200.610 by Jelmer Vernooij
Support retrieving basis tree properly.
206
    def revision_tree(self, revid):
207
        return self.repository.revision_tree(revid)
208
0.200.619 by Jelmer Vernooij
Provide dummy WorkingTree.conflicts() implementation rather than spending a lot of time not finding any conflicts.
209
    @needs_read_lock
210
    def conflicts(self):
211
        # FIXME:
212
        return []
213
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
214
215
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):
216
0.200.656 by Jelmer Vernooij
Implement GitWorkingTreeFormat._matchingbzrdir.
217
    @property
218
    def _matchingbzrdir(self):
0.200.1140 by Jelmer Vernooij
Update now that the control dir formats are no longer in __init__.
219
        from bzrlib.plugins.git.dir import LocalGitControlDirFormat
0.200.1013 by Jelmer Vernooij
More renames.
220
        return LocalGitControlDirFormat()
0.200.656 by Jelmer Vernooij
Implement GitWorkingTreeFormat._matchingbzrdir.
221
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
222
    def get_format_description(self):
223
        return "Git Working Tree"
0.200.616 by Jelmer Vernooij
Provide custom intertree implementation for GitRevisionTree->GitWorkingTree.
224
0.200.1096 by Jelmer Vernooij
Implement GitWorkingTreeFormat.initialize.
225
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
226
                   accelerator_tree=None, hardlink=False):
227
        """See WorkingTreeFormat.initialize()."""
228
        if not isinstance(a_bzrdir, LocalGitDir):
229
            raise errors.IncompatibleFormat(self, a_bzrdir)
230
        index = Index(a_bzrdir.root_transport.local_abspath(".git/index"))
231
        index.write()
232
        return GitWorkingTree(a_bzrdir, a_bzrdir.open_repository(),
233
            a_bzrdir.open_branch(), index)
234
0.200.616 by Jelmer Vernooij
Provide custom intertree implementation for GitRevisionTree->GitWorkingTree.
235
236
class InterIndexGitTree(tree.InterTree):
237
    """InterTree that works between a Git revision tree and an index."""
238
239
    def __init__(self, source, target):
240
        super(InterIndexGitTree, self).__init__(source, target)
241
        self._index = target.index
242
243
    @classmethod
244
    def is_compatible(cls, source, target):
245
        from bzrlib.plugins.git.repository import GitRevisionTree
246
        return (isinstance(source, GitRevisionTree) and 
247
                isinstance(target, GitWorkingTree))
248
249
    def compare(self, want_unchanged=False, specific_files=None,
250
                extra_trees=None, require_versioned=False, include_root=False,
251
                want_unversioned=False):
252
        changes = self._index.changes_from_tree(
253
            self.source._repository._git.object_store, self.source.tree, 
254
            want_unchanged=want_unchanged)
0.200.920 by Jelmer Vernooij
Fix some more tests.
255
        source_fileid_map = self.source.mapping.get_fileid_map(
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
256
            self.source._repository._git.object_store.__getitem__,
257
            self.source.tree)
0.200.922 by Jelmer Vernooij
Fix remaining test.
258
        if self.target.mapping.BZR_FILE_IDS_FILE is not None:
0.200.1030 by Jelmer Vernooij
More work on supporting roundtripping push.
259
            file_id = self.target.path2id(
260
                self.target.mapping.BZR_FILE_IDS_FILE)
261
            if file_id is None:
0.200.922 by Jelmer Vernooij
Fix remaining test.
262
                target_fileid_map = {}
263
            else:
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
264
                target_fileid_map = self.target.mapping.import_fileid_map(Blob.from_string(self.target.get_file_text(file_id)))
0.200.922 by Jelmer Vernooij
Fix remaining test.
265
        else:
266
            target_fileid_map = {}
0.200.971 by Chadrik
Fix 'bzr status' after 'bzr add' in native git working trees.
267
        target_fileid_map = GitFileIdMap(target_fileid_map, self.target.mapping)
0.200.1030 by Jelmer Vernooij
More work on supporting roundtripping push.
268
        ret = tree_delta_from_git_changes(changes, self.target.mapping,
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
269
            (source_fileid_map, target_fileid_map),
0.200.616 by Jelmer Vernooij
Provide custom intertree implementation for GitRevisionTree->GitWorkingTree.
270
            specific_file=specific_files, require_versioned=require_versioned)
271
        if want_unversioned:
272
            for e in self.target.extras():
273
                ret.unversioned.append((e, None, osutils.file_kind(self.target.abspath(e))))
274
        return ret
275
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
276
    def iter_changes(self, include_unchanged=False, specific_files=None,
277
        pb=None, extra_trees=[], require_versioned=True, want_unversioned=False):
278
        changes = self._index.changes_from_tree(
279
            self.source._repository._git.object_store, self.source.tree, 
280
            want_unchanged=include_unchanged)
281
        # FIXME: Handle want_unversioned
282
        return changes_from_git_changes(changes, self.target.mapping, 
283
            specific_file=specific_files)
0.200.616 by Jelmer Vernooij
Provide custom intertree implementation for GitRevisionTree->GitWorkingTree.
284
285
tree.InterTree.register_optimiser(InterIndexGitTree)