1
# Copyright (C) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
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.
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.
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
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
from __future__ import absolute_import
22
from collections import deque
24
from io import BytesIO
27
from dulwich.index import (
28
blob_from_path_and_stat,
31
index_entry_from_stat,
33
from dulwich.object_store import (
37
from dulwich.objects import (
48
controldir as _mod_controldir,
58
from ..revision import (
62
from ..sixish import (
67
from .mapping import (
75
class GitTreeDirectory(_mod_tree.TreeDirectory):
77
__slots__ = ['file_id', 'name', 'parent_id', 'children']
79
def __init__(self, file_id, name, parent_id):
80
self.file_id = file_id
82
self.parent_id = parent_id
95
return self.__class__(
96
self.file_id, self.name, self.parent_id)
99
return "%s(file_id=%r, name=%r, parent_id=%r)" % (
100
self.__class__.__name__, self.file_id, self.name,
103
def __eq__(self, other):
104
return (self.kind == other.kind and
105
self.file_id == other.file_id and
106
self.name == other.name and
107
self.parent_id == other.parent_id)
110
class GitTreeFile(_mod_tree.TreeFile):
112
__slots__ = ['file_id', 'name', 'parent_id', 'text_size', 'text_sha1',
115
def __init__(self, file_id, name, parent_id, text_size=None,
116
text_sha1=None, executable=None):
117
self.file_id = file_id
119
self.parent_id = parent_id
120
self.text_size = text_size
121
self.text_sha1 = text_sha1
122
self.executable = executable
128
def __eq__(self, other):
129
return (self.kind == other.kind and
130
self.file_id == other.file_id and
131
self.name == other.name and
132
self.parent_id == other.parent_id and
133
self.text_sha1 == other.text_sha1 and
134
self.text_size == other.text_size and
135
self.executable == other.executable)
138
return ("%s(file_id=%r, name=%r, parent_id=%r, text_size=%r, "
139
"text_sha1=%r, executable=%r)") % (
140
type(self).__name__, self.file_id, self.name, self.parent_id,
141
self.text_size, self.text_sha1, self.executable)
144
ret = self.__class__(
145
self.file_id, self.name, self.parent_id)
146
ret.text_sha1 = self.text_sha1
147
ret.text_size = self.text_size
148
ret.executable = self.executable
152
class GitTreeSymlink(_mod_tree.TreeLink):
154
__slots__ = ['file_id', 'name', 'parent_id', 'symlink_target']
156
def __init__(self, file_id, name, parent_id,
157
symlink_target=None):
158
self.file_id = file_id
160
self.parent_id = parent_id
161
self.symlink_target = symlink_target
168
def executable(self):
176
return "%s(file_id=%r, name=%r, parent_id=%r, symlink_target=%r)" % (
177
type(self).__name__, self.file_id, self.name, self.parent_id,
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)
188
return self.__class__(
189
self.file_id, self.name, self.parent_id,
193
class GitTreeSubmodule(_mod_tree.TreeLink):
195
__slots__ = ['file_id', 'name', 'parent_id', 'reference_revision']
197
def __init__(self, file_id, name, parent_id, reference_revision=None):
198
self.file_id = file_id
200
self.parent_id = parent_id
201
self.reference_revision = reference_revision
205
return 'tree-reference'
208
return ("%s(file_id=%r, name=%r, parent_id=%r, "
209
"reference_revision=%r)") % (
210
type(self).__name__, self.file_id, self.name, self.parent_id,
211
self.reference_revision)
213
def __eq__(self, other):
214
return (self.kind == other.kind and
215
self.file_id == other.file_id and
216
self.name == other.name and
217
self.parent_id == other.parent_id and
218
self.reference_revision == other.reference_revision)
221
return self.__class__(
222
self.file_id, self.name, self.parent_id,
223
self.reference_revision)
227
'directory': GitTreeDirectory,
229
'symlink': GitTreeSymlink,
230
'tree-reference': GitTreeSubmodule,
234
def ensure_normalized_path(path):
235
"""Check whether path is normalized.
237
:raises InvalidNormalization: When path is not normalized, and cannot be
238
accessed on this platform by the normalized path.
239
:return: The NFC normalised version of path.
241
norm_path, can_access = osutils.normalized_filename(path)
242
if norm_path != path:
246
raise errors.InvalidNormalization(path)
250
class GitRevisionTree(revisiontree.RevisionTree):
251
"""Revision tree implementation based on Git objects."""
253
def __init__(self, repository, revision_id):
254
self._revision_id = revision_id
255
self._repository = repository
256
self.store = repository._git.object_store
257
if not isinstance(revision_id, bytes):
258
raise TypeError(revision_id)
259
self.commit_id, self.mapping = repository.lookup_bzr_revision_id(
261
if revision_id == NULL_REVISION:
263
self.mapping = default_mapping
264
self._fileid_map = GitFileIdMap(
269
commit = self.store[self.commit_id]
271
raise errors.NoSuchRevision(repository, revision_id)
272
self.tree = commit.tree
273
self._fileid_map = self.mapping.get_fileid_map(
274
self.store.__getitem__, self.tree)
276
def _get_nested_repository(self, path):
277
nested_repo_transport = self._repository.user_transport.clone(path)
278
nested_controldir = _mod_controldir.ControlDir.open_from_transport(
279
nested_repo_transport)
280
return nested_controldir.find_repository()
282
def supports_rename_tracking(self):
285
def get_file_revision(self, path):
286
change_scanner = self._repository._file_change_scanner
287
if self.commit_id == ZERO_SHA:
289
(unused_path, commit_id) = change_scanner.find_last_change_revision(
290
path.encode('utf-8'), self.commit_id)
291
return self._repository.lookup_foreign_revision_id(
292
commit_id, self.mapping)
294
def get_file_mtime(self, path):
296
revid = self.get_file_revision(path)
298
raise errors.NoSuchFile(path)
300
rev = self._repository.get_revision(revid)
301
except errors.NoSuchRevision:
302
raise _mod_tree.FileTimestampUnavailable(path)
305
def id2path(self, file_id):
307
path = self._fileid_map.lookup_path(file_id)
309
raise errors.NoSuchId(self, file_id)
310
if self.is_versioned(path):
312
raise errors.NoSuchId(self, file_id)
314
def is_versioned(self, path):
315
return self.has_filename(path)
317
def path2id(self, path):
318
if self.mapping.is_special_file(path):
320
if not self.is_versioned(path):
322
return self._fileid_map.lookup_file_id(osutils.safe_unicode(path))
324
def all_file_ids(self):
325
raise errors.UnsupportedOperation(self.all_file_ids, self)
327
def all_versioned_paths(self):
329
todo = [(self.store, b'', self.tree)]
331
(store, path, tree_id) = todo.pop()
334
tree = store[tree_id]
335
for name, mode, hexsha in tree.items():
336
subpath = posixpath.join(path, name)
337
ret.add(subpath.decode('utf-8'))
338
if stat.S_ISDIR(mode):
339
todo.append((store, subpath, hexsha))
342
def get_root_id(self):
343
if self.tree is None:
345
return self.path2id("")
347
def has_or_had_id(self, file_id):
349
self.id2path(file_id)
350
except errors.NoSuchId:
354
def has_id(self, file_id):
356
path = self.id2path(file_id)
357
except errors.NoSuchId:
359
return self.has_filename(path)
361
def _lookup_path(self, path):
362
if self.tree is None:
363
raise errors.NoSuchFile(path)
365
(mode, hexsha) = tree_lookup_path(
366
self.store.__getitem__, self.tree, path.encode('utf-8'))
368
raise errors.NoSuchFile(self, path)
370
return (self.store, mode, hexsha)
372
def is_executable(self, path):
373
(store, mode, hexsha) = self._lookup_path(path)
375
# the tree root is a directory
377
return mode_is_executable(mode)
379
def kind(self, path):
380
(store, mode, hexsha) = self._lookup_path(path)
382
# the tree root is a directory
384
return mode_kind(mode)
386
def has_filename(self, path):
388
self._lookup_path(path)
389
except errors.NoSuchFile:
394
def list_files(self, include_root=False, from_dir=None, recursive=True):
395
if self.tree is None:
397
if from_dir is None or from_dir == '.':
399
(store, mode, hexsha) = self._lookup_path(from_dir)
400
if mode is None: # Root
401
root_ie = self._get_dir_ie(b"", None)
403
parent_path = posixpath.dirname(from_dir)
404
parent_id = self._fileid_map.lookup_file_id(parent_path)
405
if mode_kind(mode) == 'directory':
406
root_ie = self._get_dir_ie(from_dir.encode("utf-8"), parent_id)
408
root_ie = self._get_file_ie(
409
store, from_dir.encode("utf-8"),
410
posixpath.basename(from_dir), mode, hexsha)
412
yield (from_dir, "V", root_ie.kind, root_ie.file_id, root_ie)
414
if root_ie.kind == 'directory':
415
todo.append((store, from_dir.encode("utf-8"),
416
b"", hexsha, root_ie.file_id))
418
(store, path, relpath, hexsha, parent_id) = todo.pop()
420
for name, mode, hexsha in tree.iteritems():
421
if self.mapping.is_special_file(name):
423
child_path = posixpath.join(path, name)
424
child_relpath = posixpath.join(relpath, name)
425
if stat.S_ISDIR(mode):
426
ie = self._get_dir_ie(child_path, parent_id)
429
(store, child_path, child_relpath, hexsha,
432
ie = self._get_file_ie(
433
store, child_path, name, mode, hexsha, parent_id)
434
yield (child_relpath.decode('utf-8'), "V", ie.kind, ie.file_id,
437
def _get_file_ie(self, store, path, name, mode, hexsha, parent_id):
438
if not isinstance(path, bytes):
439
raise TypeError(path)
440
if not isinstance(name, bytes):
441
raise TypeError(name)
442
kind = mode_kind(mode)
443
path = path.decode('utf-8')
444
name = name.decode("utf-8")
445
file_id = self._fileid_map.lookup_file_id(path)
446
ie = entry_factory[kind](file_id, name, parent_id)
447
if kind == 'symlink':
448
ie.symlink_target = store[hexsha].data.decode('utf-8')
449
elif kind == 'tree-reference':
450
ie.reference_revision = self.mapping.revision_id_foreign_to_bzr(
453
data = store[hexsha].data
454
ie.text_sha1 = osutils.sha_string(data)
455
ie.text_size = len(data)
456
ie.executable = mode_is_executable(mode)
459
def _get_dir_ie(self, path, parent_id):
460
path = path.decode('utf-8')
461
file_id = self._fileid_map.lookup_file_id(path)
462
return GitTreeDirectory(file_id, posixpath.basename(path), parent_id)
464
def iter_child_entries(self, path, file_id=None):
465
(store, mode, tree_sha) = self._lookup_path(path)
467
if mode is not None and not stat.S_ISDIR(mode):
470
encoded_path = path.encode('utf-8')
471
file_id = self.path2id(path)
472
tree = store[tree_sha]
473
for name, mode, hexsha in tree.iteritems():
474
if self.mapping.is_special_file(name):
476
child_path = posixpath.join(encoded_path, name)
477
if stat.S_ISDIR(mode):
478
yield self._get_dir_ie(child_path, file_id)
480
yield self._get_file_ie(store, child_path, name, mode, hexsha,
483
def iter_entries_by_dir(self, specific_files=None, yield_parents=False):
484
if self.tree is None:
487
# TODO(jelmer): Support yield parents
488
raise NotImplementedError
489
if specific_files is not None:
490
if specific_files in ([""], []):
491
specific_files = None
493
specific_files = set([p.encode('utf-8')
494
for p in specific_files])
495
todo = deque([(self.store, b"", self.tree, self.get_root_id())])
496
if specific_files is None or u"" in specific_files:
497
yield u"", self._get_dir_ie(b"", None)
499
store, path, tree_sha, parent_id = todo.popleft()
500
tree = store[tree_sha]
502
for name, mode, hexsha in tree.iteritems():
503
if self.mapping.is_special_file(name):
505
child_path = posixpath.join(path, name)
506
child_path_decoded = child_path.decode('utf-8')
507
if stat.S_ISDIR(mode):
508
if (specific_files is None or
509
any([p for p in specific_files if p.startswith(
512
(store, child_path, hexsha,
513
self.path2id(child_path_decoded)))
514
if specific_files is None or child_path in specific_files:
515
if stat.S_ISDIR(mode):
516
yield (child_path_decoded,
517
self._get_dir_ie(child_path, parent_id))
519
yield (child_path_decoded,
520
self._get_file_ie(store, child_path, name, mode,
522
todo.extendleft(reversed(extradirs))
524
def iter_references(self):
525
if self.supports_tree_reference():
526
for path, entry in self.iter_entries_by_dir():
527
if entry.kind == 'tree-reference':
528
yield path, self.mapping.generate_file_id(b'')
530
def get_revision_id(self):
531
"""See RevisionTree.get_revision_id."""
532
return self._revision_id
534
def get_file_sha1(self, path, stat_value=None):
535
if self.tree is None:
536
raise errors.NoSuchFile(path)
537
return osutils.sha_string(self.get_file_text(path))
539
def get_file_verifier(self, path, stat_value=None):
540
(store, mode, hexsha) = self._lookup_path(path)
541
return ("GIT", hexsha)
543
def get_file_size(self, path):
544
(store, mode, hexsha) = self._lookup_path(path)
545
if stat.S_ISREG(mode):
546
return len(store[hexsha].data)
549
def get_file_text(self, path):
550
"""See RevisionTree.get_file_text."""
551
(store, mode, hexsha) = self._lookup_path(path)
552
if stat.S_ISREG(mode):
553
return store[hexsha].data
557
def get_symlink_target(self, path):
558
"""See RevisionTree.get_symlink_target."""
559
(store, mode, hexsha) = self._lookup_path(path)
560
if stat.S_ISLNK(mode):
561
return store[hexsha].data.decode('utf-8')
565
def get_reference_revision(self, path):
566
"""See RevisionTree.get_symlink_target."""
567
(store, mode, hexsha) = self._lookup_path(path)
568
if S_ISGITLINK(mode):
569
nested_repo = self._get_nested_repository(path)
570
return nested_repo.lookup_foreign_revision_id(hexsha)
574
def _comparison_data(self, entry, path):
576
return None, False, None
577
return entry.kind, entry.executable, None
579
def path_content_summary(self, path):
580
"""See Tree.path_content_summary."""
582
(store, mode, hexsha) = self._lookup_path(path)
583
except errors.NoSuchFile:
584
return ('missing', None, None, None)
585
kind = mode_kind(mode)
587
executable = mode_is_executable(mode)
588
contents = store[hexsha].data
589
return (kind, len(contents), executable,
590
osutils.sha_string(contents))
591
elif kind == 'symlink':
592
return (kind, None, None, store[hexsha].data.decode('utf-8'))
593
elif kind == 'tree-reference':
594
nested_repo = self._get_nested_repository(path)
595
return (kind, None, None,
596
nested_repo.lookup_foreign_revision_id(hexsha))
598
return (kind, None, None, None)
600
def find_related_paths_across_trees(self, paths, trees=[],
601
require_versioned=True):
604
if require_versioned:
605
trees = [self] + (trees if trees is not None else [])
609
if t.is_versioned(p):
614
raise errors.PathsNotVersionedError(unversioned)
615
return filter(self.is_versioned, paths)
617
def _iter_tree_contents(self, include_trees=False):
618
if self.tree is None:
620
return self.store.iter_tree_contents(
621
self.tree, include_trees=include_trees)
623
def annotate_iter(self, path, default_revision=CURRENT_REVISION):
624
"""Return an iterator of revision_id, line tuples.
626
For working trees (and mutable trees in general), the special
627
revision_id 'current:' will be used for lines that are new in this
628
tree, e.g. uncommitted changes.
629
:param default_revision: For lines that don't match a basis, mark them
630
with this revision id. Not all implementations will make use of
633
with self.lock_read():
634
# Now we have the parents of this content
635
from breezy.annotate import Annotator
636
from .annotate import AnnotateProvider
637
annotator = Annotator(AnnotateProvider(
638
self._repository._file_change_scanner))
639
this_key = (path, self.get_file_revision(path))
640
annotations = [(key[-1], line)
641
for key, line in annotator.annotate_flat(this_key)]
644
def _get_rules_searcher(self, default_searcher):
645
return default_searcher
647
def walkdirs(self, prefix=u""):
648
(store, mode, hexsha) = self._lookup_path(prefix)
650
[(store, prefix.encode('utf-8'), hexsha, self.path2id(prefix))])
652
store, path, tree_sha, parent_id = todo.popleft()
653
path_decoded = path.decode('utf-8')
654
tree = store[tree_sha]
656
for name, mode, hexsha in tree.iteritems():
657
if self.mapping.is_special_file(name):
659
child_path = posixpath.join(path, name)
660
file_id = self.path2id(child_path.decode('utf-8'))
661
if stat.S_ISDIR(mode):
662
todo.append((store, child_path, hexsha, file_id))
664
(child_path.decode('utf-8'), name.decode('utf-8'),
665
mode_kind(mode), None,
666
file_id, mode_kind(mode)))
667
yield (path_decoded, parent_id), children
670
def tree_delta_from_git_changes(changes, mapping,
671
fileid_maps, specific_files=None,
672
require_versioned=False, include_root=False,
674
"""Create a TreeDelta from two git trees.
676
source and target are iterators over tuples with:
677
(filename, sha, mode)
679
(old_fileid_map, new_fileid_map) = fileid_maps
680
if target_extras is None:
681
target_extras = set()
682
ret = delta.TreeDelta()
683
for (oldpath, newpath), (oldmode, newmode), (oldsha, newsha) in changes:
684
if newpath == b'' and not include_root:
687
oldpath_decoded = None
689
oldpath_decoded = oldpath.decode('utf-8')
691
newpath_decoded = None
693
newpath_decoded = newpath.decode('utf-8')
694
if not (specific_files is None or
695
(oldpath is not None and
696
osutils.is_inside_or_parent_of_any(
697
specific_files, oldpath_decoded)) or
698
(newpath is not None and
699
osutils.is_inside_or_parent_of_any(
700
specific_files, newpath_decoded))):
702
if mapping.is_special_file(oldpath):
704
if mapping.is_special_file(newpath):
706
if oldpath is None and newpath is None:
709
if newpath in target_extras:
710
ret.unversioned.append(
711
(osutils.normalized_filename(newpath)[0], None,
714
file_id = new_fileid_map.lookup_file_id(newpath_decoded)
716
(newpath_decoded, file_id, mode_kind(newmode)))
717
elif newpath is None or newmode == 0:
718
file_id = old_fileid_map.lookup_file_id(oldpath_decoded)
719
ret.removed.append((oldpath_decoded, file_id, mode_kind(oldmode)))
720
elif oldpath != newpath:
721
file_id = old_fileid_map.lookup_file_id(oldpath_decoded)
723
(oldpath_decoded, newpath.decode('utf-8'), file_id,
724
mode_kind(newmode), (oldsha != newsha),
725
(oldmode != newmode)))
726
elif mode_kind(oldmode) != mode_kind(newmode):
727
file_id = new_fileid_map.lookup_file_id(newpath_decoded)
728
ret.kind_changed.append(
729
(newpath_decoded, file_id, mode_kind(oldmode),
731
elif oldsha != newsha or oldmode != newmode:
732
if stat.S_ISDIR(oldmode) and stat.S_ISDIR(newmode):
734
file_id = new_fileid_map.lookup_file_id(newpath_decoded)
736
(newpath_decoded, file_id, mode_kind(newmode),
737
(oldsha != newsha), (oldmode != newmode)))
739
file_id = new_fileid_map.lookup_file_id(newpath_decoded)
740
ret.unchanged.append(
741
(newpath_decoded, file_id, mode_kind(newmode)))
746
def changes_from_git_changes(changes, mapping, specific_files=None,
747
include_unchanged=False, target_extras=None):
748
"""Create a iter_changes-like generator from a git stream.
750
source and target are iterators over tuples with:
751
(filename, sha, mode)
753
if target_extras is None:
754
target_extras = set()
755
for (oldpath, newpath), (oldmode, newmode), (oldsha, newsha) in changes:
756
if oldpath is not None:
757
oldpath_decoded = oldpath.decode('utf-8')
759
oldpath_decoded = None
760
if newpath is not None:
761
newpath_decoded = newpath.decode('utf-8')
763
newpath_decoded = None
764
if not (specific_files is None or
765
(oldpath_decoded is not None and
766
osutils.is_inside_or_parent_of_any(
767
specific_files, oldpath_decoded)) or
768
(newpath_decoded is not None and
769
osutils.is_inside_or_parent_of_any(
770
specific_files, newpath_decoded))):
772
if oldpath is not None and mapping.is_special_file(oldpath):
774
if newpath is not None and mapping.is_special_file(newpath):
776
if oldpath_decoded is None:
777
fileid = mapping.generate_file_id(newpath_decoded)
786
oldexe = mode_is_executable(oldmode)
787
oldkind = mode_kind(oldmode)
791
if oldpath_decoded == u'':
795
(oldparentpath, oldname) = osutils.split(oldpath_decoded)
796
oldparent = mapping.generate_file_id(oldparentpath)
797
fileid = mapping.generate_file_id(oldpath_decoded)
798
if newpath_decoded is None:
805
newversioned = (newpath_decoded not in target_extras)
807
newexe = mode_is_executable(newmode)
808
newkind = mode_kind(newmode)
812
if newpath_decoded == u'':
816
newparentpath, newname = osutils.split(newpath_decoded)
817
newparent = mapping.generate_file_id(newparentpath)
818
if (not include_unchanged and
819
oldkind == 'directory' and newkind == 'directory' and
820
oldpath_decoded == newpath_decoded):
822
yield (fileid, (oldpath_decoded, newpath_decoded), (oldsha != newsha),
823
(oldversioned, newversioned),
824
(oldparent, newparent), (oldname, newname),
825
(oldkind, newkind), (oldexe, newexe))
828
class InterGitTrees(_mod_tree.InterTree):
829
"""InterTree that works between two git trees."""
831
_matching_from_tree_format = None
832
_matching_to_tree_format = None
833
_test_mutable_trees_to_test_trees = None
836
def is_compatible(cls, source, target):
837
return (isinstance(source, GitRevisionTree) and
838
isinstance(target, GitRevisionTree))
840
def compare(self, want_unchanged=False, specific_files=None,
841
extra_trees=None, require_versioned=False, include_root=False,
842
want_unversioned=False):
843
with self.lock_read():
844
changes, target_extras = self._iter_git_changes(
845
want_unchanged=want_unchanged,
846
require_versioned=require_versioned,
847
specific_files=specific_files,
848
extra_trees=extra_trees,
849
want_unversioned=want_unversioned)
850
source_fileid_map = self.source._fileid_map
851
target_fileid_map = self.target._fileid_map
852
return tree_delta_from_git_changes(
853
changes, self.target.mapping,
854
(source_fileid_map, target_fileid_map),
855
specific_files=specific_files,
856
include_root=include_root, target_extras=target_extras)
858
def iter_changes(self, include_unchanged=False, specific_files=None,
859
pb=None, extra_trees=[], require_versioned=True,
860
want_unversioned=False):
861
with self.lock_read():
862
changes, target_extras = self._iter_git_changes(
863
want_unchanged=include_unchanged,
864
require_versioned=require_versioned,
865
specific_files=specific_files,
866
extra_trees=extra_trees,
867
want_unversioned=want_unversioned)
868
return changes_from_git_changes(
869
changes, self.target.mapping,
870
specific_files=specific_files,
871
include_unchanged=include_unchanged,
872
target_extras=target_extras)
874
def _iter_git_changes(self, want_unchanged=False, specific_files=None,
875
require_versioned=False, extra_trees=None,
876
want_unversioned=False):
877
raise NotImplementedError(self._iter_git_changes)
880
class InterGitRevisionTrees(InterGitTrees):
881
"""InterTree that works between two git revision trees."""
883
_matching_from_tree_format = None
884
_matching_to_tree_format = None
885
_test_mutable_trees_to_test_trees = None
888
def is_compatible(cls, source, target):
889
return (isinstance(source, GitRevisionTree) and
890
isinstance(target, GitRevisionTree))
892
def _iter_git_changes(self, want_unchanged=False, specific_files=None,
893
require_versioned=True, extra_trees=None,
894
want_unversioned=False):
895
trees = [self.source]
896
if extra_trees is not None:
897
trees.extend(extra_trees)
898
if specific_files is not None:
899
specific_files = self.target.find_related_paths_across_trees(
900
specific_files, trees,
901
require_versioned=require_versioned)
903
if (self.source._repository._git.object_store !=
904
self.target._repository._git.object_store):
905
store = OverlayObjectStore(
906
[self.source._repository._git.object_store,
907
self.target._repository._git.object_store])
909
store = self.source._repository._git.object_store
910
return store.tree_changes(
911
self.source.tree, self.target.tree, want_unchanged=want_unchanged,
912
include_trees=True, change_type_same=True), set()
915
_mod_tree.InterTree.register_optimiser(InterGitRevisionTrees)
918
class MutableGitIndexTree(mutabletree.MutableTree):
921
self._lock_mode = None
923
self._versioned_dirs = None
924
self._index_dirty = False
926
def is_versioned(self, path):
927
with self.lock_read():
928
path = path.rstrip('/').encode('utf-8')
929
(index, subpath) = self._lookup_index(path)
930
return (subpath in index or self._has_dir(path))
932
def _has_dir(self, path):
933
if not isinstance(path, bytes):
934
raise TypeError(path)
937
if self._versioned_dirs is None:
939
return path in self._versioned_dirs
941
def _load_dirs(self):
942
if self._lock_mode is None:
943
raise errors.ObjectNotLocked(self)
944
self._versioned_dirs = set()
945
# TODO(jelmer): Browse over all indexes
946
for p, i in self._recurse_index_entries():
947
self._ensure_versioned_dir(posixpath.dirname(p))
949
def _ensure_versioned_dir(self, dirname):
950
if not isinstance(dirname, bytes):
951
raise TypeError(dirname)
952
if dirname in self._versioned_dirs:
955
self._ensure_versioned_dir(posixpath.dirname(dirname))
956
self._versioned_dirs.add(dirname)
958
def path2id(self, path):
959
with self.lock_read():
960
path = path.rstrip('/')
961
if self.is_versioned(path.rstrip('/')):
962
return self._fileid_map.lookup_file_id(
963
osutils.safe_unicode(path))
966
def has_id(self, file_id):
968
self.id2path(file_id)
969
except errors.NoSuchId:
974
def id2path(self, file_id):
977
if type(file_id) is not bytes:
978
raise TypeError(file_id)
979
with self.lock_read():
981
path = self._fileid_map.lookup_path(file_id)
983
raise errors.NoSuchId(self, file_id)
984
if self.is_versioned(path):
986
raise errors.NoSuchId(self, file_id)
988
def _set_root_id(self, file_id):
989
self._fileid_map.set_file_id("", file_id)
991
def get_root_id(self):
992
return self.path2id(u"")
994
def _add(self, files, ids, kinds):
995
for (path, file_id, kind) in zip(files, ids, kinds):
996
if file_id is not None:
997
raise workingtree.SettingFileIdUnsupported()
998
path, can_access = osutils.normalized_filename(path)
1000
raise errors.InvalidNormalization(path)
1001
self._index_add_entry(path, kind)
1003
def _read_submodule_head(self, path):
1004
raise NotImplementedError(self._read_submodule_head)
1006
def _lookup_index(self, encoded_path):
1007
if not isinstance(encoded_path, bytes):
1008
raise TypeError(encoded_path)
1009
# TODO(jelmer): Look in other indexes
1010
return self.index, encoded_path
1012
def _index_del_entry(self, index, path):
1014
# TODO(jelmer): Keep track of dirty per index
1015
self._index_dirty = True
1017
def _index_add_entry(self, path, kind, flags=0, reference_revision=None):
1018
if kind == "directory":
1019
# Git indexes don't contain directories
1024
file, stat_val = self.get_file_with_stat(path)
1025
except (errors.NoSuchFile, IOError):
1026
# TODO: Rather than come up with something here, use the old
1029
stat_val = os.stat_result(
1030
(stat.S_IFREG | 0o644, 0, 0, 0, 0, 0, 0, 0, 0, 0))
1032
blob.set_raw_string(file.read())
1033
# Add object to the repository if it didn't exist yet
1034
if blob.id not in self.store:
1035
self.store.add_object(blob)
1037
elif kind == "symlink":
1040
stat_val = self._lstat(path)
1041
except EnvironmentError:
1042
# TODO: Rather than come up with something here, use the
1044
stat_val = os.stat_result(
1045
(stat.S_IFLNK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
1046
blob.set_raw_string(
1047
self.get_symlink_target(path).encode("utf-8"))
1048
# Add object to the repository if it didn't exist yet
1049
if blob.id not in self.store:
1050
self.store.add_object(blob)
1052
elif kind == "tree-reference":
1053
if reference_revision is not None:
1054
hexsha = self.branch.lookup_bzr_revision_id(
1055
reference_revision)[0]
1057
hexsha = self._read_submodule_head(path)
1059
raise errors.NoCommits(path)
1061
stat_val = self._lstat(path)
1062
except EnvironmentError:
1063
stat_val = os.stat_result(
1064
(S_IFGITLINK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
1065
stat_val = os.stat_result((S_IFGITLINK, ) + stat_val[1:])
1067
raise AssertionError("unknown kind '%s'" % kind)
1068
# Add an entry to the index or update the existing entry
1069
ensure_normalized_path(path)
1070
encoded_path = path.encode("utf-8")
1071
if b'\r' in encoded_path or b'\n' in encoded_path:
1072
# TODO(jelmer): Why do we need to do this?
1073
trace.mutter('ignoring path with invalid newline in it: %r', path)
1075
(index, index_path) = self._lookup_index(encoded_path)
1076
index[index_path] = index_entry_from_stat(stat_val, hexsha, flags)
1077
self._index_dirty = True
1078
if self._versioned_dirs is not None:
1079
self._ensure_versioned_dir(index_path)
1081
def _recurse_index_entries(self, index=None, basepath=b""):
1082
# Iterate over all index entries
1083
with self.lock_read():
1086
for path, value in index.items():
1087
yield (posixpath.join(basepath, path), value)
1088
(ctime, mtime, dev, ino, mode, uid, gid, size, sha,
1090
if S_ISGITLINK(mode):
1091
pass # TODO(jelmer): dive into submodule
1093
def iter_entries_by_dir(self, specific_files=None, yield_parents=False):
1095
raise NotImplementedError(self.iter_entries_by_dir)
1096
with self.lock_read():
1097
if specific_files is not None:
1098
specific_files = set(specific_files)
1100
specific_files = None
1101
root_ie = self._get_dir_ie(u"", None)
1103
if specific_files is None or u"" in specific_files:
1104
ret[(u"", u"")] = root_ie
1105
dir_ids = {u"": root_ie.file_id}
1106
for path, value in self._recurse_index_entries():
1107
if self.mapping.is_special_file(path):
1109
path = path.decode("utf-8")
1110
if specific_files is not None and path not in specific_files:
1112
(parent, name) = posixpath.split(path)
1114
file_ie = self._get_file_ie(name, path, value, None)
1115
except errors.NoSuchFile:
1117
if yield_parents or specific_files is None:
1118
for (dir_path, dir_ie) in self._add_missing_parent_ids(
1120
ret[(posixpath.dirname(dir_path), dir_path)] = dir_ie
1121
file_ie.parent_id = self.path2id(parent)
1122
ret[(posixpath.dirname(path), path)] = file_ie
1123
return ((path, ie) for ((_, path), ie) in sorted(viewitems(ret)))
1125
def iter_references(self):
1126
# TODO(jelmer): Implement a more efficient version of this
1127
for path, entry in self.iter_entries_by_dir():
1128
if entry.kind == 'tree-reference':
1129
yield path, self.mapping.generate_file_id(b'')
1131
def _get_dir_ie(self, path, parent_id):
1132
file_id = self.path2id(path)
1133
return GitTreeDirectory(file_id,
1134
posixpath.basename(path).strip("/"), parent_id)
1136
def _get_file_ie(self, name, path, value, parent_id):
1137
if not isinstance(name, text_type):
1138
raise TypeError(name)
1139
if not isinstance(path, text_type):
1140
raise TypeError(path)
1141
if not isinstance(value, tuple) or len(value) != 10:
1142
raise TypeError(value)
1143
(ctime, mtime, dev, ino, mode, uid, gid, size, sha, flags) = value
1144
file_id = self.path2id(path)
1145
if not isinstance(file_id, bytes):
1146
raise TypeError(file_id)
1147
kind = mode_kind(mode)
1148
ie = entry_factory[kind](file_id, name, parent_id)
1149
if kind == 'symlink':
1150
ie.symlink_target = self.get_symlink_target(path)
1151
elif kind == 'tree-reference':
1152
ie.reference_revision = self.get_reference_revision(path)
1155
data = self.get_file_text(path)
1156
except errors.NoSuchFile:
1158
except IOError as e:
1159
if e.errno != errno.ENOENT:
1163
data = self.branch.repository._git.object_store[sha].data
1164
ie.text_sha1 = osutils.sha_string(data)
1165
ie.text_size = len(data)
1166
ie.executable = bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
1169
def _add_missing_parent_ids(self, path, dir_ids):
1172
parent = posixpath.dirname(path).strip("/")
1173
ret = self._add_missing_parent_ids(parent, dir_ids)
1174
parent_id = dir_ids[parent]
1175
ie = self._get_dir_ie(path, parent_id)
1176
dir_ids[path] = ie.file_id
1177
ret.append((path, ie))
1180
def _comparison_data(self, entry, path):
1182
return None, False, None
1183
return entry.kind, entry.executable, None
1185
def _unversion_path(self, path):
1186
if self._lock_mode is None:
1187
raise errors.ObjectNotLocked(self)
1188
encoded_path = path.encode("utf-8")
1190
(index, subpath) = self._lookup_index(encoded_path)
1192
self._index_del_entry(index, encoded_path)
1194
# A directory, perhaps?
1195
# TODO(jelmer): Deletes that involve submodules?
1196
for p in list(index):
1197
if p.startswith(subpath + b"/"):
1199
self._index_del_entry(index, p)
1202
self._versioned_dirs = None
1205
def unversion(self, paths):
1206
with self.lock_tree_write():
1208
if self._unversion_path(path) == 0:
1209
raise errors.NoSuchFile(path)
1210
self._versioned_dirs = None
1216
def update_basis_by_delta(self, revid, delta):
1217
# TODO(jelmer): This shouldn't be called, it's inventory specific.
1218
for (old_path, new_path, file_id, ie) in delta:
1219
if old_path is not None:
1220
(index, old_subpath) = self._lookup_index(
1221
old_path.encode('utf-8'))
1222
if old_subpath in index:
1223
self._index_del_entry(index, old_subpath)
1224
self._versioned_dirs = None
1225
if new_path is not None and ie.kind != 'directory':
1226
self._index_add_entry(new_path, ie.kind)
1228
self._set_merges_from_parent_ids([])
1230
def move(self, from_paths, to_dir=None, after=None):
1232
with self.lock_tree_write():
1233
to_abs = self.abspath(to_dir)
1234
if not os.path.isdir(to_abs):
1235
raise errors.BzrMoveFailedError('', to_dir,
1236
errors.NotADirectory(to_abs))
1238
for from_rel in from_paths:
1239
from_tail = os.path.split(from_rel)[-1]
1240
to_rel = os.path.join(to_dir, from_tail)
1241
self.rename_one(from_rel, to_rel, after=after)
1242
rename_tuples.append((from_rel, to_rel))
1244
return rename_tuples
1246
def rename_one(self, from_rel, to_rel, after=None):
1247
from_path = from_rel.encode("utf-8")
1248
to_rel, can_access = osutils.normalized_filename(to_rel)
1250
raise errors.InvalidNormalization(to_rel)
1251
to_path = to_rel.encode("utf-8")
1252
with self.lock_tree_write():
1254
# Perhaps it's already moved?
1256
not self.has_filename(from_rel) and
1257
self.has_filename(to_rel) and
1258
not self.is_versioned(to_rel))
1260
if not self.has_filename(to_rel):
1261
raise errors.BzrMoveFailedError(
1262
from_rel, to_rel, errors.NoSuchFile(to_rel))
1263
if self.basis_tree().is_versioned(to_rel):
1264
raise errors.BzrMoveFailedError(
1265
from_rel, to_rel, errors.AlreadyVersionedError(to_rel))
1267
kind = self.kind(to_rel)
1270
to_kind = self.kind(to_rel)
1271
except errors.NoSuchFile:
1272
exc_type = errors.BzrRenameFailedError
1275
exc_type = errors.BzrMoveFailedError
1276
if self.is_versioned(to_rel):
1277
raise exc_type(from_rel, to_rel,
1278
errors.AlreadyVersionedError(to_rel))
1279
if not self.has_filename(from_rel):
1280
raise errors.BzrMoveFailedError(
1281
from_rel, to_rel, errors.NoSuchFile(from_rel))
1282
kind = self.kind(from_rel)
1283
if not self.is_versioned(from_rel) and kind != 'directory':
1284
raise exc_type(from_rel, to_rel,
1285
errors.NotVersionedError(from_rel))
1286
if self.has_filename(to_rel):
1287
raise errors.RenameFailedFilesExist(
1288
from_rel, to_rel, errors.FileExists(to_rel))
1290
kind = self.kind(from_rel)
1292
if not after and kind != 'directory':
1293
(index, from_subpath) = self._lookup_index(from_path)
1294
if from_subpath not in index:
1296
raise errors.BzrMoveFailedError(
1298
errors.NotVersionedError(path=from_rel))
1302
self._rename_one(from_rel, to_rel)
1303
except OSError as e:
1304
if e.errno == errno.ENOENT:
1305
raise errors.BzrMoveFailedError(
1306
from_rel, to_rel, errors.NoSuchFile(to_rel))
1308
if kind != 'directory':
1309
(index, from_index_path) = self._lookup_index(from_path)
1311
self._index_del_entry(index, from_path)
1314
self._index_add_entry(to_rel, kind)
1316
todo = [(p, i) for (p, i) in self._recurse_index_entries()
1317
if p.startswith(from_path + b'/')]
1318
for child_path, child_value in todo:
1319
(child_to_index, child_to_index_path) = self._lookup_index(
1320
posixpath.join(to_path, posixpath.relpath(child_path, from_path)))
1321
child_to_index[child_to_index_path] = child_value
1322
# TODO(jelmer): Mark individual index as dirty
1323
self._index_dirty = True
1324
(child_from_index, child_from_index_path) = self._lookup_index(
1326
self._index_del_entry(
1327
child_from_index, child_from_index_path)
1329
self._versioned_dirs = None
1332
def find_related_paths_across_trees(self, paths, trees=[],
1333
require_versioned=True):
1337
if require_versioned:
1338
trees = [self] + (trees if trees is not None else [])
1342
if t.is_versioned(p):
1347
raise errors.PathsNotVersionedError(unversioned)
1349
return filter(self.is_versioned, paths)
1351
def path_content_summary(self, path):
1352
"""See Tree.path_content_summary."""
1354
stat_result = self._lstat(path)
1355
except OSError as e:
1356
if getattr(e, 'errno', None) == errno.ENOENT:
1358
return ('missing', None, None, None)
1359
# propagate other errors
1361
kind = mode_kind(stat_result.st_mode)
1363
return self._file_content_summary(path, stat_result)
1364
elif kind == 'directory':
1365
# perhaps it looks like a plain directory, but it's really a
1367
if self._directory_is_tree_reference(path):
1368
kind = 'tree-reference'
1369
return kind, None, None, None
1370
elif kind == 'symlink':
1371
target = osutils.readlink(self.abspath(path))
1372
return ('symlink', None, None, target)
1374
return (kind, None, None, None)
1376
def kind(self, relpath):
1377
kind = osutils.file_kind(self.abspath(relpath))
1378
if kind == 'directory':
1379
(index, index_path) = self._lookup_index(relpath.encode('utf-8'))
1383
mode = index[index_path].mode
1387
if S_ISGITLINK(mode):
1388
return 'tree-reference'
1393
def _live_entry(self, relpath):
1394
raise NotImplementedError(self._live_entry)
1397
class InterIndexGitTree(InterGitTrees):
1398
"""InterTree that works between a Git revision tree and an index."""
1400
def __init__(self, source, target):
1401
super(InterIndexGitTree, self).__init__(source, target)
1402
self._index = target.index
1405
def is_compatible(cls, source, target):
1406
return (isinstance(source, GitRevisionTree) and
1407
isinstance(target, MutableGitIndexTree))
1409
def _iter_git_changes(self, want_unchanged=False, specific_files=None,
1410
require_versioned=False, extra_trees=None,
1411
want_unversioned=False):
1412
trees = [self.source]
1413
if extra_trees is not None:
1414
trees.extend(extra_trees)
1415
if specific_files is not None:
1416
specific_files = self.target.find_related_paths_across_trees(
1417
specific_files, trees,
1418
require_versioned=require_versioned)
1419
# TODO(jelmer): Restrict to specific_files, for performance reasons.
1420
with self.lock_read():
1421
return changes_between_git_tree_and_working_copy(
1422
self.source.store, self.source.tree,
1423
self.target, want_unchanged=want_unchanged,
1424
want_unversioned=want_unversioned)
1427
_mod_tree.InterTree.register_optimiser(InterIndexGitTree)
1430
def changes_between_git_tree_and_working_copy(store, from_tree_sha, target,
1431
want_unchanged=False,
1432
want_unversioned=False):
1433
"""Determine the changes between a git tree and a working tree with index.
1438
# Report dirified directories to commit_tree first, so that they can be
1439
# replaced with non-empty directories if they have contents.
1441
for path, index_entry in target._recurse_index_entries():
1443
live_entry = target._live_entry(path)
1444
except EnvironmentError as e:
1445
if e.errno == errno.ENOENT:
1446
# Entry was removed; keep it listed, but mark it as gone.
1447
blobs[path] = (ZERO_SHA, 0)
1448
elif e.errno == errno.EISDIR:
1449
# TODO(jelmer): Only do this if 'path' appears in .gitmodules?
1450
if S_ISGITLINK(index_entry.mode):
1451
blobs[path] = (index_entry.sha, index_entry.mode)
1453
# Entry was turned into a directory
1454
dirified.append((path, Tree().id, stat.S_IFDIR))
1455
store.add_object(Tree())
1459
blobs[path] = (live_entry.sha, cleanup_mode(live_entry.mode))
1460
if want_unversioned:
1461
for e in target.extras():
1462
st = target._lstat(e)
1464
np, accessible = osutils.normalized_filename(e)
1465
except UnicodeDecodeError:
1466
raise errors.BadFilenameEncoding(
1468
if stat.S_ISDIR(st.st_mode):
1471
blob = blob_from_path_and_stat(
1472
target.abspath(e).encode(osutils._fs_enc), st)
1473
store.add_object(blob)
1474
np = np.encode('utf-8')
1475
blobs[np] = (blob.id, cleanup_mode(st.st_mode))
1477
to_tree_sha = commit_tree(
1478
store, dirified + [(p, s, m) for (p, (s, m)) in blobs.items()])
1479
return store.tree_changes(
1480
from_tree_sha, to_tree_sha, include_trees=True,
1481
want_unchanged=want_unchanged, change_type_same=True), extras
added
removed
breezy/git/tree.py
