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