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