/brz/remove-bazaar

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