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