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