/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to workingtree.py

Provide right infrastructure for foreign repository tests from bzrlib.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
 
17
 
17
18
"""An adapter between a Git index and a Bazaar Working Tree"""
18
19
 
 
20
 
 
21
from cStringIO import (
 
22
    StringIO,
 
23
    )
 
24
import errno
 
25
from dulwich.objects import (
 
26
    Blob,
 
27
    )
19
28
import os
 
29
import stat
20
30
 
21
31
from bzrlib import (
22
 
    inventory,
 
32
    errors,
 
33
    ignores,
23
34
    lockable_files,
24
35
    lockdir,
 
36
    osutils,
25
37
    transport,
 
38
    tree,
26
39
    urlutils,
27
40
    workingtree,
28
41
    )
 
42
from bzrlib.decorators import (
 
43
    needs_read_lock,
 
44
    )
 
45
 
 
46
 
 
47
from bzrlib.plugins.git.inventory import (
 
48
    GitIndexInventory,
 
49
    )
 
50
from bzrlib.plugins.git.tree import (
 
51
    changes_from_git_changes,
 
52
    tree_delta_from_git_changes,
 
53
    )
 
54
 
 
55
 
 
56
IGNORE_FILENAME = ".gitignore"
 
57
 
29
58
 
30
59
class GitWorkingTree(workingtree.WorkingTree):
31
60
    """A Git working tree."""
32
61
 
33
62
    def __init__(self, bzrdir, repo, branch):
34
 
        self.basedir = bzrdir.transport.base
 
63
        self.basedir = bzrdir.root_transport.local_abspath('.')
35
64
        self.bzrdir = bzrdir
36
65
        self.repository = repo
 
66
        self.mapping = self.repository.get_mapping()
37
67
        self._branch = branch
38
68
        self._transport = bzrdir.transport
39
69
 
40
 
        self.controldir = urlutils.join(self.repository._git.path, 'bzr')
 
70
        self.controldir = urlutils.join(self.repository._git._controldir, 'bzr')
41
71
 
42
72
        try:
43
73
            os.makedirs(self.controldir)
47
77
 
48
78
        self._control_files = lockable_files.LockableFiles(
49
79
            transport.get_transport(self.controldir), 'lock', lockdir.LockDir)
50
 
 
51
80
        self._format = GitWorkingTreeFormat()
52
 
 
53
 
    def lock_read(self):
54
 
        pass
 
81
        self.index = self.repository._git.open_index()
 
82
        self.views = self._make_views()
 
83
        self._detect_case_handling()
 
84
 
 
85
    def extras(self):
 
86
        """Yield all unversioned files in this WorkingTree.
 
87
        """
 
88
        for (dirpath, dirnames, filenames) in os.walk(self.basedir):
 
89
            if self.bzrdir.is_control_filename(dirpath[len(self.basedir):].strip("/")):
 
90
                continue
 
91
            for filename in filenames:
 
92
                relpath = os.path.join(dirpath[len(self.basedir):].strip("/"), filename)
 
93
                if not relpath in self.index:
 
94
                    yield relpath
 
95
 
55
96
 
56
97
    def unlock(self):
57
 
        pass
 
98
        # non-implementation specific cleanup
 
99
        self._cleanup()
 
100
 
 
101
        # reverse order of locking.
 
102
        try:
 
103
            return self._control_files.unlock()
 
104
        finally:
 
105
            self.branch.unlock()
58
106
 
59
107
    def is_control_filename(self, path):
60
108
        return os.path.basename(path) == ".git"
61
109
 
62
 
    def _get_inventory(self):
63
 
        return inventory.Inventory()
64
 
 
65
 
    inventory = property(_get_inventory,
66
 
                         doc="Inventory of this Tree")
 
110
    def _rewrite_index(self):
 
111
        self.index.clear()
 
112
        for path, entry in self._inventory.iter_entries():
 
113
            if entry.kind == "directory":
 
114
                # Git indexes don't contain directories
 
115
                continue
 
116
            if entry.kind == "file":
 
117
                blob = Blob()
 
118
                try:
 
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
 
122
                    file = StringIO()
 
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":
 
127
                blob = Blob()
 
128
                try:
 
129
                    stat_val = os.lstat(self.abspath(path))
 
130
                except (errors.NoSuchFile, OSError):
 
131
                    # TODO: Rather than come up with something here, use the 
 
132
                    # old index
 
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)
 
136
            # Add object to the repository if it didn't exist yet
 
137
            if not blob.id in self.repository._git.object_store:
 
138
                self.repository._git.object_store.add_object(blob)
 
139
            # Add an entry to the index or update the existing entry
 
140
            flags = 0 # FIXME
 
141
            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)
 
142
 
 
143
    def flush(self):
 
144
        # TODO: Maybe this should only write on dirty ?
 
145
        if self._control_files._lock_mode != 'w':
 
146
            raise errors.NotWriteLocked(self)
 
147
        self._rewrite_index()           
 
148
        self.index.write()
 
149
        self._inventory_is_modified = False
 
150
 
 
151
    def get_ignore_list(self):
 
152
        ignoreset = getattr(self, '_ignoreset', None)
 
153
        if ignoreset is not None:
 
154
            return ignoreset
 
155
 
 
156
        ignore_globs = set()
 
157
        ignore_globs.update(ignores.get_runtime_ignores())
 
158
        ignore_globs.update(ignores.get_user_ignores())
 
159
        if self.has_filename(IGNORE_FILENAME):
 
160
            f = self.get_file_byname(IGNORE_FILENAME)
 
161
            try:
 
162
                ignore_globs.update(ignores.parse_ignore_file(f))
 
163
            finally:
 
164
                f.close()
 
165
        self._ignoreset = ignore_globs
 
166
        return ignore_globs
 
167
 
 
168
    def set_last_revision(self, revid):
 
169
        self._change_last_revision(revid)
 
170
 
 
171
    def _reset_data(self):
 
172
        self._inventory_is_modified = False
 
173
        basis_inv = self.repository.get_inventory(self.mapping.revision_id_foreign_to_bzr(self.repository._git.head()))
 
174
        result = GitIndexInventory(basis_inv, self.mapping, self.index,
 
175
            self.repository._git.object_store)
 
176
        self._set_inventory(result, dirty=False)
 
177
 
 
178
    @needs_read_lock
 
179
    def get_file_sha1(self, file_id, path=None, stat_value=None):
 
180
        if not path:
 
181
            path = self._inventory.id2path(file_id)
 
182
        try:
 
183
            return osutils.sha_file_by_name(self.abspath(path).encode(osutils._fs_enc))
 
184
        except OSError, (num, msg):
 
185
            if num in (errno.EISDIR, errno.ENOENT):
 
186
                return None
 
187
            raise
 
188
 
 
189
    def revision_tree(self, revid):
 
190
        return self.repository.revision_tree(revid)
 
191
 
 
192
    @needs_read_lock
 
193
    def conflicts(self):
 
194
        # FIXME:
 
195
        return []
67
196
 
68
197
 
69
198
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):
70
199
 
 
200
    @property
 
201
    def _matchingbzrdir(self):
 
202
        from bzrlib.plugins.git import LocalGitBzrDirFormat
 
203
        return LocalGitBzrDirFormat()
 
204
 
71
205
    def get_format_description(self):
72
206
        return "Git Working Tree"
 
207
 
 
208
 
 
209
class InterIndexGitTree(tree.InterTree):
 
210
    """InterTree that works between a Git revision tree and an index."""
 
211
 
 
212
    def __init__(self, source, target):
 
213
        super(InterIndexGitTree, self).__init__(source, target)
 
214
        self._index = target.index
 
215
 
 
216
    @classmethod
 
217
    def is_compatible(cls, source, target):
 
218
        from bzrlib.plugins.git.repository import GitRevisionTree
 
219
        return (isinstance(source, GitRevisionTree) and 
 
220
                isinstance(target, GitWorkingTree))
 
221
 
 
222
    def compare(self, want_unchanged=False, specific_files=None,
 
223
                extra_trees=None, require_versioned=False, include_root=False,
 
224
                want_unversioned=False):
 
225
        changes = self._index.changes_from_tree(
 
226
            self.source._repository._git.object_store, self.source.tree, 
 
227
            want_unchanged=want_unchanged)
 
228
        ret = tree_delta_from_git_changes(changes, self.target.mapping, 
 
229
            specific_file=specific_files, require_versioned=require_versioned)
 
230
        if want_unversioned:
 
231
            for e in self.target.extras():
 
232
                ret.unversioned.append((e, None, osutils.file_kind(self.target.abspath(e))))
 
233
        return ret
 
234
 
 
235
    def iter_changes(self, include_unchanged=False, specific_files=None,
 
236
        pb=None, extra_trees=[], require_versioned=True, want_unversioned=False):
 
237
        changes = self._index.changes_from_tree(
 
238
            self.source._repository._git.object_store, self.source.tree, 
 
239
            want_unchanged=include_unchanged)
 
240
        # FIXME: Handle want_unversioned
 
241
        return changes_from_git_changes(changes, self.target.mapping, 
 
242
            specific_file=specific_files)
 
243
 
 
244
tree.InterTree.register_optimiser(InterIndexGitTree)