/brz/remove-bazaar

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