/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

Import gettext.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
1
 
# Copyright (C) 2008 Jelmer Vernooij <jelmer@samba.org>
 
1
# Copyright (C) 2008-2011 Jelmer Vernooij <jelmer@samba.org>
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
21
21
from cStringIO import (
22
22
    StringIO,
23
23
    )
 
24
from collections import defaultdict
24
25
import errno
 
26
from dulwich.index import (
 
27
    Index,
 
28
    )
 
29
from dulwich.object_store import (
 
30
    tree_lookup_path,
 
31
    )
25
32
from dulwich.objects import (
26
33
    Blob,
27
 
    )
28
 
from dulwich.protocol import (
29
34
    ZERO_SHA,
30
35
    )
31
36
import os
 
37
import posixpath
32
38
import stat
 
39
import sys
33
40
 
34
41
from bzrlib import (
35
42
    errors,
 
43
    conflicts as _mod_conflicts,
36
44
    ignores,
 
45
    inventory,
37
46
    lockable_files,
38
47
    lockdir,
39
48
    osutils,
 
49
    trace,
40
50
    transport,
41
51
    tree,
42
52
    workingtree,
44
54
from bzrlib.decorators import (
45
55
    needs_read_lock,
46
56
    )
47
 
 
48
 
 
49
 
from bzrlib.plugins.git.inventory import (
50
 
    GitIndexInventory,
 
57
from bzrlib.mutabletree import needs_tree_write_lock
 
58
 
 
59
 
 
60
from bzrlib.plugins.git.dir import (
 
61
    LocalGitDir,
51
62
    )
52
63
from bzrlib.plugins.git.tree import (
53
64
    changes_from_git_changes,
55
66
    )
56
67
from bzrlib.plugins.git.mapping import (
57
68
    GitFileIdMap,
 
69
    mode_kind,
58
70
    )
59
71
 
60
72
IGNORE_FILENAME = ".gitignore"
67
79
        self.basedir = bzrdir.root_transport.local_abspath('.')
68
80
        self.bzrdir = bzrdir
69
81
        self.repository = repo
 
82
        self.store = self.repository._git.object_store
70
83
        self.mapping = self.repository.get_mapping()
71
84
        self._branch = branch
72
85
        self._transport = bzrdir.transport
83
96
            transport.get_transport(self.controldir), 'lock', lockdir.LockDir)
84
97
        self._format = GitWorkingTreeFormat()
85
98
        self.index = index
 
99
        self._versioned_dirs = None
86
100
        self.views = self._make_views()
 
101
        self._rules_searcher = None
87
102
        self._detect_case_handling()
 
103
        self._reset_data()
 
104
        self._fileid_map = self._basis_fileid_map.copy()
 
105
 
 
106
    def _detect_case_handling(self):
 
107
        try:
 
108
            self._transport.stat(".git/cOnFiG")
 
109
        except errors.NoSuchFile:
 
110
            self.case_sensitive = True
 
111
        else:
 
112
            self.case_sensitive = False
 
113
 
 
114
    def merge_modified(self):
 
115
        return {}
 
116
 
 
117
    def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
 
118
        self.set_parent_ids([p for p, t in parents_list])
 
119
 
 
120
    def _index_add_entry(self, path, file_id, kind):
 
121
        assert isinstance(path, basestring)
 
122
        assert type(file_id) == str or file_id is None
 
123
        if kind == "directory":
 
124
            # Git indexes don't contain directories
 
125
            return
 
126
        if kind == "file":
 
127
            blob = Blob()
 
128
            try:
 
129
                file, stat_val = self.get_file_with_stat(file_id, path)
 
130
            except (errors.NoSuchFile, IOError):
 
131
                # TODO: Rather than come up with something here, use the old index
 
132
                file = StringIO()
 
133
                stat_val = os.stat_result(
 
134
                    (stat.S_IFREG | 0644, 0, 0, 0, 0, 0, 0, 0, 0, 0))
 
135
            blob.set_raw_string(file.read())
 
136
        elif kind == "symlink":
 
137
            blob = Blob()
 
138
            try:
 
139
                stat_val = os.lstat(self.abspath(path))
 
140
            except (errors.NoSuchFile, OSError):
 
141
                # TODO: Rather than come up with something here, use the 
 
142
                # old index
 
143
                stat_val = os.stat_result(
 
144
                    (stat.S_IFLNK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
 
145
            blob.set_raw_string(
 
146
                self.get_symlink_target(file_id, path).encode("utf-8"))
 
147
        else:
 
148
            raise AssertionError("unknown kind '%s'" % kind)
 
149
        # Add object to the repository if it didn't exist yet
 
150
        if not blob.id in self.store:
 
151
            self.store.add_object(blob)
 
152
        # Add an entry to the index or update the existing entry
 
153
        flags = 0 # FIXME
 
154
        encoded_path = path.encode("utf-8")
 
155
        self.index[encoded_path] = (stat_val.st_ctime,
 
156
                stat_val.st_mtime, stat_val.st_dev, stat_val.st_ino,
 
157
                stat_val.st_mode, stat_val.st_uid, stat_val.st_gid,
 
158
                stat_val.st_size, blob.id, flags)
 
159
        if self._versioned_dirs is not None:
 
160
            self._ensure_versioned_dir(encoded_path)
 
161
 
 
162
    def _ensure_versioned_dir(self, dirname):
 
163
        if dirname in self._versioned_dirs:
 
164
            return
 
165
        if dirname != "":
 
166
            self._ensure_versioned_dir(posixpath.dirname(dirname))
 
167
        self._versioned_dirs.add(dirname)
 
168
 
 
169
    def _load_dirs(self):
 
170
        self._versioned_dirs = set()
 
171
        for p in self.index:
 
172
            self._ensure_versioned_dir(posixpath.dirname(p))
 
173
 
 
174
    def _unversion_path(self, path):
 
175
        encoded_path = path.encode("utf-8")
 
176
        try:
 
177
            del self.index[encoded_path]
 
178
        except KeyError:
 
179
            # A directory, perhaps?
 
180
            for p in list(self.index):
 
181
                if p.startswith(encoded_path+"/"):
 
182
                    del self.index[p]
 
183
        # FIXME: remove empty directories
 
184
 
 
185
    @needs_tree_write_lock
 
186
    def unversion(self, file_ids):
 
187
        for file_id in file_ids:
 
188
            path = self.id2path(file_id)
 
189
            self._unversion_path(path)
 
190
        self.flush()
 
191
 
 
192
    def check_state(self):
 
193
        """Check that the working state is/isn't valid."""
 
194
        pass
 
195
 
 
196
    @needs_tree_write_lock
 
197
    def remove(self, files, verbose=False, to_file=None, keep_files=True,
 
198
        force=False):
 
199
        """Remove nominated files from the working tree metadata.
 
200
 
 
201
        :param files: File paths relative to the basedir.
 
202
        :param keep_files: If true, the files will also be kept.
 
203
        :param force: Delete files and directories, even if they are changed
 
204
            and even if the directories are not empty.
 
205
        """
 
206
        all_files = set() # specified and nested files 
 
207
 
 
208
        if isinstance(files, basestring):
 
209
            files = [files]
 
210
 
 
211
        if to_file is None:
 
212
            to_file = sys.stdout
 
213
 
 
214
        files = list(all_files)
 
215
 
 
216
        if len(files) == 0:
 
217
            return # nothing to do
 
218
 
 
219
        # Sort needed to first handle directory content before the directory
 
220
        files.sort(reverse=True)
 
221
 
 
222
        def backup(file_to_backup):
 
223
            abs_path = self.abspath(file_to_backup)
 
224
            backup_name = self.bzrdir._available_backup_name(file_to_backup)
 
225
            osutils.rename(abs_path, self.abspath(backup_name))
 
226
            return "removed %s (but kept a copy: %s)" % (
 
227
                file_to_backup, backup_name)
 
228
 
 
229
        for f in files:
 
230
            fid = self.path2id(f)
 
231
            if not fid:
 
232
                message = "%s is not versioned." % (f,)
 
233
            else:
 
234
                abs_path = self.abspath(f)
 
235
                if verbose:
 
236
                    # having removed it, it must be either ignored or unknown
 
237
                    if self.is_ignored(f):
 
238
                        new_status = 'I'
 
239
                    else:
 
240
                        new_status = '?'
 
241
                    # XXX: Really should be a more abstract reporter interface
 
242
                    kind_ch = osutils.kind_marker(self.kind(fid))
 
243
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
 
244
                # Unversion file
 
245
                # FIXME: _unversion_path() is O(size-of-index) for directories
 
246
                self._unversion_path(f)
 
247
                message = "removed %s" % (f,)
 
248
                if osutils.lexists(abs_path):
 
249
                    if (osutils.isdir(abs_path) and
 
250
                        len(os.listdir(abs_path)) > 0):
 
251
                        if force:
 
252
                            osutils.rmtree(abs_path)
 
253
                            message = "deleted %s" % (f,)
 
254
                        else:
 
255
                            message = backup(f)
 
256
                    else:
 
257
                        if not keep_files:
 
258
                            osutils.delete_any(abs_path)
 
259
                            message = "deleted %s" % (f,)
 
260
 
 
261
            # print only one message (if any) per file.
 
262
            if message is not None:
 
263
                trace.note(message)
 
264
        self.flush()
 
265
 
 
266
    def _add(self, files, ids, kinds):
 
267
        for (path, file_id, kind) in zip(files, ids, kinds):
 
268
            if file_id is not None:
 
269
                self._fileid_map.set_file_id(path.encode("utf-8"), file_id)
 
270
            else:
 
271
                file_id = self._fileid_map.lookup_file_id(path.encode("utf-8"))
 
272
            self._index_add_entry(path, file_id, kind)
 
273
 
 
274
    @needs_tree_write_lock
 
275
    def smart_add(self, file_list, recurse=True, action=None, save=True):
 
276
        added = []
 
277
        ignored = {}
 
278
        user_dirs = []
 
279
        for filepath in osutils.canonical_relpaths(self.basedir, file_list):
 
280
            abspath = self.abspath(filepath)
 
281
            kind = osutils.file_kind(abspath)
 
282
            if action is not None:
 
283
                file_id = action(self, None, filepath, kind)
 
284
            else:
 
285
                file_id = None
 
286
            if kind in ("file", "symlink"):
 
287
                if save:
 
288
                    self._index_add_entry(filepath, file_id, kind)
 
289
                added.append(filepath)
 
290
            elif kind == "directory":
 
291
                if recurse:
 
292
                    user_dirs.append(filepath)
 
293
            else:
 
294
                raise errors.BadFileKindError(filename=abspath, kind=kind)
 
295
        for user_dir in user_dirs:
 
296
            abs_user_dir = self.abspath(user_dir)
 
297
            for name in os.listdir(abs_user_dir):
 
298
                subp = os.path.join(user_dir, name)
 
299
                if self.is_control_filename(subp) or self.mapping.is_special_file(subp):
 
300
                    continue
 
301
                ignore_glob = self.is_ignored(subp)
 
302
                if ignore_glob is not None:
 
303
                    ignored.setdefault(ignore_glob, []).append(subp)
 
304
                    continue
 
305
                abspath = self.abspath(subp)
 
306
                kind = osutils.file_kind(abspath)
 
307
                if kind == "directory":
 
308
                    user_dirs.append(subp)
 
309
                else:
 
310
                    if action is not None:
 
311
                        file_id = action()
 
312
                    else:
 
313
                        file_id = None
 
314
                    if save:
 
315
                        self._index_add_entry(subp, file_id, kind)
 
316
        if added and save:
 
317
            self.flush()
 
318
        return added, ignored
 
319
 
 
320
    def _set_root_id(self, file_id):
 
321
        self._fileid_map.set_file_id("", file_id)
 
322
 
 
323
    @needs_tree_write_lock
 
324
    def move(self, from_paths, to_dir=None, after=False):
 
325
        rename_tuples = []
 
326
        to_abs = self.abspath(to_dir)
 
327
        if not os.path.isdir(to_abs):
 
328
            raise errors.BzrMoveFailedError('', to_dir,
 
329
                errors.NotADirectory(to_abs))
 
330
 
 
331
        for from_rel in from_paths:
 
332
            from_tail = os.path.split(from_rel)[-1]
 
333
            to_rel = os.path.join(to_dir, from_tail)
 
334
            self.rename_one(from_rel, to_rel, after=after)
 
335
            rename_tuples.append((from_rel, to_rel))
 
336
        self.flush()
 
337
        return rename_tuples
 
338
 
 
339
    @needs_tree_write_lock
 
340
    def rename_one(self, from_rel, to_rel, after=False):
 
341
        from_path = from_rel.encode("utf-8")
 
342
        to_path = to_rel.encode("utf-8")
 
343
        if not self.has_filename(to_rel):
 
344
            raise errors.BzrMoveFailedError(from_rel, to_rel,
 
345
                errors.NoSuchFile(to_rel))
 
346
        if not from_path in self.index:
 
347
            raise errors.BzrMoveFailedError(from_rel, to_rel,
 
348
                errors.NotVersionedError(path=from_rel))
 
349
        if not after:
 
350
            os.rename(self.abspath(from_rel), self.abspath(to_rel))
 
351
        self.index[to_path] = self.index[from_path]
 
352
        del self.index[from_path]
 
353
        self.flush()
 
354
 
 
355
    def get_root_id(self):
 
356
        return self.path2id("")
 
357
 
 
358
    def _has_dir(self, path):
 
359
        if path == "":
 
360
            return True
 
361
        if self._versioned_dirs is None:
 
362
            self._load_dirs()
 
363
        return path in self._versioned_dirs
 
364
 
 
365
    @needs_read_lock
 
366
    def path2id(self, path):
 
367
        encoded_path = path.encode("utf-8")
 
368
        if self._is_versioned(encoded_path):
 
369
            return self._fileid_map.lookup_file_id(encoded_path)
 
370
        return None
 
371
 
 
372
    def _iter_files_recursive(self, from_dir=None):
 
373
        if from_dir is None:
 
374
            from_dir = ""
 
375
        for (dirpath, dirnames, filenames) in os.walk(self.abspath(from_dir)):
 
376
            dir_relpath = dirpath[len(self.basedir):].strip("/")
 
377
            if self.bzrdir.is_control_filename(dir_relpath):
 
378
                continue
 
379
            for filename in filenames:
 
380
                if not self.mapping.is_special_file(filename):
 
381
                    yield os.path.join(dir_relpath, filename)
88
382
 
89
383
    def extras(self):
90
384
        """Yield all unversioned files in this WorkingTree.
91
385
        """
92
 
        for (dirpath, dirnames, filenames) in os.walk(self.basedir):
93
 
            if self.bzrdir.is_control_filename(dirpath[len(self.basedir):].strip("/")):
94
 
                continue
95
 
            for filename in filenames:
96
 
                relpath = os.path.join(dirpath[len(self.basedir):].strip("/"), filename)
97
 
                if not relpath in self.index:
98
 
                    yield relpath
99
 
 
 
386
        return set(self._iter_files_recursive()) - set(self.index)
100
387
 
101
388
    def unlock(self):
102
389
        # non-implementation specific cleanup
108
395
        finally:
109
396
            self.branch.unlock()
110
397
 
111
 
    def is_control_filename(self, path):
112
 
        return os.path.basename(path) == ".git"
113
 
 
114
 
    def _rewrite_index(self):
115
 
        self.index.clear()
116
 
        for path, entry in self._inventory.iter_entries():
117
 
            if entry.kind == "directory":
118
 
                # Git indexes don't contain directories
119
 
                continue
120
 
            if entry.kind == "file":
121
 
                blob = Blob()
122
 
                try:
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
126
 
                    file = StringIO()
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":
131
 
                blob = Blob()
132
 
                try:
133
 
                    stat_val = os.lstat(self.abspath(path))
134
 
                except (errors.NoSuchFile, OSError):
135
 
                    # TODO: Rather than come up with something here, use the 
136
 
                    # old index
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)
140
 
            else:
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
146
 
            flags = 0 # FIXME
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)
148
 
 
149
398
    def flush(self):
150
399
        # TODO: Maybe this should only write on dirty ?
151
400
        if self._control_files._lock_mode != 'w':
152
401
            raise errors.NotWriteLocked(self)
153
 
        self._rewrite_index()
154
402
        self.index.write()
155
 
        self._inventory_is_modified = False
 
403
 
 
404
    def __iter__(self):
 
405
        for path in self.index:
 
406
            yield self.path2id(path)
 
407
        self._load_dirs()
 
408
        for path in self._versioned_dirs:
 
409
            yield self.path2id(path)
 
410
 
 
411
    def has_or_had_id(self, file_id):
 
412
        if self.has_id(file_id):
 
413
            return True
 
414
        if self.had_id(file_id):
 
415
            return True
 
416
        return False
 
417
 
 
418
    def had_id(self, file_id):
 
419
        path = self._basis_fileid_map.lookup_file_id(file_id)
 
420
        try:
 
421
            head = self.repository._git.head()
 
422
        except KeyError:
 
423
            # Assume no if basis is not accessible
 
424
            return False
 
425
        if head == ZERO_SHA:
 
426
            return False
 
427
        root_tree = self.store[head].tree
 
428
        try:
 
429
            tree_lookup_path(self.store.__getitem__, root_tree, path)
 
430
        except KeyError:
 
431
            return False
 
432
        else:
 
433
            return True
 
434
 
 
435
    def has_id(self, file_id):
 
436
        try:
 
437
            self.id2path(file_id)
 
438
        except errors.NoSuchId:
 
439
            return False
 
440
        else:
 
441
            return True
 
442
 
 
443
    def id2path(self, file_id):
 
444
        if type(file_id) != str:
 
445
            raise AssertionError
 
446
        path = self._fileid_map.lookup_path(file_id)
 
447
        # FIXME: What about directories?
 
448
        if self._is_versioned(path):
 
449
            return path.decode("utf-8")
 
450
        raise errors.NoSuchId(self, file_id)
 
451
 
 
452
    def get_file_mtime(self, file_id, path=None):
 
453
        """See Tree.get_file_mtime."""
 
454
        if not path:
 
455
            path = self.id2path(file_id)
 
456
        return os.lstat(self.abspath(path)).st_mtime
156
457
 
157
458
    def get_ignore_list(self):
158
459
        ignoreset = getattr(self, '_ignoreset', None)
165
466
        if self.has_filename(IGNORE_FILENAME):
166
467
            f = self.get_file_byname(IGNORE_FILENAME)
167
468
            try:
 
469
                # FIXME: Parse git file format, rather than assuming it's
 
470
                # the same as for bzr's native formats.
168
471
                ignore_globs.update(ignores.parse_ignore_file(f))
169
472
            finally:
170
473
                f.close()
175
478
        self._change_last_revision(revid)
176
479
 
177
480
    def _reset_data(self):
178
 
        self._inventory_is_modified = False
179
481
        try:
180
482
            head = self.repository._git.head()
181
483
        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
 
484
            raise errors.NotBranchError("branch %s at %s" % (name,
 
485
                self.repository.base))
185
486
        if head == ZERO_SHA:
186
 
            fileid_map = GitFileIdMap({}, self.mapping)
187
 
            basis_inv = None
 
487
            self._basis_fileid_map = GitFileIdMap({}, self.mapping)
188
488
        else:
189
 
            fileid_map = self.mapping.get_fileid_map(store.__getitem__,
190
 
                store[head].tree)
191
 
        result = GitIndexInventory(basis_inv, fileid_map, self.index, store)
192
 
        self._set_inventory(result, dirty=False)
 
489
            self._basis_fileid_map = self.mapping.get_fileid_map(
 
490
                self.store.__getitem__, self.store[head].tree)
 
491
 
 
492
    @needs_read_lock
 
493
    def get_file_verifier(self, file_id, path=None, stat_value=None):
 
494
        if path is None:
 
495
            path = self.id2path(file_id)
 
496
        return ("GIT", self.index[path][-2])
193
497
 
194
498
    @needs_read_lock
195
499
    def get_file_sha1(self, file_id, path=None, stat_value=None):
196
500
        if not path:
197
 
            path = self._inventory.id2path(file_id)
 
501
            path = self.id2path(file_id)
 
502
        abspath = self.abspath(path).encode(osutils._fs_enc)
198
503
        try:
199
 
            return osutils.sha_file_by_name(self.abspath(path).encode(osutils._fs_enc))
 
504
            return osutils.sha_file_by_name(abspath)
200
505
        except OSError, (num, msg):
201
506
            if num in (errno.EISDIR, errno.ENOENT):
202
507
                return None
205
510
    def revision_tree(self, revid):
206
511
        return self.repository.revision_tree(revid)
207
512
 
 
513
    def _is_versioned(self, path):
 
514
        return (path in self.index or self._has_dir(path))
 
515
 
 
516
    def filter_unversioned_files(self, files):
 
517
        return set([p for p in files if not self._is_versioned(p.encode("utf-8"))])
 
518
 
 
519
    def _get_dir_ie(self, path, parent_id):
 
520
        file_id = self.path2id(path)
 
521
        return inventory.InventoryDirectory(file_id,
 
522
            posixpath.basename(path).strip("/"), parent_id)
 
523
 
 
524
    def _add_missing_parent_ids(self, path, dir_ids):
 
525
        if path in dir_ids:
 
526
            return []
 
527
        parent = posixpath.dirname(path).strip("/")
 
528
        ret = self._add_missing_parent_ids(parent, dir_ids)
 
529
        parent_id = dir_ids[parent]
 
530
        ie = self._get_dir_ie(path, parent_id)
 
531
        dir_ids[path] = ie.file_id
 
532
        ret.append((path, ie))
 
533
        return ret
 
534
 
 
535
    def _get_file_ie(self, name, path, value, parent_id):
 
536
        assert isinstance(name, unicode)
 
537
        assert isinstance(path, unicode)
 
538
        assert isinstance(value, tuple) and len(value) == 10
 
539
        (ctime, mtime, dev, ino, mode, uid, gid, size, sha, flags) = value
 
540
        file_id = self.path2id(path)
 
541
        if type(file_id) != str:
 
542
            raise AssertionError
 
543
        kind = mode_kind(mode)
 
544
        ie = inventory.entry_factory[kind](file_id, name, parent_id)
 
545
        if kind == 'symlink':
 
546
            ie.symlink_target = self.get_symlink_target(file_id)
 
547
        else:
 
548
            data = self.get_file_text(file_id, path)
 
549
            ie.text_sha1 = osutils.sha_string(data)
 
550
            ie.text_size = len(data)
 
551
            ie.executable = self.is_executable(file_id, path)
 
552
        ie.revision = None
 
553
        return ie
 
554
 
 
555
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
 
556
        mode = stat_result.st_mode
 
557
        return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
 
558
 
 
559
    def stored_kind(self, file_id, path=None):
 
560
        if path is None:
 
561
            path = self.id2path(file_id)
 
562
        try:
 
563
            return mode_kind(self.index[path.encode("utf-8")][4])
 
564
        except KeyError:
 
565
            # Maybe it's a directory?
 
566
            if self._has_dir(path):
 
567
                return "directory"
 
568
            raise errors.NoSuchId(self, file_id)
 
569
 
 
570
    if not osutils.supports_executable():
 
571
        def is_executable(self, file_id, path=None):
 
572
            basis_tree = self.basis_tree()
 
573
            if file_id in basis_tree:
 
574
                return basis_tree.is_executable(file_id)
 
575
            # Default to not executable
 
576
            return False
 
577
    else:
 
578
        def is_executable(self, file_id, path=None):
 
579
            if not path:
 
580
                path = self.id2path(file_id)
 
581
            mode = os.lstat(self.abspath(path)).st_mode
 
582
            return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
 
583
 
 
584
        _is_executable_from_path_and_stat = \
 
585
            _is_executable_from_path_and_stat_from_stat
 
586
 
 
587
    def list_files(self, include_root=False, from_dir=None, recursive=True):
 
588
        # FIXME: Yield non-versioned files
 
589
        if from_dir is None:
 
590
            from_dir = ""
 
591
        dir_ids = {}
 
592
        fk_entries = {'directory': workingtree.TreeDirectory,
 
593
                      'file': workingtree.TreeFile,
 
594
                      'symlink': workingtree.TreeLink}
 
595
        root_ie = self._get_dir_ie(u"", None)
 
596
        if include_root and not from_dir:
 
597
            yield "", "V", root_ie.kind, root_ie.file_id, root_ie
 
598
        dir_ids[u""] = root_ie.file_id
 
599
        if recursive:
 
600
            path_iterator = self._iter_files_recursive(from_dir)
 
601
        else:
 
602
            if from_dir is None:
 
603
                start = self.basedir
 
604
            else:
 
605
                start = os.path.join(self.basedir, from_dir)
 
606
            path_iterator = sorted([os.path.join(from_dir, name) for name in
 
607
                os.listdir(start) if not self.bzrdir.is_control_filename(name)
 
608
                and not self.mapping.is_special_file(name)])
 
609
        for path in path_iterator:
 
610
            try:
 
611
                value = self.index[path]
 
612
            except KeyError:
 
613
                value = None
 
614
            path = path.decode("utf-8")
 
615
            parent, name = posixpath.split(path)
 
616
            for dir_path, dir_ie in self._add_missing_parent_ids(parent, dir_ids):
 
617
                yield dir_path, "V", dir_ie.kind, dir_ie.file_id, dir_ie
 
618
            if value is not None:
 
619
                ie = self._get_file_ie(name, path, value, dir_ids[parent])
 
620
                yield path, "V", ie.kind, ie.file_id, ie
 
621
            else:
 
622
                kind = osutils.file_kind(self.abspath(path))
 
623
                ie = fk_entries[kind]()
 
624
                yield path, "?", kind, None, ie
 
625
 
 
626
    def all_file_ids(self):
 
627
        ids = {u"": self.path2id("")}
 
628
        for path in self.index:
 
629
            if self.mapping.is_special_file(path):
 
630
                continue
 
631
            path = path.decode("utf-8")
 
632
            parent = posixpath.dirname(path).strip("/")
 
633
            for e in self._add_missing_parent_ids(parent, ids):
 
634
                pass
 
635
            ids[path] = self.path2id(path)
 
636
        return set(ids.values())
 
637
 
 
638
    def _directory_is_tree_reference(self, path):
 
639
        # FIXME: Check .gitsubmodules for path
 
640
        return False
 
641
 
 
642
    def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
 
643
        # FIXME: Is return order correct?
 
644
        if yield_parents:
 
645
            raise NotImplementedError(self.iter_entries_by_dir)
 
646
        if specific_file_ids is not None:
 
647
            specific_paths = [self.id2path(file_id) for file_id in specific_file_ids]
 
648
            if specific_paths in ([u""], []):
 
649
                specific_paths = None
 
650
            else:
 
651
                specific_paths = set(specific_paths)
 
652
        else:
 
653
            specific_paths = None
 
654
        root_ie = self._get_dir_ie(u"", None)
 
655
        if specific_paths is None:
 
656
            yield u"", root_ie
 
657
        dir_ids = {u"": root_ie.file_id}
 
658
        for path, value in self.index.iteritems():
 
659
            if self.mapping.is_special_file(path):
 
660
                continue
 
661
            path = path.decode("utf-8")
 
662
            if specific_paths is not None and not path in specific_paths:
 
663
                continue
 
664
            (parent, name) = posixpath.split(path)
 
665
            try:
 
666
                file_ie = self._get_file_ie(name, path, value, None)
 
667
            except IOError:
 
668
                continue
 
669
            for (dir_path, dir_ie) in self._add_missing_parent_ids(parent,
 
670
                    dir_ids):
 
671
                yield dir_path, dir_ie
 
672
            file_ie.parent_id = self.path2id(parent)
 
673
            yield path, file_ie
 
674
 
208
675
    @needs_read_lock
209
676
    def conflicts(self):
210
677
        # FIXME:
211
 
        return []
 
678
        return _mod_conflicts.ConflictList()
 
679
 
 
680
    def update_basis_by_delta(self, new_revid, delta):
 
681
        # The index just contains content, which won't have changed.
 
682
        self._reset_data()
 
683
 
 
684
    def get_canonical_inventory_path(self, path):
 
685
        for p in self.index:
 
686
            if p.lower() == path.lower():
 
687
                return p
 
688
        else:
 
689
            return path
 
690
 
 
691
    def _walkdirs(self, prefix=""):
 
692
        if prefix != "":
 
693
            prefix += "/"
 
694
        per_dir = defaultdict(list)
 
695
        for path, value in self.index.iteritems():
 
696
            if self.mapping.is_special_file(path):
 
697
                continue
 
698
            if not path.startswith(prefix):
 
699
                continue
 
700
            (dirname, child_name) = posixpath.split(path)
 
701
            dirname = dirname.decode("utf-8")
 
702
            dir_file_id = self.path2id(dirname)
 
703
            assert isinstance(value, tuple) and len(value) == 10
 
704
            (ctime, mtime, dev, ino, mode, uid, gid, size, sha, flags) = value
 
705
            stat_result = os.stat_result((mode, ino,
 
706
                    dev, 1, uid, gid, size,
 
707
                    0, mtime, ctime))
 
708
            per_dir[(dirname, dir_file_id)].append(
 
709
                (path.decode("utf-8"), child_name.decode("utf-8"),
 
710
                mode_kind(mode), stat_result,
 
711
                self.path2id(path.decode("utf-8")),
 
712
                mode_kind(mode)))
 
713
        return per_dir.iteritems()
212
714
 
213
715
 
214
716
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):
215
717
 
 
718
    _tree_class = GitWorkingTree
 
719
 
 
720
    supports_versioned_directories = False
 
721
 
216
722
    @property
217
723
    def _matchingbzrdir(self):
218
 
        from bzrlib.plugins.git import LocalGitControlDirFormat
 
724
        from bzrlib.plugins.git.dir import LocalGitControlDirFormat
219
725
        return LocalGitControlDirFormat()
220
726
 
221
727
    def get_format_description(self):
222
728
        return "Git Working Tree"
223
729
 
 
730
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
 
731
                   accelerator_tree=None, hardlink=False):
 
732
        """See WorkingTreeFormat.initialize()."""
 
733
        if not isinstance(a_bzrdir, LocalGitDir):
 
734
            raise errors.IncompatibleFormat(self, a_bzrdir)
 
735
        index = Index(a_bzrdir.root_transport.local_abspath(".git/index"))
 
736
        index.write()
 
737
        return GitWorkingTree(a_bzrdir, a_bzrdir.open_repository(),
 
738
            a_bzrdir.open_branch(), index)
 
739
 
224
740
 
225
741
class InterIndexGitTree(tree.InterTree):
226
742
    """InterTree that works between a Git revision tree and an index."""
239
755
                extra_trees=None, require_versioned=False, include_root=False,
240
756
                want_unversioned=False):
241
757
        changes = self._index.changes_from_tree(
242
 
            self.source._repository._git.object_store, self.source.tree, 
 
758
            self.source.store, self.source.tree, 
243
759
            want_unchanged=want_unchanged)
244
 
        source_fileid_map = self.source.mapping.get_fileid_map(
245
 
            self.source._repository._git.object_store.__getitem__,
246
 
            self.source.tree)
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)
250
 
            if file_id is None:
251
 
                target_fileid_map = {}
252
 
            else:
253
 
                target_fileid_map = self.target.mapping.import_fileid_map(Blob.from_string(self.target.get_file_text(file_id)))
254
 
        else:
255
 
            target_fileid_map = {}
256
 
        target_fileid_map = GitFileIdMap(target_fileid_map, self.target.mapping)
 
760
        source_fileid_map = self.source._fileid_map
 
761
        target_fileid_map = self.target._fileid_map
257
762
        ret = tree_delta_from_git_changes(changes, self.target.mapping,
258
763
            (source_fileid_map, target_fileid_map),
259
764
            specific_file=specific_files, require_versioned=require_versioned)
260
765
        if want_unversioned:
261
766
            for e in self.target.extras():
262
 
                ret.unversioned.append((e, None, osutils.file_kind(self.target.abspath(e))))
 
767
                ret.unversioned.append((e, None,
 
768
                    osutils.file_kind(self.target.abspath(e))))
263
769
        return ret
264
770
 
265
771
    def iter_changes(self, include_unchanged=False, specific_files=None,
266
 
        pb=None, extra_trees=[], require_versioned=True, want_unversioned=False):
 
772
        pb=None, extra_trees=[], require_versioned=True,
 
773
        want_unversioned=False):
267
774
        changes = self._index.changes_from_tree(
268
 
            self.source._repository._git.object_store, self.source.tree, 
 
775
            self.source.store, self.source.tree,
269
776
            want_unchanged=include_unchanged)
270
777
        # FIXME: Handle want_unversioned
271
 
        return changes_from_git_changes(changes, self.target.mapping, 
 
778
        return changes_from_git_changes(changes, self.target.mapping,
272
779
            specific_file=specific_files)
273
780
 
 
781
 
274
782
tree.InterTree.register_optimiser(InterIndexGitTree)