/brz/remove-bazaar

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