/brz/remove-bazaar

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