/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 breezy/git/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-03 23:48:08 UTC
  • mfrom: (7316 work)
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190603234808-15yk5c7054tj8e2b
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/workingtree.py
 
1
# Copyright (C) 2008-2018 Jelmer Vernooij <jelmer@jelmer.uk>
 
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
 
 
18
"""An adapter between a Git index and a Bazaar Working Tree"""
 
19
 
 
20
from __future__ import absolute_import
 
21
 
 
22
import itertools
 
23
from collections import defaultdict
 
24
import errno
 
25
from dulwich.ignore import (
 
26
    IgnoreFilterManager,
 
27
    )
 
28
from dulwich.file import GitFile, FileLocked
 
29
from dulwich.index import (
 
30
    Index,
 
31
    SHA1Writer,
 
32
    build_index_from_tree,
 
33
    index_entry_from_path,
 
34
    index_entry_from_stat,
 
35
    FLAG_STAGEMASK,
 
36
    read_submodule_head,
 
37
    validate_path,
 
38
    write_index_dict,
 
39
    )
 
40
from dulwich.object_store import (
 
41
    tree_lookup_path,
 
42
    )
 
43
from dulwich.objects import (
 
44
    S_ISGITLINK,
 
45
    )
 
46
import os
 
47
import posixpath
 
48
import stat
 
49
import sys
 
50
 
 
51
from .. import (
 
52
    conflicts as _mod_conflicts,
 
53
    errors,
 
54
    controldir as _mod_controldir,
 
55
    globbing,
 
56
    ignores,
 
57
    lock,
 
58
    merge,
 
59
    osutils,
 
60
    revision as _mod_revision,
 
61
    trace,
 
62
    transport as _mod_transport,
 
63
    tree,
 
64
    workingtree,
 
65
    )
 
66
from ..decorators import (
 
67
    only_raises,
 
68
    )
 
69
from ..mutabletree import (
 
70
    BadReferenceTarget,
 
71
    MutableTree,
 
72
    )
 
73
 
 
74
 
 
75
from .dir import (
 
76
    LocalGitDir,
 
77
    )
 
78
from .tree import (
 
79
    MutableGitIndexTree,
 
80
    )
 
81
from .mapping import (
 
82
    GitFileIdMap,
 
83
    mode_kind,
 
84
    )
 
85
 
 
86
 
 
87
class GitWorkingTree(MutableGitIndexTree, workingtree.WorkingTree):
 
88
    """A Git working tree."""
 
89
 
 
90
    def __init__(self, controldir, repo, branch):
 
91
        MutableGitIndexTree.__init__(self)
 
92
        basedir = controldir.root_transport.local_abspath('.')
 
93
        self.basedir = osutils.realpath(basedir)
 
94
        self.controldir = controldir
 
95
        self.repository = repo
 
96
        self.store = self.repository._git.object_store
 
97
        self.mapping = self.repository.get_mapping()
 
98
        self._branch = branch
 
99
        self._transport = self.repository._git._controltransport
 
100
        self._format = GitWorkingTreeFormat()
 
101
        self.index = None
 
102
        self._index_file = None
 
103
        self.views = self._make_views()
 
104
        self._rules_searcher = None
 
105
        self._detect_case_handling()
 
106
        self._reset_data()
 
107
 
 
108
    def supports_tree_reference(self):
 
109
        return True
 
110
 
 
111
    def supports_rename_tracking(self):
 
112
        return False
 
113
 
 
114
    def _read_index(self):
 
115
        self.index = Index(self.control_transport.local_abspath('index'))
 
116
        self._index_dirty = False
 
117
 
 
118
    def lock_read(self):
 
119
        """Lock the repository for read operations.
 
120
 
 
121
        :return: A breezy.lock.LogicalLockResult.
 
122
        """
 
123
        if not self._lock_mode:
 
124
            self._lock_mode = 'r'
 
125
            self._lock_count = 1
 
126
            self._read_index()
 
127
        else:
 
128
            self._lock_count += 1
 
129
        self.branch.lock_read()
 
130
        return lock.LogicalLockResult(self.unlock)
 
131
 
 
132
    def _lock_write_tree(self):
 
133
        if not self._lock_mode:
 
134
            self._lock_mode = 'w'
 
135
            self._lock_count = 1
 
136
            try:
 
137
                self._index_file = GitFile(
 
138
                    self.control_transport.local_abspath('index'), 'wb')
 
139
            except FileLocked:
 
140
                raise errors.LockContention('index')
 
141
            self._read_index()
 
142
        elif self._lock_mode == 'r':
 
143
            raise errors.ReadOnlyError(self)
 
144
        else:
 
145
            self._lock_count += 1
 
146
 
 
147
    def lock_tree_write(self):
 
148
        self.branch.lock_read()
 
149
        try:
 
150
            self._lock_write_tree()
 
151
            return lock.LogicalLockResult(self.unlock)
 
152
        except BaseException:
 
153
            self.branch.unlock()
 
154
            raise
 
155
 
 
156
    def lock_write(self, token=None):
 
157
        self.branch.lock_write()
 
158
        try:
 
159
            self._lock_write_tree()
 
160
            return lock.LogicalLockResult(self.unlock)
 
161
        except BaseException:
 
162
            self.branch.unlock()
 
163
            raise
 
164
 
 
165
    def is_locked(self):
 
166
        return self._lock_count >= 1
 
167
 
 
168
    def get_physical_lock_status(self):
 
169
        return False
 
170
 
 
171
    def break_lock(self):
 
172
        try:
 
173
            self.control_transport.delete('index.lock')
 
174
        except errors.NoSuchFile:
 
175
            pass
 
176
        self.branch.break_lock()
 
177
 
 
178
    @only_raises(errors.LockNotHeld, errors.LockBroken)
 
179
    def unlock(self):
 
180
        if not self._lock_count:
 
181
            return lock.cant_unlock_not_held(self)
 
182
        try:
 
183
            self._cleanup()
 
184
            self._lock_count -= 1
 
185
            if self._lock_count > 0:
 
186
                return
 
187
            if self._index_file is not None:
 
188
                if self._index_dirty:
 
189
                    self._flush(self._index_file)
 
190
                    self._index_file.close()
 
191
                else:
 
192
                    # Something else already triggered a write of the index
 
193
                    # file by calling .flush()
 
194
                    self._index_file.abort()
 
195
                self._index_file = None
 
196
            self._lock_mode = None
 
197
            self.index = None
 
198
        finally:
 
199
            self.branch.unlock()
 
200
 
 
201
    def _cleanup(self):
 
202
        pass
 
203
 
 
204
    def _detect_case_handling(self):
 
205
        try:
 
206
            self._transport.stat(".git/cOnFiG")
 
207
        except errors.NoSuchFile:
 
208
            self.case_sensitive = True
 
209
        else:
 
210
            self.case_sensitive = False
 
211
 
 
212
    def merge_modified(self):
 
213
        return {}
 
214
 
 
215
    def set_merge_modified(self, modified_hashes):
 
216
        raise errors.UnsupportedOperation(self.set_merge_modified, self)
 
217
 
 
218
    def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
 
219
        self.set_parent_ids([p for p, t in parents_list])
 
220
 
 
221
    def _set_merges_from_parent_ids(self, rhs_parent_ids):
 
222
        try:
 
223
            merges = [self.branch.lookup_bzr_revision_id(
 
224
                revid)[0] for revid in rhs_parent_ids]
 
225
        except errors.NoSuchRevision as e:
 
226
            raise errors.GhostRevisionUnusableHere(e.revision)
 
227
        if merges:
 
228
            self.control_transport.put_bytes(
 
229
                'MERGE_HEAD', b'\n'.join(merges),
 
230
                mode=self.controldir._get_file_mode())
 
231
        else:
 
232
            try:
 
233
                self.control_transport.delete('MERGE_HEAD')
 
234
            except errors.NoSuchFile:
 
235
                pass
 
236
 
 
237
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
 
238
        """Set the parent ids to revision_ids.
 
239
 
 
240
        See also set_parent_trees. This api will try to retrieve the tree data
 
241
        for each element of revision_ids from the trees repository. If you have
 
242
        tree data already available, it is more efficient to use
 
243
        set_parent_trees rather than set_parent_ids. set_parent_ids is however
 
244
        an easier API to use.
 
245
 
 
246
        :param revision_ids: The revision_ids to set as the parent ids of this
 
247
            working tree. Any of these may be ghosts.
 
248
        """
 
249
        with self.lock_tree_write():
 
250
            self._check_parents_for_ghosts(
 
251
                revision_ids, allow_leftmost_as_ghost=allow_leftmost_as_ghost)
 
252
            for revision_id in revision_ids:
 
253
                _mod_revision.check_not_reserved_id(revision_id)
 
254
 
 
255
            revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
 
256
 
 
257
            if len(revision_ids) > 0:
 
258
                self.set_last_revision(revision_ids[0])
 
259
            else:
 
260
                self.set_last_revision(_mod_revision.NULL_REVISION)
 
261
 
 
262
            self._set_merges_from_parent_ids(revision_ids[1:])
 
263
 
 
264
    def get_parent_ids(self):
 
265
        """See Tree.get_parent_ids.
 
266
 
 
267
        This implementation reads the pending merges list and last_revision
 
268
        value and uses that to decide what the parents list should be.
 
269
        """
 
270
        last_rev = _mod_revision.ensure_null(self._last_revision())
 
271
        if _mod_revision.NULL_REVISION == last_rev:
 
272
            parents = []
 
273
        else:
 
274
            parents = [last_rev]
 
275
        try:
 
276
            merges_bytes = self.control_transport.get_bytes('MERGE_HEAD')
 
277
        except errors.NoSuchFile:
 
278
            pass
 
279
        else:
 
280
            for l in osutils.split_lines(merges_bytes):
 
281
                revision_id = l.rstrip(b'\n')
 
282
                parents.append(
 
283
                    self.branch.lookup_foreign_revision_id(revision_id))
 
284
        return parents
 
285
 
 
286
    def check_state(self):
 
287
        """Check that the working state is/isn't valid."""
 
288
        pass
 
289
 
 
290
    def remove(self, files, verbose=False, to_file=None, keep_files=True,
 
291
               force=False):
 
292
        """Remove nominated files from the working tree metadata.
 
293
 
 
294
        :param files: File paths relative to the basedir.
 
295
        :param keep_files: If true, the files will also be kept.
 
296
        :param force: Delete files and directories, even if they are changed
 
297
            and even if the directories are not empty.
 
298
        """
 
299
        if not isinstance(files, list):
 
300
            files = [files]
 
301
 
 
302
        if to_file is None:
 
303
            to_file = sys.stdout
 
304
 
 
305
        def backup(file_to_backup):
 
306
            abs_path = self.abspath(file_to_backup)
 
307
            backup_name = self.controldir._available_backup_name(
 
308
                file_to_backup)
 
309
            osutils.rename(abs_path, self.abspath(backup_name))
 
310
            return "removed %s (but kept a copy: %s)" % (
 
311
                file_to_backup, backup_name)
 
312
 
 
313
        # Sort needed to first handle directory content before the directory
 
314
        files_to_backup = []
 
315
 
 
316
        all_files = set()
 
317
 
 
318
        def recurse_directory_to_add_files(directory):
 
319
            # Recurse directory and add all files
 
320
            # so we can check if they have changed.
 
321
            for parent_info, file_infos in self.walkdirs(directory):
 
322
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
 
323
                    # Is it versioned or ignored?
 
324
                    if self.is_versioned(relpath):
 
325
                        # Add nested content for deletion.
 
326
                        all_files.add(relpath)
 
327
                    else:
 
328
                        # Files which are not versioned
 
329
                        # should be treated as unknown.
 
330
                        files_to_backup.append(relpath)
 
331
 
 
332
        with self.lock_tree_write():
 
333
            for filepath in files:
 
334
                # Get file name into canonical form.
 
335
                abspath = self.abspath(filepath)
 
336
                filepath = self.relpath(abspath)
 
337
 
 
338
                if filepath:
 
339
                    all_files.add(filepath)
 
340
                    recurse_directory_to_add_files(filepath)
 
341
 
 
342
            files = list(all_files)
 
343
 
 
344
            if len(files) == 0:
 
345
                return  # nothing to do
 
346
 
 
347
            # Sort needed to first handle directory content before the
 
348
            # directory
 
349
            files.sort(reverse=True)
 
350
 
 
351
            # Bail out if we are going to delete files we shouldn't
 
352
            if not keep_files and not force:
 
353
                for (file_id, path, content_change, versioned, parent_id, name,
 
354
                     kind, executable) in self.iter_changes(
 
355
                         self.basis_tree(), include_unchanged=True,
 
356
                         require_versioned=False, want_unversioned=True,
 
357
                         specific_files=files):
 
358
                    if versioned[0] is False:
 
359
                        # The record is unknown or newly added
 
360
                        files_to_backup.append(path[1])
 
361
                        files_to_backup.extend(
 
362
                            osutils.parent_directories(path[1]))
 
363
                    elif (content_change and (kind[1] is not None)
 
364
                            and osutils.is_inside_any(files, path[1])):
 
365
                        # Versioned and changed, but not deleted, and still
 
366
                        # in one of the dirs to be deleted.
 
367
                        files_to_backup.append(path[1])
 
368
                        files_to_backup.extend(
 
369
                            osutils.parent_directories(path[1]))
 
370
 
 
371
            for f in files:
 
372
                if f == '':
 
373
                    continue
 
374
 
 
375
                try:
 
376
                    kind = self.kind(f)
 
377
                except errors.NoSuchFile:
 
378
                    kind = None
 
379
 
 
380
                abs_path = self.abspath(f)
 
381
                if verbose:
 
382
                    # having removed it, it must be either ignored or unknown
 
383
                    if self.is_ignored(f):
 
384
                        new_status = 'I'
 
385
                    else:
 
386
                        new_status = '?'
 
387
                    kind_ch = osutils.kind_marker(kind)
 
388
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
 
389
                if kind is None:
 
390
                    message = "%s does not exist" % (f, )
 
391
                else:
 
392
                    if not keep_files:
 
393
                        if f in files_to_backup and not force:
 
394
                            message = backup(f)
 
395
                        else:
 
396
                            if kind == 'directory':
 
397
                                osutils.rmtree(abs_path)
 
398
                            else:
 
399
                                osutils.delete_any(abs_path)
 
400
                            message = "deleted %s" % (f,)
 
401
                    else:
 
402
                        message = "removed %s" % (f,)
 
403
                self._unversion_path(f)
 
404
 
 
405
                # print only one message (if any) per file.
 
406
                if message is not None:
 
407
                    trace.note(message)
 
408
            self._versioned_dirs = None
 
409
 
 
410
    def smart_add(self, file_list, recurse=True, action=None, save=True):
 
411
        if not file_list:
 
412
            file_list = [u'.']
 
413
 
 
414
        # expand any symlinks in the directory part, while leaving the
 
415
        # filename alone
 
416
        # only expanding if symlinks are supported avoids windows path bugs
 
417
        if osutils.has_symlinks():
 
418
            file_list = list(map(osutils.normalizepath, file_list))
 
419
 
 
420
        conflicts_related = set()
 
421
        for c in self.conflicts():
 
422
            conflicts_related.update(c.associated_filenames())
 
423
 
 
424
        added = []
 
425
        ignored = {}
 
426
        user_dirs = []
 
427
 
 
428
        def call_action(filepath, kind):
 
429
            if filepath == '':
 
430
                return
 
431
            if action is not None:
 
432
                parent_path = posixpath.dirname(filepath)
 
433
                parent_id = self.path2id(parent_path)
 
434
                parent_ie = self._get_dir_ie(parent_path, parent_id)
 
435
                file_id = action(self, parent_ie, filepath, kind)
 
436
                if file_id is not None:
 
437
                    raise workingtree.SettingFileIdUnsupported()
 
438
 
 
439
        with self.lock_tree_write():
 
440
            for filepath in osutils.canonical_relpaths(
 
441
                    self.basedir, file_list):
 
442
                filepath, can_access = osutils.normalized_filename(filepath)
 
443
                if not can_access:
 
444
                    raise errors.InvalidNormalization(filepath)
 
445
 
 
446
                abspath = self.abspath(filepath)
 
447
                kind = osutils.file_kind(abspath)
 
448
                if kind in ("file", "symlink"):
 
449
                    (index, subpath) = self._lookup_index(
 
450
                        filepath.encode('utf-8'))
 
451
                    if subpath in index:
 
452
                        # Already present
 
453
                        continue
 
454
                    call_action(filepath, kind)
 
455
                    if save:
 
456
                        self._index_add_entry(filepath, kind)
 
457
                    added.append(filepath)
 
458
                elif kind == "directory":
 
459
                    (index, subpath) = self._lookup_index(
 
460
                        filepath.encode('utf-8'))
 
461
                    if subpath not in index:
 
462
                        call_action(filepath, kind)
 
463
                    if recurse:
 
464
                        user_dirs.append(filepath)
 
465
                else:
 
466
                    raise errors.BadFileKindError(filename=abspath, kind=kind)
 
467
            for user_dir in user_dirs:
 
468
                abs_user_dir = self.abspath(user_dir)
 
469
                if user_dir != '':
 
470
                    try:
 
471
                        transport = _mod_transport.get_transport_from_path(
 
472
                            abs_user_dir)
 
473
                        _mod_controldir.ControlDirFormat.find_format(transport)
 
474
                        subtree = True
 
475
                    except errors.NotBranchError:
 
476
                        subtree = False
 
477
                    except errors.UnsupportedFormatError:
 
478
                        subtree = False
 
479
                else:
 
480
                    subtree = False
 
481
                if subtree:
 
482
                    trace.warning('skipping nested tree %r', abs_user_dir)
 
483
                    continue
 
484
 
 
485
                for name in os.listdir(abs_user_dir):
 
486
                    subp = os.path.join(user_dir, name)
 
487
                    if (self.is_control_filename(subp) or
 
488
                            self.mapping.is_special_file(subp)):
 
489
                        continue
 
490
                    ignore_glob = self.is_ignored(subp)
 
491
                    if ignore_glob is not None:
 
492
                        ignored.setdefault(ignore_glob, []).append(subp)
 
493
                        continue
 
494
                    abspath = self.abspath(subp)
 
495
                    kind = osutils.file_kind(abspath)
 
496
                    if kind == "directory":
 
497
                        user_dirs.append(subp)
 
498
                    else:
 
499
                        (index, subpath) = self._lookup_index(
 
500
                            subp.encode('utf-8'))
 
501
                        if subpath in index:
 
502
                            # Already present
 
503
                            continue
 
504
                        if subp in conflicts_related:
 
505
                            continue
 
506
                        call_action(subp, kind)
 
507
                        if save:
 
508
                            self._index_add_entry(subp, kind)
 
509
                        added.append(subp)
 
510
            return added, ignored
 
511
 
 
512
    def has_filename(self, filename):
 
513
        return osutils.lexists(self.abspath(filename))
 
514
 
 
515
    def _iter_files_recursive(self, from_dir=None, include_dirs=False):
 
516
        if from_dir is None:
 
517
            from_dir = u""
 
518
        encoded_from_dir = self.abspath(from_dir).encode(osutils._fs_enc)
 
519
        for (dirpath, dirnames, filenames) in os.walk(encoded_from_dir):
 
520
            dir_relpath = dirpath[len(self.basedir):].strip(b"/")
 
521
            if self.controldir.is_control_filename(
 
522
                    dir_relpath.decode(osutils._fs_enc)):
 
523
                continue
 
524
            for name in list(dirnames):
 
525
                if self.controldir.is_control_filename(
 
526
                        name.decode(osutils._fs_enc)):
 
527
                    dirnames.remove(name)
 
528
                    continue
 
529
                relpath = os.path.join(dir_relpath, name)
 
530
                if include_dirs:
 
531
                    try:
 
532
                        yield relpath.decode(osutils._fs_enc)
 
533
                    except UnicodeDecodeError:
 
534
                        raise errors.BadFilenameEncoding(
 
535
                            relpath, osutils._fs_enc)
 
536
                    if not self._has_dir(relpath):
 
537
                        dirnames.remove(name)
 
538
            for name in filenames:
 
539
                if self.mapping.is_special_file(name):
 
540
                    continue
 
541
                if self.controldir.is_control_filename(
 
542
                        name.decode(osutils._fs_enc, 'replace')):
 
543
                    continue
 
544
                yp = os.path.join(dir_relpath, name)
 
545
                try:
 
546
                    yield yp.decode(osutils._fs_enc)
 
547
                except UnicodeDecodeError:
 
548
                    raise errors.BadFilenameEncoding(
 
549
                        yp, osutils._fs_enc)
 
550
 
 
551
    def extras(self):
 
552
        """Yield all unversioned files in this WorkingTree.
 
553
        """
 
554
        with self.lock_read():
 
555
            index_paths = set(
 
556
                [p.decode('utf-8') for p, i in self._recurse_index_entries()])
 
557
            all_paths = set(self._iter_files_recursive(include_dirs=False))
 
558
            return iter(all_paths - index_paths)
 
559
 
 
560
    def _gather_kinds(self, files, kinds):
 
561
        """See MutableTree._gather_kinds."""
 
562
        with self.lock_tree_write():
 
563
            for pos, f in enumerate(files):
 
564
                if kinds[pos] is None:
 
565
                    fullpath = osutils.normpath(self.abspath(f))
 
566
                    try:
 
567
                        kind = osutils.file_kind(fullpath)
 
568
                    except OSError as e:
 
569
                        if e.errno == errno.ENOENT:
 
570
                            raise errors.NoSuchFile(fullpath)
 
571
                    if f != '' and self._directory_is_tree_reference(f):
 
572
                        kind = 'tree-reference'
 
573
                    kinds[pos] = kind
 
574
 
 
575
    def flush(self):
 
576
        if self._lock_mode != 'w':
 
577
            raise errors.NotWriteLocked(self)
 
578
        # TODO(jelmer): This shouldn't be writing in-place, but index.lock is
 
579
        # already in use and GitFile doesn't allow overriding the lock file
 
580
        # name :(
 
581
        f = open(self.control_transport.local_abspath('index'), 'wb')
 
582
        # Note that _flush will close the file
 
583
        self._flush(f)
 
584
 
 
585
    def _flush(self, f):
 
586
        try:
 
587
            shaf = SHA1Writer(f)
 
588
            write_index_dict(shaf, self.index)
 
589
            shaf.close()
 
590
        except BaseException:
 
591
            f.abort()
 
592
            raise
 
593
        self._index_dirty = False
 
594
 
 
595
    def has_or_had_id(self, file_id):
 
596
        if self.has_id(file_id):
 
597
            return True
 
598
        if self.had_id(file_id):
 
599
            return True
 
600
        return False
 
601
 
 
602
    def had_id(self, file_id):
 
603
        path = self._basis_fileid_map.lookup_path(file_id)
 
604
        try:
 
605
            head = self.repository._git.head()
 
606
        except KeyError:
 
607
            # Assume no if basis is not accessible
 
608
            return False
 
609
        try:
 
610
            root_tree = self.store[head].tree
 
611
        except KeyError:
 
612
            return False
 
613
        try:
 
614
            tree_lookup_path(self.store.__getitem__,
 
615
                             root_tree, path.encode('utf-8'))
 
616
        except KeyError:
 
617
            return False
 
618
        else:
 
619
            return True
 
620
 
 
621
    def get_file_mtime(self, path):
 
622
        """See Tree.get_file_mtime."""
 
623
        try:
 
624
            return self._lstat(path).st_mtime
 
625
        except OSError as e:
 
626
            if e.errno == errno.ENOENT:
 
627
                raise errors.NoSuchFile(path)
 
628
            raise
 
629
 
 
630
    def is_ignored(self, filename):
 
631
        r"""Check whether the filename matches an ignore pattern.
 
632
 
 
633
        If the file is ignored, returns the pattern which caused it to
 
634
        be ignored, otherwise None.  So this can simply be used as a
 
635
        boolean if desired."""
 
636
        if getattr(self, '_global_ignoreglobster', None) is None:
 
637
            ignore_globs = set()
 
638
            ignore_globs.update(ignores.get_runtime_ignores())
 
639
            ignore_globs.update(ignores.get_user_ignores())
 
640
            self._global_ignoreglobster = globbing.ExceptionGlobster(
 
641
                ignore_globs)
 
642
        match = self._global_ignoreglobster.match(filename)
 
643
        if match is not None:
 
644
            return match
 
645
        try:
 
646
            if self.kind(filename) == 'directory':
 
647
                filename += '/'
 
648
        except errors.NoSuchFile:
 
649
            pass
 
650
        filename = filename.lstrip('/')
 
651
        ignore_manager = self._get_ignore_manager()
 
652
        ps = list(ignore_manager.find_matching(filename))
 
653
        if not ps:
 
654
            return None
 
655
        if not ps[-1].is_exclude:
 
656
            return None
 
657
        return bytes(ps[-1])
 
658
 
 
659
    def _get_ignore_manager(self):
 
660
        ignoremanager = getattr(self, '_ignoremanager', None)
 
661
        if ignoremanager is not None:
 
662
            return ignoremanager
 
663
 
 
664
        ignore_manager = IgnoreFilterManager.from_repo(self.repository._git)
 
665
        self._ignoremanager = ignore_manager
 
666
        return ignore_manager
 
667
 
 
668
    def _flush_ignore_list_cache(self):
 
669
        self._ignoremanager = None
 
670
 
 
671
    def set_last_revision(self, revid):
 
672
        if _mod_revision.is_null(revid):
 
673
            self.branch.set_last_revision_info(0, revid)
 
674
            return False
 
675
        _mod_revision.check_not_reserved_id(revid)
 
676
        try:
 
677
            self.branch.generate_revision_history(revid)
 
678
        except errors.NoSuchRevision:
 
679
            raise errors.GhostRevisionUnusableHere(revid)
 
680
 
 
681
    def _reset_data(self):
 
682
        try:
 
683
            head = self.repository._git.head()
 
684
        except KeyError:
 
685
            self._basis_fileid_map = GitFileIdMap({}, self.mapping)
 
686
        else:
 
687
            self._basis_fileid_map = self.mapping.get_fileid_map(
 
688
                self.store.__getitem__, self.store[head].tree)
 
689
        self._fileid_map = self._basis_fileid_map.copy()
 
690
 
 
691
    def get_file_verifier(self, path, stat_value=None):
 
692
        with self.lock_read():
 
693
            (index, subpath) = self._lookup_index(path.encode('utf-8'))
 
694
            try:
 
695
                return ("GIT", index[subpath].sha)
 
696
            except KeyError:
 
697
                if self._has_dir(path):
 
698
                    return ("GIT", None)
 
699
                raise errors.NoSuchFile(path)
 
700
 
 
701
    def get_file_sha1(self, path, stat_value=None):
 
702
        with self.lock_read():
 
703
            if not self.is_versioned(path):
 
704
                raise errors.NoSuchFile(path)
 
705
            abspath = self.abspath(path)
 
706
            try:
 
707
                return osutils.sha_file_by_name(abspath)
 
708
            except OSError as e:
 
709
                if e.errno in (errno.EISDIR, errno.ENOENT):
 
710
                    return None
 
711
                raise
 
712
 
 
713
    def revision_tree(self, revid):
 
714
        return self.repository.revision_tree(revid)
 
715
 
 
716
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
 
717
        mode = stat_result.st_mode
 
718
        return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
 
719
 
 
720
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
 
721
        return self.basis_tree().is_executable(path)
 
722
 
 
723
    def stored_kind(self, path):
 
724
        with self.lock_read():
 
725
            encoded_path = path.encode('utf-8')
 
726
            (index, subpath) = self._lookup_index(encoded_path)
 
727
            try:
 
728
                return mode_kind(index[subpath].mode)
 
729
            except KeyError:
 
730
                # Maybe it's a directory?
 
731
                if self._has_dir(encoded_path):
 
732
                    return "directory"
 
733
                raise errors.NoSuchFile(path)
 
734
 
 
735
    def _lstat(self, path):
 
736
        return os.lstat(self.abspath(path))
 
737
 
 
738
    def _live_entry(self, path):
 
739
        encoded_path = self.abspath(path.decode('utf-8')).encode(
 
740
            osutils._fs_enc)
 
741
        return index_entry_from_path(encoded_path)
 
742
 
 
743
    def is_executable(self, path):
 
744
        with self.lock_read():
 
745
            if getattr(self, "_supports_executable",
 
746
                       osutils.supports_executable)():
 
747
                mode = self._lstat(path).st_mode
 
748
            else:
 
749
                (index, subpath) = self._lookup_index(path.encode('utf-8'))
 
750
                try:
 
751
                    mode = index[subpath].mode
 
752
                except KeyError:
 
753
                    mode = 0
 
754
            return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
 
755
 
 
756
    def _is_executable_from_path_and_stat(self, path, stat_result):
 
757
        if getattr(self, "_supports_executable",
 
758
                   osutils.supports_executable)():
 
759
            return self._is_executable_from_path_and_stat_from_stat(
 
760
                path, stat_result)
 
761
        else:
 
762
            return self._is_executable_from_path_and_stat_from_basis(
 
763
                path, stat_result)
 
764
 
 
765
    def list_files(self, include_root=False, from_dir=None, recursive=True):
 
766
        if from_dir is None or from_dir == '.':
 
767
            from_dir = u""
 
768
        dir_ids = {}
 
769
        fk_entries = {'directory': tree.TreeDirectory,
 
770
                      'file': tree.TreeFile,
 
771
                      'symlink': tree.TreeLink,
 
772
                      'tree-reference': tree.TreeReference}
 
773
        with self.lock_read():
 
774
            root_ie = self._get_dir_ie(u"", None)
 
775
            if include_root and not from_dir:
 
776
                yield "", "V", root_ie.kind, root_ie
 
777
            dir_ids[u""] = root_ie.file_id
 
778
            if recursive:
 
779
                path_iterator = sorted(
 
780
                    self._iter_files_recursive(from_dir, include_dirs=True))
 
781
            else:
 
782
                encoded_from_dir = self.abspath(from_dir).encode(
 
783
                    osutils._fs_enc)
 
784
                path_iterator = sorted(
 
785
                    [os.path.join(from_dir, name.decode(osutils._fs_enc))
 
786
                     for name in os.listdir(encoded_from_dir)
 
787
                     if not self.controldir.is_control_filename(
 
788
                         name.decode(osutils._fs_enc)) and
 
789
                     not self.mapping.is_special_file(
 
790
                         name.decode(osutils._fs_enc))])
 
791
            for path in path_iterator:
 
792
                try:
 
793
                    encoded_path = path.encode("utf-8")
 
794
                except UnicodeEncodeError:
 
795
                    raise errors.BadFilenameEncoding(
 
796
                        path, osutils._fs_enc)
 
797
                (index, index_path) = self._lookup_index(encoded_path)
 
798
                try:
 
799
                    value = index[index_path]
 
800
                except KeyError:
 
801
                    value = None
 
802
                kind = self.kind(path)
 
803
                parent, name = posixpath.split(path)
 
804
                for dir_path, dir_ie in self._add_missing_parent_ids(
 
805
                        parent, dir_ids):
 
806
                    pass
 
807
                if kind in ('directory', 'tree-reference'):
 
808
                    if path != from_dir:
 
809
                        if self._has_dir(encoded_path):
 
810
                            ie = self._get_dir_ie(path, self.path2id(path))
 
811
                            status = "V"
 
812
                        elif self.is_ignored(path):
 
813
                            status = "I"
 
814
                            ie = fk_entries[kind]()
 
815
                        else:
 
816
                            status = "?"
 
817
                            ie = fk_entries[kind]()
 
818
                        yield (posixpath.relpath(path, from_dir), status, kind,
 
819
                               ie)
 
820
                    continue
 
821
                if value is not None:
 
822
                    ie = self._get_file_ie(name, path, value, dir_ids[parent])
 
823
                    yield (posixpath.relpath(path, from_dir), "V", ie.kind, ie)
 
824
                else:
 
825
                    ie = fk_entries[kind]()
 
826
                    yield (posixpath.relpath(path, from_dir),
 
827
                           ("I" if self.is_ignored(path) else "?"), kind, ie)
 
828
 
 
829
    def all_file_ids(self):
 
830
        raise errors.UnsupportedOperation(self.all_file_ids, self)
 
831
 
 
832
    def all_versioned_paths(self):
 
833
        with self.lock_read():
 
834
            paths = {u""}
 
835
            for path in self.index:
 
836
                if self.mapping.is_special_file(path):
 
837
                    continue
 
838
                path = path.decode("utf-8")
 
839
                paths.add(path)
 
840
                while path != "":
 
841
                    path = posixpath.dirname(path).strip("/")
 
842
                    if path in paths:
 
843
                        break
 
844
                    paths.add(path)
 
845
            return paths
 
846
 
 
847
    def iter_child_entries(self, path):
 
848
        encoded_path = path.encode('utf-8')
 
849
        with self.lock_read():
 
850
            parent_id = self.path2id(path)
 
851
            found_any = False
 
852
            for item_path, value in self.index.iteritems():
 
853
                decoded_item_path = item_path.decode('utf-8')
 
854
                if self.mapping.is_special_file(item_path):
 
855
                    continue
 
856
                if not osutils.is_inside(path, decoded_item_path):
 
857
                    continue
 
858
                found_any = True
 
859
                subpath = posixpath.relpath(decoded_item_path, path)
 
860
                if '/' in subpath:
 
861
                    dirname = subpath.split('/', 1)[0]
 
862
                    file_ie = self._get_dir_ie(
 
863
                        posixpath.join(path, dirname), parent_id)
 
864
                else:
 
865
                    (unused_parent, name) = posixpath.split(decoded_item_path)
 
866
                    file_ie = self._get_file_ie(
 
867
                        name, decoded_item_path, value, parent_id)
 
868
                yield file_ie
 
869
            if not found_any and path != u'':
 
870
                raise errors.NoSuchFile(path)
 
871
 
 
872
    def conflicts(self):
 
873
        with self.lock_read():
 
874
            conflicts = _mod_conflicts.ConflictList()
 
875
            for item_path, value in self.index.iteritems():
 
876
                if value.flags & FLAG_STAGEMASK:
 
877
                    conflicts.append(_mod_conflicts.TextConflict(
 
878
                        item_path.decode('utf-8')))
 
879
            return conflicts
 
880
 
 
881
    def set_conflicts(self, conflicts):
 
882
        by_path = set()
 
883
        for conflict in conflicts:
 
884
            if conflict.typestring in ('text conflict', 'contents conflict'):
 
885
                by_path.add(conflict.path.encode('utf-8'))
 
886
            else:
 
887
                raise errors.UnsupportedOperation(self.set_conflicts, self)
 
888
        with self.lock_tree_write():
 
889
            for path in self.index:
 
890
                self._set_conflicted(path, path in by_path)
 
891
 
 
892
    def _set_conflicted(self, path, conflicted):
 
893
        trace.mutter('change conflict: %r -> %r', path, conflicted)
 
894
        value = self.index[path]
 
895
        self._index_dirty = True
 
896
        if conflicted:
 
897
            self.index[path] = (value[:9] + (value[9] | FLAG_STAGEMASK, ))
 
898
        else:
 
899
            self.index[path] = (value[:9] + (value[9] & ~ FLAG_STAGEMASK, ))
 
900
 
 
901
    def add_conflicts(self, new_conflicts):
 
902
        with self.lock_tree_write():
 
903
            for conflict in new_conflicts:
 
904
                if conflict.typestring in ('text conflict',
 
905
                                           'contents conflict'):
 
906
                    try:
 
907
                        self._set_conflicted(
 
908
                            conflict.path.encode('utf-8'), True)
 
909
                    except KeyError:
 
910
                        raise errors.UnsupportedOperation(
 
911
                            self.add_conflicts, self)
 
912
                else:
 
913
                    raise errors.UnsupportedOperation(self.add_conflicts, self)
 
914
 
 
915
    def walkdirs(self, prefix=""):
 
916
        """Walk the directories of this tree.
 
917
 
 
918
        returns a generator which yields items in the form:
 
919
                ((curren_directory_path, fileid),
 
920
                 [(file1_path, file1_name, file1_kind, (lstat), file1_id,
 
921
                   file1_kind), ... ])
 
922
 
 
923
        This API returns a generator, which is only valid during the current
 
924
        tree transaction - within a single lock_read or lock_write duration.
 
925
 
 
926
        If the tree is not locked, it may cause an error to be raised,
 
927
        depending on the tree implementation.
 
928
        """
 
929
        from bisect import bisect_left
 
930
        import operator
 
931
        disk_top = self.abspath(prefix)
 
932
        if disk_top.endswith('/'):
 
933
            disk_top = disk_top[:-1]
 
934
        top_strip_len = len(disk_top) + 1
 
935
        inventory_iterator = self._walkdirs(prefix)
 
936
        disk_iterator = osutils.walkdirs(disk_top, prefix)
 
937
        try:
 
938
            current_disk = next(disk_iterator)
 
939
            disk_finished = False
 
940
        except OSError as e:
 
941
            if not (e.errno == errno.ENOENT
 
942
                    or (sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
 
943
                raise
 
944
            current_disk = None
 
945
            disk_finished = True
 
946
        try:
 
947
            current_inv = next(inventory_iterator)
 
948
            inv_finished = False
 
949
        except StopIteration:
 
950
            current_inv = None
 
951
            inv_finished = True
 
952
        while not inv_finished or not disk_finished:
 
953
            if current_disk:
 
954
                ((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
 
955
                    cur_disk_dir_content) = current_disk
 
956
            else:
 
957
                ((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
 
958
                    cur_disk_dir_content) = ((None, None), None)
 
959
            if not disk_finished:
 
960
                # strip out .bzr dirs
 
961
                if (cur_disk_dir_path_from_top[top_strip_len:] == ''
 
962
                        and len(cur_disk_dir_content) > 0):
 
963
                    # osutils.walkdirs can be made nicer -
 
964
                    # yield the path-from-prefix rather than the pathjoined
 
965
                    # value.
 
966
                    bzrdir_loc = bisect_left(cur_disk_dir_content,
 
967
                                             ('.git', '.git'))
 
968
                    if (bzrdir_loc < len(cur_disk_dir_content) and
 
969
                        self.controldir.is_control_filename(
 
970
                            cur_disk_dir_content[bzrdir_loc][0])):
 
971
                        # we dont yield the contents of, or, .bzr itself.
 
972
                        del cur_disk_dir_content[bzrdir_loc]
 
973
            if inv_finished:
 
974
                # everything is unknown
 
975
                direction = 1
 
976
            elif disk_finished:
 
977
                # everything is missing
 
978
                direction = -1
 
979
            else:
 
980
                direction = ((current_inv[0][0] > cur_disk_dir_relpath)
 
981
                             - (current_inv[0][0] < cur_disk_dir_relpath))
 
982
            if direction > 0:
 
983
                # disk is before inventory - unknown
 
984
                dirblock = [(relpath, basename, kind, stat, None, None) for
 
985
                            relpath, basename, kind, stat, top_path in
 
986
                            cur_disk_dir_content]
 
987
                yield (cur_disk_dir_relpath, None), dirblock
 
988
                try:
 
989
                    current_disk = next(disk_iterator)
 
990
                except StopIteration:
 
991
                    disk_finished = True
 
992
            elif direction < 0:
 
993
                # inventory is before disk - missing.
 
994
                dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
 
995
                            for relpath, basename, dkind, stat, fileid, kind in
 
996
                            current_inv[1]]
 
997
                yield (current_inv[0][0], current_inv[0][1]), dirblock
 
998
                try:
 
999
                    current_inv = next(inventory_iterator)
 
1000
                except StopIteration:
 
1001
                    inv_finished = True
 
1002
            else:
 
1003
                # versioned present directory
 
1004
                # merge the inventory and disk data together
 
1005
                dirblock = []
 
1006
                for relpath, subiterator in itertools.groupby(sorted(
 
1007
                        current_inv[1] + cur_disk_dir_content,
 
1008
                        key=operator.itemgetter(0)), operator.itemgetter(1)):
 
1009
                    path_elements = list(subiterator)
 
1010
                    if len(path_elements) == 2:
 
1011
                        inv_row, disk_row = path_elements
 
1012
                        # versioned, present file
 
1013
                        dirblock.append((inv_row[0],
 
1014
                                         inv_row[1], disk_row[2],
 
1015
                                         disk_row[3], inv_row[4],
 
1016
                                         inv_row[5]))
 
1017
                    elif len(path_elements[0]) == 5:
 
1018
                        # unknown disk file
 
1019
                        dirblock.append(
 
1020
                            (path_elements[0][0], path_elements[0][1],
 
1021
                                path_elements[0][2], path_elements[0][3],
 
1022
                                None, None))
 
1023
                    elif len(path_elements[0]) == 6:
 
1024
                        # versioned, absent file.
 
1025
                        dirblock.append(
 
1026
                            (path_elements[0][0], path_elements[0][1],
 
1027
                                'unknown', None, path_elements[0][4],
 
1028
                                path_elements[0][5]))
 
1029
                    else:
 
1030
                        raise NotImplementedError('unreachable code')
 
1031
                yield current_inv[0], dirblock
 
1032
                try:
 
1033
                    current_inv = next(inventory_iterator)
 
1034
                except StopIteration:
 
1035
                    inv_finished = True
 
1036
                try:
 
1037
                    current_disk = next(disk_iterator)
 
1038
                except StopIteration:
 
1039
                    disk_finished = True
 
1040
 
 
1041
    def _walkdirs(self, prefix=u""):
 
1042
        if prefix != u"":
 
1043
            prefix += u"/"
 
1044
        prefix = prefix.encode('utf-8')
 
1045
        per_dir = defaultdict(set)
 
1046
        if prefix == b"":
 
1047
            per_dir[(u'', self.get_root_id())] = set()
 
1048
 
 
1049
        def add_entry(path, kind):
 
1050
            if path == b'' or not path.startswith(prefix):
 
1051
                return
 
1052
            (dirname, child_name) = posixpath.split(path)
 
1053
            add_entry(dirname, 'directory')
 
1054
            dirname = dirname.decode("utf-8")
 
1055
            dir_file_id = self.path2id(dirname)
 
1056
            if not isinstance(value, tuple) or len(value) != 10:
 
1057
                raise ValueError(value)
 
1058
            per_dir[(dirname, dir_file_id)].add(
 
1059
                (path.decode("utf-8"), child_name.decode("utf-8"),
 
1060
                 kind, None,
 
1061
                 self.path2id(path.decode("utf-8")),
 
1062
                 kind))
 
1063
        with self.lock_read():
 
1064
            for path, value in self.index.iteritems():
 
1065
                if self.mapping.is_special_file(path):
 
1066
                    continue
 
1067
                if not path.startswith(prefix):
 
1068
                    continue
 
1069
                add_entry(path, mode_kind(value.mode))
 
1070
        return ((k, sorted(v)) for (k, v) in sorted(per_dir.items()))
 
1071
 
 
1072
    def get_shelf_manager(self):
 
1073
        raise workingtree.ShelvingUnsupported()
 
1074
 
 
1075
    def store_uncommitted(self):
 
1076
        raise errors.StoringUncommittedNotSupported(self)
 
1077
 
 
1078
    def apply_inventory_delta(self, changes):
 
1079
        for (old_path, new_path, file_id, ie) in changes:
 
1080
            if old_path is not None:
 
1081
                (index, old_subpath) = self._lookup_index(
 
1082
                    old_path.encode('utf-8'))
 
1083
                try:
 
1084
                    self._index_del_entry(index, old_subpath)
 
1085
                except KeyError:
 
1086
                    pass
 
1087
                else:
 
1088
                    self._versioned_dirs = None
 
1089
            if new_path is not None and ie.kind != 'directory':
 
1090
                if ie.kind == 'tree-reference':
 
1091
                    self._index_add_entry(
 
1092
                        new_path, ie.kind,
 
1093
                        reference_revision=ie.reference_revision)
 
1094
                else:
 
1095
                    self._index_add_entry(new_path, ie.kind)
 
1096
        self.flush()
 
1097
 
 
1098
    def annotate_iter(self, path,
 
1099
                      default_revision=_mod_revision.CURRENT_REVISION):
 
1100
        """See Tree.annotate_iter
 
1101
 
 
1102
        This implementation will use the basis tree implementation if possible.
 
1103
        Lines not in the basis are attributed to CURRENT_REVISION
 
1104
 
 
1105
        If there are pending merges, lines added by those merges will be
 
1106
        incorrectly attributed to CURRENT_REVISION (but after committing, the
 
1107
        attribution will be correct).
 
1108
        """
 
1109
        with self.lock_read():
 
1110
            maybe_file_parent_keys = []
 
1111
            for parent_id in self.get_parent_ids():
 
1112
                try:
 
1113
                    parent_tree = self.revision_tree(parent_id)
 
1114
                except errors.NoSuchRevisionInTree:
 
1115
                    parent_tree = self.branch.repository.revision_tree(
 
1116
                        parent_id)
 
1117
                with parent_tree.lock_read():
 
1118
                    # TODO(jelmer): Use rename/copy tracker to find path name
 
1119
                    # in parent
 
1120
                    parent_path = path
 
1121
                    try:
 
1122
                        kind = parent_tree.kind(parent_path)
 
1123
                    except errors.NoSuchFile:
 
1124
                        continue
 
1125
                    if kind != 'file':
 
1126
                        # Note: this is slightly unnecessary, because symlinks
 
1127
                        # and directories have a "text" which is the empty
 
1128
                        # text, and we know that won't mess up annotations. But
 
1129
                        # it seems cleaner
 
1130
                        continue
 
1131
                    parent_text_key = (
 
1132
                        parent_path,
 
1133
                        parent_tree.get_file_revision(parent_path))
 
1134
                    if parent_text_key not in maybe_file_parent_keys:
 
1135
                        maybe_file_parent_keys.append(parent_text_key)
 
1136
            # Now we have the parents of this content
 
1137
            from breezy.annotate import Annotator
 
1138
            from .annotate import AnnotateProvider
 
1139
            annotate_provider = AnnotateProvider(
 
1140
                self.branch.repository._file_change_scanner)
 
1141
            annotator = Annotator(annotate_provider)
 
1142
 
 
1143
            from breezy.graph import Graph
 
1144
            graph = Graph(annotate_provider)
 
1145
            heads = graph.heads(maybe_file_parent_keys)
 
1146
            file_parent_keys = []
 
1147
            for key in maybe_file_parent_keys:
 
1148
                if key in heads:
 
1149
                    file_parent_keys.append(key)
 
1150
 
 
1151
            text = self.get_file_text(path)
 
1152
            this_key = (path, default_revision)
 
1153
            annotator.add_special_text(this_key, file_parent_keys, text)
 
1154
            annotations = [(key[-1], line)
 
1155
                           for key, line in annotator.annotate_flat(this_key)]
 
1156
            return annotations
 
1157
 
 
1158
    def _rename_one(self, from_rel, to_rel):
 
1159
        os.rename(self.abspath(from_rel), self.abspath(to_rel))
 
1160
 
 
1161
    def _build_checkout_with_index(self):
 
1162
        build_index_from_tree(
 
1163
            self.user_transport.local_abspath('.'),
 
1164
            self.control_transport.local_abspath("index"),
 
1165
            self.store,
 
1166
            None
 
1167
            if self.branch.head is None
 
1168
            else self.store[self.branch.head].tree)
 
1169
 
 
1170
    def reset_state(self, revision_ids=None):
 
1171
        """Reset the state of the working tree.
 
1172
 
 
1173
        This does a hard-reset to a last-known-good state. This is a way to
 
1174
        fix if something got corrupted (like the .git/index file)
 
1175
        """
 
1176
        with self.lock_tree_write():
 
1177
            if revision_ids is not None:
 
1178
                self.set_parent_ids(revision_ids)
 
1179
            self.index.clear()
 
1180
            self._index_dirty = True
 
1181
            if self.branch.head is not None:
 
1182
                for entry in self.store.iter_tree_contents(
 
1183
                        self.store[self.branch.head].tree):
 
1184
                    if not validate_path(entry.path):
 
1185
                        continue
 
1186
 
 
1187
                    if S_ISGITLINK(entry.mode):
 
1188
                        pass  # TODO(jelmer): record and return submodule paths
 
1189
                    else:
 
1190
                        # Let's at least try to use the working tree file:
 
1191
                        try:
 
1192
                            st = self._lstat(self.abspath(
 
1193
                                entry.path.decode('utf-8')))
 
1194
                        except OSError:
 
1195
                            # But if it doesn't exist, we'll make something up.
 
1196
                            obj = self.store[entry.sha]
 
1197
                            st = os.stat_result((entry.mode, 0, 0, 0,
 
1198
                                                 0, 0, len(
 
1199
                                                     obj.as_raw_string()), 0,
 
1200
                                                 0, 0))
 
1201
                    (index, subpath) = self._lookup_index(entry.path)
 
1202
                    index[subpath] = index_entry_from_stat(st, entry.sha, 0)
 
1203
 
 
1204
    def pull(self, source, overwrite=False, stop_revision=None,
 
1205
             change_reporter=None, possible_transports=None, local=False,
 
1206
             show_base=False):
 
1207
        with self.lock_write(), source.lock_read():
 
1208
            old_revision = self.branch.last_revision()
 
1209
            basis_tree = self.basis_tree()
 
1210
            count = self.branch.pull(source, overwrite, stop_revision,
 
1211
                                     possible_transports=possible_transports,
 
1212
                                     local=local)
 
1213
            new_revision = self.branch.last_revision()
 
1214
            if new_revision != old_revision:
 
1215
                with basis_tree.lock_read():
 
1216
                    new_basis_tree = self.branch.basis_tree()
 
1217
                    merge.merge_inner(
 
1218
                        self.branch,
 
1219
                        new_basis_tree,
 
1220
                        basis_tree,
 
1221
                        this_tree=self,
 
1222
                        change_reporter=change_reporter,
 
1223
                        show_base=show_base)
 
1224
            return count
 
1225
 
 
1226
    def add_reference(self, sub_tree):
 
1227
        """Add a TreeReference to the tree, pointing at sub_tree.
 
1228
 
 
1229
        :param sub_tree: subtree to add.
 
1230
        """
 
1231
        with self.lock_tree_write():
 
1232
            try:
 
1233
                sub_tree_path = self.relpath(sub_tree.basedir)
 
1234
            except errors.PathNotChild:
 
1235
                raise BadReferenceTarget(
 
1236
                    self, sub_tree, 'Target not inside tree.')
 
1237
 
 
1238
            self._add([sub_tree_path], [None], ['tree-reference'])
 
1239
 
 
1240
    def _read_submodule_head(self, path):
 
1241
        return read_submodule_head(self.abspath(path))
 
1242
 
 
1243
    def get_reference_revision(self, path):
 
1244
        hexsha = self._read_submodule_head(path)
 
1245
        if hexsha is None:
 
1246
            return _mod_revision.NULL_REVISION
 
1247
        return self.branch.lookup_foreign_revision_id(hexsha)
 
1248
 
 
1249
    def get_nested_tree(self, path):
 
1250
        return workingtree.WorkingTree.open(self.abspath(path))
 
1251
 
 
1252
    def _directory_is_tree_reference(self, relpath):
 
1253
        # as a special case, if a directory contains control files then
 
1254
        # it's a tree reference, except that the root of the tree is not
 
1255
        return relpath and osutils.lexists(self.abspath(relpath) + u"/.git")
 
1256
 
 
1257
    def extract(self, sub_path, format=None):
 
1258
        """Extract a subtree from this tree.
 
1259
 
 
1260
        A new branch will be created, relative to the path for this tree.
 
1261
        """
 
1262
        def mkdirs(path):
 
1263
            segments = osutils.splitpath(path)
 
1264
            transport = self.branch.controldir.root_transport
 
1265
            for name in segments:
 
1266
                transport = transport.clone(name)
 
1267
                transport.ensure_base()
 
1268
            return transport
 
1269
 
 
1270
        with self.lock_tree_write():
 
1271
            self.flush()
 
1272
            branch_transport = mkdirs(sub_path)
 
1273
            if format is None:
 
1274
                format = self.controldir.cloning_metadir()
 
1275
            branch_transport.ensure_base()
 
1276
            branch_bzrdir = format.initialize_on_transport(branch_transport)
 
1277
            try:
 
1278
                repo = branch_bzrdir.find_repository()
 
1279
            except errors.NoRepositoryPresent:
 
1280
                repo = branch_bzrdir.create_repository()
 
1281
            if not repo.supports_rich_root():
 
1282
                raise errors.RootNotRich()
 
1283
            new_branch = branch_bzrdir.create_branch()
 
1284
            new_branch.pull(self.branch)
 
1285
            for parent_id in self.get_parent_ids():
 
1286
                new_branch.fetch(self.branch, parent_id)
 
1287
            tree_transport = self.controldir.root_transport.clone(sub_path)
 
1288
            if tree_transport.base != branch_transport.base:
 
1289
                tree_bzrdir = format.initialize_on_transport(tree_transport)
 
1290
                tree_bzrdir.set_branch_reference(new_branch)
 
1291
            else:
 
1292
                tree_bzrdir = branch_bzrdir
 
1293
            wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
 
1294
            wt.set_parent_ids(self.get_parent_ids())
 
1295
            return wt
 
1296
 
 
1297
    def _get_check_refs(self):
 
1298
        """Return the references needed to perform a check of this tree.
 
1299
 
 
1300
        The default implementation returns no refs, and is only suitable for
 
1301
        trees that have no local caching and can commit on ghosts at any time.
 
1302
 
 
1303
        :seealso: breezy.check for details about check_refs.
 
1304
        """
 
1305
        return []
 
1306
 
 
1307
    def copy_content_into(self, tree, revision_id=None):
 
1308
        """Copy the current content and user files of this tree into tree."""
 
1309
        with self.lock_read():
 
1310
            if revision_id is None:
 
1311
                merge.transform_tree(tree, self)
 
1312
            else:
 
1313
                # TODO now merge from tree.last_revision to revision (to
 
1314
                # preserve user local changes)
 
1315
                try:
 
1316
                    other_tree = self.revision_tree(revision_id)
 
1317
                except errors.NoSuchRevision:
 
1318
                    other_tree = self.branch.repository.revision_tree(
 
1319
                        revision_id)
 
1320
 
 
1321
                merge.transform_tree(tree, other_tree)
 
1322
                if revision_id == _mod_revision.NULL_REVISION:
 
1323
                    new_parents = []
 
1324
                else:
 
1325
                    new_parents = [revision_id]
 
1326
                tree.set_parent_ids(new_parents)
 
1327
 
 
1328
 
 
1329
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):
 
1330
 
 
1331
    _tree_class = GitWorkingTree
 
1332
 
 
1333
    supports_versioned_directories = False
 
1334
 
 
1335
    supports_setting_file_ids = False
 
1336
 
 
1337
    supports_store_uncommitted = False
 
1338
 
 
1339
    supports_leftmost_parent_id_as_ghost = False
 
1340
 
 
1341
    supports_righthand_parent_id_as_ghost = False
 
1342
 
 
1343
    requires_normalized_unicode_filenames = True
 
1344
 
 
1345
    supports_merge_modified = False
 
1346
 
 
1347
    ignore_filename = ".gitignore"
 
1348
 
 
1349
    @property
 
1350
    def _matchingcontroldir(self):
 
1351
        from .dir import LocalGitControlDirFormat
 
1352
        return LocalGitControlDirFormat()
 
1353
 
 
1354
    def get_format_description(self):
 
1355
        return "Git Working Tree"
 
1356
 
 
1357
    def initialize(self, a_controldir, revision_id=None, from_branch=None,
 
1358
                   accelerator_tree=None, hardlink=False):
 
1359
        """See WorkingTreeFormat.initialize()."""
 
1360
        if not isinstance(a_controldir, LocalGitDir):
 
1361
            raise errors.IncompatibleFormat(self, a_controldir)
 
1362
        branch = a_controldir.open_branch(nascent_ok=True)
 
1363
        if revision_id is not None:
 
1364
            branch.set_last_revision(revision_id)
 
1365
        wt = GitWorkingTree(
 
1366
            a_controldir, a_controldir.open_repository(), branch)
 
1367
        for hook in MutableTree.hooks['post_build_tree']:
 
1368
            hook(wt)
 
1369
        return wt