/brz/remove-bazaar

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