/brz/remove-bazaar

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