/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-03-04 01:31:43 UTC
  • mfrom: (7058.6.5 memorytree-symlinks)
  • mto: This revision was merged to the branch mainline in revision 7318.
  • Revision ID: jelmer@jelmer.uk-20190304013143-7euyjbmanwo3tpmn
More improvements, add tests.

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 self.supports_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 (kind == 'directory' and f != '' and
 
572
                            os.path.exists(os.path.join(fullpath, '.git'))):
 
573
                        kind = 'tree-reference'
 
574
                    kinds[pos] = kind
 
575
 
 
576
    def flush(self):
 
577
        if self._lock_mode != 'w':
 
578
            raise errors.NotWriteLocked(self)
 
579
        # TODO(jelmer): This shouldn't be writing in-place, but index.lock is
 
580
        # already in use and GitFile doesn't allow overriding the lock file
 
581
        # name :(
 
582
        f = open(self.control_transport.local_abspath('index'), 'wb')
 
583
        # Note that _flush will close the file
 
584
        self._flush(f)
 
585
 
 
586
    def _flush(self, f):
 
587
        try:
 
588
            shaf = SHA1Writer(f)
 
589
            write_index_dict(shaf, self.index)
 
590
            shaf.close()
 
591
        except BaseException:
 
592
            f.abort()
 
593
            raise
 
594
        self._index_dirty = False
 
595
 
 
596
    def has_or_had_id(self, file_id):
 
597
        if self.has_id(file_id):
 
598
            return True
 
599
        if self.had_id(file_id):
 
600
            return True
 
601
        return False
 
602
 
 
603
    def had_id(self, file_id):
 
604
        path = self._basis_fileid_map.lookup_path(file_id)
 
605
        try:
 
606
            head = self.repository._git.head()
 
607
        except KeyError:
 
608
            # Assume no if basis is not accessible
 
609
            return False
 
610
        try:
 
611
            root_tree = self.store[head].tree
 
612
        except KeyError:
 
613
            return False
 
614
        try:
 
615
            tree_lookup_path(self.store.__getitem__,
 
616
                             root_tree, path.encode('utf-8'))
 
617
        except KeyError:
 
618
            return False
 
619
        else:
 
620
            return True
 
621
 
 
622
    def get_file_mtime(self, path):
 
623
        """See Tree.get_file_mtime."""
 
624
        try:
 
625
            return self._lstat(path).st_mtime
 
626
        except OSError as e:
 
627
            if e.errno == errno.ENOENT:
 
628
                raise errors.NoSuchFile(path)
 
629
            raise
 
630
 
 
631
    def is_ignored(self, filename):
 
632
        r"""Check whether the filename matches an ignore pattern.
 
633
 
 
634
        If the file is ignored, returns the pattern which caused it to
 
635
        be ignored, otherwise None.  So this can simply be used as a
 
636
        boolean if desired."""
 
637
        if getattr(self, '_global_ignoreglobster', None) is None:
 
638
            ignore_globs = set()
 
639
            ignore_globs.update(ignores.get_runtime_ignores())
 
640
            ignore_globs.update(ignores.get_user_ignores())
 
641
            self._global_ignoreglobster = globbing.ExceptionGlobster(
 
642
                ignore_globs)
 
643
        match = self._global_ignoreglobster.match(filename)
 
644
        if match is not None:
 
645
            return match
 
646
        try:
 
647
            if self.kind(filename) == 'directory':
 
648
                filename += '/'
 
649
        except errors.NoSuchFile:
 
650
            pass
 
651
        filename = filename.lstrip('/')
 
652
        ignore_manager = self._get_ignore_manager()
 
653
        ps = list(ignore_manager.find_matching(filename))
 
654
        if not ps:
 
655
            return None
 
656
        if not ps[-1].is_exclude:
 
657
            return None
 
658
        return bytes(ps[-1])
 
659
 
 
660
    def _get_ignore_manager(self):
 
661
        ignoremanager = getattr(self, '_ignoremanager', None)
 
662
        if ignoremanager is not None:
 
663
            return ignoremanager
 
664
 
 
665
        ignore_manager = IgnoreFilterManager.from_repo(self.repository._git)
 
666
        self._ignoremanager = ignore_manager
 
667
        return ignore_manager
 
668
 
 
669
    def _flush_ignore_list_cache(self):
 
670
        self._ignoremanager = None
 
671
 
 
672
    def set_last_revision(self, revid):
 
673
        if _mod_revision.is_null(revid):
 
674
            self.branch.set_last_revision_info(0, revid)
 
675
            return False
 
676
        _mod_revision.check_not_reserved_id(revid)
 
677
        try:
 
678
            self.branch.generate_revision_history(revid)
 
679
        except errors.NoSuchRevision:
 
680
            raise errors.GhostRevisionUnusableHere(revid)
 
681
 
 
682
    def _reset_data(self):
 
683
        try:
 
684
            head = self.repository._git.head()
 
685
        except KeyError:
 
686
            self._basis_fileid_map = GitFileIdMap({}, self.mapping)
 
687
        else:
 
688
            self._basis_fileid_map = self.mapping.get_fileid_map(
 
689
                self.store.__getitem__, self.store[head].tree)
 
690
        self._fileid_map = self._basis_fileid_map.copy()
 
691
 
 
692
    def get_file_verifier(self, path, stat_value=None):
 
693
        with self.lock_read():
 
694
            (index, subpath) = self._lookup_index(path.encode('utf-8'))
 
695
            try:
 
696
                return ("GIT", index[subpath].sha)
 
697
            except KeyError:
 
698
                if self._has_dir(path):
 
699
                    return ("GIT", None)
 
700
                raise errors.NoSuchFile(path)
 
701
 
 
702
    def get_file_sha1(self, path, stat_value=None):
 
703
        with self.lock_read():
 
704
            if not self.is_versioned(path):
 
705
                raise errors.NoSuchFile(path)
 
706
            abspath = self.abspath(path)
 
707
            try:
 
708
                return osutils.sha_file_by_name(abspath)
 
709
            except OSError as e:
 
710
                if e.errno in (errno.EISDIR, errno.ENOENT):
 
711
                    return None
 
712
                raise
 
713
 
 
714
    def revision_tree(self, revid):
 
715
        return self.repository.revision_tree(revid)
 
716
 
 
717
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
 
718
        mode = stat_result.st_mode
 
719
        return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
 
720
 
 
721
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
 
722
        return self.basis_tree().is_executable(path)
 
723
 
 
724
    def stored_kind(self, path):
 
725
        with self.lock_read():
 
726
            encoded_path = path.encode('utf-8')
 
727
            (index, subpath) = self._lookup_index(encoded_path)
 
728
            try:
 
729
                return mode_kind(index[subpath].mode)
 
730
            except KeyError:
 
731
                # Maybe it's a directory?
 
732
                if self._has_dir(encoded_path):
 
733
                    return "directory"
 
734
                raise errors.NoSuchFile(path)
 
735
 
 
736
    def _lstat(self, path):
 
737
        return os.lstat(self.abspath(path))
 
738
 
 
739
    def _live_entry(self, path):
 
740
        encoded_path = self.abspath(path.decode('utf-8')).encode(
 
741
            osutils._fs_enc)
 
742
        return index_entry_from_path(encoded_path)
 
743
 
 
744
    def is_executable(self, path):
 
745
        with self.lock_read():
 
746
            if self._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 self._supports_executable():
 
758
            return self._is_executable_from_path_and_stat_from_stat(path, stat_result)
 
759
        else:
 
760
            return self._is_executable_from_path_and_stat_from_basis(
 
761
                path, stat_result)
 
762
 
 
763
    def list_files(self, include_root=False, from_dir=None, recursive=True):
 
764
        if from_dir is None or from_dir == '.':
 
765
            from_dir = u""
 
766
        dir_ids = {}
 
767
        fk_entries = {'directory': tree.TreeDirectory,
 
768
                      'file': tree.TreeFile,
 
769
                      'symlink': tree.TreeLink,
 
770
                      'tree-reference': tree.TreeReference}
 
771
        with self.lock_read():
 
772
            root_ie = self._get_dir_ie(u"", None)
 
773
            if include_root and not from_dir:
 
774
                yield "", "V", root_ie.kind, root_ie
 
775
            dir_ids[u""] = root_ie.file_id
 
776
            if recursive:
 
777
                path_iterator = sorted(
 
778
                    self._iter_files_recursive(from_dir, include_dirs=True))
 
779
            else:
 
780
                encoded_from_dir = self.abspath(from_dir).encode(
 
781
                    osutils._fs_enc)
 
782
                path_iterator = sorted(
 
783
                    [os.path.join(from_dir, name.decode(osutils._fs_enc))
 
784
                     for name in os.listdir(encoded_from_dir)
 
785
                     if not self.controldir.is_control_filename(
 
786
                         name.decode(osutils._fs_enc)) and
 
787
                     not self.mapping.is_special_file(
 
788
                         name.decode(osutils._fs_enc))])
 
789
            for path in path_iterator:
 
790
                try:
 
791
                    encoded_path = path.encode("utf-8")
 
792
                except UnicodeEncodeError:
 
793
                    raise errors.BadFilenameEncoding(
 
794
                        path, osutils._fs_enc)
 
795
                (index, index_path) = self._lookup_index(encoded_path)
 
796
                try:
 
797
                    value = index[index_path]
 
798
                except KeyError:
 
799
                    value = None
 
800
                kind = self.kind(path)
 
801
                parent, name = posixpath.split(path)
 
802
                for dir_path, dir_ie in self._add_missing_parent_ids(
 
803
                        parent, dir_ids):
 
804
                    pass
 
805
                if kind in ('directory', 'tree-reference'):
 
806
                    if path != from_dir:
 
807
                        if self._has_dir(encoded_path):
 
808
                            ie = self._get_dir_ie(path, self.path2id(path))
 
809
                            status = "V"
 
810
                        elif self.is_ignored(path):
 
811
                            status = "I"
 
812
                            ie = fk_entries[kind]()
 
813
                        else:
 
814
                            status = "?"
 
815
                            ie = fk_entries[kind]()
 
816
                        yield (posixpath.relpath(path, from_dir), status, kind,
 
817
                               ie)
 
818
                    continue
 
819
                if value is not None:
 
820
                    ie = self._get_file_ie(name, path, value, dir_ids[parent])
 
821
                    yield (posixpath.relpath(path, from_dir), "V", ie.kind, ie)
 
822
                else:
 
823
                    ie = fk_entries[kind]()
 
824
                    yield (posixpath.relpath(path, from_dir),
 
825
                           ("I" if self.is_ignored(path) else "?"), kind, ie)
 
826
 
 
827
    def all_file_ids(self):
 
828
        raise errors.UnsupportedOperation(self.all_file_ids, self)
 
829
 
 
830
    def all_versioned_paths(self):
 
831
        with self.lock_read():
 
832
            paths = {u""}
 
833
            for path in self.index:
 
834
                if self.mapping.is_special_file(path):
 
835
                    continue
 
836
                path = path.decode("utf-8")
 
837
                paths.add(path)
 
838
                while path != "":
 
839
                    path = posixpath.dirname(path).strip("/")
 
840
                    if path in paths:
 
841
                        break
 
842
                    paths.add(path)
 
843
            return paths
 
844
 
 
845
    def iter_child_entries(self, path):
 
846
        encoded_path = path.encode('utf-8')
 
847
        with self.lock_read():
 
848
            parent_id = self.path2id(path)
 
849
            found_any = False
 
850
            for item_path, value in self.index.iteritems():
 
851
                decoded_item_path = item_path.decode('utf-8')
 
852
                if self.mapping.is_special_file(item_path):
 
853
                    continue
 
854
                if not osutils.is_inside(path, decoded_item_path):
 
855
                    continue
 
856
                found_any = True
 
857
                subpath = posixpath.relpath(decoded_item_path, path)
 
858
                if '/' in subpath:
 
859
                    dirname = subpath.split('/', 1)[0]
 
860
                    file_ie = self._get_dir_ie(
 
861
                        posixpath.join(path, dirname), parent_id)
 
862
                else:
 
863
                    (unused_parent, name) = posixpath.split(decoded_item_path)
 
864
                    file_ie = self._get_file_ie(
 
865
                        name, decoded_item_path, value, parent_id)
 
866
                yield file_ie
 
867
            if not found_any and path != u'':
 
868
                raise errors.NoSuchFile(path)
 
869
 
 
870
    def conflicts(self):
 
871
        with self.lock_read():
 
872
            conflicts = _mod_conflicts.ConflictList()
 
873
            for item_path, value in self.index.iteritems():
 
874
                if value.flags & FLAG_STAGEMASK:
 
875
                    conflicts.append(_mod_conflicts.TextConflict(
 
876
                        item_path.decode('utf-8')))
 
877
            return conflicts
 
878
 
 
879
    def set_conflicts(self, conflicts):
 
880
        by_path = set()
 
881
        for conflict in conflicts:
 
882
            if conflict.typestring in ('text conflict', 'contents conflict'):
 
883
                by_path.add(conflict.path.encode('utf-8'))
 
884
            else:
 
885
                raise errors.UnsupportedOperation(self.set_conflicts, self)
 
886
        with self.lock_tree_write():
 
887
            for path in self.index:
 
888
                self._set_conflicted(path, path in by_path)
 
889
 
 
890
    def _set_conflicted(self, path, conflicted):
 
891
        trace.mutter('change conflict: %r -> %r', path, conflicted)
 
892
        value = self.index[path]
 
893
        self._index_dirty = True
 
894
        if conflicted:
 
895
            self.index[path] = (value[:9] + (value[9] | FLAG_STAGEMASK, ))
 
896
        else:
 
897
            self.index[path] = (value[:9] + (value[9] & ~ FLAG_STAGEMASK, ))
 
898
 
 
899
    def add_conflicts(self, new_conflicts):
 
900
        with self.lock_tree_write():
 
901
            for conflict in new_conflicts:
 
902
                if conflict.typestring in ('text conflict',
 
903
                                           'contents conflict'):
 
904
                    try:
 
905
                        self._set_conflicted(
 
906
                            conflict.path.encode('utf-8'), True)
 
907
                    except KeyError:
 
908
                        raise errors.UnsupportedOperation(
 
909
                            self.add_conflicts, self)
 
910
                else:
 
911
                    raise errors.UnsupportedOperation(self.add_conflicts, self)
 
912
 
 
913
    def walkdirs(self, prefix=""):
 
914
        """Walk the directories of this tree.
 
915
 
 
916
        returns a generator which yields items in the form:
 
917
                ((curren_directory_path, fileid),
 
918
                 [(file1_path, file1_name, file1_kind, (lstat), file1_id,
 
919
                   file1_kind), ... ])
 
920
 
 
921
        This API returns a generator, which is only valid during the current
 
922
        tree transaction - within a single lock_read or lock_write duration.
 
923
 
 
924
        If the tree is not locked, it may cause an error to be raised,
 
925
        depending on the tree implementation.
 
926
        """
 
927
        from bisect import bisect_left
 
928
        import operator
 
929
        disk_top = self.abspath(prefix)
 
930
        if disk_top.endswith('/'):
 
931
            disk_top = disk_top[:-1]
 
932
        top_strip_len = len(disk_top) + 1
 
933
        inventory_iterator = self._walkdirs(prefix)
 
934
        disk_iterator = osutils.walkdirs(disk_top, prefix)
 
935
        try:
 
936
            current_disk = next(disk_iterator)
 
937
            disk_finished = False
 
938
        except OSError as e:
 
939
            if not (e.errno == errno.ENOENT
 
940
                    or (sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
 
941
                raise
 
942
            current_disk = None
 
943
            disk_finished = True
 
944
        try:
 
945
            current_inv = next(inventory_iterator)
 
946
            inv_finished = False
 
947
        except StopIteration:
 
948
            current_inv = None
 
949
            inv_finished = True
 
950
        while not inv_finished or not disk_finished:
 
951
            if current_disk:
 
952
                ((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
 
953
                    cur_disk_dir_content) = current_disk
 
954
            else:
 
955
                ((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
 
956
                    cur_disk_dir_content) = ((None, None), None)
 
957
            if not disk_finished:
 
958
                # strip out .bzr dirs
 
959
                if (cur_disk_dir_path_from_top[top_strip_len:] == ''
 
960
                        and len(cur_disk_dir_content) > 0):
 
961
                    # osutils.walkdirs can be made nicer -
 
962
                    # yield the path-from-prefix rather than the pathjoined
 
963
                    # value.
 
964
                    bzrdir_loc = bisect_left(cur_disk_dir_content,
 
965
                                             ('.git', '.git'))
 
966
                    if (bzrdir_loc < len(cur_disk_dir_content) and
 
967
                        self.controldir.is_control_filename(
 
968
                            cur_disk_dir_content[bzrdir_loc][0])):
 
969
                        # we dont yield the contents of, or, .bzr itself.
 
970
                        del cur_disk_dir_content[bzrdir_loc]
 
971
            if inv_finished:
 
972
                # everything is unknown
 
973
                direction = 1
 
974
            elif disk_finished:
 
975
                # everything is missing
 
976
                direction = -1
 
977
            else:
 
978
                direction = ((current_inv[0][0] > cur_disk_dir_relpath)
 
979
                             - (current_inv[0][0] < cur_disk_dir_relpath))
 
980
            if direction > 0:
 
981
                # disk is before inventory - unknown
 
982
                dirblock = [(relpath, basename, kind, stat, None, None) for
 
983
                            relpath, basename, kind, stat, top_path in
 
984
                            cur_disk_dir_content]
 
985
                yield (cur_disk_dir_relpath, None), dirblock
 
986
                try:
 
987
                    current_disk = next(disk_iterator)
 
988
                except StopIteration:
 
989
                    disk_finished = True
 
990
            elif direction < 0:
 
991
                # inventory is before disk - missing.
 
992
                dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
 
993
                            for relpath, basename, dkind, stat, fileid, kind in
 
994
                            current_inv[1]]
 
995
                yield (current_inv[0][0], current_inv[0][1]), dirblock
 
996
                try:
 
997
                    current_inv = next(inventory_iterator)
 
998
                except StopIteration:
 
999
                    inv_finished = True
 
1000
            else:
 
1001
                # versioned present directory
 
1002
                # merge the inventory and disk data together
 
1003
                dirblock = []
 
1004
                for relpath, subiterator in itertools.groupby(sorted(
 
1005
                        current_inv[1] + cur_disk_dir_content,
 
1006
                        key=operator.itemgetter(0)), operator.itemgetter(1)):
 
1007
                    path_elements = list(subiterator)
 
1008
                    if len(path_elements) == 2:
 
1009
                        inv_row, disk_row = path_elements
 
1010
                        # versioned, present file
 
1011
                        dirblock.append((inv_row[0],
 
1012
                                         inv_row[1], disk_row[2],
 
1013
                                         disk_row[3], inv_row[4],
 
1014
                                         inv_row[5]))
 
1015
                    elif len(path_elements[0]) == 5:
 
1016
                        # unknown disk file
 
1017
                        dirblock.append(
 
1018
                            (path_elements[0][0], path_elements[0][1],
 
1019
                                path_elements[0][2], path_elements[0][3],
 
1020
                                None, None))
 
1021
                    elif len(path_elements[0]) == 6:
 
1022
                        # versioned, absent file.
 
1023
                        dirblock.append(
 
1024
                            (path_elements[0][0], path_elements[0][1],
 
1025
                                'unknown', None, path_elements[0][4],
 
1026
                                path_elements[0][5]))
 
1027
                    else:
 
1028
                        raise NotImplementedError('unreachable code')
 
1029
                yield current_inv[0], dirblock
 
1030
                try:
 
1031
                    current_inv = next(inventory_iterator)
 
1032
                except StopIteration:
 
1033
                    inv_finished = True
 
1034
                try:
 
1035
                    current_disk = next(disk_iterator)
 
1036
                except StopIteration:
 
1037
                    disk_finished = True
 
1038
 
 
1039
    def _walkdirs(self, prefix=u""):
 
1040
        if prefix != u"":
 
1041
            prefix += u"/"
 
1042
        prefix = prefix.encode('utf-8')
 
1043
        per_dir = defaultdict(set)
 
1044
        if prefix == b"":
 
1045
            per_dir[(u'', self.get_root_id())] = set()
 
1046
 
 
1047
        def add_entry(path, kind):
 
1048
            if path == b'' or not path.startswith(prefix):
 
1049
                return
 
1050
            (dirname, child_name) = posixpath.split(path)
 
1051
            add_entry(dirname, 'directory')
 
1052
            dirname = dirname.decode("utf-8")
 
1053
            dir_file_id = self.path2id(dirname)
 
1054
            if not isinstance(value, tuple) or len(value) != 10:
 
1055
                raise ValueError(value)
 
1056
            per_dir[(dirname, dir_file_id)].add(
 
1057
                (path.decode("utf-8"), child_name.decode("utf-8"),
 
1058
                 kind, None,
 
1059
                 self.path2id(path.decode("utf-8")),
 
1060
                 kind))
 
1061
        with self.lock_read():
 
1062
            for path, value in self.index.iteritems():
 
1063
                if self.mapping.is_special_file(path):
 
1064
                    continue
 
1065
                if not path.startswith(prefix):
 
1066
                    continue
 
1067
                add_entry(path, mode_kind(value.mode))
 
1068
        return ((k, sorted(v)) for (k, v) in sorted(per_dir.items()))
 
1069
 
 
1070
    def get_shelf_manager(self):
 
1071
        raise workingtree.ShelvingUnsupported()
 
1072
 
 
1073
    def store_uncommitted(self):
 
1074
        raise errors.StoringUncommittedNotSupported(self)
 
1075
 
 
1076
    def apply_inventory_delta(self, changes):
 
1077
        for (old_path, new_path, file_id, ie) in changes:
 
1078
            if old_path is not None:
 
1079
                (index, old_subpath) = self._lookup_index(
 
1080
                    old_path.encode('utf-8'))
 
1081
                try:
 
1082
                    self._index_del_entry(index, old_subpath)
 
1083
                except KeyError:
 
1084
                    pass
 
1085
                else:
 
1086
                    self._versioned_dirs = None
 
1087
            if new_path is not None and ie.kind != 'directory':
 
1088
                if ie.kind == 'tree-reference':
 
1089
                    self._index_add_entry(
 
1090
                        new_path, ie.kind,
 
1091
                        reference_revision=ie.reference_revision)
 
1092
                else:
 
1093
                    self._index_add_entry(new_path, ie.kind)
 
1094
        self.flush()
 
1095
 
 
1096
    def annotate_iter(self, path,
 
1097
                      default_revision=_mod_revision.CURRENT_REVISION):
 
1098
        """See Tree.annotate_iter
 
1099
 
 
1100
        This implementation will use the basis tree implementation if possible.
 
1101
        Lines not in the basis are attributed to CURRENT_REVISION
 
1102
 
 
1103
        If there are pending merges, lines added by those merges will be
 
1104
        incorrectly attributed to CURRENT_REVISION (but after committing, the
 
1105
        attribution will be correct).
 
1106
        """
 
1107
        with self.lock_read():
 
1108
            maybe_file_parent_keys = []
 
1109
            for parent_id in self.get_parent_ids():
 
1110
                try:
 
1111
                    parent_tree = self.revision_tree(parent_id)
 
1112
                except errors.NoSuchRevisionInTree:
 
1113
                    parent_tree = self.branch.repository.revision_tree(
 
1114
                        parent_id)
 
1115
                with parent_tree.lock_read():
 
1116
                    # TODO(jelmer): Use rename/copy tracker to find path name
 
1117
                    # in parent
 
1118
                    parent_path = path
 
1119
                    try:
 
1120
                        kind = parent_tree.kind(parent_path)
 
1121
                    except errors.NoSuchFile:
 
1122
                        continue
 
1123
                    if kind != 'file':
 
1124
                        # Note: this is slightly unnecessary, because symlinks
 
1125
                        # and directories have a "text" which is the empty
 
1126
                        # text, and we know that won't mess up annotations. But
 
1127
                        # it seems cleaner
 
1128
                        continue
 
1129
                    parent_text_key = (
 
1130
                        parent_path,
 
1131
                        parent_tree.get_file_revision(parent_path))
 
1132
                    if parent_text_key not in maybe_file_parent_keys:
 
1133
                        maybe_file_parent_keys.append(parent_text_key)
 
1134
            # Now we have the parents of this content
 
1135
            from breezy.annotate import Annotator
 
1136
            from .annotate import AnnotateProvider
 
1137
            annotate_provider = AnnotateProvider(
 
1138
                self.branch.repository._file_change_scanner)
 
1139
            annotator = Annotator(annotate_provider)
 
1140
 
 
1141
            from breezy.graph import Graph
 
1142
            graph = Graph(annotate_provider)
 
1143
            heads = graph.heads(maybe_file_parent_keys)
 
1144
            file_parent_keys = []
 
1145
            for key in maybe_file_parent_keys:
 
1146
                if key in heads:
 
1147
                    file_parent_keys.append(key)
 
1148
 
 
1149
            text = self.get_file_text(path)
 
1150
            this_key = (path, default_revision)
 
1151
            annotator.add_special_text(this_key, file_parent_keys, text)
 
1152
            annotations = [(key[-1], line)
 
1153
                           for key, line in annotator.annotate_flat(this_key)]
 
1154
            return annotations
 
1155
 
 
1156
    def _rename_one(self, from_rel, to_rel):
 
1157
        os.rename(self.abspath(from_rel), self.abspath(to_rel))
 
1158
 
 
1159
    def _build_checkout_with_index(self):
 
1160
        build_index_from_tree(
 
1161
            self.user_transport.local_abspath('.'),
 
1162
            self.control_transport.local_abspath("index"),
 
1163
            self.store,
 
1164
            None
 
1165
            if self.branch.head is None
 
1166
            else self.store[self.branch.head].tree,
 
1167
            honor_filemode=self._supports_executable())
 
1168
 
 
1169
    def reset_state(self, revision_ids=None):
 
1170
        """Reset the state of the working tree.
 
1171
 
 
1172
        This does a hard-reset to a last-known-good state. This is a way to
 
1173
        fix if something got corrupted (like the .git/index file)
 
1174
        """
 
1175
        with self.lock_tree_write():
 
1176
            if revision_ids is not None:
 
1177
                self.set_parent_ids(revision_ids)
 
1178
            self.index.clear()
 
1179
            self._index_dirty = True
 
1180
            if self.branch.head is not None:
 
1181
                for entry in self.store.iter_tree_contents(
 
1182
                        self.store[self.branch.head].tree):
 
1183
                    if not validate_path(entry.path):
 
1184
                        continue
 
1185
 
 
1186
                    if S_ISGITLINK(entry.mode):
 
1187
                        pass  # TODO(jelmer): record and return submodule paths
 
1188
                    else:
 
1189
                        # Let's at least try to use the working tree file:
 
1190
                        try:
 
1191
                            st = self._lstat(self.abspath(
 
1192
                                entry.path.decode('utf-8')))
 
1193
                        except OSError:
 
1194
                            # But if it doesn't exist, we'll make something up.
 
1195
                            obj = self.store[entry.sha]
 
1196
                            st = os.stat_result((entry.mode, 0, 0, 0,
 
1197
                                                 0, 0, len(
 
1198
                                                     obj.as_raw_string()), 0,
 
1199
                                                 0, 0))
 
1200
                    (index, subpath) = self._lookup_index(entry.path)
 
1201
                    index[subpath] = index_entry_from_stat(st, entry.sha, 0)
 
1202
 
 
1203
    def pull(self, source, overwrite=False, stop_revision=None,
 
1204
             change_reporter=None, possible_transports=None, local=False,
 
1205
             show_base=False):
 
1206
        with self.lock_write(), source.lock_read():
 
1207
            old_revision = self.branch.last_revision()
 
1208
            basis_tree = self.basis_tree()
 
1209
            count = self.branch.pull(source, overwrite, stop_revision,
 
1210
                                     possible_transports=possible_transports,
 
1211
                                     local=local)
 
1212
            new_revision = self.branch.last_revision()
 
1213
            if new_revision != old_revision:
 
1214
                with basis_tree.lock_read():
 
1215
                    new_basis_tree = self.branch.basis_tree()
 
1216
                    merge.merge_inner(
 
1217
                        self.branch,
 
1218
                        new_basis_tree,
 
1219
                        basis_tree,
 
1220
                        this_tree=self,
 
1221
                        change_reporter=change_reporter,
 
1222
                        show_base=show_base)
 
1223
            return count
 
1224
 
 
1225
    def add_reference(self, sub_tree):
 
1226
        """Add a TreeReference to the tree, pointing at sub_tree.
 
1227
 
 
1228
        :param sub_tree: subtree to add.
 
1229
        """
 
1230
        with self.lock_tree_write():
 
1231
            try:
 
1232
                sub_tree_path = self.relpath(sub_tree.basedir)
 
1233
            except errors.PathNotChild:
 
1234
                raise BadReferenceTarget(
 
1235
                    self, sub_tree, 'Target not inside tree.')
 
1236
 
 
1237
            self._add([sub_tree_path], [None], ['tree-reference'])
 
1238
 
 
1239
    def _read_submodule_head(self, path):
 
1240
        return read_submodule_head(self.abspath(path))
 
1241
 
 
1242
    def get_reference_revision(self, path):
 
1243
        hexsha = self._read_submodule_head(path)
 
1244
        if hexsha is None:
 
1245
            return _mod_revision.NULL_REVISION
 
1246
        return self.branch.lookup_foreign_revision_id(hexsha)
 
1247
 
 
1248
    def get_nested_tree(self, path):
 
1249
        return workingtree.WorkingTree.open(self.abspath(path))
 
1250
 
 
1251
    def _directory_is_tree_reference(self, relpath):
 
1252
        # as a special case, if a directory contains control files then
 
1253
        # it's a tree reference, except that the root of the tree is not
 
1254
        return relpath and osutils.lexists(self.abspath(relpath) + u"/.git")
 
1255
 
 
1256
    def extract(self, sub_path, format=None):
 
1257
        """Extract a subtree from this tree.
 
1258
 
 
1259
        A new branch will be created, relative to the path for this tree.
 
1260
        """
 
1261
        def mkdirs(path):
 
1262
            segments = osutils.splitpath(path)
 
1263
            transport = self.branch.controldir.root_transport
 
1264
            for name in segments:
 
1265
                transport = transport.clone(name)
 
1266
                transport.ensure_base()
 
1267
            return transport
 
1268
 
 
1269
        with self.lock_tree_write():
 
1270
            self.flush()
 
1271
            branch_transport = mkdirs(sub_path)
 
1272
            if format is None:
 
1273
                format = self.controldir.cloning_metadir()
 
1274
            branch_transport.ensure_base()
 
1275
            branch_bzrdir = format.initialize_on_transport(branch_transport)
 
1276
            try:
 
1277
                repo = branch_bzrdir.find_repository()
 
1278
            except errors.NoRepositoryPresent:
 
1279
                repo = branch_bzrdir.create_repository()
 
1280
            if not repo.supports_rich_root():
 
1281
                raise errors.RootNotRich()
 
1282
            new_branch = branch_bzrdir.create_branch()
 
1283
            new_branch.pull(self.branch)
 
1284
            for parent_id in self.get_parent_ids():
 
1285
                new_branch.fetch(self.branch, parent_id)
 
1286
            tree_transport = self.controldir.root_transport.clone(sub_path)
 
1287
            if tree_transport.base != branch_transport.base:
 
1288
                tree_bzrdir = format.initialize_on_transport(tree_transport)
 
1289
                tree_bzrdir.set_branch_reference(new_branch)
 
1290
            else:
 
1291
                tree_bzrdir = branch_bzrdir
 
1292
            wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
 
1293
            wt.set_parent_ids(self.get_parent_ids())
 
1294
            return wt
 
1295
 
 
1296
    def _get_check_refs(self):
 
1297
        """Return the references needed to perform a check of this tree.
 
1298
 
 
1299
        The default implementation returns no refs, and is only suitable for
 
1300
        trees that have no local caching and can commit on ghosts at any time.
 
1301
 
 
1302
        :seealso: breezy.check for details about check_refs.
 
1303
        """
 
1304
        return []
 
1305
 
 
1306
    def copy_content_into(self, tree, revision_id=None):
 
1307
        """Copy the current content and user files of this tree into tree."""
 
1308
        with self.lock_read():
 
1309
            if revision_id is None:
 
1310
                merge.transform_tree(tree, self)
 
1311
            else:
 
1312
                # TODO now merge from tree.last_revision to revision (to
 
1313
                # preserve user local changes)
 
1314
                try:
 
1315
                    other_tree = self.revision_tree(revision_id)
 
1316
                except errors.NoSuchRevision:
 
1317
                    other_tree = self.branch.repository.revision_tree(
 
1318
                        revision_id)
 
1319
 
 
1320
                merge.transform_tree(tree, other_tree)
 
1321
                if revision_id == _mod_revision.NULL_REVISION:
 
1322
                    new_parents = []
 
1323
                else:
 
1324
                    new_parents = [revision_id]
 
1325
                tree.set_parent_ids(new_parents)
 
1326
 
 
1327
 
 
1328
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):
 
1329
 
 
1330
    _tree_class = GitWorkingTree
 
1331
 
 
1332
    supports_versioned_directories = False
 
1333
 
 
1334
    supports_setting_file_ids = False
 
1335
 
 
1336
    supports_store_uncommitted = False
 
1337
 
 
1338
    supports_leftmost_parent_id_as_ghost = False
 
1339
 
 
1340
    supports_righthand_parent_id_as_ghost = False
 
1341
 
 
1342
    requires_normalized_unicode_filenames = True
 
1343
 
 
1344
    supports_merge_modified = False
 
1345
 
 
1346
    ignore_filename = ".gitignore"
 
1347
 
 
1348
    @property
 
1349
    def _matchingcontroldir(self):
 
1350
        from .dir import LocalGitControlDirFormat
 
1351
        return LocalGitControlDirFormat()
 
1352
 
 
1353
    def get_format_description(self):
 
1354
        return "Git Working Tree"
 
1355
 
 
1356
    def initialize(self, a_controldir, revision_id=None, from_branch=None,
 
1357
                   accelerator_tree=None, hardlink=False):
 
1358
        """See WorkingTreeFormat.initialize()."""
 
1359
        if not isinstance(a_controldir, LocalGitDir):
 
1360
            raise errors.IncompatibleFormat(self, a_controldir)
 
1361
        branch = a_controldir.open_branch(nascent_ok=True)
 
1362
        if revision_id is not None:
 
1363
            branch.set_last_revision(revision_id)
 
1364
        wt = GitWorkingTree(
 
1365
            a_controldir, a_controldir.open_repository(), branch)
 
1366
        for hook in MutableTree.hooks['post_build_tree']:
 
1367
            hook(wt)
 
1368
        return wt