/brz/remove-bazaar

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