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