/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) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision 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.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
16
17
18
"""Git Trees."""
19
0.200.1594 by Jelmer Vernooij
Use absolute_import everywhere.
20
from __future__ import absolute_import
21
7096.3.2 by Jelmer Vernooij
Fix some git tests.
22
from collections import deque
0.360.2 by Jelmer Vernooij
Fix test.
23
import errno
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
24
from io import BytesIO
25
import os
26
27
from dulwich.index import (
6973.1.1 by Jelmer Vernooij
Make InterIndexGitTree suitable for use with MemoryGitTree.
28
    blob_from_path_and_stat,
29
    cleanup_mode,
30
    commit_tree,
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
31
    index_entry_from_stat,
32
    )
0.200.1780 by Jelmer Vernooij
Fix cross-object-store tree comparison.
33
from dulwich.object_store import (
34
    tree_lookup_path,
35
    OverlayObjectStore,
36
    )
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
37
from dulwich.objects import (
38
    Blob,
39
    Tree,
0.372.1 by Jelmer Vernooij
Fix some missing id handling.
40
    ZERO_SHA,
0.429.2 by Jelmer Vernooij
Some more work on submodule support.
41
    S_IFGITLINK,
0.429.7 by Jelmer Vernooij
Consistent file ids.
42
    S_ISGITLINK,
0.429.2 by Jelmer Vernooij
Some more work on submodule support.
43
    )
0.264.3 by Jelmer Vernooij
Make RevisionTree inventoryless.
44
import stat
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
45
import posixpath
0.264.3 by Jelmer Vernooij
Make RevisionTree inventoryless.
46
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
47
from .. import (
0.429.26 by Jelmer Vernooij
Fix remaining test.
48
    controldir as _mod_controldir,
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
49
    delta,
50
    errors,
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
51
    mutabletree,
0.264.10 by Jelmer Vernooij
Yield inventory entries.
52
    osutils,
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
53
    revisiontree,
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
54
    trace,
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
55
    tree as _mod_tree,
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
56
    workingtree,
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
57
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
58
from ..revision import (
6973.2.1 by Jelmer Vernooij
Implement GitRevisionTree.annotate_iter.
59
    CURRENT_REVISION,
60
    NULL_REVISION,
61
    )
6986.2.2 by Jelmer Vernooij
Merge trunk.
62
from ..sixish import (
6973.9.1 by Jelmer Vernooij
More test fixes.
63
    text_type,
64
    viewitems,
65
    )
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
66
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
67
from .mapping import (
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
68
    mode_is_executable,
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
69
    mode_kind,
0.200.1731 by Jelmer Vernooij
Add support for checking untracked changes.
70
    GitFileIdMap,
0.287.2 by Jelmer Vernooij
Support empty trees in GitRevisionTree.
71
    default_mapping,
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
72
    )
73
74
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
75
class GitTreeDirectory(_mod_tree.TreeDirectory):
76
0.390.1 by Jelmer Vernooij
Don't set .revision for returned TreeEntry objects; it's slow, and callers can call Tree.get_file_revision if they really care.
77
    __slots__ = ['file_id', 'name', 'parent_id', 'children']
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
78
0.390.1 by Jelmer Vernooij
Don't set .revision for returned TreeEntry objects; it's slow, and callers can call Tree.get_file_revision if they really care.
79
    def __init__(self, file_id, name, parent_id):
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
80
        self.file_id = file_id
81
        self.name = name
82
        self.parent_id = parent_id
83
        # TODO(jelmer)
84
        self.children = {}
85
86
    @property
87
    def kind(self):
88
        return 'directory'
89
90
    @property
91
    def executable(self):
92
        return False
93
94
    def copy(self):
95
        return self.__class__(
0.390.1 by Jelmer Vernooij
Don't set .revision for returned TreeEntry objects; it's slow, and callers can call Tree.get_file_revision if they really care.
96
            self.file_id, self.name, self.parent_id)
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
97
98
    def __repr__(self):
0.390.1 by Jelmer Vernooij
Don't set .revision for returned TreeEntry objects; it's slow, and callers can call Tree.get_file_revision if they really care.
99
        return "%s(file_id=%r, name=%r, parent_id=%r)" % (
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
100
            self.__class__.__name__, self.file_id, self.name,
0.390.1 by Jelmer Vernooij
Don't set .revision for returned TreeEntry objects; it's slow, and callers can call Tree.get_file_revision if they really care.
101
            self.parent_id)
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
102
103
    def __eq__(self, other):
104
        return (self.kind == other.kind and
105
                self.file_id == other.file_id and
106
                self.name == other.name and
0.390.1 by Jelmer Vernooij
Don't set .revision for returned TreeEntry objects; it's slow, and callers can call Tree.get_file_revision if they really care.
107
                self.parent_id == other.parent_id)
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
108
109
110
class GitTreeFile(_mod_tree.TreeFile):
111
0.390.1 by Jelmer Vernooij
Don't set .revision for returned TreeEntry objects; it's slow, and callers can call Tree.get_file_revision if they really care.
112
    __slots__ = ['file_id', 'name', 'parent_id', 'text_size', 'text_sha1',
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
113
                 'executable']
114
0.390.2 by Jelmer Vernooij
merge trunk
115
    def __init__(self, file_id, name, parent_id, text_size=None,
0.389.2 by Jelmer Vernooij
Add repr implementation to GitTreeFile & GitTreeLink.
116
                 text_sha1=None, executable=None):
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
117
        self.file_id = file_id
118
        self.name = name
119
        self.parent_id = parent_id
0.389.2 by Jelmer Vernooij
Add repr implementation to GitTreeFile & GitTreeLink.
120
        self.text_size = text_size
121
        self.text_sha1 = text_sha1
122
        self.executable = executable
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
123
124
    @property
125
    def kind(self):
126
        return 'file'
127
128
    def __eq__(self, other):
129
        return (self.kind == other.kind and
130
                self.file_id == other.file_id and
131
                self.name == other.name and
132
                self.parent_id == other.parent_id and
133
                self.text_sha1 == other.text_sha1 and
134
                self.text_size == other.text_size and
135
                self.executable == other.executable)
136
0.389.2 by Jelmer Vernooij
Add repr implementation to GitTreeFile & GitTreeLink.
137
    def __repr__(self):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
138
        return ("%s(file_id=%r, name=%r, parent_id=%r, text_size=%r, "
139
                "text_sha1=%r, executable=%r)") % (
0.389.2 by Jelmer Vernooij
Add repr implementation to GitTreeFile & GitTreeLink.
140
            type(self).__name__, self.file_id, self.name, self.parent_id,
0.390.2 by Jelmer Vernooij
merge trunk
141
            self.text_size, self.text_sha1, self.executable)
0.389.2 by Jelmer Vernooij
Add repr implementation to GitTreeFile & GitTreeLink.
142
0.365.2 by Jelmer Vernooij
Add eq/copy.
143
    def copy(self):
144
        ret = self.__class__(
7143.15.2 by Jelmer Vernooij
Run autopep8.
145
            self.file_id, self.name, self.parent_id)
0.365.2 by Jelmer Vernooij
Add eq/copy.
146
        ret.text_sha1 = self.text_sha1
147
        ret.text_size = self.text_size
148
        ret.executable = self.executable
149
        return ret
150
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
151
152
class GitTreeSymlink(_mod_tree.TreeLink):
153
0.390.1 by Jelmer Vernooij
Don't set .revision for returned TreeEntry objects; it's slow, and callers can call Tree.get_file_revision if they really care.
154
    __slots__ = ['file_id', 'name', 'parent_id', 'symlink_target']
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
155
0.390.1 by Jelmer Vernooij
Don't set .revision for returned TreeEntry objects; it's slow, and callers can call Tree.get_file_revision if they really care.
156
    def __init__(self, file_id, name, parent_id,
0.365.2 by Jelmer Vernooij
Add eq/copy.
157
                 symlink_target=None):
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
158
        self.file_id = file_id
159
        self.name = name
160
        self.parent_id = parent_id
0.365.2 by Jelmer Vernooij
Add eq/copy.
161
        self.symlink_target = symlink_target
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
162
163
    @property
164
    def kind(self):
165
        return 'symlink'
166
167
    @property
168
    def executable(self):
169
        return False
170
171
    @property
172
    def text_size(self):
173
        return None
174
0.389.2 by Jelmer Vernooij
Add repr implementation to GitTreeFile & GitTreeLink.
175
    def __repr__(self):
0.390.2 by Jelmer Vernooij
merge trunk
176
        return "%s(file_id=%r, name=%r, parent_id=%r, symlink_target=%r)" % (
0.389.2 by Jelmer Vernooij
Add repr implementation to GitTreeFile & GitTreeLink.
177
            type(self).__name__, self.file_id, self.name, self.parent_id,
0.390.2 by Jelmer Vernooij
merge trunk
178
            self.symlink_target)
0.389.2 by Jelmer Vernooij
Add repr implementation to GitTreeFile & GitTreeLink.
179
0.365.2 by Jelmer Vernooij
Add eq/copy.
180
    def __eq__(self, other):
181
        return (self.kind == other.kind and
182
                self.file_id == other.file_id and
183
                self.name == other.name and
184
                self.parent_id == other.parent_id and
185
                self.symlink_target == other.symlink_target)
186
187
    def copy(self):
188
        return self.__class__(
7143.15.2 by Jelmer Vernooij
Run autopep8.
189
            self.file_id, self.name, self.parent_id,
190
            self.symlink_target)
0.365.2 by Jelmer Vernooij
Add eq/copy.
191
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
192
0.429.5 by Jelmer Vernooij
Fix tree_content_summary test.
193
class GitTreeSubmodule(_mod_tree.TreeLink):
194
0.429.12 by Jelmer Vernooij
Remove revision.
195
    __slots__ = ['file_id', 'name', 'parent_id', 'reference_revision']
0.429.5 by Jelmer Vernooij
Fix tree_content_summary test.
196
0.429.12 by Jelmer Vernooij
Remove revision.
197
    def __init__(self, file_id, name, parent_id, reference_revision=None):
0.429.5 by Jelmer Vernooij
Fix tree_content_summary test.
198
        self.file_id = file_id
199
        self.name = name
200
        self.parent_id = parent_id
201
        self.reference_revision = reference_revision
202
203
    @property
204
    def kind(self):
205
        return 'tree-reference'
206
207
    def __repr__(self):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
208
        return ("%s(file_id=%r, name=%r, parent_id=%r, "
209
                "reference_revision=%r)") % (
0.429.5 by Jelmer Vernooij
Fix tree_content_summary test.
210
            type(self).__name__, self.file_id, self.name, self.parent_id,
0.429.12 by Jelmer Vernooij
Remove revision.
211
            self.reference_revision)
0.429.5 by Jelmer Vernooij
Fix tree_content_summary test.
212
213
    def __eq__(self, other):
214
        return (self.kind == other.kind and
215
                self.file_id == other.file_id and
216
                self.name == other.name and
217
                self.parent_id == other.parent_id and
218
                self.reference_revision == other.reference_revision)
219
220
    def copy(self):
221
        return self.__class__(
7143.15.2 by Jelmer Vernooij
Run autopep8.
222
            self.file_id, self.name, self.parent_id,
223
            self.reference_revision)
0.429.5 by Jelmer Vernooij
Fix tree_content_summary test.
224
225
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
226
entry_factory = {
227
    'directory': GitTreeDirectory,
228
    'file': GitTreeFile,
229
    'symlink': GitTreeSymlink,
0.429.5 by Jelmer Vernooij
Fix tree_content_summary test.
230
    'tree-reference': GitTreeSubmodule,
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
231
    }
232
233
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
234
def ensure_normalized_path(path):
235
    """Check whether path is normalized.
236
237
    :raises InvalidNormalization: When path is not normalized, and cannot be
238
        accessed on this platform by the normalized path.
239
    :return: The NFC normalised version of path.
240
    """
241
    norm_path, can_access = osutils.normalized_filename(path)
242
    if norm_path != path:
243
        if can_access:
244
            return norm_path
245
        else:
246
            raise errors.InvalidNormalization(path)
247
    return path
248
249
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
250
class GitRevisionTree(revisiontree.RevisionTree):
0.200.959 by Jelmer Vernooij
Improve docstrings.
251
    """Revision tree implementation based on Git objects."""
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
252
253
    def __init__(self, repository, revision_id):
254
        self._revision_id = revision_id
255
        self._repository = repository
0.264.3 by Jelmer Vernooij
Make RevisionTree inventoryless.
256
        self.store = repository._git.object_store
6964.2.3 by Jelmer Vernooij
Review comments.
257
        if not isinstance(revision_id, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
258
            raise TypeError(revision_id)
7143.15.2 by Jelmer Vernooij
Run autopep8.
259
        self.commit_id, self.mapping = repository.lookup_bzr_revision_id(
260
            revision_id)
0.200.1731 by Jelmer Vernooij
Add support for checking untracked changes.
261
        if revision_id == NULL_REVISION:
262
            self.tree = None
0.287.2 by Jelmer Vernooij
Support empty trees in GitRevisionTree.
263
            self.mapping = default_mapping
264
            self._fileid_map = GitFileIdMap(
0.287.4 by Jelmer Vernooij
Fix GitRevisionTree behaviour for null:
265
                {},
0.287.2 by Jelmer Vernooij
Support empty trees in GitRevisionTree.
266
                default_mapping)
0.200.1731 by Jelmer Vernooij
Add support for checking untracked changes.
267
        else:
268
            try:
269
                commit = self.store[self.commit_id]
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
270
            except KeyError:
0.200.1731 by Jelmer Vernooij
Add support for checking untracked changes.
271
                raise errors.NoSuchRevision(repository, revision_id)
272
            self.tree = commit.tree
7143.15.2 by Jelmer Vernooij
Run autopep8.
273
            self._fileid_map = self.mapping.get_fileid_map(
274
                self.store.__getitem__, self.tree)
0.264.3 by Jelmer Vernooij
Make RevisionTree inventoryless.
275
0.429.26 by Jelmer Vernooij
Fix remaining test.
276
    def _get_nested_repository(self, path):
277
        nested_repo_transport = self._repository.user_transport.clone(path)
7143.15.2 by Jelmer Vernooij
Run autopep8.
278
        nested_controldir = _mod_controldir.ControlDir.open_from_transport(
279
            nested_repo_transport)
0.429.26 by Jelmer Vernooij
Fix remaining test.
280
        return nested_controldir.find_repository()
281
0.349.1 by Jelmer Vernooij
Support supports_rename_tracking method.
282
    def supports_rename_tracking(self):
283
        return False
284
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
285
    def get_file_revision(self, path, file_id=None):
0.200.1283 by Jelmer Vernooij
Provide Repository.get_file_graph() and Tree.get_file_revision().
286
        change_scanner = self._repository._file_change_scanner
0.372.1 by Jelmer Vernooij
Fix some missing id handling.
287
        if self.commit_id == ZERO_SHA:
288
            return NULL_REVISION
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
289
        (unused_path, commit_id) = change_scanner.find_last_change_revision(
0.335.1 by Jelmer Vernooij
Be a bit stricter about encodings.
290
            path.encode('utf-8'), self.commit_id)
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
291
        return self._repository.lookup_foreign_revision_id(
292
            commit_id, self.mapping)
0.200.1283 by Jelmer Vernooij
Provide Repository.get_file_graph() and Tree.get_file_revision().
293
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
294
    def get_file_mtime(self, path, file_id=None):
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
295
        try:
296
            revid = self.get_file_revision(path, file_id)
297
        except KeyError:
7096.3.2 by Jelmer Vernooij
Fix some git tests.
298
            raise errors.NoSuchFile(path)
0.200.1283 by Jelmer Vernooij
Provide Repository.get_file_graph() and Tree.get_file_revision().
299
        try:
300
            rev = self._repository.get_revision(revid)
301
        except errors.NoSuchRevision:
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
302
            raise _mod_tree.FileTimestampUnavailable(path)
0.200.1283 by Jelmer Vernooij
Provide Repository.get_file_graph() and Tree.get_file_revision().
303
        return rev.timestamp
304
0.264.3 by Jelmer Vernooij
Make RevisionTree inventoryless.
305
    def id2path(self, file_id):
0.200.1712 by Jelmer Vernooij
Add file_id prefix.
306
        try:
0.329.1 by Jelmer Vernooij
Check that path actually exists in Tree.id2path.
307
            path = self._fileid_map.lookup_path(file_id)
0.200.1712 by Jelmer Vernooij
Add file_id prefix.
308
        except ValueError:
0.200.1714 by Jelmer Vernooij
Fix NoSuchId raising.
309
            raise errors.NoSuchId(self, file_id)
0.372.1 by Jelmer Vernooij
Fix some missing id handling.
310
        if self.is_versioned(path):
0.329.1 by Jelmer Vernooij
Check that path actually exists in Tree.id2path.
311
            return path
312
        raise errors.NoSuchId(self, file_id)
313
314
    def is_versioned(self, path):
315
        return self.has_filename(path)
0.264.3 by Jelmer Vernooij
Make RevisionTree inventoryless.
316
317
    def path2id(self, path):
0.200.1328 by Jelmer Vernooij
More test fixes.
318
        if self.mapping.is_special_file(path):
319
            return None
7096.3.6 by Jelmer Vernooij
Fix tests, on python 2 at least.
320
        if not self.is_versioned(path):
321
            return None
7018.3.2 by Jelmer Vernooij
Fix some git tests.
322
        return self._fileid_map.lookup_file_id(osutils.safe_unicode(path))
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
323
0.200.1569 by Jelmer Vernooij
Implement GitRevisionTree.all_file_ids().
324
    def all_file_ids(self):
7096.3.3 by Jelmer Vernooij
Fix two more tests.
325
        return {self.path2id(path) for path in self.all_versioned_paths()}
0.200.1569 by Jelmer Vernooij
Implement GitRevisionTree.all_file_ids().
326
0.200.1724 by Jelmer Vernooij
Add GitRevisionTree.all_versioned_paths implementation.
327
    def all_versioned_paths(self):
7096.3.2 by Jelmer Vernooij
Fix some git tests.
328
        ret = {u''}
7045.2.17 by Jelmer Vernooij
Some more.
329
        todo = [(self.store, b'', self.tree)]
0.200.1724 by Jelmer Vernooij
Add GitRevisionTree.all_versioned_paths implementation.
330
        while todo:
0.400.1 by Jelmer Vernooij
Track store in Tree.all_versioned_paths.
331
            (store, path, tree_id) = todo.pop()
0.287.2 by Jelmer Vernooij
Support empty trees in GitRevisionTree.
332
            if tree_id is None:
333
                continue
0.400.1 by Jelmer Vernooij
Track store in Tree.all_versioned_paths.
334
            tree = store[tree_id]
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
335
            for name, mode, hexsha in tree.items():
0.200.1724 by Jelmer Vernooij
Add GitRevisionTree.all_versioned_paths implementation.
336
                subpath = posixpath.join(path, name)
7096.3.2 by Jelmer Vernooij
Fix some git tests.
337
                ret.add(subpath.decode('utf-8'))
0.200.1724 by Jelmer Vernooij
Add GitRevisionTree.all_versioned_paths implementation.
338
                if stat.S_ISDIR(mode):
7045.2.17 by Jelmer Vernooij
Some more.
339
                    todo.append((store, subpath, hexsha))
0.200.1724 by Jelmer Vernooij
Add GitRevisionTree.all_versioned_paths implementation.
340
        return ret
341
0.200.1204 by Jelmer Vernooij
Implement GitRevisionTree.get_root_id().
342
    def get_root_id(self):
0.378.1 by Jelmer Vernooij
Return None from Tree.get_root_id() when encountering an empty tree.
343
        if self.tree is None:
344
            return None
0.200.1204 by Jelmer Vernooij
Implement GitRevisionTree.get_root_id().
345
        return self.path2id("")
346
0.200.1208 by Jelmer Vernooij
Add GitWorkingTree.has_id and GitWorkingTree.has_or_had_id.
347
    def has_or_had_id(self, file_id):
0.372.1 by Jelmer Vernooij
Fix some missing id handling.
348
        try:
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
349
            self.id2path(file_id)
0.372.1 by Jelmer Vernooij
Fix some missing id handling.
350
        except errors.NoSuchId:
351
            return False
352
        return True
0.200.1208 by Jelmer Vernooij
Add GitWorkingTree.has_id and GitWorkingTree.has_or_had_id.
353
354
    def has_id(self, file_id):
355
        try:
356
            path = self.id2path(file_id)
357
        except errors.NoSuchId:
358
            return False
359
        return self.has_filename(path)
360
0.381.1 by Jelmer Vernooij
Standardize looking up entries in Git trees.
361
    def _lookup_path(self, path):
362
        if self.tree is None:
363
            raise errors.NoSuchFile(path)
364
        try:
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
365
            (mode, hexsha) = tree_lookup_path(
366
                self.store.__getitem__, self.tree, path.encode('utf-8'))
0.381.1 by Jelmer Vernooij
Standardize looking up entries in Git trees.
367
        except KeyError:
368
            raise errors.NoSuchFile(self, path)
0.400.2 by Jelmer Vernooij
Return store from self._lookup_path.
369
        else:
370
            return (self.store, mode, hexsha)
0.381.1 by Jelmer Vernooij
Standardize looking up entries in Git trees.
371
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
372
    def is_executable(self, path, file_id=None):
0.400.2 by Jelmer Vernooij
Return store from self._lookup_path.
373
        (store, mode, hexsha) = self._lookup_path(path)
0.200.1615 by Jelmer Vernooij
Implement GitRevisionTree.is_executable.:
374
        if mode is None:
375
            # the tree root is a directory
376
            return False
377
        return mode_is_executable(mode)
378
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
379
    def kind(self, path, file_id=None):
0.400.2 by Jelmer Vernooij
Return store from self._lookup_path.
380
        (store, mode, hexsha) = self._lookup_path(path)
0.200.1253 by Jelmer Vernooij
Fix Tree.kind(TREE_ROOT).
381
        if mode is None:
382
            # the tree root is a directory
383
            return "directory"
0.200.1241 by Jelmer Vernooij
Implement GitRevisionTree.kind.
384
        return mode_kind(mode)
385
0.200.1197 by Jelmer Vernooij
Implement GitRevisionTree.has_filename.
386
    def has_filename(self, path):
387
        try:
0.381.1 by Jelmer Vernooij
Standardize looking up entries in Git trees.
388
            self._lookup_path(path)
389
        except errors.NoSuchFile:
0.200.1197 by Jelmer Vernooij
Implement GitRevisionTree.has_filename.
390
            return False
391
        else:
392
            return True
393
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
394
    def list_files(self, include_root=False, from_dir=None, recursive=True):
0.381.1 by Jelmer Vernooij
Standardize looking up entries in Git trees.
395
        if self.tree is None:
396
            return
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
397
        if from_dir is None:
0.200.1197 by Jelmer Vernooij
Implement GitRevisionTree.has_filename.
398
            from_dir = u""
0.400.2 by Jelmer Vernooij
Return store from self._lookup_path.
399
        (store, mode, hexsha) = self._lookup_path(from_dir)
7143.15.2 by Jelmer Vernooij
Run autopep8.
400
        if mode is None:  # Root
0.335.1 by Jelmer Vernooij
Be a bit stricter about encodings.
401
            root_ie = self._get_dir_ie(b"", None)
0.264.9 by Jelmer Vernooij
Implement basic GitWorkingTree.iter_entries_by_dir.
402
        else:
7096.3.2 by Jelmer Vernooij
Fix some git tests.
403
            parent_path = posixpath.dirname(from_dir)
0.200.1328 by Jelmer Vernooij
More test fixes.
404
            parent_id = self._fileid_map.lookup_file_id(parent_path)
0.264.10 by Jelmer Vernooij
Yield inventory entries.
405
            if mode_kind(mode) == 'directory':
406
                root_ie = self._get_dir_ie(from_dir.encode("utf-8"), parent_id)
407
            else:
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
408
                root_ie = self._get_file_ie(
409
                    store, from_dir.encode("utf-8"),
410
                    posixpath.basename(from_dir), mode, hexsha)
7096.3.2 by Jelmer Vernooij
Fix some git tests.
411
        if include_root:
0.264.10 by Jelmer Vernooij
Yield inventory entries.
412
            yield (from_dir, "V", root_ie.kind, root_ie.file_id, root_ie)
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
413
        todo = []
0.264.10 by Jelmer Vernooij
Yield inventory entries.
414
        if root_ie.kind == 'directory':
7143.15.2 by Jelmer Vernooij
Run autopep8.
415
            todo.append((store, from_dir.encode("utf-8"),
416
                         b"", hexsha, root_ie.file_id))
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
417
        while todo:
7096.3.2 by Jelmer Vernooij
Fix some git tests.
418
            (store, path, relpath, hexsha, parent_id) = todo.pop()
0.400.2 by Jelmer Vernooij
Return store from self._lookup_path.
419
            tree = store[hexsha]
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
420
            for name, mode, hexsha in tree.iteritems():
0.200.1328 by Jelmer Vernooij
More test fixes.
421
                if self.mapping.is_special_file(name):
422
                    continue
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
423
                child_path = posixpath.join(path, name)
7096.3.2 by Jelmer Vernooij
Fix some git tests.
424
                child_relpath = posixpath.join(relpath, name)
0.264.10 by Jelmer Vernooij
Yield inventory entries.
425
                if stat.S_ISDIR(mode):
426
                    ie = self._get_dir_ie(child_path, parent_id)
427
                    if recursive:
7143.15.2 by Jelmer Vernooij
Run autopep8.
428
                        todo.append(
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
429
                            (store, child_path, child_relpath, hexsha,
430
                             ie.file_id))
0.264.10 by Jelmer Vernooij
Yield inventory entries.
431
                else:
7143.15.2 by Jelmer Vernooij
Run autopep8.
432
                    ie = self._get_file_ie(
433
                        store, child_path, name, mode, hexsha, parent_id)
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
434
                yield (child_relpath.decode('utf-8'), "V", ie.kind, ie.file_id,
435
                       ie)
0.264.10 by Jelmer Vernooij
Yield inventory entries.
436
0.400.3 by Jelmer Vernooij
Pass store in a few more places.
437
    def _get_file_ie(self, store, path, name, mode, hexsha, parent_id):
7018.3.2 by Jelmer Vernooij
Fix some git tests.
438
        if not isinstance(path, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
439
            raise TypeError(path)
7018.3.2 by Jelmer Vernooij
Fix some git tests.
440
        if not isinstance(name, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
441
            raise TypeError(name)
0.264.10 by Jelmer Vernooij
Yield inventory entries.
442
        kind = mode_kind(mode)
7018.3.2 by Jelmer Vernooij
Fix some git tests.
443
        path = path.decode('utf-8')
444
        name = name.decode("utf-8")
0.200.1328 by Jelmer Vernooij
More test fixes.
445
        file_id = self._fileid_map.lookup_file_id(path)
7018.3.2 by Jelmer Vernooij
Fix some git tests.
446
        ie = entry_factory[kind](file_id, name, parent_id)
0.264.10 by Jelmer Vernooij
Yield inventory entries.
447
        if kind == 'symlink':
0.400.3 by Jelmer Vernooij
Pass store in a few more places.
448
            ie.symlink_target = store[hexsha].data.decode('utf-8')
0.200.1401 by Jelmer Vernooij
Cope with submodules in working trees.
449
        elif kind == 'tree-reference':
7143.15.2 by Jelmer Vernooij
Run autopep8.
450
            ie.reference_revision = self.mapping.revision_id_foreign_to_bzr(
451
                hexsha)
0.264.10 by Jelmer Vernooij
Yield inventory entries.
452
        else:
0.400.3 by Jelmer Vernooij
Pass store in a few more places.
453
            data = store[hexsha].data
0.264.10 by Jelmer Vernooij
Yield inventory entries.
454
            ie.text_sha1 = osutils.sha_string(data)
455
            ie.text_size = len(data)
456
            ie.executable = mode_is_executable(mode)
457
        return ie
458
459
    def _get_dir_ie(self, path, parent_id):
7018.3.2 by Jelmer Vernooij
Fix some git tests.
460
        path = path.decode('utf-8')
0.200.1328 by Jelmer Vernooij
More test fixes.
461
        file_id = self._fileid_map.lookup_file_id(path)
7018.3.2 by Jelmer Vernooij
Fix some git tests.
462
        return GitTreeDirectory(file_id, posixpath.basename(path), parent_id)
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
463
0.374.1 by Jelmer Vernooij
Implement GitRevisionTree.iter_child_entries.
464
    def iter_child_entries(self, path, file_id=None):
0.400.2 by Jelmer Vernooij
Return store from self._lookup_path.
465
        (store, mode, tree_sha) = self._lookup_path(path)
0.381.1 by Jelmer Vernooij
Standardize looking up entries in Git trees.
466
7096.3.1 by Jelmer Vernooij
Run tests against GitRevisionTree.
467
        if mode is not None and not stat.S_ISDIR(mode):
0.381.1 by Jelmer Vernooij
Standardize looking up entries in Git trees.
468
            return
469
0.374.1 by Jelmer Vernooij
Implement GitRevisionTree.iter_child_entries.
470
        encoded_path = path.encode('utf-8')
471
        file_id = self.path2id(path)
0.400.2 by Jelmer Vernooij
Return store from self._lookup_path.
472
        tree = store[tree_sha]
0.374.1 by Jelmer Vernooij
Implement GitRevisionTree.iter_child_entries.
473
        for name, mode, hexsha in tree.iteritems():
474
            if self.mapping.is_special_file(name):
475
                continue
476
            child_path = posixpath.join(encoded_path, name)
477
            if stat.S_ISDIR(mode):
478
                yield self._get_dir_ie(child_path, file_id)
479
            else:
0.400.3 by Jelmer Vernooij
Pass store in a few more places.
480
                yield self._get_file_ie(store, child_path, name, mode, hexsha,
0.374.1 by Jelmer Vernooij
Implement GitRevisionTree.iter_child_entries.
481
                                        file_id)
482
0.385.1 by Jelmer Vernooij
Use specific_files argument to Tree.iter_entries_by_dir.
483
    def iter_entries_by_dir(self, specific_files=None, yield_parents=False):
0.287.4 by Jelmer Vernooij
Fix GitRevisionTree behaviour for null:
484
        if self.tree is None:
485
            return
0.335.1 by Jelmer Vernooij
Be a bit stricter about encodings.
486
        if yield_parents:
487
            # TODO(jelmer): Support yield parents
488
            raise NotImplementedError
0.385.1 by Jelmer Vernooij
Use specific_files argument to Tree.iter_entries_by_dir.
489
        if specific_files is not None:
490
            if specific_files in ([""], []):
491
                specific_files = None
0.200.1285 by Jelmer Vernooij
Support specific_file_ids argument to Tree.iter_entries_by_dir.
492
            else:
7143.15.2 by Jelmer Vernooij
Run autopep8.
493
                specific_files = set([p.encode('utf-8')
494
                                      for p in specific_files])
7096.3.2 by Jelmer Vernooij
Fix some git tests.
495
        todo = deque([(self.store, b"", self.tree, self.get_root_id())])
496
        if specific_files is None or u"" in specific_files:
7096.3.7 by Jelmer Vernooij
Fix tests on python 3.
497
            yield u"", self._get_dir_ie(b"", None)
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
498
        while todo:
7096.3.2 by Jelmer Vernooij
Fix some git tests.
499
            store, path, tree_sha, parent_id = todo.popleft()
0.400.3 by Jelmer Vernooij
Pass store in a few more places.
500
            tree = store[tree_sha]
7096.3.2 by Jelmer Vernooij
Fix some git tests.
501
            extradirs = []
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
502
            for name, mode, hexsha in tree.iteritems():
0.200.1328 by Jelmer Vernooij
More test fixes.
503
                if self.mapping.is_special_file(name):
504
                    continue
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
505
                child_path = posixpath.join(path, name)
7096.3.2 by Jelmer Vernooij
Fix some git tests.
506
                child_path_decoded = child_path.decode('utf-8')
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
507
                if stat.S_ISDIR(mode):
0.385.1 by Jelmer Vernooij
Use specific_files argument to Tree.iter_entries_by_dir.
508
                    if (specific_files is None or
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
509
                            any([p for p in specific_files if p.startswith(
510
                                child_path)])):
7096.3.2 by Jelmer Vernooij
Fix some git tests.
511
                        extradirs.append(
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
512
                            (store, child_path, hexsha,
513
                             self.path2id(child_path_decoded)))
7096.3.2 by Jelmer Vernooij
Fix some git tests.
514
                if specific_files is None or child_path in specific_files:
515
                    if stat.S_ISDIR(mode):
516
                        yield (child_path_decoded,
517
                               self._get_dir_ie(child_path, parent_id))
518
                    else:
519
                        yield (child_path_decoded,
520
                               self._get_file_ie(store, child_path, name, mode,
7143.15.2 by Jelmer Vernooij
Run autopep8.
521
                                                 hexsha, parent_id))
7096.3.2 by Jelmer Vernooij
Fix some git tests.
522
            todo.extendleft(reversed(extradirs))
0.264.6 by Jelmer Vernooij
Implement custom GitRevisionTree.iter_entries_by_dir, GitRevisionTree.list_files.
523
7096.3.5 by Jelmer Vernooij
Fix GitRevisionTree.iter_references.
524
    def iter_references(self):
525
        if self.supports_tree_reference():
526
            for path, entry in self.iter_entries_by_dir():
527
                if entry.kind == 'tree-reference':
528
                    yield path, self.mapping.generate_file_id(b'')
529
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
530
    def get_revision_id(self):
0.200.959 by Jelmer Vernooij
Improve docstrings.
531
        """See RevisionTree.get_revision_id."""
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
532
        return self._revision_id
533
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
534
    def get_file_sha1(self, path, file_id=None, stat_value=None):
0.287.6 by Jelmer Vernooij
Fix some more tests.
535
        if self.tree is None:
536
            raise errors.NoSuchFile(path)
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
537
        return osutils.sha_string(self.get_file_text(path, file_id))
0.200.1255 by Jelmer Vernooij
Implement GitRevisionTree.get_file_sha1.
538
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
539
    def get_file_verifier(self, path, file_id=None, stat_value=None):
0.400.2 by Jelmer Vernooij
Return store from self._lookup_path.
540
        (store, mode, hexsha) = self._lookup_path(path)
0.200.1302 by Jelmer Vernooij
Significantly improve performance of WorkingTree.extras().
541
        return ("GIT", hexsha)
542
7096.3.2 by Jelmer Vernooij
Fix some git tests.
543
    def get_file_size(self, path, file_id=None):
544
        (store, mode, hexsha) = self._lookup_path(path)
545
        if stat.S_ISREG(mode):
546
            return len(store[hexsha].data)
547
        return None
548
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
549
    def get_file_text(self, path, file_id=None):
0.200.959 by Jelmer Vernooij
Improve docstrings.
550
        """See RevisionTree.get_file_text."""
0.400.2 by Jelmer Vernooij
Return store from self._lookup_path.
551
        (store, mode, hexsha) = self._lookup_path(path)
0.264.3 by Jelmer Vernooij
Make RevisionTree inventoryless.
552
        if stat.S_ISREG(mode):
0.400.2 by Jelmer Vernooij
Return store from self._lookup_path.
553
            return store[hexsha].data
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
554
        else:
0.335.1 by Jelmer Vernooij
Be a bit stricter about encodings.
555
            return b""
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
556
0.285.1 by Jelmer Vernooij
Swap arguments for tree methods.
557
    def get_symlink_target(self, path, file_id=None):
0.200.1466 by Jelmer Vernooij
Implement GitRevisionTree.get_symlink_target.
558
        """See RevisionTree.get_symlink_target."""
0.400.2 by Jelmer Vernooij
Return store from self._lookup_path.
559
        (store, mode, hexsha) = self._lookup_path(path)
0.200.1466 by Jelmer Vernooij
Implement GitRevisionTree.get_symlink_target.
560
        if stat.S_ISLNK(mode):
0.400.2 by Jelmer Vernooij
Return store from self._lookup_path.
561
            return store[hexsha].data.decode('utf-8')
0.200.1466 by Jelmer Vernooij
Implement GitRevisionTree.get_symlink_target.
562
        else:
563
            return None
564
0.429.17 by Jelmer Vernooij
Fix some more tests.
565
    def get_reference_revision(self, path, file_id=None):
566
        """See RevisionTree.get_symlink_target."""
0.429.25 by Jelmer Vernooij
Merge trunk.
567
        (store, mode, hexsha) = self._lookup_path(path)
0.429.17 by Jelmer Vernooij
Fix some more tests.
568
        if S_ISGITLINK(mode):
0.429.26 by Jelmer Vernooij
Fix remaining test.
569
            nested_repo = self._get_nested_repository(path)
570
            return nested_repo.lookup_foreign_revision_id(hexsha)
0.429.17 by Jelmer Vernooij
Fix some more tests.
571
        else:
572
            return None
573
0.264.10 by Jelmer Vernooij
Yield inventory entries.
574
    def _comparison_data(self, entry, path):
575
        if entry is None:
576
            return None, False, None
577
        return entry.kind, entry.executable, None
578
0.200.1568 by Jelmer Vernooij
Implement GitRevisionTree.path_content_summary.
579
    def path_content_summary(self, path):
580
        """See Tree.path_content_summary."""
581
        try:
0.400.2 by Jelmer Vernooij
Return store from self._lookup_path.
582
            (store, mode, hexsha) = self._lookup_path(path)
0.381.1 by Jelmer Vernooij
Standardize looking up entries in Git trees.
583
        except errors.NoSuchFile:
0.200.1568 by Jelmer Vernooij
Implement GitRevisionTree.path_content_summary.
584
            return ('missing', None, None, None)
585
        kind = mode_kind(mode)
586
        if kind == 'file':
587
            executable = mode_is_executable(mode)
0.400.2 by Jelmer Vernooij
Return store from self._lookup_path.
588
            contents = store[hexsha].data
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
589
            return (kind, len(contents), executable,
590
                    osutils.sha_string(contents))
0.200.1568 by Jelmer Vernooij
Implement GitRevisionTree.path_content_summary.
591
        elif kind == 'symlink':
7096.3.2 by Jelmer Vernooij
Fix some git tests.
592
            return (kind, None, None, store[hexsha].data.decode('utf-8'))
0.429.5 by Jelmer Vernooij
Fix tree_content_summary test.
593
        elif kind == 'tree-reference':
0.429.26 by Jelmer Vernooij
Fix remaining test.
594
            nested_repo = self._get_nested_repository(path)
0.429.5 by Jelmer Vernooij
Fix tree_content_summary test.
595
            return (kind, None, None,
0.429.26 by Jelmer Vernooij
Fix remaining test.
596
                    nested_repo.lookup_foreign_revision_id(hexsha))
0.200.1568 by Jelmer Vernooij
Implement GitRevisionTree.path_content_summary.
597
        else:
598
            return (kind, None, None, None)
599
0.385.1 by Jelmer Vernooij
Use specific_files argument to Tree.iter_entries_by_dir.
600
    def find_related_paths_across_trees(self, paths, trees=[],
7143.15.2 by Jelmer Vernooij
Run autopep8.
601
                                        require_versioned=True):
0.385.1 by Jelmer Vernooij
Use specific_files argument to Tree.iter_entries_by_dir.
602
        if paths is None:
603
            return None
604
        if require_versioned:
605
            trees = [self] + (trees if trees is not None else [])
606
            unversioned = set()
607
            for p in paths:
608
                for t in trees:
609
                    if t.is_versioned(p):
610
                        break
611
                else:
612
                    unversioned.add(p)
613
            if unversioned:
614
                raise errors.PathsNotVersionedError(unversioned)
615
        return filter(self.is_versioned, paths)
616
0.393.1 by Jelmer Vernooij
Avoid expensive bzr APIs in commit.
617
    def _iter_tree_contents(self, include_trees=False):
618
        if self.tree is None:
619
            return iter([])
620
        return self.store.iter_tree_contents(
7143.15.2 by Jelmer Vernooij
Run autopep8.
621
            self.tree, include_trees=include_trees)
0.393.1 by Jelmer Vernooij
Avoid expensive bzr APIs in commit.
622
6973.2.1 by Jelmer Vernooij
Implement GitRevisionTree.annotate_iter.
623
    def annotate_iter(self, path, file_id=None,
624
                      default_revision=CURRENT_REVISION):
625
        """Return an iterator of revision_id, line tuples.
626
627
        For working trees (and mutable trees in general), the special
628
        revision_id 'current:' will be used for lines that are new in this
629
        tree, e.g. uncommitted changes.
630
        :param file_id: The file to produce an annotated version from
631
        :param default_revision: For lines that don't match a basis, mark them
632
            with this revision id. Not all implementations will make use of
633
            this value.
634
        """
635
        with self.lock_read():
636
            # Now we have the parents of this content
637
            from breezy.annotate import Annotator
638
            from .annotate import AnnotateProvider
639
            annotator = Annotator(AnnotateProvider(
640
                self._repository._file_change_scanner))
641
            this_key = (path, self.get_file_revision(path))
642
            annotations = [(key[-1], line)
643
                           for key, line in annotator.annotate_flat(this_key)]
644
            return annotations
645
7096.3.2 by Jelmer Vernooij
Fix some git tests.
646
    def _get_rules_searcher(self, default_searcher):
647
        return default_searcher
648
7096.3.6 by Jelmer Vernooij
Fix tests, on python 2 at least.
649
    def walkdirs(self, prefix=u""):
7096.3.2 by Jelmer Vernooij
Fix some git tests.
650
        (store, mode, hexsha) = self._lookup_path(prefix)
7143.15.2 by Jelmer Vernooij
Run autopep8.
651
        todo = deque(
652
            [(store, prefix.encode('utf-8'), hexsha, self.path2id(prefix))])
7096.3.2 by Jelmer Vernooij
Fix some git tests.
653
        while todo:
7096.3.4 by Jelmer Vernooij
Fix returned paths.
654
            store, path, tree_sha, parent_id = todo.popleft()
7096.3.2 by Jelmer Vernooij
Fix some git tests.
655
            path_decoded = path.decode('utf-8')
656
            tree = store[tree_sha]
657
            children = []
658
            for name, mode, hexsha in tree.iteritems():
659
                if self.mapping.is_special_file(name):
660
                    continue
661
                child_path = posixpath.join(path, name)
662
                file_id = self.path2id(child_path.decode('utf-8'))
663
                if stat.S_ISDIR(mode):
7096.3.4 by Jelmer Vernooij
Fix returned paths.
664
                    todo.append((store, child_path, hexsha, file_id))
7096.3.6 by Jelmer Vernooij
Fix tests, on python 2 at least.
665
                children.append(
666
                    (child_path.decode('utf-8'), name.decode('utf-8'),
667
                        mode_kind(mode), None,
668
                        file_id, mode_kind(mode)))
7096.3.4 by Jelmer Vernooij
Fix returned paths.
669
            yield (path_decoded, parent_id), children
7096.3.2 by Jelmer Vernooij
Fix some git tests.
670
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
671
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
672
def tree_delta_from_git_changes(changes, mapping,
7143.15.2 by Jelmer Vernooij
Run autopep8.
673
                                fileid_maps, specific_files=None,
674
                                require_versioned=False, include_root=False,
675
                                target_extras=None):
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
676
    """Create a TreeDelta from two git trees.
0.200.959 by Jelmer Vernooij
Improve docstrings.
677
678
    source and target are iterators over tuples with:
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
679
        (filename, sha, mode)
680
    """
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
681
    (old_fileid_map, new_fileid_map) = fileid_maps
0.394.1 by Jelmer Vernooij
Fix reporting of extras in TreeDelta.
682
    if target_extras is None:
683
        target_extras = set()
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
684
    ret = delta.TreeDelta()
685
    for (oldpath, newpath), (oldmode, newmode), (oldsha, newsha) in changes:
7018.3.2 by Jelmer Vernooij
Fix some git tests.
686
        if newpath == b'' and not include_root:
0.287.5 by Jelmer Vernooij
Fix root handling.
687
            continue
7027.5.2 by Jelmer Vernooij
Fix some more git tests.
688
        if oldpath is None:
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
689
            oldpath_decoded = None
7027.5.2 by Jelmer Vernooij
Fix some more git tests.
690
        else:
691
            oldpath_decoded = oldpath.decode('utf-8')
692
        if newpath is None:
693
            newpath_decoded = None
694
        else:
695
            newpath_decoded = newpath.decode('utf-8')
0.200.1743 by Jelmer Vernooij
Fix some revision delta filtering.
696
        if not (specific_files is None or
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
697
                (oldpath is not None and
698
                    osutils.is_inside_or_parent_of_any(
699
                        specific_files, oldpath_decoded)) or
700
                (newpath is not None and
701
                    osutils.is_inside_or_parent_of_any(
702
                        specific_files, newpath_decoded))):
0.200.1743 by Jelmer Vernooij
Fix some revision delta filtering.
703
            continue
0.200.1752 by Jelmer Vernooij
Don't traverse nested trees in WorkingTree.smart_add.
704
        if mapping.is_special_file(oldpath):
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
705
            oldpath = None
0.200.1752 by Jelmer Vernooij
Don't traverse nested trees in WorkingTree.smart_add.
706
        if mapping.is_special_file(newpath):
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
707
            newpath = None
708
        if oldpath is None and newpath is None:
709
            continue
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
710
        if oldpath is None:
0.394.1 by Jelmer Vernooij
Fix reporting of extras in TreeDelta.
711
            if newpath in target_extras:
712
                ret.unversioned.append(
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
713
                    (osutils.normalized_filename(newpath)[0], None,
714
                     mode_kind(newmode)))
0.394.1 by Jelmer Vernooij
Fix reporting of extras in TreeDelta.
715
            else:
7018.3.2 by Jelmer Vernooij
Fix some git tests.
716
                file_id = new_fileid_map.lookup_file_id(newpath_decoded)
7143.15.2 by Jelmer Vernooij
Run autopep8.
717
                ret.added.append(
718
                    (newpath_decoded, file_id, mode_kind(newmode)))
6977.1.2 by Jelmer Vernooij
Deal with missing files properly in 'bzr st'.
719
        elif newpath is None or newmode == 0:
7018.3.2 by Jelmer Vernooij
Fix some git tests.
720
            file_id = old_fileid_map.lookup_file_id(oldpath_decoded)
721
            ret.removed.append((oldpath_decoded, file_id, mode_kind(oldmode)))
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
722
        elif oldpath != newpath:
7018.3.2 by Jelmer Vernooij
Fix some git tests.
723
            file_id = old_fileid_map.lookup_file_id(oldpath_decoded)
0.287.3 by Jelmer Vernooij
Some improvements to changes iterator.
724
            ret.renamed.append(
7018.3.2 by Jelmer Vernooij
Fix some git tests.
725
                (oldpath_decoded, newpath.decode('utf-8'), file_id,
7143.15.2 by Jelmer Vernooij
Run autopep8.
726
                 mode_kind(newmode), (oldsha != newsha),
727
                 (oldmode != newmode)))
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
728
        elif mode_kind(oldmode) != mode_kind(newmode):
7018.3.2 by Jelmer Vernooij
Fix some git tests.
729
            file_id = new_fileid_map.lookup_file_id(newpath_decoded)
0.287.3 by Jelmer Vernooij
Some improvements to changes iterator.
730
            ret.kind_changed.append(
7018.3.2 by Jelmer Vernooij
Fix some git tests.
731
                (newpath_decoded, file_id, mode_kind(oldmode),
7143.15.2 by Jelmer Vernooij
Run autopep8.
732
                 mode_kind(newmode)))
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
733
        elif oldsha != newsha or oldmode != newmode:
0.287.3 by Jelmer Vernooij
Some improvements to changes iterator.
734
            if stat.S_ISDIR(oldmode) and stat.S_ISDIR(newmode):
735
                continue
7018.3.2 by Jelmer Vernooij
Fix some git tests.
736
            file_id = new_fileid_map.lookup_file_id(newpath_decoded)
0.287.3 by Jelmer Vernooij
Some improvements to changes iterator.
737
            ret.modified.append(
7067.13.12 by Jelmer Vernooij
Handle decoded paths.
738
                (newpath_decoded, file_id, mode_kind(newmode),
7143.15.2 by Jelmer Vernooij
Run autopep8.
739
                 (oldsha != newsha), (oldmode != newmode)))
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
740
        else:
7018.3.2 by Jelmer Vernooij
Fix some git tests.
741
            file_id = new_fileid_map.lookup_file_id(newpath_decoded)
7143.15.2 by Jelmer Vernooij
Run autopep8.
742
            ret.unchanged.append(
743
                (newpath_decoded, file_id, mode_kind(newmode)))
0.394.1 by Jelmer Vernooij
Fix reporting of extras in TreeDelta.
744
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
745
    return ret
746
747
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
748
def changes_from_git_changes(changes, mapping, specific_files=None,
749
                             include_unchanged=False, target_extras=None):
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
750
    """Create a iter_changes-like generator from a git stream.
0.200.959 by Jelmer Vernooij
Improve docstrings.
751
752
    source and target are iterators over tuples with:
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
753
        (filename, sha, mode)
754
    """
0.391.7 by Jelmer Vernooij
Fix reporting of missing files in .iter_changes.
755
    if target_extras is None:
756
        target_extras = set()
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
757
    for (oldpath, newpath), (oldmode, newmode), (oldsha, newsha) in changes:
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
758
        if oldpath is not None:
759
            oldpath_decoded = oldpath.decode('utf-8')
760
        else:
761
            oldpath_decoded = None
762
        if newpath is not None:
763
            newpath_decoded = newpath.decode('utf-8')
764
        else:
765
            newpath_decoded = None
0.200.1743 by Jelmer Vernooij
Fix some revision delta filtering.
766
        if not (specific_files is None or
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
767
                (oldpath_decoded is not None and
768
                    osutils.is_inside_or_parent_of_any(
769
                        specific_files, oldpath_decoded)) or
770
                (newpath_decoded is not None and
771
                    osutils.is_inside_or_parent_of_any(
772
                        specific_files, newpath_decoded))):
0.200.1743 by Jelmer Vernooij
Fix some revision delta filtering.
773
            continue
0.287.3 by Jelmer Vernooij
Some improvements to changes iterator.
774
        if oldpath is not None and mapping.is_special_file(oldpath):
775
            continue
776
        if newpath is not None and mapping.is_special_file(newpath):
0.200.1328 by Jelmer Vernooij
More test fixes.
777
            continue
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
778
        if oldpath_decoded is None:
779
            fileid = mapping.generate_file_id(newpath_decoded)
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
780
            oldexe = None
781
            oldkind = None
782
            oldname = None
783
            oldparent = None
0.391.7 by Jelmer Vernooij
Fix reporting of missing files in .iter_changes.
784
            oldversioned = False
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
785
        else:
0.391.7 by Jelmer Vernooij
Fix reporting of missing files in .iter_changes.
786
            oldversioned = True
0.391.8 by Jelmer Vernooij
Allow missing items in old tree.
787
            if oldmode:
788
                oldexe = mode_is_executable(oldmode)
789
                oldkind = mode_kind(oldmode)
790
            else:
791
                oldexe = False
792
                oldkind = None
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
793
            if oldpath_decoded == u'':
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
794
                oldparent = None
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
795
                oldname = u''
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
796
            else:
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
797
                (oldparentpath, oldname) = osutils.split(oldpath_decoded)
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
798
                oldparent = mapping.generate_file_id(oldparentpath)
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
799
            fileid = mapping.generate_file_id(oldpath_decoded)
800
        if newpath_decoded is None:
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
801
            newexe = None
802
            newkind = None
803
            newname = None
804
            newparent = None
0.391.7 by Jelmer Vernooij
Fix reporting of missing files in .iter_changes.
805
            newversioned = False
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
806
        else:
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
807
            newversioned = (newpath_decoded not in target_extras)
0.391.7 by Jelmer Vernooij
Fix reporting of missing files in .iter_changes.
808
            if newmode:
0.200.1576 by Jelmer Vernooij
Merge a bunch of fixes from store-roundtrip-info.
809
                newexe = mode_is_executable(newmode)
810
                newkind = mode_kind(newmode)
811
            else:
812
                newexe = False
813
                newkind = None
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
814
            if newpath_decoded == u'':
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
815
                newparent = None
0.316.1 by Jelmer Vernooij
Fix iter_changes behaviour for trees in the tree root.
816
                newname = u''
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
817
            else:
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
818
                newparentpath, newname = osutils.split(newpath_decoded)
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
819
                newparent = mapping.generate_file_id(newparentpath)
0.357.3 by Jelmer Vernooij
More remove fixes.
820
        if (not include_unchanged and
821
            oldkind == 'directory' and newkind == 'directory' and
7143.15.2 by Jelmer Vernooij
Run autopep8.
822
                oldpath_decoded == newpath_decoded):
0.357.3 by Jelmer Vernooij
More remove fixes.
823
            continue
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
824
        yield (fileid, (oldpath_decoded, newpath_decoded), (oldsha != newsha),
7143.15.2 by Jelmer Vernooij
Run autopep8.
825
               (oldversioned, newversioned),
826
               (oldparent, newparent), (oldname, newname),
827
               (oldkind, newkind), (oldexe, newexe))
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
828
829
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
830
class InterGitTrees(_mod_tree.InterTree):
0.287.3 by Jelmer Vernooij
Some improvements to changes iterator.
831
    """InterTree that works between two git trees."""
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
832
0.200.659 by Jelmer Vernooij
Prevent tests using InterGitRevisionTrees.
833
    _matching_from_tree_format = None
834
    _matching_to_tree_format = None
835
    _test_mutable_trees_to_test_trees = None
836
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
837
    @classmethod
838
    def is_compatible(cls, source, target):
0.200.959 by Jelmer Vernooij
Improve docstrings.
839
        return (isinstance(source, GitRevisionTree) and
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
840
                isinstance(target, GitRevisionTree))
841
842
    def compare(self, want_unchanged=False, specific_files=None,
843
                extra_trees=None, require_versioned=False, include_root=False,
844
                want_unversioned=False):
0.391.4 by Jelmer Vernooij
Simplify InterGitTrees implementation.
845
        with self.lock_read():
0.391.7 by Jelmer Vernooij
Fix reporting of missing files in .iter_changes.
846
            changes, target_extras = self._iter_git_changes(
7143.15.2 by Jelmer Vernooij
Run autopep8.
847
                want_unchanged=want_unchanged,
848
                require_versioned=require_versioned,
849
                specific_files=specific_files,
850
                extra_trees=extra_trees,
851
                want_unversioned=want_unversioned)
0.391.4 by Jelmer Vernooij
Simplify InterGitTrees implementation.
852
            source_fileid_map = self.source._fileid_map
853
            target_fileid_map = self.target._fileid_map
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
854
            return tree_delta_from_git_changes(
855
                changes, self.target.mapping,
856
                (source_fileid_map, target_fileid_map),
857
                specific_files=specific_files,
858
                include_root=include_root, target_extras=target_extras)
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
859
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
860
    def iter_changes(self, include_unchanged=False, specific_files=None,
0.287.3 by Jelmer Vernooij
Some improvements to changes iterator.
861
                     pb=None, extra_trees=[], require_versioned=True,
862
                     want_unversioned=False):
0.391.4 by Jelmer Vernooij
Simplify InterGitTrees implementation.
863
        with self.lock_read():
0.391.7 by Jelmer Vernooij
Fix reporting of missing files in .iter_changes.
864
            changes, target_extras = self._iter_git_changes(
7143.15.2 by Jelmer Vernooij
Run autopep8.
865
                want_unchanged=include_unchanged,
866
                require_versioned=require_versioned,
867
                specific_files=specific_files,
868
                extra_trees=extra_trees,
869
                want_unversioned=want_unversioned)
0.391.4 by Jelmer Vernooij
Simplify InterGitTrees implementation.
870
            return changes_from_git_changes(
7143.15.2 by Jelmer Vernooij
Run autopep8.
871
                changes, self.target.mapping,
872
                specific_files=specific_files,
873
                include_unchanged=include_unchanged,
874
                target_extras=target_extras)
0.200.622 by Jelmer Vernooij
Implement InterTree.iter_changes() as well.
875
0.385.1 by Jelmer Vernooij
Use specific_files argument to Tree.iter_entries_by_dir.
876
    def _iter_git_changes(self, want_unchanged=False, specific_files=None,
7143.15.2 by Jelmer Vernooij
Run autopep8.
877
                          require_versioned=False, extra_trees=None,
878
                          want_unversioned=False):
0.287.3 by Jelmer Vernooij
Some improvements to changes iterator.
879
        raise NotImplementedError(self._iter_git_changes)
880
881
882
class InterGitRevisionTrees(InterGitTrees):
883
    """InterTree that works between two git revision trees."""
884
885
    _matching_from_tree_format = None
886
    _matching_to_tree_format = None
887
    _test_mutable_trees_to_test_trees = None
888
889
    @classmethod
890
    def is_compatible(cls, source, target):
891
        return (isinstance(source, GitRevisionTree) and
892
                isinstance(target, GitRevisionTree))
893
0.385.1 by Jelmer Vernooij
Use specific_files argument to Tree.iter_entries_by_dir.
894
    def _iter_git_changes(self, want_unchanged=False, specific_files=None,
7143.15.2 by Jelmer Vernooij
Run autopep8.
895
                          require_versioned=True, extra_trees=None,
896
                          want_unversioned=False):
0.385.1 by Jelmer Vernooij
Use specific_files argument to Tree.iter_entries_by_dir.
897
        trees = [self.source]
898
        if extra_trees is not None:
899
            trees.extend(extra_trees)
900
        if specific_files is not None:
901
            specific_files = self.target.find_related_paths_across_trees(
7143.15.2 by Jelmer Vernooij
Run autopep8.
902
                specific_files, trees,
903
                require_versioned=require_versioned)
0.357.1 by Jelmer Vernooij
Fix some remove tests.
904
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
905
        if (self.source._repository._git.object_store !=
906
                self.target._repository._git.object_store):
907
            store = OverlayObjectStore(
908
                [self.source._repository._git.object_store,
909
                    self.target._repository._git.object_store])
0.200.1780 by Jelmer Vernooij
Fix cross-object-store tree comparison.
910
        else:
911
            store = self.source._repository._git.object_store
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
912
        return store.tree_changes(
0.287.3 by Jelmer Vernooij
Some improvements to changes iterator.
913
            self.source.tree, self.target.tree, want_unchanged=want_unchanged,
0.391.2 by Jelmer Vernooij
Pass along target_missing.
914
            include_trees=True, change_type_same=True), set()
0.287.3 by Jelmer Vernooij
Some improvements to changes iterator.
915
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
916
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
917
_mod_tree.InterTree.register_optimiser(InterGitRevisionTrees)
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
918
919
920
class MutableGitIndexTree(mutabletree.MutableTree):
921
922
    def __init__(self):
923
        self._lock_mode = None
924
        self._lock_count = 0
925
        self._versioned_dirs = None
0.415.1 by Jelmer Vernooij
Only write index when it's dirty.
926
        self._index_dirty = False
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
927
928
    def is_versioned(self, path):
929
        with self.lock_read():
930
            path = path.rstrip('/').encode('utf-8')
0.429.1 by Jelmer Vernooij
Abstract away index access.
931
            (index, subpath) = self._lookup_index(path)
932
            return (subpath in index or self._has_dir(path))
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
933
934
    def _has_dir(self, path):
7018.3.2 by Jelmer Vernooij
Fix some git tests.
935
        if not isinstance(path, bytes):
936
            raise TypeError(path)
937
        if path == b"":
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
938
            return True
939
        if self._versioned_dirs is None:
940
            self._load_dirs()
941
        return path in self._versioned_dirs
942
943
    def _load_dirs(self):
0.361.3 by Jelmer Vernooij
Merge trunk,
944
        if self._lock_mode is None:
945
            raise errors.ObjectNotLocked(self)
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
946
        self._versioned_dirs = set()
0.429.1 by Jelmer Vernooij
Abstract away index access.
947
        # TODO(jelmer): Browse over all indexes
0.429.11 by Jelmer Vernooij
Merge trunk.
948
        for p, i in self._recurse_index_entries():
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
949
            self._ensure_versioned_dir(posixpath.dirname(p))
950
951
    def _ensure_versioned_dir(self, dirname):
7018.3.2 by Jelmer Vernooij
Fix some git tests.
952
        if not isinstance(dirname, bytes):
953
            raise TypeError(dirname)
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
954
        if dirname in self._versioned_dirs:
955
            return
7018.3.2 by Jelmer Vernooij
Fix some git tests.
956
        if dirname != b"":
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
957
            self._ensure_versioned_dir(posixpath.dirname(dirname))
958
        self._versioned_dirs.add(dirname)
959
960
    def path2id(self, path):
961
        with self.lock_read():
962
            path = path.rstrip('/')
963
            if self.is_versioned(path.rstrip('/')):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
964
                return self._fileid_map.lookup_file_id(
965
                    osutils.safe_unicode(path))
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
966
            return None
967
968
    def has_id(self, file_id):
969
        try:
970
            self.id2path(file_id)
971
        except errors.NoSuchId:
972
            return False
973
        else:
974
            return True
975
976
    def id2path(self, file_id):
977
        if file_id is None:
978
            return ''
0.361.3 by Jelmer Vernooij
Merge trunk,
979
        if type(file_id) is not bytes:
980
            raise TypeError(file_id)
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
981
        with self.lock_read():
982
            try:
983
                path = self._fileid_map.lookup_path(file_id)
984
            except ValueError:
985
                raise errors.NoSuchId(self, file_id)
986
            if self.is_versioned(path):
987
                return path
988
            raise errors.NoSuchId(self, file_id)
989
990
    def _set_root_id(self, file_id):
991
        self._fileid_map.set_file_id("", file_id)
992
993
    def get_root_id(self):
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
994
        return self.path2id(u"")
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
995
996
    def _add(self, files, ids, kinds):
997
        for (path, file_id, kind) in zip(files, ids, kinds):
998
            if file_id is not None:
999
                raise workingtree.SettingFileIdUnsupported()
0.366.1 by Jelmer Vernooij
Fix normalized filename checking in add.
1000
            path, can_access = osutils.normalized_filename(path)
1001
            if not can_access:
1002
                raise errors.InvalidNormalization(path)
6964.2.4 by Jelmer Vernooij
Fix running on python2.
1003
            self._index_add_entry(path, kind)
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1004
0.429.5 by Jelmer Vernooij
Fix tree_content_summary test.
1005
    def _read_submodule_head(self, path):
1006
        raise NotImplementedError(self._read_submodule_head)
1007
0.429.1 by Jelmer Vernooij
Abstract away index access.
1008
    def _lookup_index(self, encoded_path):
1009
        if not isinstance(encoded_path, bytes):
1010
            raise TypeError(encoded_path)
0.429.11 by Jelmer Vernooij
Merge trunk.
1011
        # TODO(jelmer): Look in other indexes
0.429.1 by Jelmer Vernooij
Abstract away index access.
1012
        return self.index, encoded_path
1013
0.429.25 by Jelmer Vernooij
Merge trunk.
1014
    def _index_del_entry(self, index, path):
1015
        del index[path]
1016
        # TODO(jelmer): Keep track of dirty per index
0.415.1 by Jelmer Vernooij
Only write index when it's dirty.
1017
        self._index_dirty = True
1018
0.429.16 by Jelmer Vernooij
Look at reference_revision on ie.
1019
    def _index_add_entry(self, path, kind, flags=0, reference_revision=None):
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1020
        if kind == "directory":
1021
            # Git indexes don't contain directories
1022
            return
1023
        if kind == "file":
1024
            blob = Blob()
1025
            try:
1026
                file, stat_val = self.get_file_with_stat(path)
1027
            except (errors.NoSuchFile, IOError):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
1028
                # TODO: Rather than come up with something here, use the old
1029
                # index
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1030
                file = BytesIO()
1031
                stat_val = os.stat_result(
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
1032
                    (stat.S_IFREG | 0o644, 0, 0, 0, 0, 0, 0, 0, 0, 0))
7027.4.7 by Jelmer Vernooij
Fix some tests.
1033
            with file:
1034
                blob.set_raw_string(file.read())
0.429.2 by Jelmer Vernooij
Some more work on submodule support.
1035
            # Add object to the repository if it didn't exist yet
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
1036
            if blob.id not in self.store:
0.429.2 by Jelmer Vernooij
Some more work on submodule support.
1037
                self.store.add_object(blob)
1038
            hexsha = blob.id
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1039
        elif kind == "symlink":
1040
            blob = Blob()
1041
            try:
1042
                stat_val = self._lstat(path)
0.429.2 by Jelmer Vernooij
Some more work on submodule support.
1043
            except EnvironmentError:
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1044
                # TODO: Rather than come up with something here, use the
1045
                # old index
1046
                stat_val = os.stat_result(
1047
                    (stat.S_IFLNK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
1048
            blob.set_raw_string(
1049
                self.get_symlink_target(path).encode("utf-8"))
0.429.2 by Jelmer Vernooij
Some more work on submodule support.
1050
            # Add object to the repository if it didn't exist yet
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
1051
            if blob.id not in self.store:
0.429.2 by Jelmer Vernooij
Some more work on submodule support.
1052
                self.store.add_object(blob)
1053
            hexsha = blob.id
1054
        elif kind == "tree-reference":
0.429.16 by Jelmer Vernooij
Look at reference_revision on ie.
1055
            if reference_revision is not None:
7143.15.2 by Jelmer Vernooij
Run autopep8.
1056
                hexsha = self.branch.lookup_bzr_revision_id(
1057
                    reference_revision)[0]
0.429.16 by Jelmer Vernooij
Look at reference_revision on ie.
1058
            else:
1059
                hexsha = self._read_submodule_head(path)
1060
                if hexsha is None:
1061
                    raise errors.NoCommits(path)
0.429.2 by Jelmer Vernooij
Some more work on submodule support.
1062
            try:
1063
                stat_val = self._lstat(path)
1064
            except EnvironmentError:
1065
                stat_val = os.stat_result(
1066
                    (S_IFGITLINK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
1067
            stat_val = os.stat_result((S_IFGITLINK, ) + stat_val[1:])
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1068
        else:
1069
            raise AssertionError("unknown kind '%s'" % kind)
1070
        # Add an entry to the index or update the existing entry
1071
        ensure_normalized_path(path)
1072
        encoded_path = path.encode("utf-8")
1073
        if b'\r' in encoded_path or b'\n' in encoded_path:
1074
            # TODO(jelmer): Why do we need to do this?
1075
            trace.mutter('ignoring path with invalid newline in it: %r', path)
1076
            return
0.429.1 by Jelmer Vernooij
Abstract away index access.
1077
        (index, index_path) = self._lookup_index(encoded_path)
0.429.2 by Jelmer Vernooij
Some more work on submodule support.
1078
        index[index_path] = index_entry_from_stat(stat_val, hexsha, flags)
0.415.1 by Jelmer Vernooij
Only write index when it's dirty.
1079
        self._index_dirty = True
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1080
        if self._versioned_dirs is not None:
0.429.1 by Jelmer Vernooij
Abstract away index access.
1081
            self._ensure_versioned_dir(index_path)
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1082
7018.3.2 by Jelmer Vernooij
Fix some git tests.
1083
    def _recurse_index_entries(self, index=None, basepath=b""):
0.429.7 by Jelmer Vernooij
Consistent file ids.
1084
        # Iterate over all index entries
1085
        with self.lock_read():
1086
            if index is None:
1087
                index = self.index
6973.12.3 by Jelmer Vernooij
Fixes.
1088
            for path, value in index.items():
0.429.7 by Jelmer Vernooij
Consistent file ids.
1089
                yield (posixpath.join(basepath, path), value)
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
1090
                (ctime, mtime, dev, ino, mode, uid, gid, size, sha,
1091
                 flags) = value
0.429.10 by Jelmer Vernooij
use new read_submodule_head from dulwich.
1092
                if S_ISGITLINK(mode):
7143.15.2 by Jelmer Vernooij
Run autopep8.
1093
                    pass  # TODO(jelmer): dive into submodule
0.429.7 by Jelmer Vernooij
Consistent file ids.
1094
0.385.1 by Jelmer Vernooij
Use specific_files argument to Tree.iter_entries_by_dir.
1095
    def iter_entries_by_dir(self, specific_files=None, yield_parents=False):
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1096
        if yield_parents:
1097
            raise NotImplementedError(self.iter_entries_by_dir)
1098
        with self.lock_read():
0.385.1 by Jelmer Vernooij
Use specific_files argument to Tree.iter_entries_by_dir.
1099
            if specific_files is not None:
1100
                specific_files = set(specific_files)
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1101
            else:
0.385.1 by Jelmer Vernooij
Use specific_files argument to Tree.iter_entries_by_dir.
1102
                specific_files = None
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1103
            root_ie = self._get_dir_ie(u"", None)
1104
            ret = {}
0.385.1 by Jelmer Vernooij
Use specific_files argument to Tree.iter_entries_by_dir.
1105
            if specific_files is None or u"" in specific_files:
7029.4.2 by Jelmer Vernooij
Fix more merge tests.
1106
                ret[(u"", u"")] = root_ie
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1107
            dir_ids = {u"": root_ie.file_id}
0.429.7 by Jelmer Vernooij
Consistent file ids.
1108
            for path, value in self._recurse_index_entries():
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1109
                if self.mapping.is_special_file(path):
1110
                    continue
1111
                path = path.decode("utf-8")
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
1112
                if specific_files is not None and path not in specific_files:
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1113
                    continue
1114
                (parent, name) = posixpath.split(path)
1115
                try:
1116
                    file_ie = self._get_file_ie(name, path, value, None)
1117
                except errors.NoSuchFile:
1118
                    continue
0.385.1 by Jelmer Vernooij
Use specific_files argument to Tree.iter_entries_by_dir.
1119
                if yield_parents or specific_files is None:
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
1120
                    for (dir_path, dir_ie) in self._add_missing_parent_ids(
1121
                            parent, dir_ids):
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1122
                        ret[(posixpath.dirname(dir_path), dir_path)] = dir_ie
0.429.12 by Jelmer Vernooij
Remove revision.
1123
                file_ie.parent_id = self.path2id(parent)
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1124
                ret[(posixpath.dirname(path), path)] = file_ie
7029.4.2 by Jelmer Vernooij
Fix more merge tests.
1125
            return ((path, ie) for ((_, path), ie) in sorted(viewitems(ret)))
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1126
0.429.7 by Jelmer Vernooij
Consistent file ids.
1127
    def iter_references(self):
1128
        # TODO(jelmer): Implement a more efficient version of this
1129
        for path, entry in self.iter_entries_by_dir():
1130
            if entry.kind == 'tree-reference':
0.429.20 by Jelmer Vernooij
Fix iter_references.
1131
                yield path, self.mapping.generate_file_id(b'')
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1132
1133
    def _get_dir_ie(self, path, parent_id):
1134
        file_id = self.path2id(path)
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
1135
        return GitTreeDirectory(file_id,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1136
                                posixpath.basename(path).strip("/"), parent_id)
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1137
1138
    def _get_file_ie(self, name, path, value, parent_id):
6973.6.2 by Jelmer Vernooij
Fix more tests.
1139
        if not isinstance(name, text_type):
0.361.3 by Jelmer Vernooij
Merge trunk,
1140
            raise TypeError(name)
6973.6.2 by Jelmer Vernooij
Fix more tests.
1141
        if not isinstance(path, text_type):
0.361.3 by Jelmer Vernooij
Merge trunk,
1142
            raise TypeError(path)
1143
        if not isinstance(value, tuple) or len(value) != 10:
1144
            raise TypeError(value)
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1145
        (ctime, mtime, dev, ino, mode, uid, gid, size, sha, flags) = value
1146
        file_id = self.path2id(path)
7018.3.2 by Jelmer Vernooij
Fix some git tests.
1147
        if not isinstance(file_id, bytes):
1148
            raise TypeError(file_id)
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1149
        kind = mode_kind(mode)
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
1150
        ie = entry_factory[kind](file_id, name, parent_id)
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1151
        if kind == 'symlink':
1152
            ie.symlink_target = self.get_symlink_target(path, file_id)
0.429.7 by Jelmer Vernooij
Consistent file ids.
1153
        elif kind == 'tree-reference':
1154
            ie.reference_revision = self.get_reference_revision(path, file_id)
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1155
        else:
1156
            try:
1157
                data = self.get_file_text(path, file_id)
1158
            except errors.NoSuchFile:
1159
                data = None
1160
            except IOError as e:
1161
                if e.errno != errno.ENOENT:
1162
                    raise
1163
                data = None
1164
            if data is None:
1165
                data = self.branch.repository._git.object_store[sha].data
1166
            ie.text_sha1 = osutils.sha_string(data)
1167
            ie.text_size = len(data)
1168
            ie.executable = bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
1169
        return ie
1170
1171
    def _add_missing_parent_ids(self, path, dir_ids):
1172
        if path in dir_ids:
1173
            return []
1174
        parent = posixpath.dirname(path).strip("/")
1175
        ret = self._add_missing_parent_ids(parent, dir_ids)
1176
        parent_id = dir_ids[parent]
1177
        ie = self._get_dir_ie(path, parent_id)
1178
        dir_ids[path] = ie.file_id
1179
        ret.append((path, ie))
1180
        return ret
1181
1182
    def _comparison_data(self, entry, path):
1183
        if entry is None:
1184
            return None, False, None
1185
        return entry.kind, entry.executable, None
1186
1187
    def _unversion_path(self, path):
0.361.3 by Jelmer Vernooij
Merge trunk,
1188
        if self._lock_mode is None:
1189
            raise errors.ObjectNotLocked(self)
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1190
        encoded_path = path.encode("utf-8")
1191
        count = 0
0.429.1 by Jelmer Vernooij
Abstract away index access.
1192
        (index, subpath) = self._lookup_index(encoded_path)
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1193
        try:
0.429.25 by Jelmer Vernooij
Merge trunk.
1194
            self._index_del_entry(index, encoded_path)
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1195
        except KeyError:
1196
            # A directory, perhaps?
0.429.1 by Jelmer Vernooij
Abstract away index access.
1197
            # TODO(jelmer): Deletes that involve submodules?
1198
            for p in list(index):
7143.15.2 by Jelmer Vernooij
Run autopep8.
1199
                if p.startswith(subpath + b"/"):
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1200
                    count += 1
0.429.25 by Jelmer Vernooij
Merge trunk.
1201
                    self._index_del_entry(index, p)
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1202
        else:
1203
            count = 1
1204
        self._versioned_dirs = None
1205
        return count
1206
1207
    def unversion(self, paths, file_ids=None):
1208
        with self.lock_tree_write():
1209
            for path in paths:
1210
                if self._unversion_path(path) == 0:
1211
                    raise errors.NoSuchFile(path)
1212
            self._versioned_dirs = None
1213
            self.flush()
1214
1215
    def flush(self):
1216
        pass
1217
1218
    def update_basis_by_delta(self, revid, delta):
1219
        # TODO(jelmer): This shouldn't be called, it's inventory specific.
1220
        for (old_path, new_path, file_id, ie) in delta:
0.429.1 by Jelmer Vernooij
Abstract away index access.
1221
            if old_path is not None:
7143.15.2 by Jelmer Vernooij
Run autopep8.
1222
                (index, old_subpath) = self._lookup_index(
1223
                    old_path.encode('utf-8'))
0.429.1 by Jelmer Vernooij
Abstract away index access.
1224
                if old_subpath in index:
0.429.25 by Jelmer Vernooij
Merge trunk.
1225
                    self._index_del_entry(index, old_subpath)
0.429.1 by Jelmer Vernooij
Abstract away index access.
1226
                    self._versioned_dirs = None
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1227
            if new_path is not None and ie.kind != 'directory':
6964.2.4 by Jelmer Vernooij
Fix running on python2.
1228
                self._index_add_entry(new_path, ie.kind)
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
1229
        self.flush()
1230
        self._set_merges_from_parent_ids([])
0.360.4 by Jelmer Vernooij
Implement MemoryTree.rename_one, MemoryTree.mkdir.
1231
1232
    def move(self, from_paths, to_dir=None, after=None):
1233
        rename_tuples = []
1234
        with self.lock_tree_write():
1235
            to_abs = self.abspath(to_dir)
1236
            if not os.path.isdir(to_abs):
1237
                raise errors.BzrMoveFailedError('', to_dir,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1238
                                                errors.NotADirectory(to_abs))
0.360.4 by Jelmer Vernooij
Implement MemoryTree.rename_one, MemoryTree.mkdir.
1239
1240
            for from_rel in from_paths:
1241
                from_tail = os.path.split(from_rel)[-1]
1242
                to_rel = os.path.join(to_dir, from_tail)
1243
                self.rename_one(from_rel, to_rel, after=after)
1244
                rename_tuples.append((from_rel, to_rel))
1245
            self.flush()
1246
            return rename_tuples
1247
1248
    def rename_one(self, from_rel, to_rel, after=None):
1249
        from_path = from_rel.encode("utf-8")
1250
        to_rel, can_access = osutils.normalized_filename(to_rel)
1251
        if not can_access:
1252
            raise errors.InvalidNormalization(to_rel)
1253
        to_path = to_rel.encode("utf-8")
1254
        with self.lock_tree_write():
1255
            if not after:
1256
                # Perhaps it's already moved?
1257
                after = (
1258
                    not self.has_filename(from_rel) and
1259
                    self.has_filename(to_rel) and
1260
                    not self.is_versioned(to_rel))
1261
            if after:
1262
                if not self.has_filename(to_rel):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
1263
                    raise errors.BzrMoveFailedError(
1264
                        from_rel, to_rel, errors.NoSuchFile(to_rel))
0.360.4 by Jelmer Vernooij
Implement MemoryTree.rename_one, MemoryTree.mkdir.
1265
                if self.basis_tree().is_versioned(to_rel):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
1266
                    raise errors.BzrMoveFailedError(
1267
                        from_rel, to_rel, errors.AlreadyVersionedError(to_rel))
0.360.4 by Jelmer Vernooij
Implement MemoryTree.rename_one, MemoryTree.mkdir.
1268
1269
                kind = self.kind(to_rel)
1270
            else:
1271
                try:
1272
                    to_kind = self.kind(to_rel)
1273
                except errors.NoSuchFile:
1274
                    exc_type = errors.BzrRenameFailedError
1275
                    to_kind = None
1276
                else:
1277
                    exc_type = errors.BzrMoveFailedError
1278
                if self.is_versioned(to_rel):
1279
                    raise exc_type(from_rel, to_rel,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1280
                                   errors.AlreadyVersionedError(to_rel))
0.360.4 by Jelmer Vernooij
Implement MemoryTree.rename_one, MemoryTree.mkdir.
1281
                if not self.has_filename(from_rel):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
1282
                    raise errors.BzrMoveFailedError(
1283
                        from_rel, to_rel, errors.NoSuchFile(from_rel))
0.388.1 by Jelmer Vernooij
Don't print error moving to an unversioned directory.
1284
                kind = self.kind(from_rel)
1285
                if not self.is_versioned(from_rel) and kind != 'directory':
0.360.4 by Jelmer Vernooij
Implement MemoryTree.rename_one, MemoryTree.mkdir.
1286
                    raise exc_type(from_rel, to_rel,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1287
                                   errors.NotVersionedError(from_rel))
0.360.4 by Jelmer Vernooij
Implement MemoryTree.rename_one, MemoryTree.mkdir.
1288
                if self.has_filename(to_rel):
1289
                    raise errors.RenameFailedFilesExist(
1290
                        from_rel, to_rel, errors.FileExists(to_rel))
1291
1292
                kind = self.kind(from_rel)
1293
0.429.1 by Jelmer Vernooij
Abstract away index access.
1294
            if not after and kind != 'directory':
1295
                (index, from_subpath) = self._lookup_index(from_path)
1296
                if from_subpath not in index:
1297
                    # It's not a file
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
1298
                    raise errors.BzrMoveFailedError(
1299
                        from_rel, to_rel,
1300
                        errors.NotVersionedError(path=from_rel))
0.360.4 by Jelmer Vernooij
Implement MemoryTree.rename_one, MemoryTree.mkdir.
1301
1302
            if not after:
1303
                try:
1304
                    self._rename_one(from_rel, to_rel)
1305
                except OSError as e:
1306
                    if e.errno == errno.ENOENT:
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
1307
                        raise errors.BzrMoveFailedError(
1308
                            from_rel, to_rel, errors.NoSuchFile(to_rel))
0.360.4 by Jelmer Vernooij
Implement MemoryTree.rename_one, MemoryTree.mkdir.
1309
                    raise
1310
            if kind != 'directory':
0.429.13 by Jelmer Vernooij
Fix regressions.
1311
                (index, from_index_path) = self._lookup_index(from_path)
0.360.4 by Jelmer Vernooij
Implement MemoryTree.rename_one, MemoryTree.mkdir.
1312
                try:
0.429.25 by Jelmer Vernooij
Merge trunk.
1313
                    self._index_del_entry(index, from_path)
0.360.4 by Jelmer Vernooij
Implement MemoryTree.rename_one, MemoryTree.mkdir.
1314
                except KeyError:
1315
                    pass
1316
                self._index_add_entry(to_rel, kind)
1317
            else:
7143.15.2 by Jelmer Vernooij
Run autopep8.
1318
                todo = [(p, i) for (p, i) in self._recurse_index_entries()
1319
                        if p.startswith(from_path + b'/')]
0.429.13 by Jelmer Vernooij
Fix regressions.
1320
                for child_path, child_value in todo:
6973.1.1 by Jelmer Vernooij
Make InterIndexGitTree suitable for use with MemoryGitTree.
1321
                    (child_to_index, child_to_index_path) = self._lookup_index(
7143.15.2 by Jelmer Vernooij
Run autopep8.
1322
                        posixpath.join(to_path, posixpath.relpath(child_path, from_path)))
0.429.13 by Jelmer Vernooij
Fix regressions.
1323
                    child_to_index[child_to_index_path] = child_value
0.429.25 by Jelmer Vernooij
Merge trunk.
1324
                    # TODO(jelmer): Mark individual index as dirty
0.415.1 by Jelmer Vernooij
Only write index when it's dirty.
1325
                    self._index_dirty = True
7143.15.2 by Jelmer Vernooij
Run autopep8.
1326
                    (child_from_index, child_from_index_path) = self._lookup_index(
1327
                        child_path)
1328
                    self._index_del_entry(
1329
                        child_from_index, child_from_index_path)
0.360.4 by Jelmer Vernooij
Implement MemoryTree.rename_one, MemoryTree.mkdir.
1330
1331
            self._versioned_dirs = None
1332
            self.flush()
0.385.1 by Jelmer Vernooij
Use specific_files argument to Tree.iter_entries_by_dir.
1333
1334
    def find_related_paths_across_trees(self, paths, trees=[],
7143.15.2 by Jelmer Vernooij
Run autopep8.
1335
                                        require_versioned=True):
0.385.1 by Jelmer Vernooij
Use specific_files argument to Tree.iter_entries_by_dir.
1336
        if paths is None:
1337
            return None
1338
1339
        if require_versioned:
1340
            trees = [self] + (trees if trees is not None else [])
1341
            unversioned = set()
1342
            for p in paths:
1343
                for t in trees:
1344
                    if t.is_versioned(p):
1345
                        break
1346
                else:
1347
                    unversioned.add(p)
1348
            if unversioned:
1349
                raise errors.PathsNotVersionedError(unversioned)
1350
1351
        return filter(self.is_versioned, paths)
0.429.5 by Jelmer Vernooij
Fix tree_content_summary test.
1352
1353
    def path_content_summary(self, path):
1354
        """See Tree.path_content_summary."""
1355
        try:
1356
            stat_result = self._lstat(path)
1357
        except OSError as e:
1358
            if getattr(e, 'errno', None) == errno.ENOENT:
1359
                # no file.
1360
                return ('missing', None, None, None)
1361
            # propagate other errors
1362
            raise
1363
        kind = mode_kind(stat_result.st_mode)
1364
        if kind == 'file':
1365
            return self._file_content_summary(path, stat_result)
1366
        elif kind == 'directory':
1367
            # perhaps it looks like a plain directory, but it's really a
1368
            # reference.
1369
            if self._directory_is_tree_reference(path):
1370
                kind = 'tree-reference'
1371
            return kind, None, None, None
1372
        elif kind == 'symlink':
1373
            target = osutils.readlink(self.abspath(path))
1374
            return ('symlink', None, None, target)
1375
        else:
1376
            return (kind, None, None, None)
1377
1378
    def kind(self, relpath, file_id=None):
0.429.15 by Jelmer Vernooij
Autodetect tree-reference based on index.
1379
        kind = osutils.file_kind(self.abspath(relpath))
1380
        if kind == 'directory':
1381
            (index, index_path) = self._lookup_index(relpath.encode('utf-8'))
7065.1.1 by Jelmer Vernooij
Properly handle ignored directories in Git.
1382
            if index is None:
1383
                return kind
0.429.15 by Jelmer Vernooij
Autodetect tree-reference based on index.
1384
            try:
1385
                mode = index[index_path].mode
1386
            except KeyError:
1387
                return kind
1388
            else:
1389
                if S_ISGITLINK(mode):
1390
                    return 'tree-reference'
1391
                return 'directory'
1392
        else:
1393
            return kind
6973.1.1 by Jelmer Vernooij
Make InterIndexGitTree suitable for use with MemoryGitTree.
1394
1395
    def _live_entry(self, relpath):
1396
        raise NotImplementedError(self._live_entry)
1397
1398
1399
class InterIndexGitTree(InterGitTrees):
1400
    """InterTree that works between a Git revision tree and an index."""
1401
1402
    def __init__(self, source, target):
1403
        super(InterIndexGitTree, self).__init__(source, target)
1404
        self._index = target.index
1405
1406
    @classmethod
1407
    def is_compatible(cls, source, target):
1408
        return (isinstance(source, GitRevisionTree) and
1409
                isinstance(target, MutableGitIndexTree))
1410
1411
    def _iter_git_changes(self, want_unchanged=False, specific_files=None,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1412
                          require_versioned=False, extra_trees=None,
1413
                          want_unversioned=False):
6973.1.1 by Jelmer Vernooij
Make InterIndexGitTree suitable for use with MemoryGitTree.
1414
        trees = [self.source]
1415
        if extra_trees is not None:
1416
            trees.extend(extra_trees)
1417
        if specific_files is not None:
1418
            specific_files = self.target.find_related_paths_across_trees(
7143.15.2 by Jelmer Vernooij
Run autopep8.
1419
                specific_files, trees,
1420
                require_versioned=require_versioned)
6973.1.1 by Jelmer Vernooij
Make InterIndexGitTree suitable for use with MemoryGitTree.
1421
        # TODO(jelmer): Restrict to specific_files, for performance reasons.
1422
        with self.lock_read():
1423
            return changes_between_git_tree_and_working_copy(
1424
                self.source.store, self.source.tree,
1425
                self.target, want_unchanged=want_unchanged,
1426
                want_unversioned=want_unversioned)
1427
1428
1429
_mod_tree.InterTree.register_optimiser(InterIndexGitTree)
1430
1431
1432
def changes_between_git_tree_and_working_copy(store, from_tree_sha, target,
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
1433
                                              want_unchanged=False,
1434
                                              want_unversioned=False):
6973.1.1 by Jelmer Vernooij
Make InterIndexGitTree suitable for use with MemoryGitTree.
1435
    """Determine the changes between a git tree and a working tree with index.
1436
1437
    """
1438
    extras = set()
1439
    blobs = {}
1440
    # Report dirified directories to commit_tree first, so that they can be
1441
    # replaced with non-empty directories if they have contents.
1442
    dirified = []
1443
    for path, index_entry in target._recurse_index_entries():
1444
        try:
7045.3.2 by Jelmer Vernooij
Fix tests.
1445
            live_entry = target._live_entry(path)
6973.1.1 by Jelmer Vernooij
Make InterIndexGitTree suitable for use with MemoryGitTree.
1446
        except EnvironmentError as e:
1447
            if e.errno == errno.ENOENT:
1448
                # Entry was removed; keep it listed, but mark it as gone.
1449
                blobs[path] = (ZERO_SHA, 0)
1450
            elif e.errno == errno.EISDIR:
1451
                # Entry was turned into a directory
1452
                dirified.append((path, Tree().id, stat.S_IFDIR))
1453
                store.add_object(Tree())
1454
            else:
1455
                raise
1456
        else:
1457
            blobs[path] = (live_entry.sha, cleanup_mode(live_entry.mode))
1458
    if want_unversioned:
1459
        for e in target.extras():
1460
            st = target._lstat(e)
1461
            try:
1462
                np, accessible = osutils.normalized_filename(e)
1463
            except UnicodeDecodeError:
1464
                raise errors.BadFilenameEncoding(
1465
                    e, osutils._fs_enc)
1466
            if stat.S_ISDIR(st.st_mode):
1467
                blob = Tree()
1468
            else:
7143.15.2 by Jelmer Vernooij
Run autopep8.
1469
                blob = blob_from_path_and_stat(
1470
                    target.abspath(e).encode(osutils._fs_enc), st)
6973.1.1 by Jelmer Vernooij
Make InterIndexGitTree suitable for use with MemoryGitTree.
1471
            store.add_object(blob)
1472
            np = np.encode('utf-8')
1473
            blobs[np] = (blob.id, cleanup_mode(st.st_mode))
1474
            extras.add(np)
7143.15.2 by Jelmer Vernooij
Run autopep8.
1475
    to_tree_sha = commit_tree(
1476
        store, dirified + [(p, s, m) for (p, (s, m)) in blobs.items()])
6973.1.1 by Jelmer Vernooij
Make InterIndexGitTree suitable for use with MemoryGitTree.
1477
    return store.tree_changes(
1478
        from_tree_sha, to_tree_sha, include_trees=True,
1479
        want_unchanged=want_unchanged, change_type_same=True), extras