/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
7131.3.1 by Jelmer Vernooij
When opening working trees with .git files, open the right control transport.
115
        self._transport = self.repository._git._controltransport
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):
7141.3.2 by Jelmer Vernooij
add some tests.
435
            if filepath == '':
436
                return
0.200.1733 by Jelmer Vernooij
Support handling of custom ids in smart_add.
437
            if action is not None:
438
                parent_path = posixpath.dirname(filepath)
439
                parent_id = self.path2id(parent_path)
440
                parent_ie = self._get_dir_ie(parent_path, parent_id)
441
                file_id = action(self, parent_ie, filepath, kind)
442
                if file_id is not None:
443
                    raise workingtree.SettingFileIdUnsupported()
444
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
445
        with self.lock_tree_write():
446
            for filepath in osutils.canonical_relpaths(self.basedir, file_list):
0.352.1 by Jelmer Vernooij
Check for normalization during add.
447
                filepath, can_access = osutils.normalized_filename(filepath)
448
                if not can_access:
449
                    raise errors.InvalidNormalization(filepath)
450
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
451
                abspath = self.abspath(filepath)
0.200.1240 by Jelmer Vernooij
Implement GitWorkingTree.smart_add.
452
                kind = osutils.file_kind(abspath)
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
453
                if kind in ("file", "symlink"):
0.429.2 by Jelmer Vernooij
Some more work on submodule support.
454
                    (index, subpath) = self._lookup_index(filepath.encode('utf-8'))
455
                    if subpath in index:
0.369.2 by Jelmer Vernooij
Fix tests.
456
                        # Already present
457
                        continue
0.200.1733 by Jelmer Vernooij
Support handling of custom ids in smart_add.
458
                    call_action(filepath, kind)
0.200.1308 by Jelmer Vernooij
Write index to disk after adding files.
459
                    if save:
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
460
                        self._index_add_entry(filepath, kind)
461
                    added.append(filepath)
462
                elif kind == "directory":
0.429.2 by Jelmer Vernooij
Some more work on submodule support.
463
                    (index, subpath) = self._lookup_index(filepath.encode('utf-8'))
464
                    if subpath not in index:
0.369.2 by Jelmer Vernooij
Fix tests.
465
                        call_action(filepath, kind)
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
466
                    if recurse:
467
                        user_dirs.append(filepath)
468
                else:
469
                    raise errors.BadFileKindError(filename=abspath, kind=kind)
470
            for user_dir in user_dirs:
471
                abs_user_dir = self.abspath(user_dir)
0.200.1752 by Jelmer Vernooij
Don't traverse nested trees in WorkingTree.smart_add.
472
                if user_dir != '':
473
                    try:
474
                        transport = _mod_transport.get_transport_from_path(abs_user_dir)
475
                        _mod_controldir.ControlDirFormat.find_format(transport)
476
                        subtree = True
477
                    except errors.NotBranchError:
478
                        subtree = False
479
                    except errors.UnsupportedFormatError:
480
                        subtree = False
481
                else:
482
                    subtree = False
483
                if subtree:
0.200.1769 by Jelmer Vernooij
Raise proper error when encountering nested trees.
484
                    trace.warning('skipping nested tree %r', abs_user_dir)
0.200.1752 by Jelmer Vernooij
Don't traverse nested trees in WorkingTree.smart_add.
485
                    continue
486
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
487
                for name in os.listdir(abs_user_dir):
488
                    subp = os.path.join(user_dir, name)
489
                    if self.is_control_filename(subp) or self.mapping.is_special_file(subp):
490
                        continue
491
                    ignore_glob = self.is_ignored(subp)
492
                    if ignore_glob is not None:
493
                        ignored.setdefault(ignore_glob, []).append(subp)
494
                        continue
495
                    abspath = self.abspath(subp)
496
                    kind = osutils.file_kind(abspath)
497
                    if kind == "directory":
498
                        user_dirs.append(subp)
499
                    else:
7067.13.14 by Jelmer Vernooij
Fix a smart_add test.
500
                        (index, subpath) = self._lookup_index(subp.encode('utf-8'))
501
                        if subpath in index:
0.369.2 by Jelmer Vernooij
Fix tests.
502
                            # Already present
503
                            continue
0.369.3 by Jelmer Vernooij
Fix another conflict test.
504
                        if subp in conflicts_related:
505
                            continue
7141.3.1 by Brian de Alwis
'brz add' in git format doesn't report files added
506
                        call_action(subp, kind)
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
507
                        if save:
508
                            self._index_add_entry(subp, kind)
0.200.1751 by Jelmer Vernooij
Fix smart_add return value.
509
                        added.append(subp)
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
510
            return added, ignored
0.200.1240 by Jelmer Vernooij
Implement GitWorkingTree.smart_add.
511
0.200.1712 by Jelmer Vernooij
Add file_id prefix.
512
    def has_filename(self, filename):
513
        return osutils.lexists(self.abspath(filename))
514
0.200.1766 by Jelmer Vernooij
Fix another list_files test, integrate is_versioned.
515
    def _iter_files_recursive(self, from_dir=None, include_dirs=False):
0.200.1328 by Jelmer Vernooij
More test fixes.
516
        if from_dir is None:
0.379.1 by Jelmer Vernooij
Improve unicode handling in GitWorkingTree.
517
            from_dir = u""
0.341.1 by Jelmer Vernooij
Fix BadFilenameEncoding raising during WorkingTree.extras.
518
        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.
519
            dir_relpath = dirpath[len(self.basedir):].strip(b"/")
520
            if self.controldir.is_control_filename(dir_relpath.decode(osutils._fs_enc)):
0.200.605 by Jelmer Vernooij
Ignore directories in WorkingTree.extras().
521
                continue
0.200.1766 by Jelmer Vernooij
Fix another list_files test, integrate is_versioned.
522
            for name in list(dirnames):
7018.3.10 by Jelmer Vernooij
Consistent return values in PreviewTree.list_files.
523
                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.
524
                    dirnames.remove(name)
525
                    continue
526
                relpath = os.path.join(dir_relpath, name)
527
                if include_dirs:
0.341.1 by Jelmer Vernooij
Fix BadFilenameEncoding raising during WorkingTree.extras.
528
                    try:
529
                        yield relpath.decode(osutils._fs_enc)
0.379.1 by Jelmer Vernooij
Improve unicode handling in GitWorkingTree.
530
                    except UnicodeDecodeError:
0.341.1 by Jelmer Vernooij
Fix BadFilenameEncoding raising during WorkingTree.extras.
531
                        raise errors.BadFilenameEncoding(
532
                            relpath, osutils._fs_enc)
0.200.1766 by Jelmer Vernooij
Fix another list_files test, integrate is_versioned.
533
                if not self._has_dir(relpath):
534
                    dirnames.remove(name)
535
            for name in filenames:
536
                if not self.mapping.is_special_file(name):
0.341.1 by Jelmer Vernooij
Fix BadFilenameEncoding raising during WorkingTree.extras.
537
                    yp = os.path.join(dir_relpath, name)
538
                    try:
539
                        yield yp.decode(osutils._fs_enc)
540
                    except UnicodeDecodeError:
541
                        raise errors.BadFilenameEncoding(
542
                            yp, osutils._fs_enc)
0.200.1327 by Jelmer Vernooij
Factor out all file browsing in extras.
543
544
    def extras(self):
545
        """Yield all unversioned files in this WorkingTree.
546
        """
0.200.1676 by Jelmer Vernooij
Fix typo.
547
        with self.lock_read():
0.429.11 by Jelmer Vernooij
Merge trunk.
548
            index_paths = set([p.decode('utf-8') for p, i in self._recurse_index_entries()])
549
            all_paths = set(self._iter_files_recursive(include_dirs=True))
550
            for p in (all_paths - index_paths):
7018.3.2 by Jelmer Vernooij
Fix some git tests.
551
                if not self._has_dir(p.encode('utf-8')):
0.379.1 by Jelmer Vernooij
Improve unicode handling in GitWorkingTree.
552
                    yield p
0.200.605 by Jelmer Vernooij
Ignore directories in WorkingTree.extras().
553
0.429.17 by Jelmer Vernooij
Fix some more tests.
554
    def _gather_kinds(self, files, kinds):
555
        """See MutableTree._gather_kinds."""
556
        with self.lock_tree_write():
557
            for pos, f in enumerate(files):
558
                if kinds[pos] is None:
559
                    fullpath = osutils.normpath(self.abspath(f))
560
                    try:
561
                         kind = osutils.file_kind(fullpath)
562
                    except OSError as e:
563
                        if e.errno == errno.ENOENT:
564
                            raise errors.NoSuchFile(fullpath)
565
                    if kind == 'directory' and f != '' and os.path.exists(os.path.join(fullpath, '.git')):
566
                        kind = 'tree-reference'
567
                    kinds[pos] = kind
568
0.200.382 by Jelmer Vernooij
Support flushing index.
569
    def flush(self):
0.287.6 by Jelmer Vernooij
Fix some more tests.
570
        if self._lock_mode != 'w':
571
            raise errors.NotWriteLocked(self)
0.415.5 by Jelmer Vernooij
Don't flush, just wait for unlock.
572
        # TODO(jelmer): This shouldn't be writing in-place, but index.lock is
573
        # already in use and GitFile doesn't allow overriding the lock file name :(
0.415.4 by Jelmer Vernooij
proper locking on index.
574
        f = open(self.control_transport.local_abspath('index'), 'wb')
575
        # Note that _flush will close the file
576
        self._flush(f)
577
578
    def _flush(self, f):
579
        try:
580
            shaf = SHA1Writer(f)
581
            write_index_dict(shaf, self.index)
582
            shaf.close()
583
        except:
584
            f.abort()
585
            raise
586
        self._index_dirty = False
0.200.382 by Jelmer Vernooij
Support flushing index.
587
0.200.1202 by Jelmer Vernooij
Implement has_or_had_id.
588
    def has_or_had_id(self, file_id):
589
        if self.has_id(file_id):
590
            return True
591
        if self.had_id(file_id):
592
            return True
593
        return False
594
595
    def had_id(self, file_id):
7018.3.2 by Jelmer Vernooij
Fix some git tests.
596
        path = self._basis_fileid_map.lookup_path(file_id)
0.200.1202 by Jelmer Vernooij
Implement has_or_had_id.
597
        try:
598
            head = self.repository._git.head()
599
        except KeyError:
600
            # Assume no if basis is not accessible
601
            return False
0.336.2 by Jelmer Vernooij
Don't use ZERO_SHA outside of remote communication to indicate empty history.
602
        try:
603
            root_tree = self.store[head].tree
604
        except KeyError:
0.200.1205 by Jelmer Vernooij
Implement GitWorkingTree.stored_kind.
605
            return False
0.200.1202 by Jelmer Vernooij
Implement has_or_had_id.
606
        try:
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
607
            tree_lookup_path(self.store.__getitem__, root_tree, path.encode('utf-8'))
0.200.1202 by Jelmer Vernooij
Implement has_or_had_id.
608
        except KeyError:
609
            return False
610
        else:
611
            return True
612
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
613
    def get_file_mtime(self, path, file_id=None):
0.200.1200 by Jelmer Vernooij
Support GitWorkingTree.get_file_mtime.
614
        """See Tree.get_file_mtime."""
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
615
        try:
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
616
            return self._lstat(path).st_mtime
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
617
        except OSError as e:
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
618
            if e.errno == errno.ENOENT:
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
619
                raise errors.NoSuchFile(path)
620
            raise
0.200.1200 by Jelmer Vernooij
Support GitWorkingTree.get_file_mtime.
621
0.200.1655 by Jelmer Vernooij
Basic support for git ignores.
622
    def is_ignored(self, filename):
623
        r"""Check whether the filename matches an ignore pattern.
624
625
        If the file is ignored, returns the pattern which caused it to
626
        be ignored, otherwise None.  So this can simply be used as a
627
        boolean if desired."""
628
        if getattr(self, '_global_ignoreglobster', None) is None:
629
            ignore_globs = set()
630
            ignore_globs.update(ignores.get_runtime_ignores())
631
            ignore_globs.update(ignores.get_user_ignores())
632
            self._global_ignoreglobster = globbing.ExceptionGlobster(ignore_globs)
0.200.1656 by Jelmer Vernooij
Report proper patterns, ignore files.
633
        match = self._global_ignoreglobster.match(filename)
634
        if match is not None:
635
            return match
0.200.1716 by Jelmer Vernooij
Fix some more tests.
636
        try:
637
            if self.kind(filename) == 'directory':
7065.1.1 by Jelmer Vernooij
Properly handle ignored directories in Git.
638
                filename += '/'
0.200.1716 by Jelmer Vernooij
Fix some more tests.
639
        except errors.NoSuchFile:
640
            pass
7065.1.1 by Jelmer Vernooij
Properly handle ignored directories in Git.
641
        filename = filename.lstrip('/')
0.200.1658 by Jelmer Vernooij
Fix handling of ignores - return patterns that matched.
642
        ignore_manager = self._get_ignore_manager()
643
        ps = list(ignore_manager.find_matching(filename))
644
        if not ps:
645
            return None
646
        if not ps[-1].is_exclude:
647
            return None
648
        return bytes(ps[-1])
649
650
    def _get_ignore_manager(self):
651
        ignoremanager = getattr(self, '_ignoremanager', None)
652
        if ignoremanager is not None:
653
            return ignoremanager
654
655
        ignore_manager = IgnoreFilterManager.from_repo(self.repository._git)
656
        self._ignoremanager = ignore_manager
657
        return ignore_manager
0.200.409 by Jelmer Vernooij
Support parsing .gitignore.
658
0.200.1716 by Jelmer Vernooij
Fix some more tests.
659
    def _flush_ignore_list_cache(self):
660
        self._ignoremanager = None
661
0.200.508 by Jelmer Vernooij
Skip inventory caching bits.
662
    def set_last_revision(self, revid):
0.200.1720 by Jelmer Vernooij
Fix handling of pending merges.
663
        if _mod_revision.is_null(revid):
664
            self.branch.set_last_revision_info(0, revid)
665
            return False
666
        _mod_revision.check_not_reserved_id(revid)
667
        try:
668
            self.branch.generate_revision_history(revid)
669
        except errors.NoSuchRevision:
670
            raise errors.GhostRevisionUnusableHere(revid)
0.200.508 by Jelmer Vernooij
Skip inventory caching bits.
671
0.200.379 by Jelmer Vernooij
Re-enable working tree support.
672
    def _reset_data(self):
0.248.3 by Jelmer Vernooij
Handle working trees without valid HEAD branch.
673
        try:
674
            head = self.repository._git.head()
0.336.2 by Jelmer Vernooij
Don't use ZERO_SHA outside of remote communication to indicate empty history.
675
        except KeyError:
0.200.1202 by Jelmer Vernooij
Implement has_or_had_id.
676
            self._basis_fileid_map = GitFileIdMap({}, self.mapping)
0.200.948 by Jelmer Vernooij
Cope with empty inventories.
677
        else:
0.336.2 by Jelmer Vernooij
Don't use ZERO_SHA outside of remote communication to indicate empty history.
678
            self._basis_fileid_map = self.mapping.get_fileid_map(
679
                self.store.__getitem__, self.store[head].tree)
0.371.1 by Jelmer Vernooij
Implement WorkingTree.reset_state().
680
        self._fileid_map = self._basis_fileid_map.copy()
0.200.379 by Jelmer Vernooij
Re-enable working tree support.
681
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
682
    def get_file_verifier(self, path, file_id=None, stat_value=None):
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
683
        with self.lock_read():
0.429.2 by Jelmer Vernooij
Some more work on submodule support.
684
            (index, subpath) = self._lookup_index(path.encode('utf-8'))
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
685
            try:
0.429.2 by Jelmer Vernooij
Some more work on submodule support.
686
                return ("GIT", index[subpath].sha)
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
687
            except KeyError:
688
                if self._has_dir(path):
689
                    return ("GIT", None)
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
690
                raise errors.NoSuchFile(path)
0.200.1302 by Jelmer Vernooij
Significantly improve performance of WorkingTree.extras().
691
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
692
    def get_file_sha1(self, path, file_id=None, stat_value=None):
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
693
        with self.lock_read():
0.200.1772 by Jelmer Vernooij
Fix handling of unversioned file in get_file_sha1.
694
            if not self.is_versioned(path):
695
                raise errors.NoSuchFile(path)
696
            abspath = self.abspath(path)
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
697
            try:
698
                return osutils.sha_file_by_name(abspath)
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
699
            except OSError as e:
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
700
                if e.errno in (errno.EISDIR, errno.ENOENT):
0.200.1772 by Jelmer Vernooij
Fix handling of unversioned file in get_file_sha1.
701
                    return None
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
702
                raise
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
703
0.200.610 by Jelmer Vernooij
Support retrieving basis tree properly.
704
    def revision_tree(self, revid):
705
        return self.repository.revision_tree(revid)
706
0.264.11 by Jelmer Vernooij
Completer implementation of iter_entries_by_dir and list_files.
707
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
708
        mode = stat_result.st_mode
709
        return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
710
0.318.1 by Jelmer Vernooij
Fix executable test.
711
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
712
        return self.basis_tree().is_executable(path)
713
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
714
    def stored_kind(self, path, file_id=None):
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
715
        with self.lock_read():
7018.3.2 by Jelmer Vernooij
Fix some git tests.
716
            encoded_path = path.encode('utf-8')
717
            (index, subpath) = self._lookup_index(encoded_path)
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
718
            try:
0.429.2 by Jelmer Vernooij
Some more work on submodule support.
719
                return mode_kind(index[subpath].mode)
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
720
            except KeyError:
721
                # Maybe it's a directory?
7018.3.2 by Jelmer Vernooij
Fix some git tests.
722
                if self._has_dir(encoded_path):
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
723
                    return "directory"
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
724
                raise errors.NoSuchFile(path)
0.200.1205 by Jelmer Vernooij
Implement GitWorkingTree.stored_kind.
725
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
726
    def _lstat(self, path):
727
        return os.lstat(self.abspath(path))
728
6973.1.1 by Jelmer Vernooij
Make InterIndexGitTree suitable for use with MemoryGitTree.
729
    def _live_entry(self, path):
730
        return index_entry_from_path(self.abspath(path.decode('utf-8')).encode(osutils._fs_enc))
731
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
732
    def is_executable(self, path, file_id=None):
0.379.1 by Jelmer Vernooij
Improve unicode handling in GitWorkingTree.
733
        with self.lock_read():
734
            if getattr(self, "_supports_executable", osutils.supports_executable)():
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):
745
        if getattr(self, "_supports_executable", osutils.supports_executable)():
746
            return self._is_executable_from_path_and_stat_from_stat(path, stat_result)
747
        else:
748
            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.
749
0.264.10 by Jelmer Vernooij
Yield inventory entries.
750
    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.
751
        if from_dir is None:
0.379.1 by Jelmer Vernooij
Improve unicode handling in GitWorkingTree.
752
            from_dir = u""
0.264.11 by Jelmer Vernooij
Completer implementation of iter_entries_by_dir and list_files.
753
        dir_ids = {}
0.200.1767 by Jelmer Vernooij
Fix references to Tree*.
754
        fk_entries = {'directory': tree.TreeDirectory,
755
                      'file': tree.TreeFile,
0.429.5 by Jelmer Vernooij
Fix tree_content_summary test.
756
                      'symlink': tree.TreeLink,
0.429.8 by Jelmer Vernooij
Fix class name.
757
                      'tree-reference': tree.TreeReference}
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
758
        with self.lock_read():
759
            root_ie = self._get_dir_ie(u"", None)
760
            if include_root and not from_dir:
761
                yield "", "V", root_ie.kind, root_ie.file_id, root_ie
762
            dir_ids[u""] = root_ie.file_id
763
            if recursive:
0.200.1766 by Jelmer Vernooij
Fix another list_files test, integrate is_versioned.
764
                path_iterator = sorted(self._iter_files_recursive(from_dir, include_dirs=True))
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
765
            else:
0.379.1 by Jelmer Vernooij
Improve unicode handling in GitWorkingTree.
766
                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.
767
                    os.listdir(self.abspath(from_dir).encode(osutils._fs_enc))
768
                    if not self.controldir.is_control_filename(name.decode(osutils._fs_enc))
769
                    and not self.mapping.is_special_file(name.decode(osutils._fs_enc))])
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
770
            for path in path_iterator:
771
                try:
0.429.2 by Jelmer Vernooij
Some more work on submodule support.
772
                    encoded_path = path.encode("utf-8")
0.379.1 by Jelmer Vernooij
Improve unicode handling in GitWorkingTree.
773
                except UnicodeEncodeError:
774
                    raise errors.BadFilenameEncoding(
775
                        path, osutils._fs_enc)
0.429.2 by Jelmer Vernooij
Some more work on submodule support.
776
                (index, index_path) = self._lookup_index(encoded_path)
0.379.1 by Jelmer Vernooij
Improve unicode handling in GitWorkingTree.
777
                try:
0.429.2 by Jelmer Vernooij
Some more work on submodule support.
778
                    value = index[index_path]
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
779
                except KeyError:
780
                    value = None
0.429.5 by Jelmer Vernooij
Fix tree_content_summary test.
781
                kind = self.kind(path)
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
782
                parent, name = posixpath.split(path)
783
                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.
784
                    pass
0.429.5 by Jelmer Vernooij
Fix tree_content_summary test.
785
                if kind in ('directory', 'tree-reference'):
0.200.1766 by Jelmer Vernooij
Fix another list_files test, integrate is_versioned.
786
                    if path != from_dir:
7018.3.2 by Jelmer Vernooij
Fix some git tests.
787
                        if self._has_dir(encoded_path):
0.200.1766 by Jelmer Vernooij
Fix another list_files test, integrate is_versioned.
788
                            ie = self._get_dir_ie(path, self.path2id(path))
789
                            status = "V"
790
                            file_id = ie.file_id
791
                        elif self.is_ignored(path):
792
                            status = "I"
793
                            ie = fk_entries[kind]()
794
                            file_id = None
795
                        else:
796
                            status = "?"
797
                            ie = fk_entries[kind]()
798
                            file_id = None
799
                        yield posixpath.relpath(path, from_dir), status, kind, file_id, ie
800
                    continue
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
801
                if value is not None:
802
                    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.
803
                    yield posixpath.relpath(path, from_dir), "V", ie.kind, ie.file_id, ie
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
804
                else:
805
                    ie = fk_entries[kind]()
0.200.1766 by Jelmer Vernooij
Fix another list_files test, integrate is_versioned.
806
                    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.
807
0.200.1206 by Jelmer Vernooij
Implement GitWorkingTree.all_file_ids.
808
    def all_file_ids(self):
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
809
        with self.lock_read():
810
            ids = {u"": self.path2id("")}
811
            for path in self.index:
812
                if self.mapping.is_special_file(path):
813
                    continue
814
                path = path.decode("utf-8")
815
                parent = posixpath.dirname(path).strip("/")
816
                for e in self._add_missing_parent_ids(parent, ids):
817
                    pass
818
                ids[path] = self.path2id(path)
819
            return set(ids.values())
0.200.1206 by Jelmer Vernooij
Implement GitWorkingTree.all_file_ids.
820
0.200.1710 by Jelmer Vernooij
Regenerate xfail.
821
    def all_versioned_paths(self):
822
        with self.lock_read():
823
            paths = {u""}
824
            for path in self.index:
825
                if self.mapping.is_special_file(path):
826
                    continue
827
                path = path.decode("utf-8")
828
                paths.add(path)
829
                while path != "":
830
                    path = posixpath.dirname(path).strip("/")
831
                    if path in paths:
832
                        break
833
                    paths.add(path)
834
            return paths
835
0.200.1716 by Jelmer Vernooij
Fix some more tests.
836
    def iter_child_entries(self, path, file_id=None):
837
        encoded_path = path.encode('utf-8')
0.379.1 by Jelmer Vernooij
Improve unicode handling in GitWorkingTree.
838
        with self.lock_read():
839
            parent_id = self.path2id(path)
840
            found_any = False
841
            seen_children = set()
842
            for item_path, value in self.index.iteritems():
7045.4.2 by Jelmer Vernooij
Fix some more gitty tests.
843
                decoded_item_path = item_path.decode('utf-8')
0.379.1 by Jelmer Vernooij
Improve unicode handling in GitWorkingTree.
844
                if self.mapping.is_special_file(item_path):
845
                    continue
7045.4.2 by Jelmer Vernooij
Fix some more gitty tests.
846
                if not osutils.is_inside(path, decoded_item_path):
0.379.1 by Jelmer Vernooij
Improve unicode handling in GitWorkingTree.
847
                    continue
848
                found_any = True
7045.4.2 by Jelmer Vernooij
Fix some more gitty tests.
849
                subpath = posixpath.relpath(decoded_item_path, path)
850
                if '/' in subpath:
851
                    dirname = subpath.split('/', 1)[0]
0.379.1 by Jelmer Vernooij
Improve unicode handling in GitWorkingTree.
852
                    file_ie = self._get_dir_ie(posixpath.join(path, dirname), parent_id)
853
                else:
7045.4.2 by Jelmer Vernooij
Fix some more gitty tests.
854
                    (unused_parent, name) = posixpath.split(decoded_item_path)
0.379.1 by Jelmer Vernooij
Improve unicode handling in GitWorkingTree.
855
                    file_ie = self._get_file_ie(
7045.4.2 by Jelmer Vernooij
Fix some more gitty tests.
856
                        name, decoded_item_path, value, parent_id)
0.379.1 by Jelmer Vernooij
Improve unicode handling in GitWorkingTree.
857
                yield file_ie
858
            if not found_any and path != u'':
859
                raise errors.NoSuchFile(path)
0.200.1716 by Jelmer Vernooij
Fix some more tests.
860
0.200.619 by Jelmer Vernooij
Provide dummy WorkingTree.conflicts() implementation rather than spending a lot of time not finding any conflicts.
861
    def conflicts(self):
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
862
        with self.lock_read():
0.369.2 by Jelmer Vernooij
Fix tests.
863
            conflicts = _mod_conflicts.ConflictList()
0.369.1 by Jelmer Vernooij
Implement conflict handling.
864
            for item_path, value in self.index.iteritems():
865
                if value.flags & FLAG_STAGEMASK:
866
                    conflicts.append(_mod_conflicts.TextConflict(item_path.decode('utf-8')))
867
            return conflicts
868
869
    def set_conflicts(self, conflicts):
870
        by_path = set()
871
        for conflict in conflicts:
872
            if conflict.typestring in ('text conflict', 'contents conflict'):
873
                by_path.add(conflict.path.encode('utf-8'))
874
            else:
875
                raise errors.UnsupportedOperation(self.set_conflicts, self)
876
        with self.lock_tree_write():
877
            for path in self.index:
878
                self._set_conflicted(path, path in by_path)
879
880
    def _set_conflicted(self, path, conflicted):
881
        trace.mutter('change conflict: %r -> %r', path, conflicted)
882
        value = self.index[path]
0.415.1 by Jelmer Vernooij
Only write index when it's dirty.
883
        self._index_dirty = True
0.369.1 by Jelmer Vernooij
Implement conflict handling.
884
        if conflicted:
885
            self.index[path] = (value[:9] + (value[9] | FLAG_STAGEMASK, ))
886
        else:
887
            self.index[path] = (value[:9] + (value[9] &~ FLAG_STAGEMASK, ))
888
889
    def add_conflicts(self, new_conflicts):
890
        with self.lock_tree_write():
891
            for conflict in new_conflicts:
892
                if conflict.typestring in ('text conflict', 'contents conflict'):
893
                    try:
894
                        self._set_conflicted(conflict.path.encode('utf-8'), True)
895
                    except KeyError:
896
                        raise errors.UnsupportedOperation(self.add_conflicts, self)
897
                else:
898
                    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.
899
0.200.1705 by Jelmer Vernooij
Fix walkdirs.
900
    def walkdirs(self, prefix=""):
0.324.1 by Jelmer Vernooij
initial work fixing walkdirs.
901
        """Walk the directories of this tree.
902
903
        returns a generator which yields items in the form:
904
                ((curren_directory_path, fileid),
905
                 [(file1_path, file1_name, file1_kind, (lstat), file1_id,
906
                   file1_kind), ... ])
907
908
        This API returns a generator, which is only valid during the current
909
        tree transaction - within a single lock_read or lock_write duration.
910
911
        If the tree is not locked, it may cause an error to be raised,
912
        depending on the tree implementation.
913
        """
914
        from bisect import bisect_left
915
        import operator
916
        disk_top = self.abspath(prefix)
917
        if disk_top.endswith('/'):
918
            disk_top = disk_top[:-1]
919
        top_strip_len = len(disk_top) + 1
920
        inventory_iterator = self._walkdirs(prefix)
921
        disk_iterator = osutils.walkdirs(disk_top, prefix)
922
        try:
923
            current_disk = next(disk_iterator)
924
            disk_finished = False
925
        except OSError as e:
926
            if not (e.errno == errno.ENOENT or
927
                (sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
928
                raise
929
            current_disk = None
930
            disk_finished = True
931
        try:
932
            current_inv = next(inventory_iterator)
933
            inv_finished = False
934
        except StopIteration:
935
            current_inv = None
936
            inv_finished = True
937
        while not inv_finished or not disk_finished:
938
            if current_disk:
939
                ((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
940
                    cur_disk_dir_content) = current_disk
941
            else:
942
                ((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
943
                    cur_disk_dir_content) = ((None, None), None)
944
            if not disk_finished:
945
                # strip out .bzr dirs
946
                if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
947
                    len(cur_disk_dir_content) > 0):
948
                    # osutils.walkdirs can be made nicer -
949
                    # yield the path-from-prefix rather than the pathjoined
950
                    # value.
951
                    bzrdir_loc = bisect_left(cur_disk_dir_content,
952
                        ('.git', '.git'))
953
                    if (bzrdir_loc < len(cur_disk_dir_content)
954
                        and self.controldir.is_control_filename(
955
                            cur_disk_dir_content[bzrdir_loc][0])):
956
                        # we dont yield the contents of, or, .bzr itself.
957
                        del cur_disk_dir_content[bzrdir_loc]
958
            if inv_finished:
959
                # everything is unknown
960
                direction = 1
961
            elif disk_finished:
962
                # everything is missing
963
                direction = -1
964
            else:
7027.5.2 by Jelmer Vernooij
Fix some more git tests.
965
                direction = ((current_inv[0][0] > cur_disk_dir_relpath) -
966
                             (current_inv[0][0] < cur_disk_dir_relpath))
0.324.1 by Jelmer Vernooij
initial work fixing walkdirs.
967
            if direction > 0:
968
                # disk is before inventory - unknown
969
                dirblock = [(relpath, basename, kind, stat, None, None) for
970
                    relpath, basename, kind, stat, top_path in
971
                    cur_disk_dir_content]
972
                yield (cur_disk_dir_relpath, None), dirblock
973
                try:
974
                    current_disk = next(disk_iterator)
975
                except StopIteration:
976
                    disk_finished = True
977
            elif direction < 0:
978
                # inventory is before disk - missing.
979
                dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
980
                    for relpath, basename, dkind, stat, fileid, kind in
981
                    current_inv[1]]
982
                yield (current_inv[0][0], current_inv[0][1]), dirblock
983
                try:
984
                    current_inv = next(inventory_iterator)
985
                except StopIteration:
986
                    inv_finished = True
987
            else:
988
                # versioned present directory
989
                # merge the inventory and disk data together
990
                dirblock = []
991
                for relpath, subiterator in itertools.groupby(sorted(
992
                    current_inv[1] + cur_disk_dir_content,
993
                    key=operator.itemgetter(0)), operator.itemgetter(1)):
994
                    path_elements = list(subiterator)
995
                    if len(path_elements) == 2:
996
                        inv_row, disk_row = path_elements
997
                        # versioned, present file
998
                        dirblock.append((inv_row[0],
999
                            inv_row[1], disk_row[2],
1000
                            disk_row[3], inv_row[4],
1001
                            inv_row[5]))
1002
                    elif len(path_elements[0]) == 5:
1003
                        # unknown disk file
1004
                        dirblock.append((path_elements[0][0],
1005
                            path_elements[0][1], path_elements[0][2],
1006
                            path_elements[0][3], None, None))
1007
                    elif len(path_elements[0]) == 6:
1008
                        # versioned, absent file.
1009
                        dirblock.append((path_elements[0][0],
1010
                            path_elements[0][1], 'unknown', None,
1011
                            path_elements[0][4], path_elements[0][5]))
1012
                    else:
1013
                        raise NotImplementedError('unreachable code')
1014
                yield current_inv[0], dirblock
1015
                try:
1016
                    current_inv = next(inventory_iterator)
1017
                except StopIteration:
1018
                    inv_finished = True
1019
                try:
1020
                    current_disk = next(disk_iterator)
1021
                except StopIteration:
1022
                    disk_finished = True
1023
7027.5.2 by Jelmer Vernooij
Fix some more git tests.
1024
    def _walkdirs(self, prefix=u""):
1025
        if prefix != u"":
1026
            prefix += u"/"
0.379.1 by Jelmer Vernooij
Improve unicode handling in GitWorkingTree.
1027
        prefix = prefix.encode('utf-8')
0.353.1 by Jelmer Vernooij
Iterate over dirs in _walkdirs.
1028
        per_dir = defaultdict(set)
7027.5.2 by Jelmer Vernooij
Fix some more git tests.
1029
        if prefix == b"":
1030
            per_dir[(u'', self.get_root_id())] = set()
0.353.1 by Jelmer Vernooij
Iterate over dirs in _walkdirs.
1031
        def add_entry(path, kind):
7027.5.2 by Jelmer Vernooij
Fix some more git tests.
1032
            if path == b'' or not path.startswith(prefix):
0.353.1 by Jelmer Vernooij
Iterate over dirs in _walkdirs.
1033
                return
0.200.1210 by Jelmer Vernooij
Implement GitWorkingTree._walkdirs.
1034
            (dirname, child_name) = posixpath.split(path)
0.353.1 by Jelmer Vernooij
Iterate over dirs in _walkdirs.
1035
            add_entry(dirname, 'directory')
0.200.1210 by Jelmer Vernooij
Implement GitWorkingTree._walkdirs.
1036
            dirname = dirname.decode("utf-8")
1037
            dir_file_id = self.path2id(dirname)
0.361.2 by Jelmer Vernooij
Fix up assert.
1038
            if not isinstance(value, tuple) or len(value) != 10:
0.361.1 by Jelmer Vernooij
Don't use assert.
1039
                raise ValueError(value)
0.353.1 by Jelmer Vernooij
Iterate over dirs in _walkdirs.
1040
            per_dir[(dirname, dir_file_id)].add(
0.200.1210 by Jelmer Vernooij
Implement GitWorkingTree._walkdirs.
1041
                (path.decode("utf-8"), child_name.decode("utf-8"),
0.353.1 by Jelmer Vernooij
Iterate over dirs in _walkdirs.
1042
                kind, None,
0.200.1210 by Jelmer Vernooij
Implement GitWorkingTree._walkdirs.
1043
                self.path2id(path.decode("utf-8")),
0.353.1 by Jelmer Vernooij
Iterate over dirs in _walkdirs.
1044
                kind))
0.379.1 by Jelmer Vernooij
Improve unicode handling in GitWorkingTree.
1045
        with self.lock_read():
1046
            for path, value in self.index.iteritems():
1047
                if self.mapping.is_special_file(path):
1048
                    continue
1049
                if not path.startswith(prefix):
1050
                    continue
1051
                add_entry(path, mode_kind(value.mode))
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
1052
        return ((k, sorted(v)) for (k, v) in sorted(per_dir.items()))
0.200.1542 by Jelmer Vernooij
Refactor iter_changes.
1053
0.200.1677 by Jelmer Vernooij
Mark shelving as unsupported.
1054
    def get_shelf_manager(self):
0.200.1729 by Jelmer Vernooij
ShelvingUnsupported doesn't take an argument.
1055
        raise workingtree.ShelvingUnsupported()
0.200.1677 by Jelmer Vernooij
Mark shelving as unsupported.
1056
0.200.1678 by Jelmer Vernooij
Fix tests.
1057
    def store_uncommitted(self):
1058
        raise errors.StoringUncommittedNotSupported(self)
1059
0.200.1703 by Jelmer Vernooij
Implement apply_inventory_delta.
1060
    def apply_inventory_delta(self, changes):
1061
        for (old_path, new_path, file_id, ie) in changes:
1062
            if old_path is not None:
0.429.25 by Jelmer Vernooij
Merge trunk.
1063
                (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.
1064
                try:
0.429.25 by Jelmer Vernooij
Merge trunk.
1065
                    self._index_del_entry(index, old_subpath)
0.385.1 by Jelmer Vernooij
Use specific_files argument to Tree.iter_entries_by_dir.
1066
                except KeyError:
1067
                    pass
1068
                else:
1069
                    self._versioned_dirs = None
0.200.1703 by Jelmer Vernooij
Implement apply_inventory_delta.
1070
            if new_path is not None and ie.kind != 'directory':
0.429.16 by Jelmer Vernooij
Look at reference_revision on ie.
1071
                if ie.kind == 'tree-reference':
1072
                    self._index_add_entry(
1073
                            new_path, ie.kind,
1074
                            reference_revision=ie.reference_revision)
1075
                else:
1076
                    self._index_add_entry(new_path, ie.kind)
0.316.2 by Jelmer Vernooij
Flush after modifying index.
1077
        self.flush()
0.200.1703 by Jelmer Vernooij
Implement apply_inventory_delta.
1078
0.200.1756 by Jelmer Vernooij
Initial work on annotate support.
1079
    def annotate_iter(self, path, file_id=None,
1080
                      default_revision=_mod_revision.CURRENT_REVISION):
1081
        """See Tree.annotate_iter
1082
1083
        This implementation will use the basis tree implementation if possible.
1084
        Lines not in the basis are attributed to CURRENT_REVISION
1085
1086
        If there are pending merges, lines added by those merges will be
1087
        incorrectly attributed to CURRENT_REVISION (but after committing, the
1088
        attribution will be correct).
1089
        """
1090
        with self.lock_read():
1091
            maybe_file_parent_keys = []
1092
            for parent_id in self.get_parent_ids():
1093
                try:
1094
                    parent_tree = self.revision_tree(parent_id)
1095
                except errors.NoSuchRevisionInTree:
1096
                    parent_tree = self.branch.repository.revision_tree(
1097
                            parent_id)
1098
                with parent_tree.lock_read():
1099
                    # TODO(jelmer): Use rename/copy tracker to find path name in parent
1100
                    parent_path = path
1101
                    try:
1102
                        kind = parent_tree.kind(parent_path)
1103
                    except errors.NoSuchFile:
1104
                        continue
1105
                    if kind != 'file':
1106
                        # Note: this is slightly unnecessary, because symlinks and
1107
                        # directories have a "text" which is the empty text, and we
1108
                        # know that won't mess up annotations. But it seems cleaner
1109
                        continue
1110
                    parent_text_key = (
1111
                        parent_path,
1112
                        parent_tree.get_file_revision(parent_path))
1113
                    if parent_text_key not in maybe_file_parent_keys:
1114
                        maybe_file_parent_keys.append(parent_text_key)
7045.4.2 by Jelmer Vernooij
Fix some more gitty tests.
1115
            # Now we have the parents of this content
1116
            from breezy.annotate import Annotator
1117
            from .annotate import AnnotateProvider
1118
            annotate_provider = AnnotateProvider(
1119
                self.branch.repository._file_change_scanner)
1120
            annotator = Annotator(annotate_provider)
1121
1122
            from breezy.graph import Graph
1123
            graph = Graph(annotate_provider)
0.200.1756 by Jelmer Vernooij
Initial work on annotate support.
1124
            heads = graph.heads(maybe_file_parent_keys)
1125
            file_parent_keys = []
1126
            for key in maybe_file_parent_keys:
1127
                if key in heads:
1128
                    file_parent_keys.append(key)
1129
1130
            text = self.get_file_text(path)
1131
            this_key = (path, default_revision)
1132
            annotator.add_special_text(this_key, file_parent_keys, text)
1133
            annotations = [(key[-1], line)
1134
                           for key, line in annotator.annotate_flat(this_key)]
1135
            return annotations
1136
0.360.4 by Jelmer Vernooij
Implement MemoryTree.rename_one, MemoryTree.mkdir.
1137
    def _rename_one(self, from_rel, to_rel):
1138
        os.rename(self.abspath(from_rel), self.abspath(to_rel))
1139
0.373.1 by Jelmer Vernooij
Fix WorkingTree.reset_state().
1140
    def _build_checkout_with_index(self):
1141
        build_index_from_tree(
1142
            self.user_transport.local_abspath('.'),
1143
            self.control_transport.local_abspath("index"),
1144
            self.store,
1145
            None if self.branch.head is None else self.store[self.branch.head].tree)
1146
0.371.1 by Jelmer Vernooij
Implement WorkingTree.reset_state().
1147
    def reset_state(self, revision_ids=None):
1148
        """Reset the state of the working tree.
1149
1150
        This does a hard-reset to a last-known-good state. This is a way to
1151
        fix if something got corrupted (like the .git/index file)
1152
        """
1153
        with self.lock_tree_write():
1154
            if revision_ids is not None:
1155
                self.set_parent_ids(revision_ids)
0.373.1 by Jelmer Vernooij
Fix WorkingTree.reset_state().
1156
            self.index.clear()
0.415.1 by Jelmer Vernooij
Only write index when it's dirty.
1157
            self._index_dirty = True
0.373.1 by Jelmer Vernooij
Fix WorkingTree.reset_state().
1158
            if self.branch.head is not None:
1159
                for entry in self.store.iter_tree_contents(self.store[self.branch.head].tree):
1160
                    if not validate_path(entry.path):
1161
                        continue
1162
1163
                    if S_ISGITLINK(entry.mode):
1164
                        pass # TODO(jelmer): record and return submodule paths
1165
                    else:
1166
                        # Let's at least try to use the working tree file:
1167
                        try:
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
1168
                            st = self._lstat(self.abspath(entry.path.decode('utf-8')))
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
1169
                        except OSError:
0.373.1 by Jelmer Vernooij
Fix WorkingTree.reset_state().
1170
                            # But if it doesn't exist, we'll make something up.
1171
                            obj = self.store[entry.sha]
1172
                            st = os.stat_result((entry.mode, 0, 0, 0,
1173
                                  0, 0, len(obj.as_raw_string()), 0,
1174
                                  0, 0))
0.429.2 by Jelmer Vernooij
Some more work on submodule support.
1175
                    (index, subpath) = self._lookup_index(entry.path)
1176
                    index[subpath] = index_entry_from_stat(st, entry.sha, 0)
0.371.1 by Jelmer Vernooij
Implement WorkingTree.reset_state().
1177
0.380.1 by Jelmer Vernooij
Implement WorkingTree.pull.
1178
    def pull(self, source, overwrite=False, stop_revision=None,
1179
             change_reporter=None, possible_transports=None, local=False,
1180
             show_base=False):
1181
        with self.lock_write(), source.lock_read():
1182
            old_revision = self.branch.last_revision()
1183
            basis_tree = self.basis_tree()
1184
            count = self.branch.pull(source, overwrite, stop_revision,
1185
                                     possible_transports=possible_transports,
1186
                                     local=local)
1187
            new_revision = self.branch.last_revision()
1188
            if new_revision != old_revision:
1189
                with basis_tree.lock_read():
1190
                    new_basis_tree = self.branch.basis_tree()
1191
                    merge.merge_inner(
1192
                                self.branch,
1193
                                new_basis_tree,
1194
                                basis_tree,
1195
                                this_tree=self,
1196
                                change_reporter=change_reporter,
1197
                                show_base=show_base)
1198
            return count
1199
0.429.2 by Jelmer Vernooij
Some more work on submodule support.
1200
    def add_reference(self, sub_tree):
1201
        """Add a TreeReference to the tree, pointing at sub_tree.
1202
1203
        :param sub_tree: subtree to add.
1204
        """
1205
        with self.lock_tree_write():
1206
            try:
1207
                sub_tree_path = self.relpath(sub_tree.basedir)
1208
            except errors.PathNotChild:
1209
                raise BadReferenceTarget(
1210
                        self, sub_tree, 'Target not inside tree.')
1211
1212
            self._add([sub_tree_path], [None], ['tree-reference'])
1213
0.429.10 by Jelmer Vernooij
use new read_submodule_head from dulwich.
1214
    def _read_submodule_head(self, path):
1215
        return read_submodule_head(self.abspath(path))
1216
0.429.5 by Jelmer Vernooij
Fix tree_content_summary test.
1217
    def get_reference_revision(self, path, file_id=None):
1218
        hexsha = self._read_submodule_head(path)
0.429.16 by Jelmer Vernooij
Look at reference_revision on ie.
1219
        if hexsha is None:
1220
            return _mod_revision.NULL_REVISION
0.429.5 by Jelmer Vernooij
Fix tree_content_summary test.
1221
        return self.branch.lookup_foreign_revision_id(hexsha)
1222
0.429.2 by Jelmer Vernooij
Some more work on submodule support.
1223
    def get_nested_tree(self, path, file_id=None):
1224
        return workingtree.WorkingTree.open(self.abspath(path))
1225
0.429.5 by Jelmer Vernooij
Fix tree_content_summary test.
1226
    def _directory_is_tree_reference(self, relpath):
1227
        # as a special case, if a directory contains control files then
1228
        # it's a tree reference, except that the root of the tree is not
1229
        return relpath and osutils.lexists(self.abspath(relpath) + u"/.git")
1230
0.429.15 by Jelmer Vernooij
Autodetect tree-reference based on index.
1231
    def extract(self, sub_path, file_id=None, format=None):
1232
        """Extract a subtree from this tree.
1233
1234
        A new branch will be created, relative to the path for this tree.
1235
        """
1236
        def mkdirs(path):
1237
            segments = osutils.splitpath(path)
1238
            transport = self.branch.controldir.root_transport
1239
            for name in segments:
1240
                transport = transport.clone(name)
1241
                transport.ensure_base()
1242
            return transport
1243
1244
        with self.lock_tree_write():
1245
            self.flush()
1246
            branch_transport = mkdirs(sub_path)
1247
            if format is None:
1248
                format = self.controldir.cloning_metadir()
1249
            branch_transport.ensure_base()
1250
            branch_bzrdir = format.initialize_on_transport(branch_transport)
1251
            try:
1252
                repo = branch_bzrdir.find_repository()
1253
            except errors.NoRepositoryPresent:
1254
                repo = branch_bzrdir.create_repository()
1255
            if not repo.supports_rich_root():
1256
                raise errors.RootNotRich()
1257
            new_branch = branch_bzrdir.create_branch()
1258
            new_branch.pull(self.branch)
1259
            for parent_id in self.get_parent_ids():
1260
                new_branch.fetch(self.branch, parent_id)
1261
            tree_transport = self.controldir.root_transport.clone(sub_path)
1262
            if tree_transport.base != branch_transport.base:
1263
                tree_bzrdir = format.initialize_on_transport(tree_transport)
1264
                tree_bzrdir.set_branch_reference(new_branch)
1265
            else:
1266
                tree_bzrdir = branch_bzrdir
1267
            wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1268
            wt.set_parent_ids(self.get_parent_ids())
1269
            return wt
1270
0.425.1 by Jelmer Vernooij
Add really basic check implementation.
1271
    def _get_check_refs(self):
1272
        """Return the references needed to perform a check of this tree.
1273
1274
        The default implementation returns no refs, and is only suitable for
1275
        trees that have no local caching and can commit on ghosts at any time.
1276
1277
        :seealso: breezy.check for details about check_refs.
1278
        """
1279
        return []
1280
0.428.1 by Jelmer Vernooij
Fix clone_preserves_content test.
1281
    def copy_content_into(self, tree, revision_id=None):
1282
        """Copy the current content and user files of this tree into tree."""
1283
        with self.lock_read():
1284
            if revision_id is None:
1285
                merge.transform_tree(tree, self)
1286
            else:
1287
                # TODO now merge from tree.last_revision to revision (to
1288
                # preserve user local changes)
1289
                try:
1290
                    other_tree = self.revision_tree(revision_id)
1291
                except errors.NoSuchRevision:
1292
                    other_tree = self.branch.repository.revision_tree(
1293
                            revision_id)
1294
1295
                merge.transform_tree(tree, other_tree)
1296
                if revision_id == _mod_revision.NULL_REVISION:
1297
                    new_parents = []
1298
                else:
1299
                    new_parents = [revision_id]
1300
                tree.set_parent_ids(new_parents)
1301
0.200.1308 by Jelmer Vernooij
Write index to disk after adding files.
1302
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
1303
class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):
1304
0.200.1206 by Jelmer Vernooij
Implement GitWorkingTree.all_file_ids.
1305
    _tree_class = GitWorkingTree
1306
0.200.1295 by Jelmer Vernooij
Mark working trees as not supporting directories.
1307
    supports_versioned_directories = False
1308
0.200.1661 by Jelmer Vernooij
Set supports_setting_file_ids to False.
1309
    supports_setting_file_ids = False
1310
0.200.1677 by Jelmer Vernooij
Mark shelving as unsupported.
1311
    supports_store_uncommitted = False
1312
0.200.1723 by Jelmer Vernooij
Set supports_leftmost_parent_id_as_ghost property.
1313
    supports_leftmost_parent_id_as_ghost = False
1314
0.200.1779 by Jelmer Vernooij
Actually store git revision ids rather than bzr revision ids.
1315
    supports_righthand_parent_id_as_ghost = False
1316
0.200.1768 by Jelmer Vernooij
Fix handling of normalized filenames.
1317
    requires_normalized_unicode_filenames = True
1318
0.367.1 by Jelmer Vernooij
Set supports_merge_modified flag.
1319
    supports_merge_modified = False
1320
0.200.656 by Jelmer Vernooij
Implement GitWorkingTreeFormat._matchingbzrdir.
1321
    @property
0.200.1665 by Jelmer Vernooij
Rename _matchingbzrdir to _matchingcnotroldir.
1322
    def _matchingcontroldir(self):
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
1323
        from .dir import LocalGitControlDirFormat
0.200.1013 by Jelmer Vernooij
More renames.
1324
        return LocalGitControlDirFormat()
0.200.656 by Jelmer Vernooij
Implement GitWorkingTreeFormat._matchingbzrdir.
1325
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
1326
    def get_format_description(self):
1327
        return "Git Working Tree"
0.200.616 by Jelmer Vernooij
Provide custom intertree implementation for GitRevisionTree->GitWorkingTree.
1328
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
1329
    def initialize(self, a_controldir, revision_id=None, from_branch=None,
0.200.1096 by Jelmer Vernooij
Implement GitWorkingTreeFormat.initialize.
1330
                   accelerator_tree=None, hardlink=False):
1331
        """See WorkingTreeFormat.initialize()."""
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
1332
        if not isinstance(a_controldir, LocalGitDir):
1333
            raise errors.IncompatibleFormat(self, a_controldir)
0.388.2 by Jelmer Vernooij
Allow opening nascent branches when opening trees.
1334
        branch = a_controldir.open_branch(nascent_ok=True)
0.308.1 by Jelmer Vernooij
Set revision id if specified to WorkingTreeFormat.initialize.
1335
        if revision_id is not None:
1336
            branch.set_last_revision(revision_id)
0.200.1680 by Jelmer Vernooij
Fix repo locks.
1337
        wt = GitWorkingTree(
0.415.3 by Jelmer Vernooij
Open index on demand.
1338
                a_controldir, a_controldir.open_repository(), branch)
0.200.1680 by Jelmer Vernooij
Fix repo locks.
1339
        for hook in MutableTree.hooks['post_build_tree']:
1340
            hook(wt)
1341
        return wt