/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/plugins/git/tree.py

Merge test-run support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/tree.py
19
19
 
20
20
from __future__ import absolute_import
21
21
 
22
 
from collections import deque
23
22
import errno
24
23
from io import BytesIO
25
24
import os
26
25
 
27
 
from dulwich.config import (
28
 
    parse_submodules,
29
 
    ConfigFile as GitConfigFile,
30
 
    )
31
 
from dulwich.diff_tree import tree_changes
32
 
from dulwich.errors import NotTreeError
33
26
from dulwich.index import (
34
27
    blob_from_path_and_stat,
35
28
    cleanup_mode,
36
29
    commit_tree,
37
30
    index_entry_from_stat,
38
 
    Index,
39
31
    )
40
32
from dulwich.object_store import (
41
33
    tree_lookup_path,
51
43
import stat
52
44
import posixpath
53
45
 
54
 
from .. import (
 
46
from ... import (
55
47
    controldir as _mod_controldir,
56
48
    delta,
57
49
    errors,
 
50
    lock,
58
51
    mutabletree,
59
52
    osutils,
60
53
    revisiontree,
62
55
    tree as _mod_tree,
63
56
    workingtree,
64
57
    )
65
 
from ..revision import (
 
58
from ...revision import (
66
59
    CURRENT_REVISION,
67
60
    NULL_REVISION,
68
61
    )
69
 
from ..sixish import (
 
62
from ...sixish import (
70
63
    text_type,
71
64
    viewitems,
72
65
    )
74
67
from .mapping import (
75
68
    mode_is_executable,
76
69
    mode_kind,
 
70
    GitFileIdMap,
77
71
    default_mapping,
78
72
    )
79
 
from .transportgit import (
80
 
    TransportObjectStore,
81
 
    TransportRepo,
82
 
    )
83
73
 
84
74
 
85
75
class GitTreeDirectory(_mod_tree.TreeDirectory):
145
135
                self.executable == other.executable)
146
136
 
147
137
    def __repr__(self):
148
 
        return ("%s(file_id=%r, name=%r, parent_id=%r, text_size=%r, "
149
 
                "text_sha1=%r, executable=%r)") % (
 
138
        return "%s(file_id=%r, name=%r, parent_id=%r, text_size=%r, text_sha1=%r, executable=%r)" % (
150
139
            type(self).__name__, self.file_id, self.name, self.parent_id,
151
140
            self.text_size, self.text_sha1, self.executable)
152
141
 
153
142
    def copy(self):
154
143
        ret = self.__class__(
155
 
            self.file_id, self.name, self.parent_id)
 
144
                self.file_id, self.name, self.parent_id)
156
145
        ret.text_sha1 = self.text_sha1
157
146
        ret.text_size = self.text_size
158
147
        ret.executable = self.executable
196
185
 
197
186
    def copy(self):
198
187
        return self.__class__(
199
 
            self.file_id, self.name, self.parent_id,
200
 
            self.symlink_target)
201
 
 
202
 
 
203
 
class GitTreeSubmodule(_mod_tree.TreeReference):
 
188
                self.file_id, self.name, self.parent_id,
 
189
                self.symlink_target)
 
190
 
 
191
 
 
192
class GitTreeSubmodule(_mod_tree.TreeLink):
204
193
 
205
194
    __slots__ = ['file_id', 'name', 'parent_id', 'reference_revision']
206
195
 
211
200
        self.reference_revision = reference_revision
212
201
 
213
202
    @property
214
 
    def executable(self):
215
 
        return False
216
 
 
217
 
    @property
218
203
    def kind(self):
219
204
        return 'tree-reference'
220
205
 
221
206
    def __repr__(self):
222
 
        return ("%s(file_id=%r, name=%r, parent_id=%r, "
223
 
                "reference_revision=%r)") % (
 
207
        return "%s(file_id=%r, name=%r, parent_id=%r, reference_revision=%r)" % (
224
208
            type(self).__name__, self.file_id, self.name, self.parent_id,
225
209
            self.reference_revision)
226
210
 
233
217
 
234
218
    def copy(self):
235
219
        return self.__class__(
236
 
            self.file_id, self.name, self.parent_id,
237
 
            self.reference_revision)
 
220
                self.file_id, self.name, self.parent_id,
 
221
                self.reference_revision)
238
222
 
239
223
 
240
224
entry_factory = {
267
251
    def __init__(self, repository, revision_id):
268
252
        self._revision_id = revision_id
269
253
        self._repository = repository
270
 
        self._submodules = None
271
254
        self.store = repository._git.object_store
272
255
        if not isinstance(revision_id, bytes):
273
256
            raise TypeError(revision_id)
274
 
        self.commit_id, self.mapping = repository.lookup_bzr_revision_id(
275
 
            revision_id)
 
257
        self.commit_id, self.mapping = repository.lookup_bzr_revision_id(revision_id)
276
258
        if revision_id == NULL_REVISION:
277
259
            self.tree = None
278
260
            self.mapping = default_mapping
 
261
            self._fileid_map = GitFileIdMap(
 
262
                {},
 
263
                default_mapping)
279
264
        else:
280
265
            try:
281
266
                commit = self.store[self.commit_id]
282
267
            except KeyError:
283
268
                raise errors.NoSuchRevision(repository, revision_id)
284
269
            self.tree = commit.tree
285
 
 
286
 
    def _submodule_info(self):
287
 
        if self._submodules is None:
288
 
            try:
289
 
                with self.get_file('.gitmodules') as f:
290
 
                    config = GitConfigFile.from_file(f)
291
 
                    self._submodules = {
292
 
                        path: (url, section)
293
 
                        for path, url, section in parse_submodules(config)}
294
 
            except errors.NoSuchFile:
295
 
                self._submodules = {}
296
 
        return self._submodules
297
 
 
298
 
    def _get_submodule_repository(self, relpath):
299
 
        if not isinstance(relpath, bytes):
300
 
            raise TypeError(relpath)
301
 
        try:
302
 
            info = self._submodule_info()[relpath]
303
 
        except KeyError:
304
 
            nested_repo_transport = self._repository.controldir.user_transport.clone(
305
 
                relpath.decode('utf-8'))
306
 
        else:
307
 
            nested_repo_transport = self._repository.controldir.control_transport.clone(
308
 
                posixpath.join('modules', info[1].decode('utf-8')))
309
 
        nested_controldir = _mod_controldir.ControlDir.open_from_transport(
310
 
            nested_repo_transport)
 
270
            self._fileid_map = self.mapping.get_fileid_map(self.store.__getitem__, self.tree)
 
271
 
 
272
    def _get_nested_repository(self, path):
 
273
        nested_repo_transport = self._repository.user_transport.clone(path)
 
274
        nested_controldir = _mod_controldir.ControlDir.open_from_transport(nested_repo_transport)
311
275
        return nested_controldir.find_repository()
312
276
 
313
 
    def _get_submodule_store(self, relpath):
314
 
        return self._get_submodule_repository(relpath)._git.object_store
315
 
 
316
 
    def get_nested_tree(self, path):
317
 
        encoded_path = path.encode('utf-8')
318
 
        nested_repo = self._get_submodule_repository(encoded_path)
319
 
        ref_rev = self.get_reference_revision(path)
320
 
        return nested_repo.revision_tree(ref_rev)
321
 
 
322
277
    def supports_rename_tracking(self):
323
278
        return False
324
279
 
325
 
    def get_file_revision(self, path):
 
280
    def get_file_revision(self, path, file_id=None):
326
281
        change_scanner = self._repository._file_change_scanner
327
282
        if self.commit_id == ZERO_SHA:
328
283
            return NULL_REVISION
329
 
        (unused_path, commit_id) = change_scanner.find_last_change_revision(
 
284
        (path, commit_id) = change_scanner.find_last_change_revision(
330
285
            path.encode('utf-8'), self.commit_id)
331
 
        return self._repository.lookup_foreign_revision_id(
332
 
            commit_id, self.mapping)
 
286
        return self._repository.lookup_foreign_revision_id(commit_id, self.mapping)
333
287
 
334
 
    def get_file_mtime(self, path):
 
288
    def get_file_mtime(self, path, file_id=None):
335
289
        try:
336
 
            revid = self.get_file_revision(path)
 
290
            revid = self.get_file_revision(path, file_id)
337
291
        except KeyError:
338
 
            raise errors.NoSuchFile(path)
 
292
            raise _mod_tree.FileTimestampUnavailable(path)
339
293
        try:
340
294
            rev = self._repository.get_revision(revid)
341
295
        except errors.NoSuchRevision:
342
296
            raise _mod_tree.FileTimestampUnavailable(path)
343
297
        return rev.timestamp
344
298
 
345
 
    def id2path(self, file_id, recurse='down'):
 
299
    def id2path(self, file_id):
346
300
        try:
347
 
            path = self.mapping.parse_file_id(file_id)
 
301
            path = self._fileid_map.lookup_path(file_id)
348
302
        except ValueError:
349
303
            raise errors.NoSuchId(self, file_id)
 
304
        path = path.decode('utf-8')
350
305
        if self.is_versioned(path):
351
306
            return path
352
307
        raise errors.NoSuchId(self, file_id)
357
312
    def path2id(self, path):
358
313
        if self.mapping.is_special_file(path):
359
314
            return None
360
 
        if not self.is_versioned(path):
361
 
            return None
362
 
        return self.mapping.generate_file_id(osutils.safe_unicode(path))
 
315
        return self._fileid_map.lookup_file_id(path.encode('utf-8'))
363
316
 
364
317
    def all_file_ids(self):
365
 
        raise errors.UnsupportedOperation(self.all_file_ids, self)
 
318
        return set(self._fileid_map.all_file_ids())
366
319
 
367
320
    def all_versioned_paths(self):
368
 
        ret = {u''}
369
 
        todo = [(self.store, b'', self.tree)]
 
321
        ret = set()
 
322
        todo = {(self.store, '', self.tree)}
370
323
        while todo:
371
324
            (store, path, tree_id) = todo.pop()
372
325
            if tree_id is None:
374
327
            tree = store[tree_id]
375
328
            for name, mode, hexsha in tree.items():
376
329
                subpath = posixpath.join(path, name)
377
 
                ret.add(subpath.decode('utf-8'))
378
330
                if stat.S_ISDIR(mode):
379
 
                    todo.append((store, subpath, hexsha))
 
331
                    todo.add((store, subpath, hexsha))
 
332
                else:
 
333
                    ret.add(subpath)
380
334
        return ret
381
335
 
 
336
    def get_root_id(self):
 
337
        if self.tree is None:
 
338
            return None
 
339
        return self.path2id("")
 
340
 
 
341
    def has_or_had_id(self, file_id):
 
342
        try:
 
343
            path = self.id2path(file_id)
 
344
        except errors.NoSuchId:
 
345
            return False
 
346
        return True
 
347
 
 
348
    def has_id(self, file_id):
 
349
        try:
 
350
            path = self.id2path(file_id)
 
351
        except errors.NoSuchId:
 
352
            return False
 
353
        return self.has_filename(path)
 
354
 
382
355
    def _lookup_path(self, path):
383
356
        if self.tree is None:
384
357
            raise errors.NoSuchFile(path)
385
 
 
386
 
        encoded_path = path.encode('utf-8')
387
 
        parts = encoded_path.split(b'/')
388
 
        hexsha = self.tree
389
 
        store = self.store
390
 
        mode = None
391
 
        for i, p in enumerate(parts):
392
 
            if not p:
393
 
                continue
394
 
            obj = store[hexsha]
395
 
            if not isinstance(obj, Tree):
396
 
                raise NotTreeError(hexsha)
397
 
            try:
398
 
                mode, hexsha = obj[p]
399
 
            except KeyError:
400
 
                raise errors.NoSuchFile(path)
401
 
            if S_ISGITLINK(mode) and i != len(parts) - 1:
402
 
                store = self._get_submodule_store(b'/'.join(parts[:i + 1]))
403
 
                hexsha = store[hexsha].tree
404
 
        return (store, mode, hexsha)
405
 
 
406
 
    def is_executable(self, path):
 
358
        try:
 
359
            (mode, hexsha) = tree_lookup_path(self.store.__getitem__, self.tree,
 
360
                path.encode('utf-8'))
 
361
        except KeyError:
 
362
            raise errors.NoSuchFile(self, path)
 
363
        else:
 
364
            return (self.store, mode, hexsha)
 
365
 
 
366
    def is_executable(self, path, file_id=None):
407
367
        (store, mode, hexsha) = self._lookup_path(path)
408
368
        if mode is None:
409
369
            # the tree root is a directory
410
370
            return False
411
371
        return mode_is_executable(mode)
412
372
 
413
 
    def kind(self, path):
 
373
    def kind(self, path, file_id=None):
414
374
        (store, mode, hexsha) = self._lookup_path(path)
415
375
        if mode is None:
416
376
            # the tree root is a directory
425
385
        else:
426
386
            return True
427
387
 
428
 
    def _submodule_info(self):
429
 
        if self._submodules is None:
430
 
            try:
431
 
                with self.get_file('.gitmodules') as f:
432
 
                    config = GitConfigFile.from_file(f)
433
 
                    self._submodules = {
434
 
                        path: (url, section)
435
 
                        for path, url, section in parse_submodules(config)}
436
 
            except errors.NoSuchFile:
437
 
                self._submodules = {}
438
 
        return self._submodules
439
 
 
440
 
    def list_files(self, include_root=False, from_dir=None, recursive=True,
441
 
                   recurse_nested=False):
 
388
    def list_files(self, include_root=False, from_dir=None, recursive=True):
442
389
        if self.tree is None:
443
390
            return
444
 
        if from_dir is None or from_dir == '.':
 
391
        if from_dir is None:
445
392
            from_dir = u""
446
393
        (store, mode, hexsha) = self._lookup_path(from_dir)
447
 
        if mode is None:  # Root
 
394
        if mode is None: # Root
448
395
            root_ie = self._get_dir_ie(b"", None)
449
396
        else:
450
 
            parent_path = posixpath.dirname(from_dir)
451
 
            parent_id = self.mapping.generate_file_id(parent_path)
 
397
            parent_path = posixpath.dirname(from_dir.encode("utf-8"))
 
398
            parent_id = self._fileid_map.lookup_file_id(parent_path)
452
399
            if mode_kind(mode) == 'directory':
453
400
                root_ie = self._get_dir_ie(from_dir.encode("utf-8"), parent_id)
454
401
            else:
455
 
                root_ie = self._get_file_ie(
456
 
                    store, from_dir.encode("utf-8"),
 
402
                root_ie = self._get_file_ie(store, from_dir.encode("utf-8"),
457
403
                    posixpath.basename(from_dir), mode, hexsha)
458
 
        if include_root:
459
 
            yield (from_dir, "V", root_ie.kind, root_ie)
460
 
        todo = []
 
404
        if from_dir != "" or include_root:
 
405
            yield (from_dir, "V", root_ie.kind, root_ie.file_id, root_ie)
 
406
        todo = set()
461
407
        if root_ie.kind == 'directory':
462
 
            todo.append((store, from_dir.encode("utf-8"),
463
 
                         b"", hexsha, root_ie.file_id))
 
408
            todo.add((store, from_dir.encode("utf-8"), hexsha, root_ie.file_id))
464
409
        while todo:
465
 
            (store, path, relpath, hexsha, parent_id) = todo.pop()
 
410
            (store, path, hexsha, parent_id) = todo.pop()
466
411
            tree = store[hexsha]
467
412
            for name, mode, hexsha in tree.iteritems():
468
413
                if self.mapping.is_special_file(name):
469
414
                    continue
470
415
                child_path = posixpath.join(path, name)
471
 
                child_relpath = posixpath.join(relpath, name)
472
 
                if S_ISGITLINK(mode) and recurse_nested:
473
 
                    mode = stat.S_IFDIR
474
 
                    store = self._get_submodule_store(child_relpath)
475
 
                    hexsha = store[hexsha].tree
476
416
                if stat.S_ISDIR(mode):
477
417
                    ie = self._get_dir_ie(child_path, parent_id)
478
418
                    if recursive:
479
 
                        todo.append(
480
 
                            (store, child_path, child_relpath, hexsha,
481
 
                             ie.file_id))
 
419
                        todo.add((store, child_path, hexsha, ie.file_id))
482
420
                else:
483
 
                    ie = self._get_file_ie(
484
 
                        store, child_path, name, mode, hexsha, parent_id)
485
 
                yield (child_relpath.decode('utf-8'), "V", ie.kind, ie)
 
421
                    ie = self._get_file_ie(store, child_path, name, mode, hexsha, parent_id)
 
422
                yield child_path.decode('utf-8'), "V", ie.kind, ie.file_id, ie
486
423
 
487
424
    def _get_file_ie(self, store, path, name, mode, hexsha, parent_id):
488
 
        if not isinstance(path, bytes):
 
425
        if type(path) is not bytes:
489
426
            raise TypeError(path)
490
 
        if not isinstance(name, bytes):
 
427
        if type(name) is not bytes:
491
428
            raise TypeError(name)
492
429
        kind = mode_kind(mode)
493
 
        path = path.decode('utf-8')
494
 
        name = name.decode("utf-8")
495
 
        file_id = self.mapping.generate_file_id(path)
496
 
        ie = entry_factory[kind](file_id, name, parent_id)
 
430
        file_id = self._fileid_map.lookup_file_id(path)
 
431
        ie = entry_factory[kind](file_id, name.decode("utf-8"), parent_id)
497
432
        if kind == 'symlink':
498
433
            ie.symlink_target = store[hexsha].data.decode('utf-8')
499
434
        elif kind == 'tree-reference':
500
 
            ie.reference_revision = self.mapping.revision_id_foreign_to_bzr(
501
 
                hexsha)
 
435
            ie.reference_revision = self.mapping.revision_id_foreign_to_bzr(hexsha)
502
436
        else:
503
437
            data = store[hexsha].data
504
438
            ie.text_sha1 = osutils.sha_string(data)
507
441
        return ie
508
442
 
509
443
    def _get_dir_ie(self, path, parent_id):
510
 
        path = path.decode('utf-8')
511
 
        file_id = self.mapping.generate_file_id(path)
512
 
        return GitTreeDirectory(file_id, posixpath.basename(path), parent_id)
 
444
        file_id = self._fileid_map.lookup_file_id(path)
 
445
        return GitTreeDirectory(file_id,
 
446
            posixpath.basename(path).decode("utf-8"), parent_id)
513
447
 
514
 
    def iter_child_entries(self, path):
 
448
    def iter_child_entries(self, path, file_id=None):
515
449
        (store, mode, tree_sha) = self._lookup_path(path)
516
450
 
517
 
        if mode is not None and not stat.S_ISDIR(mode):
 
451
        if not stat.S_ISDIR(mode):
518
452
            return
519
453
 
520
454
        encoded_path = path.encode('utf-8')
530
464
                yield self._get_file_ie(store, child_path, name, mode, hexsha,
531
465
                                        file_id)
532
466
 
533
 
    def iter_entries_by_dir(self, specific_files=None,
534
 
                            recurse_nested=False):
 
467
    def iter_entries_by_dir(self, specific_files=None, yield_parents=False):
535
468
        if self.tree is None:
536
469
            return
 
470
        if yield_parents:
 
471
            # TODO(jelmer): Support yield parents
 
472
            raise NotImplementedError
537
473
        if specific_files is not None:
538
474
            if specific_files in ([""], []):
539
475
                specific_files = None
540
476
            else:
541
 
                specific_files = set([p.encode('utf-8')
542
 
                                      for p in specific_files])
543
 
        todo = deque([(self.store, b"", self.tree, self.path2id(''))])
544
 
        if specific_files is None or u"" in specific_files:
545
 
            yield u"", self._get_dir_ie(b"", None)
 
477
                specific_files = set([p.encode('utf-8') for p in specific_files])
 
478
        todo = set([(self.store, "", self.tree, None)])
546
479
        while todo:
547
 
            store, path, tree_sha, parent_id = todo.popleft()
 
480
            store, path, tree_sha, parent_id = todo.pop()
 
481
            ie = self._get_dir_ie(path, parent_id)
 
482
            if specific_files is None or path in specific_files:
 
483
                yield path.decode("utf-8"), ie
548
484
            tree = store[tree_sha]
549
 
            extradirs = []
550
485
            for name, mode, hexsha in tree.iteritems():
551
486
                if self.mapping.is_special_file(name):
552
487
                    continue
553
488
                child_path = posixpath.join(path, name)
554
 
                child_path_decoded = child_path.decode('utf-8')
555
 
                if recurse_nested and S_ISGITLINK(mode):
556
 
                    mode = stat.S_IFDIR
557
 
                    store = self._get_submodule_store(child_path)
558
 
                    hexsha = store[hexsha].tree
559
489
                if stat.S_ISDIR(mode):
560
490
                    if (specific_files is None or
561
 
                            any([p for p in specific_files if p.startswith(
562
 
                                child_path)])):
563
 
                        extradirs.append(
564
 
                            (store, child_path, hexsha,
565
 
                             self.path2id(child_path_decoded)))
566
 
                if specific_files is None or child_path in specific_files:
567
 
                    if stat.S_ISDIR(mode):
568
 
                        yield (child_path_decoded,
569
 
                               self._get_dir_ie(child_path, parent_id))
570
 
                    else:
571
 
                        yield (child_path_decoded,
572
 
                               self._get_file_ie(store, child_path, name, mode,
573
 
                                                 hexsha, parent_id))
574
 
            todo.extendleft(reversed(extradirs))
575
 
 
576
 
    def iter_references(self):
577
 
        if self.supports_tree_reference():
578
 
            for path, entry in self.iter_entries_by_dir():
579
 
                if entry.kind == 'tree-reference':
580
 
                    yield path
 
491
                        any(filter(lambda p: p.startswith(child_path), specific_files))):
 
492
                        todo.add((store, child_path, hexsha, ie.file_id))
 
493
                elif specific_files is None or child_path in specific_files:
 
494
                    yield (child_path.decode("utf-8"),
 
495
                            self._get_file_ie(store, child_path, name, mode, hexsha,
 
496
                           ie.file_id))
581
497
 
582
498
    def get_revision_id(self):
583
499
        """See RevisionTree.get_revision_id."""
584
500
        return self._revision_id
585
501
 
586
 
    def get_file_sha1(self, path, stat_value=None):
 
502
    def get_file_sha1(self, path, file_id=None, stat_value=None):
587
503
        if self.tree is None:
588
504
            raise errors.NoSuchFile(path)
589
 
        return osutils.sha_string(self.get_file_text(path))
 
505
        return osutils.sha_string(self.get_file_text(path, file_id))
590
506
 
591
 
    def get_file_verifier(self, path, stat_value=None):
 
507
    def get_file_verifier(self, path, file_id=None, stat_value=None):
592
508
        (store, mode, hexsha) = self._lookup_path(path)
593
509
        return ("GIT", hexsha)
594
510
 
595
 
    def get_file_size(self, path):
596
 
        (store, mode, hexsha) = self._lookup_path(path)
597
 
        if stat.S_ISREG(mode):
598
 
            return len(store[hexsha].data)
599
 
        return None
600
 
 
601
 
    def get_file_text(self, path):
 
511
    def get_file_text(self, path, file_id=None):
602
512
        """See RevisionTree.get_file_text."""
603
513
        (store, mode, hexsha) = self._lookup_path(path)
604
514
        if stat.S_ISREG(mode):
606
516
        else:
607
517
            return b""
608
518
 
609
 
    def get_symlink_target(self, path):
 
519
    def get_symlink_target(self, path, file_id=None):
610
520
        """See RevisionTree.get_symlink_target."""
611
521
        (store, mode, hexsha) = self._lookup_path(path)
612
522
        if stat.S_ISLNK(mode):
614
524
        else:
615
525
            return None
616
526
 
617
 
    def get_reference_revision(self, path):
 
527
    def get_reference_revision(self, path, file_id=None):
618
528
        """See RevisionTree.get_symlink_target."""
619
529
        (store, mode, hexsha) = self._lookup_path(path)
620
530
        if S_ISGITLINK(mode):
621
 
            try:
622
 
                nested_repo = self._get_submodule_repository(path.encode('utf-8'))
623
 
            except errors.NotBranchError:
624
 
                return self.mapping.revision_id_foreign_to_bzr(hexsha)
625
 
            else:
626
 
                return nested_repo.lookup_foreign_revision_id(hexsha)
 
531
            nested_repo = self._get_nested_repository(path)
 
532
            return nested_repo.lookup_foreign_revision_id(hexsha)
627
533
        else:
628
534
            return None
629
535
 
642
548
        if kind == 'file':
643
549
            executable = mode_is_executable(mode)
644
550
            contents = store[hexsha].data
645
 
            return (kind, len(contents), executable,
646
 
                    osutils.sha_string(contents))
 
551
            return (kind, len(contents), executable, osutils.sha_string(contents))
647
552
        elif kind == 'symlink':
648
 
            return (kind, None, None, store[hexsha].data.decode('utf-8'))
 
553
            return (kind, None, None, store[hexsha].data)
649
554
        elif kind == 'tree-reference':
650
 
            nested_repo = self._get_submodule_repository(path.encode('utf-8'))
 
555
            nested_repo = self._get_nested_repository(path)
651
556
            return (kind, None, None,
652
557
                    nested_repo.lookup_foreign_revision_id(hexsha))
653
558
        else:
654
559
            return (kind, None, None, None)
655
560
 
656
561
    def find_related_paths_across_trees(self, paths, trees=[],
657
 
                                        require_versioned=True):
 
562
            require_versioned=True):
658
563
        if paths is None:
659
564
            return None
660
565
        if require_versioned:
674
579
        if self.tree is None:
675
580
            return iter([])
676
581
        return self.store.iter_tree_contents(
677
 
            self.tree, include_trees=include_trees)
 
582
                self.tree, include_trees=include_trees)
678
583
 
679
 
    def annotate_iter(self, path, default_revision=CURRENT_REVISION):
 
584
    def annotate_iter(self, path, file_id=None,
 
585
                      default_revision=CURRENT_REVISION):
680
586
        """Return an iterator of revision_id, line tuples.
681
587
 
682
588
        For working trees (and mutable trees in general), the special
683
589
        revision_id 'current:' will be used for lines that are new in this
684
590
        tree, e.g. uncommitted changes.
 
591
        :param file_id: The file to produce an annotated version from
685
592
        :param default_revision: For lines that don't match a basis, mark them
686
593
            with this revision id. Not all implementations will make use of
687
594
            this value.
697
604
                           for key, line in annotator.annotate_flat(this_key)]
698
605
            return annotations
699
606
 
700
 
    def _get_rules_searcher(self, default_searcher):
701
 
        return default_searcher
702
 
 
703
 
    def walkdirs(self, prefix=u""):
704
 
        (store, mode, hexsha) = self._lookup_path(prefix)
705
 
        todo = deque(
706
 
            [(store, prefix.encode('utf-8'), hexsha, self.path2id(prefix))])
707
 
        while todo:
708
 
            store, path, tree_sha, parent_id = todo.popleft()
709
 
            path_decoded = path.decode('utf-8')
710
 
            tree = store[tree_sha]
711
 
            children = []
712
 
            for name, mode, hexsha in tree.iteritems():
713
 
                if self.mapping.is_special_file(name):
714
 
                    continue
715
 
                child_path = posixpath.join(path, name)
716
 
                file_id = self.path2id(child_path.decode('utf-8'))
717
 
                if stat.S_ISDIR(mode):
718
 
                    todo.append((store, child_path, hexsha, file_id))
719
 
                children.append(
720
 
                    (child_path.decode('utf-8'), name.decode('utf-8'),
721
 
                        mode_kind(mode), None,
722
 
                        file_id, mode_kind(mode)))
723
 
            yield (path_decoded, parent_id), children
724
 
 
725
 
 
726
 
def tree_delta_from_git_changes(changes, mappings,
727
 
                                specific_files=None,
728
 
                                require_versioned=False, include_root=False,
729
 
                                target_extras=None):
 
607
 
 
608
def tree_delta_from_git_changes(changes, mapping,
 
609
        fileid_maps, specific_files=None,
 
610
        require_versioned=False, include_root=False,
 
611
        target_extras=None):
730
612
    """Create a TreeDelta from two git trees.
731
613
 
732
614
    source and target are iterators over tuples with:
733
615
        (filename, sha, mode)
734
616
    """
735
 
    (old_mapping, new_mapping) = mappings
 
617
    (old_fileid_map, new_fileid_map) = fileid_maps
736
618
    if target_extras is None:
737
619
        target_extras = set()
738
620
    ret = delta.TreeDelta()
739
 
    added = []
740
621
    for (oldpath, newpath), (oldmode, newmode), (oldsha, newsha) in changes:
741
 
        if newpath == b'' and not include_root:
 
622
        if newpath == u'' and not include_root:
742
623
            continue
743
 
        if oldpath is not None:
744
 
            oldpath_decoded = oldpath.decode('utf-8')
745
 
        else:
746
 
            oldpath_decoded = None
747
 
        if newpath is not None:
748
 
            newpath_decoded = newpath.decode('utf-8')
749
 
        else:
750
 
            newpath_decoded = None
751
624
        if not (specific_files is None or
752
 
                (oldpath is not None and
753
 
                    osutils.is_inside_or_parent_of_any(
754
 
                        specific_files, oldpath_decoded)) or
755
 
                (newpath is not None and
756
 
                    osutils.is_inside_or_parent_of_any(
757
 
                        specific_files, newpath_decoded))):
 
625
                (oldpath is not None and osutils.is_inside_or_parent_of_any(specific_files, oldpath)) or
 
626
                (newpath is not None and osutils.is_inside_or_parent_of_any(specific_files, newpath))):
758
627
            continue
759
 
 
760
 
        if oldpath_decoded is None:
761
 
            fileid = new_mapping.generate_file_id(newpath_decoded)
762
 
            oldexe = None
763
 
            oldkind = None
764
 
            oldname = None
765
 
            oldparent = None
766
 
            oldversioned = False
767
 
        else:
768
 
            oldversioned = True
769
 
            if oldmode:
770
 
                oldexe = mode_is_executable(oldmode)
771
 
                oldkind = mode_kind(oldmode)
772
 
            else:
773
 
                oldexe = False
774
 
                oldkind = None
775
 
            if oldpath_decoded == u'':
776
 
                oldparent = None
777
 
                oldname = u''
778
 
            else:
779
 
                (oldparentpath, oldname) = osutils.split(oldpath_decoded)
780
 
                oldparent = old_mapping.generate_file_id(oldparentpath)
781
 
            fileid = old_mapping.generate_file_id(oldpath_decoded)
782
 
        if newpath_decoded is None:
783
 
            newexe = None
784
 
            newkind = None
785
 
            newname = None
786
 
            newparent = None
787
 
            newversioned = False
788
 
        else:
789
 
            newversioned = (newpath_decoded not in target_extras)
790
 
            if newmode:
791
 
                newexe = mode_is_executable(newmode)
792
 
                newkind = mode_kind(newmode)
793
 
            else:
794
 
                newexe = False
795
 
                newkind = None
796
 
            if newpath_decoded == u'':
797
 
                newparent = None
798
 
                newname = u''
799
 
            else:
800
 
                newparentpath, newname = osutils.split(newpath_decoded)
801
 
                newparent = new_mapping.generate_file_id(newparentpath)
802
 
        if old_mapping.is_special_file(oldpath):
 
628
        if mapping.is_special_file(oldpath):
803
629
            oldpath = None
804
 
        if new_mapping.is_special_file(newpath):
 
630
        if mapping.is_special_file(newpath):
805
631
            newpath = None
806
632
        if oldpath is None and newpath is None:
807
633
            continue
808
 
        change = _mod_tree.TreeChange(
809
 
            fileid, (oldpath_decoded, newpath_decoded), (oldsha != newsha),
810
 
            (oldversioned, newversioned),
811
 
            (oldparent, newparent), (oldname, newname),
812
 
            (oldkind, newkind), (oldexe, newexe))
813
634
        if oldpath is None:
814
 
            added.append((newpath, newkind))
 
635
            if newpath in target_extras:
 
636
                ret.unversioned.append(
 
637
                    (osutils.normalized_filename(newpath)[0], None, mode_kind(newmode)))
 
638
            else:
 
639
                file_id = new_fileid_map.lookup_file_id(newpath)
 
640
                ret.added.append((newpath.decode('utf-8'), file_id, mode_kind(newmode)))
815
641
        elif newpath is None or newmode == 0:
816
 
            ret.removed.append(change)
 
642
            file_id = old_fileid_map.lookup_file_id(oldpath)
 
643
            ret.removed.append((oldpath.decode('utf-8'), file_id, mode_kind(oldmode)))
817
644
        elif oldpath != newpath:
818
 
            ret.renamed.append(change)
 
645
            file_id = old_fileid_map.lookup_file_id(oldpath)
 
646
            ret.renamed.append(
 
647
                (oldpath.decode('utf-8'), newpath.decode('utf-8'), file_id,
 
648
                mode_kind(newmode), (oldsha != newsha),
 
649
                (oldmode != newmode)))
819
650
        elif mode_kind(oldmode) != mode_kind(newmode):
820
 
            ret.kind_changed.append(change)
 
651
            file_id = new_fileid_map.lookup_file_id(newpath)
 
652
            ret.kind_changed.append(
 
653
                (newpath.decode('utf-8'), file_id, mode_kind(oldmode),
 
654
                mode_kind(newmode)))
821
655
        elif oldsha != newsha or oldmode != newmode:
822
656
            if stat.S_ISDIR(oldmode) and stat.S_ISDIR(newmode):
823
657
                continue
824
 
            ret.modified.append(change)
825
 
        else:
826
 
            ret.unchanged.append(change)
827
 
 
828
 
    implicit_dirs = {b''}
829
 
    for path, kind in added:
830
 
        if kind == 'directory' or path in target_extras:
831
 
            continue
832
 
        implicit_dirs.update(osutils.parent_directories(path))
833
 
 
834
 
    for path, kind in added:
835
 
        if kind == 'directory' and path not in implicit_dirs:
836
 
            continue
837
 
        path_decoded = osutils.normalized_filename(path)[0]
838
 
        parent_path, basename = osutils.split(path_decoded)
839
 
        parent_id = new_mapping.generate_file_id(parent_path)
840
 
        if path in target_extras:
841
 
            ret.unversioned.append(_mod_tree.TreeChange(
842
 
                None, (None, path_decoded),
843
 
                True, (False, False), (None, parent_id),
844
 
                (None, basename), (None, kind), (None, False)))
845
 
        else:
846
 
            file_id = new_mapping.generate_file_id(path_decoded)
847
 
            ret.added.append(
848
 
                _mod_tree.TreeChange(
849
 
                    file_id, (None, path_decoded), True,
850
 
                    (False, True),
851
 
                    (None, parent_id),
852
 
                    (None, basename), (None, kind), (None, False)))
 
658
            file_id = new_fileid_map.lookup_file_id(newpath)
 
659
            ret.modified.append(
 
660
                (newpath.decode('utf-8'), file_id, mode_kind(newmode),
 
661
                (oldsha != newsha), (oldmode != newmode)))
 
662
        else:
 
663
            file_id = new_fileid_map.lookup_file_id(newpath)
 
664
            ret.unchanged.append((newpath.decode('utf-8'), file_id, mode_kind(newmode)))
853
665
 
854
666
    return ret
855
667
 
856
668
 
857
 
def changes_from_git_changes(changes, mapping, specific_files=None,
858
 
                             include_unchanged=False, target_extras=None):
 
669
def changes_from_git_changes(changes, mapping, specific_files=None, include_unchanged=False,
 
670
                             target_extras=None):
859
671
    """Create a iter_changes-like generator from a git stream.
860
672
 
861
673
    source and target are iterators over tuples with:
864
676
    if target_extras is None:
865
677
        target_extras = set()
866
678
    for (oldpath, newpath), (oldmode, newmode), (oldsha, newsha) in changes:
867
 
        if oldpath is not None:
868
 
            oldpath_decoded = oldpath.decode('utf-8')
869
 
        else:
870
 
            oldpath_decoded = None
871
 
        if newpath is not None:
872
 
            newpath_decoded = newpath.decode('utf-8')
873
 
        else:
874
 
            newpath_decoded = None
875
679
        if not (specific_files is None or
876
 
                (oldpath_decoded is not None and
877
 
                    osutils.is_inside_or_parent_of_any(
878
 
                        specific_files, oldpath_decoded)) or
879
 
                (newpath_decoded is not None and
880
 
                    osutils.is_inside_or_parent_of_any(
881
 
                        specific_files, newpath_decoded))):
 
680
                (oldpath is not None and osutils.is_inside_or_parent_of_any(specific_files, oldpath)) or
 
681
                (newpath is not None and osutils.is_inside_or_parent_of_any(specific_files, newpath))):
882
682
            continue
 
683
        path = (oldpath, newpath)
883
684
        if oldpath is not None and mapping.is_special_file(oldpath):
884
685
            continue
885
686
        if newpath is not None and mapping.is_special_file(newpath):
886
687
            continue
887
 
        if oldpath_decoded is None:
888
 
            fileid = mapping.generate_file_id(newpath_decoded)
 
688
        if oldpath is None:
 
689
            fileid = mapping.generate_file_id(newpath)
889
690
            oldexe = None
890
691
            oldkind = None
891
692
            oldname = None
893
694
            oldversioned = False
894
695
        else:
895
696
            oldversioned = True
 
697
            oldpath = oldpath.decode("utf-8")
896
698
            if oldmode:
897
699
                oldexe = mode_is_executable(oldmode)
898
700
                oldkind = mode_kind(oldmode)
899
701
            else:
900
702
                oldexe = False
901
703
                oldkind = None
902
 
            if oldpath_decoded == u'':
 
704
            if oldpath == u'':
903
705
                oldparent = None
904
 
                oldname = u''
 
706
                oldname = ''
905
707
            else:
906
 
                (oldparentpath, oldname) = osutils.split(oldpath_decoded)
 
708
                (oldparentpath, oldname) = osutils.split(oldpath)
907
709
                oldparent = mapping.generate_file_id(oldparentpath)
908
 
            fileid = mapping.generate_file_id(oldpath_decoded)
909
 
        if newpath_decoded is None:
 
710
            fileid = mapping.generate_file_id(oldpath)
 
711
        if newpath is None:
910
712
            newexe = None
911
713
            newkind = None
912
714
            newname = None
913
715
            newparent = None
914
716
            newversioned = False
915
717
        else:
916
 
            newversioned = (newpath_decoded not in target_extras)
 
718
            newversioned = (newpath not in target_extras)
917
719
            if newmode:
918
720
                newexe = mode_is_executable(newmode)
919
721
                newkind = mode_kind(newmode)
920
722
            else:
921
723
                newexe = False
922
724
                newkind = None
923
 
            if newpath_decoded == u'':
 
725
            newpath = newpath.decode("utf-8")
 
726
            if newpath == u'':
924
727
                newparent = None
925
728
                newname = u''
926
729
            else:
927
 
                newparentpath, newname = osutils.split(newpath_decoded)
 
730
                newparentpath, newname = osutils.split(newpath)
928
731
                newparent = mapping.generate_file_id(newparentpath)
929
732
        if (not include_unchanged and
930
733
            oldkind == 'directory' and newkind == 'directory' and
931
 
                oldpath_decoded == newpath_decoded):
 
734
            oldpath == newpath):
932
735
            continue
933
 
        yield _mod_tree.TreeChange(
934
 
            fileid, (oldpath_decoded, newpath_decoded), (oldsha != newsha),
935
 
            (oldversioned, newversioned),
936
 
            (oldparent, newparent), (oldname, newname),
937
 
            (oldkind, newkind), (oldexe, newexe))
 
736
        yield (fileid, (oldpath, newpath), (oldsha != newsha),
 
737
             (oldversioned, newversioned),
 
738
             (oldparent, newparent), (oldname, newname),
 
739
             (oldkind, newkind), (oldexe, newexe))
938
740
 
939
741
 
940
742
class InterGitTrees(_mod_tree.InterTree):
954
756
                want_unversioned=False):
955
757
        with self.lock_read():
956
758
            changes, target_extras = self._iter_git_changes(
957
 
                want_unchanged=want_unchanged,
958
 
                require_versioned=require_versioned,
959
 
                specific_files=specific_files,
960
 
                extra_trees=extra_trees,
961
 
                want_unversioned=want_unversioned)
962
 
            return tree_delta_from_git_changes(
963
 
                changes, (self.source.mapping, self.target.mapping),
964
 
                specific_files=specific_files,
965
 
                include_root=include_root, target_extras=target_extras)
 
759
                    want_unchanged=want_unchanged,
 
760
                    require_versioned=require_versioned,
 
761
                    specific_files=specific_files,
 
762
                    extra_trees=extra_trees,
 
763
                    want_unversioned=want_unversioned)
 
764
            source_fileid_map = self.source._fileid_map
 
765
            target_fileid_map = self.target._fileid_map
 
766
            return tree_delta_from_git_changes(changes, self.target.mapping,
 
767
                (source_fileid_map, target_fileid_map),
 
768
                specific_files=specific_files, include_root=include_root,
 
769
                target_extras=target_extras)
966
770
 
967
771
    def iter_changes(self, include_unchanged=False, specific_files=None,
968
772
                     pb=None, extra_trees=[], require_versioned=True,
969
773
                     want_unversioned=False):
970
774
        with self.lock_read():
971
775
            changes, target_extras = self._iter_git_changes(
972
 
                want_unchanged=include_unchanged,
973
 
                require_versioned=require_versioned,
974
 
                specific_files=specific_files,
975
 
                extra_trees=extra_trees,
976
 
                want_unversioned=want_unversioned)
 
776
                    want_unchanged=include_unchanged,
 
777
                    require_versioned=require_versioned,
 
778
                    specific_files=specific_files,
 
779
                    extra_trees=extra_trees,
 
780
                    want_unversioned=want_unversioned)
977
781
            return changes_from_git_changes(
978
 
                changes, self.target.mapping,
979
 
                specific_files=specific_files,
980
 
                include_unchanged=include_unchanged,
981
 
                target_extras=target_extras)
 
782
                    changes, self.target.mapping,
 
783
                    specific_files=specific_files,
 
784
                    include_unchanged=include_unchanged,
 
785
                    target_extras=target_extras)
982
786
 
983
787
    def _iter_git_changes(self, want_unchanged=False, specific_files=None,
984
 
                          require_versioned=False, extra_trees=None,
985
 
                          want_unversioned=False):
 
788
            require_versioned=False, extra_trees=None,
 
789
            want_unversioned=False):
986
790
        raise NotImplementedError(self._iter_git_changes)
987
791
 
988
 
    def find_target_path(self, path, recurse='none'):
989
 
        ret = self.find_target_paths([path], recurse=recurse)
990
 
        return ret[path]
991
 
 
992
 
    def find_source_path(self, path, recurse='none'):
993
 
        ret = self.find_source_paths([path], recurse=recurse)
994
 
        return ret[path]
995
 
 
996
 
    def find_target_paths(self, paths, recurse='none'):
997
 
        paths = set(paths)
998
 
        ret = {}
999
 
        changes = self._iter_git_changes(specific_files=paths)[0]
1000
 
        for (oldpath, newpath), (oldmode, newmode), (oldsha, newsha) in changes:
1001
 
            if oldpath in paths:
1002
 
                ret[oldpath] = newpath
1003
 
        for path in paths:
1004
 
            if path not in ret:
1005
 
                if self.source.has_filename(path):
1006
 
                    if self.target.has_filename(path):
1007
 
                        ret[path] = path
1008
 
                    else:
1009
 
                        ret[path] = None
1010
 
                else:
1011
 
                    raise errors.NoSuchFile(path)
1012
 
        return ret
1013
 
 
1014
 
    def find_source_paths(self, paths, recurse='none'):
1015
 
        paths = set(paths)
1016
 
        ret = {}
1017
 
        changes = self._iter_git_changes(specific_files=paths)[0]
1018
 
        for (oldpath, newpath), (oldmode, newmode), (oldsha, newsha) in changes:
1019
 
            if newpath in paths:
1020
 
                ret[newpath] = oldpath
1021
 
        for path in paths:
1022
 
            if path not in ret:
1023
 
                if self.target.has_filename(path):
1024
 
                    if self.source.has_filename(path):
1025
 
                        ret[path] = path
1026
 
                    else:
1027
 
                        ret[path] = None
1028
 
                else:
1029
 
                    raise errors.NoSuchFile(path)
1030
 
        return ret
1031
 
 
1032
792
 
1033
793
class InterGitRevisionTrees(InterGitTrees):
1034
794
    """InterTree that works between two git revision trees."""
1043
803
                isinstance(target, GitRevisionTree))
1044
804
 
1045
805
    def _iter_git_changes(self, want_unchanged=False, specific_files=None,
1046
 
                          require_versioned=True, extra_trees=None,
1047
 
                          want_unversioned=False):
 
806
            require_versioned=True, extra_trees=None,
 
807
            want_unversioned=False):
1048
808
        trees = [self.source]
1049
809
        if extra_trees is not None:
1050
810
            trees.extend(extra_trees)
1051
811
        if specific_files is not None:
1052
812
            specific_files = self.target.find_related_paths_across_trees(
1053
 
                specific_files, trees,
1054
 
                require_versioned=require_versioned)
 
813
                    specific_files, trees,
 
814
                    require_versioned=require_versioned)
1055
815
 
1056
 
        if (self.source._repository._git.object_store !=
1057
 
                self.target._repository._git.object_store):
1058
 
            store = OverlayObjectStore(
1059
 
                [self.source._repository._git.object_store,
1060
 
                    self.target._repository._git.object_store])
 
816
        if self.source._repository._git.object_store != self.target._repository._git.object_store:
 
817
            store = OverlayObjectStore([self.source._repository._git.object_store,
 
818
                                        self.target._repository._git.object_store])
1061
819
        else:
1062
820
            store = self.source._repository._git.object_store
1063
 
        return store.tree_changes(
 
821
        return self.source._repository._git.object_store.tree_changes(
1064
822
            self.source.tree, self.target.tree, want_unchanged=want_unchanged,
1065
823
            include_trees=True, change_type_same=True), set()
1066
824
 
1075
833
        self._lock_count = 0
1076
834
        self._versioned_dirs = None
1077
835
        self._index_dirty = False
1078
 
        self._submodules = None
1079
836
 
1080
837
    def is_versioned(self, path):
1081
838
        with self.lock_read():
1084
841
            return (subpath in index or self._has_dir(path))
1085
842
 
1086
843
    def _has_dir(self, path):
1087
 
        if not isinstance(path, bytes):
1088
 
            raise TypeError(path)
1089
 
        if path == b"":
 
844
        if path == "":
1090
845
            return True
1091
846
        if self._versioned_dirs is None:
1092
847
            self._load_dirs()
1096
851
        if self._lock_mode is None:
1097
852
            raise errors.ObjectNotLocked(self)
1098
853
        self._versioned_dirs = set()
 
854
        # TODO(jelmer): Browse over all indexes
1099
855
        for p, i in self._recurse_index_entries():
1100
856
            self._ensure_versioned_dir(posixpath.dirname(p))
1101
857
 
1102
858
    def _ensure_versioned_dir(self, dirname):
1103
 
        if not isinstance(dirname, bytes):
1104
 
            raise TypeError(dirname)
1105
859
        if dirname in self._versioned_dirs:
1106
860
            return
1107
 
        if dirname != b"":
 
861
        if dirname != "":
1108
862
            self._ensure_versioned_dir(posixpath.dirname(dirname))
1109
863
        self._versioned_dirs.add(dirname)
1110
864
 
1112
866
        with self.lock_read():
1113
867
            path = path.rstrip('/')
1114
868
            if self.is_versioned(path.rstrip('/')):
1115
 
                return self.mapping.generate_file_id(
1116
 
                    osutils.safe_unicode(path))
 
869
                return self._fileid_map.lookup_file_id(path.encode("utf-8"))
1117
870
            return None
1118
871
 
1119
 
    def id2path(self, file_id, recurse='down'):
 
872
    def has_id(self, file_id):
 
873
        try:
 
874
            self.id2path(file_id)
 
875
        except errors.NoSuchId:
 
876
            return False
 
877
        else:
 
878
            return True
 
879
 
 
880
    def id2path(self, file_id):
1120
881
        if file_id is None:
1121
882
            return ''
1122
883
        if type(file_id) is not bytes:
1123
884
            raise TypeError(file_id)
1124
885
        with self.lock_read():
1125
886
            try:
1126
 
                path = self.mapping.parse_file_id(file_id)
 
887
                path = self._fileid_map.lookup_path(file_id)
1127
888
            except ValueError:
1128
889
                raise errors.NoSuchId(self, file_id)
 
890
            path = path.decode('utf-8')
1129
891
            if self.is_versioned(path):
1130
892
                return path
1131
893
            raise errors.NoSuchId(self, file_id)
1132
894
 
1133
895
    def _set_root_id(self, file_id):
1134
 
        raise errors.UnsupportedOperation(self._set_root_id, self)
 
896
        self._fileid_map.set_file_id("", file_id)
 
897
 
 
898
    def get_root_id(self):
 
899
        return self.path2id("")
1135
900
 
1136
901
    def _add(self, files, ids, kinds):
1137
902
        for (path, file_id, kind) in zip(files, ids, kinds):
1145
910
    def _read_submodule_head(self, path):
1146
911
        raise NotImplementedError(self._read_submodule_head)
1147
912
 
1148
 
    def _submodule_info(self):
1149
 
        if self._submodules is None:
1150
 
            try:
1151
 
                with self.get_file('.gitmodules') as f:
1152
 
                    config = GitConfigFile.from_file(f)
1153
 
                    self._submodules = {
1154
 
                        path: (url, section)
1155
 
                        for path, url, section in parse_submodules(config)}
1156
 
            except errors.NoSuchFile:
1157
 
                self._submodules = {}
1158
 
        return self._submodules
1159
 
 
1160
913
    def _lookup_index(self, encoded_path):
1161
914
        if not isinstance(encoded_path, bytes):
1162
915
            raise TypeError(encoded_path)
1163
 
        # Common case:
1164
 
        if encoded_path in self.index:
1165
 
            return self.index, encoded_path
1166
 
        # TODO(jelmer): Perhaps have a cache with paths under which some
1167
 
        # submodules exist?
1168
 
        index = self.index
1169
 
        remaining_path = encoded_path
1170
 
        while True:
1171
 
            parts = remaining_path.split(b'/')
1172
 
            for i in range(1, len(parts)):
1173
 
                basepath = b'/'.join(parts[:i])
1174
 
                try:
1175
 
                    (ctime, mtime, dev, ino, mode, uid, gid, size, sha,
1176
 
                     flags) = index[basepath]
1177
 
                except KeyError:
1178
 
                    continue
1179
 
                else:
1180
 
                    if S_ISGITLINK(mode):
1181
 
                        index = self._get_submodule_index(basepath)
1182
 
                        remaining_path = b'/'.join(parts[i:])
1183
 
                        break
1184
 
                    else:
1185
 
                        return index, remaining_path
1186
 
            else:
1187
 
                return index, remaining_path
1188
 
        return index, remaining_path
 
916
        # TODO(jelmer): Look in other indexes
 
917
        return self.index, encoded_path
1189
918
 
1190
919
    def _index_del_entry(self, index, path):
1191
920
        del index[path]
1201
930
            try:
1202
931
                file, stat_val = self.get_file_with_stat(path)
1203
932
            except (errors.NoSuchFile, IOError):
1204
 
                # TODO: Rather than come up with something here, use the old
1205
 
                # index
 
933
                # TODO: Rather than come up with something here, use the old index
1206
934
                file = BytesIO()
1207
935
                stat_val = os.stat_result(
1208
936
                    (stat.S_IFREG | 0o644, 0, 0, 0, 0, 0, 0, 0, 0, 0))
1209
 
            with file:
1210
 
                blob.set_raw_string(file.read())
 
937
            blob.set_raw_string(file.read())
1211
938
            # Add object to the repository if it didn't exist yet
1212
 
            if blob.id not in self.store:
 
939
            if not blob.id in self.store:
1213
940
                self.store.add_object(blob)
1214
941
            hexsha = blob.id
1215
942
        elif kind == "symlink":
1224
951
            blob.set_raw_string(
1225
952
                self.get_symlink_target(path).encode("utf-8"))
1226
953
            # Add object to the repository if it didn't exist yet
1227
 
            if blob.id not in self.store:
 
954
            if not blob.id in self.store:
1228
955
                self.store.add_object(blob)
1229
956
            hexsha = blob.id
1230
957
        elif kind == "tree-reference":
1231
958
            if reference_revision is not None:
1232
 
                hexsha = self.branch.lookup_bzr_revision_id(
1233
 
                    reference_revision)[0]
 
959
                hexsha = self.branch.lookup_bzr_revision_id(reference_revision)[0]
1234
960
            else:
1235
961
                hexsha = self._read_submodule_head(path)
1236
962
                if hexsha is None:
1256
982
        if self._versioned_dirs is not None:
1257
983
            self._ensure_versioned_dir(index_path)
1258
984
 
1259
 
    def _recurse_index_entries(self, index=None, basepath=b"",
1260
 
                               recurse_nested=False):
 
985
    def _recurse_index_entries(self, index=None, basepath=""):
1261
986
        # Iterate over all index entries
1262
987
        with self.lock_read():
1263
988
            if index is None:
1264
989
                index = self.index
1265
990
            for path, value in index.items():
1266
 
                (ctime, mtime, dev, ino, mode, uid, gid, size, sha,
1267
 
                 flags) = value
1268
 
                if S_ISGITLINK(mode) and recurse_nested:
1269
 
                    subindex = self._get_submodule_index(path)
1270
 
                    for entry in self._recurse_index_entries(
1271
 
                            index=subindex, basepath=path,
1272
 
                            recurse_nested=recurse_nested):
1273
 
                        yield entry
1274
 
                else:
1275
 
                    yield (posixpath.join(basepath, path), value)
1276
 
 
1277
 
    def iter_entries_by_dir(self, specific_files=None,
1278
 
                            recurse_nested=False):
 
991
                yield (posixpath.join(basepath, path), value)
 
992
                (ctime, mtime, dev, ino, mode, uid, gid, size, sha, flags) = value
 
993
                if S_ISGITLINK(mode):
 
994
                    pass # TODO(jelmer): dive into submodule
 
995
 
 
996
 
 
997
    def iter_entries_by_dir(self, specific_files=None, yield_parents=False):
 
998
        if yield_parents:
 
999
            raise NotImplementedError(self.iter_entries_by_dir)
1279
1000
        with self.lock_read():
1280
1001
            if specific_files is not None:
1281
1002
                specific_files = set(specific_files)
1284
1005
            root_ie = self._get_dir_ie(u"", None)
1285
1006
            ret = {}
1286
1007
            if specific_files is None or u"" in specific_files:
1287
 
                ret[(u"", u"")] = root_ie
 
1008
                ret[(None, u"")] = root_ie
1288
1009
            dir_ids = {u"": root_ie.file_id}
1289
 
            for path, value in self._recurse_index_entries(
1290
 
                    recurse_nested=recurse_nested):
 
1010
            for path, value in self._recurse_index_entries():
1291
1011
                if self.mapping.is_special_file(path):
1292
1012
                    continue
1293
1013
                path = path.decode("utf-8")
1294
 
                if specific_files is not None and path not in specific_files:
 
1014
                if specific_files is not None and not path in specific_files:
1295
1015
                    continue
1296
1016
                (parent, name) = posixpath.split(path)
1297
1017
                try:
1298
1018
                    file_ie = self._get_file_ie(name, path, value, None)
1299
1019
                except errors.NoSuchFile:
1300
1020
                    continue
1301
 
                if specific_files is None:
1302
 
                    for (dir_path, dir_ie) in self._add_missing_parent_ids(
1303
 
                            parent, dir_ids):
 
1021
                if yield_parents or specific_files is None:
 
1022
                    for (dir_path, dir_ie) in self._add_missing_parent_ids(parent,
 
1023
                            dir_ids):
1304
1024
                        ret[(posixpath.dirname(dir_path), dir_path)] = dir_ie
1305
1025
                file_ie.parent_id = self.path2id(parent)
1306
1026
                ret[(posixpath.dirname(path), path)] = file_ie
1307
 
            # Special casing for directories
1308
 
            if specific_files:
1309
 
                for path in specific_files:
1310
 
                    key = (posixpath.dirname(path), path)
1311
 
                    if key not in ret and self.is_versioned(path):
1312
 
                        ret[key] = self._get_dir_ie(path, self.path2id(key[0]))
1313
 
            return ((path, ie) for ((_, path), ie) in sorted(viewitems(ret)))
 
1027
            return ((path, ie) for ((_, path), ie) in sorted(ret.items()))
1314
1028
 
1315
1029
    def iter_references(self):
1316
 
        if self.supports_tree_reference():
1317
 
            # TODO(jelmer): Implement a more efficient version of this
1318
 
            for path, entry in self.iter_entries_by_dir():
1319
 
                if entry.kind == 'tree-reference':
1320
 
                    yield path
 
1030
        # TODO(jelmer): Implement a more efficient version of this
 
1031
        for path, entry in self.iter_entries_by_dir():
 
1032
            if entry.kind == 'tree-reference':
 
1033
                yield path, self.mapping.generate_file_id(b'')
1321
1034
 
1322
1035
    def _get_dir_ie(self, path, parent_id):
1323
1036
        file_id = self.path2id(path)
1324
1037
        return GitTreeDirectory(file_id,
1325
 
                                posixpath.basename(path).strip("/"), parent_id)
 
1038
            posixpath.basename(path).strip("/"), parent_id)
1326
1039
 
1327
1040
    def _get_file_ie(self, name, path, value, parent_id):
1328
1041
        if not isinstance(name, text_type):
1333
1046
            raise TypeError(value)
1334
1047
        (ctime, mtime, dev, ino, mode, uid, gid, size, sha, flags) = value
1335
1048
        file_id = self.path2id(path)
1336
 
        if not isinstance(file_id, bytes):
1337
 
            raise TypeError(file_id)
 
1049
        if type(file_id) != str:
 
1050
            raise AssertionError
1338
1051
        kind = mode_kind(mode)
1339
1052
        ie = entry_factory[kind](file_id, name, parent_id)
1340
1053
        if kind == 'symlink':
1341
 
            ie.symlink_target = self.get_symlink_target(path)
 
1054
            ie.symlink_target = self.get_symlink_target(path, file_id)
1342
1055
        elif kind == 'tree-reference':
1343
 
            ie.reference_revision = self.get_reference_revision(path)
 
1056
            ie.reference_revision = self.get_reference_revision(path, file_id)
1344
1057
        else:
1345
1058
            try:
1346
 
                data = self.get_file_text(path)
 
1059
                data = self.get_file_text(path, file_id)
1347
1060
            except errors.NoSuchFile:
1348
1061
                data = None
1349
1062
            except IOError as e:
1385
1098
            # A directory, perhaps?
1386
1099
            # TODO(jelmer): Deletes that involve submodules?
1387
1100
            for p in list(index):
1388
 
                if p.startswith(subpath + b"/"):
 
1101
                if p.startswith(subpath+b"/"):
1389
1102
                    count += 1
1390
1103
                    self._index_del_entry(index, p)
1391
1104
        else:
1393
1106
        self._versioned_dirs = None
1394
1107
        return count
1395
1108
 
1396
 
    def unversion(self, paths):
 
1109
    def unversion(self, paths, file_ids=None):
1397
1110
        with self.lock_tree_write():
1398
1111
            for path in paths:
1399
1112
                if self._unversion_path(path) == 0:
1408
1121
        # TODO(jelmer): This shouldn't be called, it's inventory specific.
1409
1122
        for (old_path, new_path, file_id, ie) in delta:
1410
1123
            if old_path is not None:
1411
 
                (index, old_subpath) = self._lookup_index(
1412
 
                    old_path.encode('utf-8'))
 
1124
                (index, old_subpath) = self._lookup_index(old_path.encode('utf-8'))
1413
1125
                if old_subpath in index:
1414
1126
                    self._index_del_entry(index, old_subpath)
1415
1127
                    self._versioned_dirs = None
1424
1136
            to_abs = self.abspath(to_dir)
1425
1137
            if not os.path.isdir(to_abs):
1426
1138
                raise errors.BzrMoveFailedError('', to_dir,
1427
 
                                                errors.NotADirectory(to_abs))
 
1139
                    errors.NotADirectory(to_abs))
1428
1140
 
1429
1141
            for from_rel in from_paths:
1430
1142
                from_tail = os.path.split(from_rel)[-1]
1449
1161
                    not self.is_versioned(to_rel))
1450
1162
            if after:
1451
1163
                if not self.has_filename(to_rel):
1452
 
                    raise errors.BzrMoveFailedError(
1453
 
                        from_rel, to_rel, errors.NoSuchFile(to_rel))
 
1164
                    raise errors.BzrMoveFailedError(from_rel, to_rel,
 
1165
                        errors.NoSuchFile(to_rel))
1454
1166
                if self.basis_tree().is_versioned(to_rel):
1455
 
                    raise errors.BzrMoveFailedError(
1456
 
                        from_rel, to_rel, errors.AlreadyVersionedError(to_rel))
 
1167
                    raise errors.BzrMoveFailedError(from_rel, to_rel,
 
1168
                        errors.AlreadyVersionedError(to_rel))
1457
1169
 
1458
1170
                kind = self.kind(to_rel)
1459
1171
            else:
1466
1178
                    exc_type = errors.BzrMoveFailedError
1467
1179
                if self.is_versioned(to_rel):
1468
1180
                    raise exc_type(from_rel, to_rel,
1469
 
                                   errors.AlreadyVersionedError(to_rel))
 
1181
                        errors.AlreadyVersionedError(to_rel))
1470
1182
                if not self.has_filename(from_rel):
1471
 
                    raise errors.BzrMoveFailedError(
1472
 
                        from_rel, to_rel, errors.NoSuchFile(from_rel))
 
1183
                    raise errors.BzrMoveFailedError(from_rel, to_rel,
 
1184
                        errors.NoSuchFile(from_rel))
1473
1185
                kind = self.kind(from_rel)
1474
1186
                if not self.is_versioned(from_rel) and kind != 'directory':
1475
1187
                    raise exc_type(from_rel, to_rel,
1476
 
                                   errors.NotVersionedError(from_rel))
 
1188
                        errors.NotVersionedError(from_rel))
1477
1189
                if self.has_filename(to_rel):
1478
1190
                    raise errors.RenameFailedFilesExist(
1479
1191
                        from_rel, to_rel, errors.FileExists(to_rel))
1484
1196
                (index, from_subpath) = self._lookup_index(from_path)
1485
1197
                if from_subpath not in index:
1486
1198
                    # It's not a file
1487
 
                    raise errors.BzrMoveFailedError(
1488
 
                        from_rel, to_rel,
 
1199
                    raise errors.BzrMoveFailedError(from_rel, to_rel,
1489
1200
                        errors.NotVersionedError(path=from_rel))
1490
1201
 
1491
1202
            if not after:
1493
1204
                    self._rename_one(from_rel, to_rel)
1494
1205
                except OSError as e:
1495
1206
                    if e.errno == errno.ENOENT:
1496
 
                        raise errors.BzrMoveFailedError(
1497
 
                            from_rel, to_rel, errors.NoSuchFile(to_rel))
 
1207
                        raise errors.BzrMoveFailedError(from_rel, to_rel,
 
1208
                            errors.NoSuchFile(to_rel))
1498
1209
                    raise
1499
1210
            if kind != 'directory':
1500
1211
                (index, from_index_path) = self._lookup_index(from_path)
1504
1215
                    pass
1505
1216
                self._index_add_entry(to_rel, kind)
1506
1217
            else:
1507
 
                todo = [(p, i) for (p, i) in self._recurse_index_entries()
1508
 
                        if p.startswith(from_path + b'/')]
 
1218
                todo = [(p, i) for (p, i) in self._recurse_index_entries() if p.startswith(from_path+'/')]
1509
1219
                for child_path, child_value in todo:
1510
1220
                    (child_to_index, child_to_index_path) = self._lookup_index(
1511
 
                        posixpath.join(to_path, posixpath.relpath(child_path, from_path)))
 
1221
                            posixpath.join(to_path, posixpath.relpath(child_path, from_path)))
1512
1222
                    child_to_index[child_to_index_path] = child_value
1513
1223
                    # TODO(jelmer): Mark individual index as dirty
1514
1224
                    self._index_dirty = True
1515
 
                    (child_from_index, child_from_index_path) = self._lookup_index(
1516
 
                        child_path)
1517
 
                    self._index_del_entry(
1518
 
                        child_from_index, child_from_index_path)
 
1225
                    (child_from_index, child_from_index_path) = self._lookup_index(child_path)
 
1226
                    self._index_del_entry(child_from_index, child_from_index_path)
1519
1227
 
1520
1228
            self._versioned_dirs = None
1521
1229
            self.flush()
1522
1230
 
1523
1231
    def find_related_paths_across_trees(self, paths, trees=[],
1524
 
                                        require_versioned=True):
 
1232
            require_versioned=True):
1525
1233
        if paths is None:
1526
1234
            return None
1527
1235
 
1564
1272
        else:
1565
1273
            return (kind, None, None, None)
1566
1274
 
1567
 
    def stored_kind(self, relpath):
1568
 
        (index, index_path) = self._lookup_index(relpath.encode('utf-8'))
1569
 
        if index is None:
1570
 
            return kind
1571
 
        try:
1572
 
            mode = index[index_path].mode
1573
 
        except KeyError:
1574
 
            return kind
1575
 
        else:
1576
 
            if S_ISGITLINK(mode):
1577
 
                return 'tree-reference'
1578
 
            return 'directory'
1579
 
 
1580
 
    def kind(self, relpath):
 
1275
    def kind(self, relpath, file_id=None):
1581
1276
        kind = osutils.file_kind(self.abspath(relpath))
1582
1277
        if kind == 'directory':
1583
 
            if self._directory_is_tree_reference(relpath):
1584
 
                return 'tree-reference'
1585
 
            return 'directory'
 
1278
            (index, index_path) = self._lookup_index(relpath.encode('utf-8'))
 
1279
            try:
 
1280
                mode = index[index_path].mode
 
1281
            except KeyError:
 
1282
                return kind
 
1283
            else:
 
1284
                if S_ISGITLINK(mode):
 
1285
                    return 'tree-reference'
 
1286
                return 'directory'
1586
1287
        else:
1587
1288
            return kind
1588
1289
 
1589
1290
    def _live_entry(self, relpath):
1590
1291
        raise NotImplementedError(self._live_entry)
1591
1292
 
1592
 
    def get_transform(self, pb=None):
1593
 
        from ..transform import TreeTransform
1594
 
        return TreeTransform(self, pb=pb)
1595
 
 
1596
 
 
1597
1293
 
1598
1294
class InterIndexGitTree(InterGitTrees):
1599
1295
    """InterTree that works between a Git revision tree and an index."""
1608
1304
                isinstance(target, MutableGitIndexTree))
1609
1305
 
1610
1306
    def _iter_git_changes(self, want_unchanged=False, specific_files=None,
1611
 
                          require_versioned=False, extra_trees=None,
1612
 
                          want_unversioned=False):
 
1307
            require_versioned=False, extra_trees=None,
 
1308
            want_unversioned=False):
1613
1309
        trees = [self.source]
1614
1310
        if extra_trees is not None:
1615
1311
            trees.extend(extra_trees)
1616
1312
        if specific_files is not None:
1617
1313
            specific_files = self.target.find_related_paths_across_trees(
1618
 
                specific_files, trees,
1619
 
                require_versioned=require_versioned)
 
1314
                    specific_files, trees,
 
1315
                    require_versioned=require_versioned)
1620
1316
        # TODO(jelmer): Restrict to specific_files, for performance reasons.
1621
1317
        with self.lock_read():
1622
1318
            return changes_between_git_tree_and_working_copy(
1629
1325
 
1630
1326
 
1631
1327
def changes_between_git_tree_and_working_copy(store, from_tree_sha, target,
1632
 
                                              want_unchanged=False,
1633
 
                                              want_unversioned=False):
 
1328
        want_unchanged=False, want_unversioned=False):
1634
1329
    """Determine the changes between a git tree and a working tree with index.
1635
1330
 
1636
1331
    """
1639
1334
    # Report dirified directories to commit_tree first, so that they can be
1640
1335
    # replaced with non-empty directories if they have contents.
1641
1336
    dirified = []
1642
 
    trust_executable = target._supports_executable()
1643
1337
    for path, index_entry in target._recurse_index_entries():
1644
1338
        try:
1645
1339
            live_entry = target._live_entry(path)
1647
1341
            if e.errno == errno.ENOENT:
1648
1342
                # Entry was removed; keep it listed, but mark it as gone.
1649
1343
                blobs[path] = (ZERO_SHA, 0)
 
1344
            elif e.errno == errno.EISDIR:
 
1345
                # Entry was turned into a directory
 
1346
                dirified.append((path, Tree().id, stat.S_IFDIR))
 
1347
                store.add_object(Tree())
1650
1348
            else:
1651
1349
                raise
1652
1350
        else:
1653
 
            if live_entry is None:
1654
 
                # Entry was turned into a directory.
1655
 
                # Maybe it's just a submodule that's not checked out?
1656
 
                if S_ISGITLINK(index_entry.mode):
1657
 
                    blobs[path] = (index_entry.sha, index_entry.mode)
1658
 
                else:
1659
 
                    dirified.append((path, Tree().id, stat.S_IFDIR))
1660
 
                    store.add_object(Tree())
1661
 
            else:
1662
 
                mode = live_entry.mode
1663
 
                if not trust_executable:
1664
 
                    if mode_is_executable(index_entry.mode):
1665
 
                        mode |= 0o111
1666
 
                    else:
1667
 
                        mode &= ~0o111
1668
 
                blobs[path] = (live_entry.sha, cleanup_mode(live_entry.mode))
 
1351
            blobs[path] = (live_entry.sha, cleanup_mode(live_entry.mode))
1669
1352
    if want_unversioned:
1670
1353
        for e in target.extras():
1671
1354
            st = target._lstat(e)
1677
1360
            if stat.S_ISDIR(st.st_mode):
1678
1361
                blob = Tree()
1679
1362
            else:
1680
 
                blob = blob_from_path_and_stat(
1681
 
                    target.abspath(e).encode(osutils._fs_enc), st)
 
1363
                blob = blob_from_path_and_stat(target.abspath(e).encode(osutils._fs_enc), st)
1682
1364
            store.add_object(blob)
1683
1365
            np = np.encode('utf-8')
1684
1366
            blobs[np] = (blob.id, cleanup_mode(st.st_mode))
1685
1367
            extras.add(np)
1686
 
    to_tree_sha = commit_tree(
1687
 
        store, dirified + [(p, s, m) for (p, (s, m)) in blobs.items()])
 
1368
    to_tree_sha = commit_tree(store, dirified + [(p, s, m) for (p, (s, m)) in blobs.items()])
1688
1369
    return store.tree_changes(
1689
1370
        from_tree_sha, to_tree_sha, include_trees=True,
1690
1371
        want_unchanged=want_unchanged, change_type_same=True), extras