/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.383 by Jelmer Vernooij
Simplify, support rewriting index based on inventory.
25
from dulwich.objects import (
26
    Blob,
27
    )
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
28
import os
0.200.384 by Jelmer Vernooij
Fix reading of inventory from index.
29
import stat
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
30
31
from bzrlib import (
0.200.382 by Jelmer Vernooij
Support flushing index.
32
    errors,
0.200.409 by Jelmer Vernooij
Support parsing .gitignore.
33
    ignores,
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
34
    lockable_files,
35
    lockdir,
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
36
    osutils,
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
37
    transport,
0.200.519 by Jelmer Vernooij
Move imports down, might not be available in older bzr-git versions.
38
    tree,
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
39
    urlutils,
40
    workingtree,
41
    )
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
42
from bzrlib.decorators import (
43
    needs_read_lock,
44
    )
45
46
0.200.401 by Jelmer Vernooij
Move working tree inventory code to inventory.
47
from bzrlib.plugins.git.inventory import (
48
    GitIndexInventory,
49
    )
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
50
from bzrlib.plugins.git.tree import (
51
    tree_delta_from_git_changes,
52
    )
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
53
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
54
0.200.409 by Jelmer Vernooij
Support parsing .gitignore.
55
IGNORE_FILENAME = ".gitignore"
56
57
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
58
class GitWorkingTree(workingtree.WorkingTree):
59
    """A Git working tree."""
60
61
    def __init__(self, bzrdir, repo, branch):
0.200.379 by Jelmer Vernooij
Re-enable working tree support.
62
        self.basedir = bzrdir.root_transport.local_abspath('.')
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
63
        self.bzrdir = bzrdir
64
        self.repository = repo
0.200.384 by Jelmer Vernooij
Fix reading of inventory from index.
65
        self.mapping = self.repository.get_mapping()
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
66
        self._branch = branch
67
        self._transport = bzrdir.transport
68
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
69
        self.controldir = urlutils.join(self.repository._git._controldir, 'bzr')
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
70
71
        try:
72
            os.makedirs(self.controldir)
73
            os.makedirs(os.path.join(self.controldir, 'lock'))
74
        except OSError:
75
            pass
76
77
        self._control_files = lockable_files.LockableFiles(
78
            transport.get_transport(self.controldir), 'lock', lockdir.LockDir)
79
        self._format = GitWorkingTreeFormat()
0.200.414 by Jelmer Vernooij
Use new convenience function in dulwich to open index.
80
        self.index = self.repository._git.open_index()
0.200.239 by Jelmer Vernooij
Provide views.
81
        self.views = self._make_views()
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
82
        self._detect_case_handling()
0.200.173 by Jelmer Vernooij
Merge changes, open index.
83
0.200.605 by Jelmer Vernooij
Ignore directories in WorkingTree.extras().
84
    def extras(self):
85
        """Yield all unversioned files in this WorkingTree.
86
        """
0.200.615 by Jelmer Vernooij
Optimize WorkingTree.extras().
87
        for (dirpath, dirnames, filenames) in os.walk(self.basedir):
88
            if self.bzrdir.is_control_filename(dirpath[len(self.basedir):].strip("/")):
0.200.605 by Jelmer Vernooij
Ignore directories in WorkingTree.extras().
89
                continue
0.200.615 by Jelmer Vernooij
Optimize WorkingTree.extras().
90
            for filename in filenames:
91
                relpath = os.path.join(dirpath[len(self.basedir):].strip("/"), filename)
92
                if not relpath in self.index:
0.200.605 by Jelmer Vernooij
Ignore directories in WorkingTree.extras().
93
                    yield relpath
94
95
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
96
    def unlock(self):
0.200.224 by Jelmer Vernooij
Fix working tree locking.
97
        # non-implementation specific cleanup
98
        self._cleanup()
99
100
        # reverse order of locking.
101
        try:
102
            return self._control_files.unlock()
103
        finally:
104
            self.branch.unlock()
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
105
106
    def is_control_filename(self, path):
107
        return os.path.basename(path) == ".git"
108
0.200.383 by Jelmer Vernooij
Simplify, support rewriting index based on inventory.
109
    def _rewrite_index(self):
110
        self.index.clear()
111
        for path, entry in self._inventory.iter_entries():
112
            if entry.kind == "directory":
113
                # Git indexes don't contain directories
114
                continue
115
            if entry.kind == "file":
116
                blob = Blob()
0.200.385 by Jelmer Vernooij
Cope with removed files.
117
                try:
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
121
                    file = StringIO()
0.239.4 by Jelmer Vernooij
Cope with nonexistent files and directories in get_file_sha1.
122
                    from posix import stat_result
123
                    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.
124
                blob.set_raw_string(file.read())
0.200.383 by Jelmer Vernooij
Simplify, support rewriting index based on inventory.
125
            elif entry.kind == "symlink":
126
                blob = Blob()
0.200.502 by Jelmer Vernooij
Fill in sha1s in inventory.
127
                try:
128
                    stat_val = os.lstat(self.abspath(path))
129
                except (errors.NoSuchFile, OSError):
130
                    # TODO: Rather than come up with something here, use the 
131
                    # old index
0.239.4 by Jelmer Vernooij
Cope with nonexistent files and directories in get_file_sha1.
132
                    from posix import stat_result
133
                    stat_val = stat_result((stat.S_IFLNK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
0.200.502 by Jelmer Vernooij
Fill in sha1s in inventory.
134
                blob.set_raw_string(entry.symlink_target)
0.200.383 by Jelmer Vernooij
Simplify, support rewriting index based on inventory.
135
            # Add object to the repository if it didn't exist yet
136
            if not blob.id in self.repository._git.object_store:
137
                self.repository._git.object_store.add_object(blob)
138
            # Add an entry to the index or update the existing entry
0.200.522 by Jelmer Vernooij
Simplify index handling a bit more.
139
            flags = 0 # FIXME
140
            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.
141
0.200.382 by Jelmer Vernooij
Support flushing index.
142
    def flush(self):
143
        # TODO: Maybe this should only write on dirty ?
144
        if self._control_files._lock_mode != 'w':
145
            raise errors.NotWriteLocked(self)
0.200.383 by Jelmer Vernooij
Simplify, support rewriting index based on inventory.
146
        self._rewrite_index()           
0.200.385 by Jelmer Vernooij
Cope with removed files.
147
        self.index.write()
0.200.382 by Jelmer Vernooij
Support flushing index.
148
        self._inventory_is_modified = False
149
0.200.409 by Jelmer Vernooij
Support parsing .gitignore.
150
    def get_ignore_list(self):
151
        ignoreset = getattr(self, '_ignoreset', None)
152
        if ignoreset is not None:
153
            return ignoreset
154
155
        ignore_globs = set()
156
        ignore_globs.update(ignores.get_runtime_ignores())
157
        ignore_globs.update(ignores.get_user_ignores())
158
        if self.has_filename(IGNORE_FILENAME):
159
            f = self.get_file_byname(IGNORE_FILENAME)
160
            try:
161
                ignore_globs.update(ignores.parse_ignore_file(f))
162
            finally:
163
                f.close()
164
        self._ignoreset = ignore_globs
165
        return ignore_globs
166
0.200.508 by Jelmer Vernooij
Skip inventory caching bits.
167
    def set_last_revision(self, revid):
168
        self._change_last_revision(revid)
169
0.200.379 by Jelmer Vernooij
Re-enable working tree support.
170
    def _reset_data(self):
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
171
        self._inventory_is_modified = False
0.200.384 by Jelmer Vernooij
Fix reading of inventory from index.
172
        basis_inv = self.repository.get_inventory(self.mapping.revision_id_foreign_to_bzr(self.repository._git.head()))
0.200.502 by Jelmer Vernooij
Fill in sha1s in inventory.
173
        result = GitIndexInventory(basis_inv, self.mapping, self.index,
174
            self.repository._git.object_store)
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
175
        self._set_inventory(result, dirty=False)
0.200.379 by Jelmer Vernooij
Re-enable working tree support.
176
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
177
    @needs_read_lock
178
    def get_file_sha1(self, file_id, path=None, stat_value=None):
179
        if not path:
180
            path = self._inventory.id2path(file_id)
0.239.4 by Jelmer Vernooij
Cope with nonexistent files and directories in get_file_sha1.
181
        try:
182
            return osutils.sha_file_by_name(self.abspath(path).encode(osutils._fs_enc))
183
        except OSError, (num, msg):
184
            if num in (errno.EISDIR, errno.ENOENT):
185
                return None
186
            raise
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
187
0.200.610 by Jelmer Vernooij
Support retrieving basis tree properly.
188
    def revision_tree(self, revid):
189
        return self.repository.revision_tree(revid)
190
0.200.619 by Jelmer Vernooij
Provide dummy WorkingTree.conflicts() implementation rather than spending a lot of time not finding any conflicts.
191
    @needs_read_lock
192
    def conflicts(self):
193
        # FIXME:
194
        return []
195
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
196
197
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):
198
199
    def get_format_description(self):
200
        return "Git Working Tree"
0.200.616 by Jelmer Vernooij
Provide custom intertree implementation for GitRevisionTree->GitWorkingTree.
201
202
203
class InterIndexGitTree(tree.InterTree):
204
    """InterTree that works between a Git revision tree and an index."""
205
206
    def __init__(self, source, target):
207
        super(InterIndexGitTree, self).__init__(source, target)
208
        self._index = target.index
209
210
    @classmethod
211
    def is_compatible(cls, source, target):
212
        from bzrlib.plugins.git.repository import GitRevisionTree
213
        return (isinstance(source, GitRevisionTree) and 
214
                isinstance(target, GitWorkingTree))
215
216
    def compare(self, want_unchanged=False, specific_files=None,
217
                extra_trees=None, require_versioned=False, include_root=False,
218
                want_unversioned=False):
219
        changes = self._index.changes_from_tree(
220
            self.source._repository._git.object_store, self.source.tree, 
221
            want_unchanged=want_unchanged)
222
        ret = tree_delta_from_git_changes(changes, self.target.mapping, 
223
            specific_file=specific_files, require_versioned=require_versioned)
224
        if want_unversioned:
225
            for e in self.target.extras():
226
                ret.unversioned.append((e, None, osutils.file_kind(self.target.abspath(e))))
227
        return ret
228
229
230
tree.InterTree.register_optimiser(InterIndexGitTree)