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