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