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, text_sha1=%r, executable=%r)" % (
139
type(self).__name__, self.file_id, self.name, self.parent_id,
140
self.text_size, self.text_sha1, self.executable)
143
ret = self.__class__(
144
self.file_id, self.name, self.parent_id)
145
ret.text_sha1 = self.text_sha1
146
ret.text_size = self.text_size
147
ret.executable = self.executable
151
class GitTreeSymlink(_mod_tree.TreeLink):
153
__slots__ = ['file_id', 'name', 'parent_id', 'symlink_target']
155
def __init__(self, file_id, name, parent_id,
156
symlink_target=None):
157
self.file_id = file_id
159
self.parent_id = parent_id
160
self.symlink_target = symlink_target
167
def executable(self):
175
return "%s(file_id=%r, name=%r, parent_id=%r, symlink_target=%r)" % (
176
type(self).__name__, self.file_id, self.name, self.parent_id,
179
def __eq__(self, other):
180
return (self.kind == other.kind and
181
self.file_id == other.file_id and
182
self.name == other.name and
183
self.parent_id == other.parent_id and
184
self.symlink_target == other.symlink_target)
187
return self.__class__(
188
self.file_id, self.name, self.parent_id,
192
class GitTreeSubmodule(_mod_tree.TreeLink):
194
__slots__ = ['file_id', 'name', 'parent_id', 'reference_revision']
196
def __init__(self, file_id, name, parent_id, reference_revision=None):
197
self.file_id = file_id
199
self.parent_id = parent_id
200
self.reference_revision = reference_revision
204
return 'tree-reference'
207
return "%s(file_id=%r, name=%r, parent_id=%r, reference_revision=%r)" % (
208
type(self).__name__, self.file_id, self.name, self.parent_id,
209
self.reference_revision)
211
def __eq__(self, other):
212
return (self.kind == other.kind and
213
self.file_id == other.file_id and
214
self.name == other.name and
215
self.parent_id == other.parent_id and
216
self.reference_revision == other.reference_revision)
219
return self.__class__(
220
self.file_id, self.name, self.parent_id,
221
self.reference_revision)
225
'directory': GitTreeDirectory,
227
'symlink': GitTreeSymlink,
228
'tree-reference': GitTreeSubmodule,
232
def ensure_normalized_path(path):
233
"""Check whether path is normalized.
235
:raises InvalidNormalization: When path is not normalized, and cannot be
236
accessed on this platform by the normalized path.
237
:return: The NFC normalised version of path.
239
norm_path, can_access = osutils.normalized_filename(path)
240
if norm_path != path:
244
raise errors.InvalidNormalization(path)
248
class GitRevisionTree(revisiontree.RevisionTree):
249
"""Revision tree implementation based on Git objects."""
251
def __init__(self, repository, revision_id):
252
self._revision_id = revision_id
253
self._repository = repository
254
self.store = repository._git.object_store
255
if not isinstance(revision_id, bytes):
256
raise TypeError(revision_id)
257
self.commit_id, self.mapping = repository.lookup_bzr_revision_id(revision_id)
258
if revision_id == NULL_REVISION:
260
self.mapping = default_mapping
261
self._fileid_map = GitFileIdMap(
266
commit = self.store[self.commit_id]
268
raise errors.NoSuchRevision(repository, revision_id)
269
self.tree = commit.tree
270
self._fileid_map = self.mapping.get_fileid_map(self.store.__getitem__, self.tree)
272
def _get_nested_repository(self, path):
273
nested_repo_transport = self._repository.user_transport.clone(path)
274
nested_controldir = _mod_controldir.ControlDir.open_from_transport(nested_repo_transport)
275
return nested_controldir.find_repository()
277
def supports_rename_tracking(self):
280
def get_file_revision(self, path):
281
change_scanner = self._repository._file_change_scanner
282
if self.commit_id == ZERO_SHA:
284
(unused_path, commit_id) = change_scanner.find_last_change_revision(
285
path.encode('utf-8'), self.commit_id)
286
return self._repository.lookup_foreign_revision_id(commit_id, self.mapping)
288
def get_file_mtime(self, path):
290
revid = self.get_file_revision(path)
292
raise errors.NoSuchFile(path)
294
rev = self._repository.get_revision(revid)
295
except errors.NoSuchRevision:
296
raise _mod_tree.FileTimestampUnavailable(path)
299
def id2path(self, file_id):
301
path = self._fileid_map.lookup_path(file_id)
303
raise errors.NoSuchId(self, file_id)
304
if self.is_versioned(path):
306
raise errors.NoSuchId(self, file_id)
308
def is_versioned(self, path):
309
return self.has_filename(path)
311
def path2id(self, path):
312
if self.mapping.is_special_file(path):
314
if not self.is_versioned(path):
316
return self._fileid_map.lookup_file_id(osutils.safe_unicode(path))
318
def all_file_ids(self):
319
return {self.path2id(path) for path in self.all_versioned_paths()}
321
def all_versioned_paths(self):
323
todo = [(self.store, b'', self.tree)]
325
(store, path, tree_id) = todo.pop()
328
tree = store[tree_id]
329
for name, mode, hexsha in tree.items():
330
subpath = posixpath.join(path, name)
331
ret.add(subpath.decode('utf-8'))
332
if stat.S_ISDIR(mode):
333
todo.append((store, subpath, hexsha))
336
def get_root_id(self):
337
if self.tree is None:
339
return self.path2id("")
341
def has_or_had_id(self, file_id):
343
path = self.id2path(file_id)
344
except errors.NoSuchId:
348
def has_id(self, file_id):
350
path = self.id2path(file_id)
351
except errors.NoSuchId:
353
return self.has_filename(path)
355
def _lookup_path(self, path):
356
if self.tree is None:
357
raise errors.NoSuchFile(path)
359
(mode, hexsha) = tree_lookup_path(self.store.__getitem__, self.tree,
360
path.encode('utf-8'))
362
raise errors.NoSuchFile(self, path)
364
return (self.store, mode, hexsha)
366
def is_executable(self, path):
367
(store, mode, hexsha) = self._lookup_path(path)
369
# the tree root is a directory
371
return mode_is_executable(mode)
373
def kind(self, path):
374
(store, mode, hexsha) = self._lookup_path(path)
376
# the tree root is a directory
378
return mode_kind(mode)
380
def has_filename(self, path):
382
self._lookup_path(path)
383
except errors.NoSuchFile:
388
def list_files(self, include_root=False, from_dir=None, recursive=True):
389
if self.tree is None:
393
(store, mode, hexsha) = self._lookup_path(from_dir)
394
if mode is None: # Root
395
root_ie = self._get_dir_ie(b"", None)
397
parent_path = posixpath.dirname(from_dir)
398
parent_id = self._fileid_map.lookup_file_id(parent_path)
399
if mode_kind(mode) == 'directory':
400
root_ie = self._get_dir_ie(from_dir.encode("utf-8"), parent_id)
402
root_ie = self._get_file_ie(store, from_dir.encode("utf-8"),
403
posixpath.basename(from_dir), mode, hexsha)
405
yield (from_dir, "V", root_ie.kind, root_ie.file_id, root_ie)
407
if root_ie.kind == 'directory':
408
todo.append((store, from_dir.encode("utf-8"), b"", hexsha, root_ie.file_id))
410
(store, path, relpath, hexsha, parent_id) = todo.pop()
412
for name, mode, hexsha in tree.iteritems():
413
if self.mapping.is_special_file(name):
415
child_path = posixpath.join(path, name)
416
child_relpath = posixpath.join(relpath, name)
417
if stat.S_ISDIR(mode):
418
ie = self._get_dir_ie(child_path, parent_id)
420
todo.append((store, child_path, child_relpath, hexsha, ie.file_id))
422
ie = self._get_file_ie(store, child_path, name, mode, hexsha, parent_id)
423
yield child_relpath.decode('utf-8'), "V", ie.kind, ie.file_id, ie
425
def _get_file_ie(self, store, path, name, mode, hexsha, parent_id):
426
if not isinstance(path, bytes):
427
raise TypeError(path)
428
if not isinstance(name, bytes):
429
raise TypeError(name)
430
kind = mode_kind(mode)
431
path = path.decode('utf-8')
432
name = name.decode("utf-8")
433
file_id = self._fileid_map.lookup_file_id(path)
434
ie = entry_factory[kind](file_id, name, parent_id)
435
if kind == 'symlink':
436
ie.symlink_target = store[hexsha].data.decode('utf-8')
437
elif kind == 'tree-reference':
438
ie.reference_revision = self.mapping.revision_id_foreign_to_bzr(hexsha)
440
data = store[hexsha].data
441
ie.text_sha1 = osutils.sha_string(data)
442
ie.text_size = len(data)
443
ie.executable = mode_is_executable(mode)
446
def _get_dir_ie(self, path, parent_id):
447
path = path.decode('utf-8')
448
file_id = self._fileid_map.lookup_file_id(path)
449
return GitTreeDirectory(file_id, posixpath.basename(path), parent_id)
451
def iter_child_entries(self, path, file_id=None):
452
(store, mode, tree_sha) = self._lookup_path(path)
454
if mode is not None and not stat.S_ISDIR(mode):
457
encoded_path = path.encode('utf-8')
458
file_id = self.path2id(path)
459
tree = store[tree_sha]
460
for name, mode, hexsha in tree.iteritems():
461
if self.mapping.is_special_file(name):
463
child_path = posixpath.join(encoded_path, name)
464
if stat.S_ISDIR(mode):
465
yield self._get_dir_ie(child_path, file_id)
467
yield self._get_file_ie(store, child_path, name, mode, hexsha,
470
def iter_entries_by_dir(self, specific_files=None, yield_parents=False):
471
if self.tree is None:
474
# TODO(jelmer): Support yield parents
475
raise NotImplementedError
476
if specific_files is not None:
477
if specific_files in ([""], []):
478
specific_files = None
480
specific_files = set([p.encode('utf-8') for p in specific_files])
481
todo = deque([(self.store, b"", self.tree, self.get_root_id())])
482
if specific_files is None or u"" in specific_files:
483
yield u"", self._get_dir_ie(b"", None)
485
store, path, tree_sha, parent_id = todo.popleft()
486
tree = store[tree_sha]
488
for name, mode, hexsha in tree.iteritems():
489
if self.mapping.is_special_file(name):
491
child_path = posixpath.join(path, name)
492
child_path_decoded = child_path.decode('utf-8')
493
if stat.S_ISDIR(mode):
494
if (specific_files is None or
495
any(filter(lambda p: p.startswith(child_path), specific_files))):
497
(store, child_path, hexsha, self.path2id(child_path_decoded)))
498
if specific_files is None or child_path in specific_files:
499
if stat.S_ISDIR(mode):
500
yield (child_path_decoded,
501
self._get_dir_ie(child_path, parent_id))
503
yield (child_path_decoded,
504
self._get_file_ie(store, child_path, name, mode,
506
todo.extendleft(reversed(extradirs))
508
def iter_references(self):
509
if self.supports_tree_reference():
510
for path, entry in self.iter_entries_by_dir():
511
if entry.kind == 'tree-reference':
512
yield path, self.mapping.generate_file_id(b'')
514
def get_revision_id(self):
515
"""See RevisionTree.get_revision_id."""
516
return self._revision_id
518
def get_file_sha1(self, path, stat_value=None):
519
if self.tree is None:
520
raise errors.NoSuchFile(path)
521
return osutils.sha_string(self.get_file_text(path))
523
def get_file_verifier(self, path, stat_value=None):
524
(store, mode, hexsha) = self._lookup_path(path)
525
return ("GIT", hexsha)
527
def get_file_size(self, path):
528
(store, mode, hexsha) = self._lookup_path(path)
529
if stat.S_ISREG(mode):
530
return len(store[hexsha].data)
533
def get_file_text(self, path):
534
"""See RevisionTree.get_file_text."""
535
(store, mode, hexsha) = self._lookup_path(path)
536
if stat.S_ISREG(mode):
537
return store[hexsha].data
541
def get_symlink_target(self, path):
542
"""See RevisionTree.get_symlink_target."""
543
(store, mode, hexsha) = self._lookup_path(path)
544
if stat.S_ISLNK(mode):
545
return store[hexsha].data.decode('utf-8')
549
def get_reference_revision(self, path):
550
"""See RevisionTree.get_symlink_target."""
551
(store, mode, hexsha) = self._lookup_path(path)
552
if S_ISGITLINK(mode):
553
nested_repo = self._get_nested_repository(path)
554
return nested_repo.lookup_foreign_revision_id(hexsha)
558
def _comparison_data(self, entry, path):
560
return None, False, None
561
return entry.kind, entry.executable, None
563
def path_content_summary(self, path):
564
"""See Tree.path_content_summary."""
566
(store, mode, hexsha) = self._lookup_path(path)
567
except errors.NoSuchFile:
568
return ('missing', None, None, None)
569
kind = mode_kind(mode)
571
executable = mode_is_executable(mode)
572
contents = store[hexsha].data
573
return (kind, len(contents), executable, osutils.sha_string(contents))
574
elif kind == 'symlink':
575
return (kind, None, None, store[hexsha].data.decode('utf-8'))
576
elif kind == 'tree-reference':
577
nested_repo = self._get_nested_repository(path)
578
return (kind, None, None,
579
nested_repo.lookup_foreign_revision_id(hexsha))
581
return (kind, None, None, None)
583
def find_related_paths_across_trees(self, paths, trees=[],
584
require_versioned=True):
587
if require_versioned:
588
trees = [self] + (trees if trees is not None else [])
592
if t.is_versioned(p):
597
raise errors.PathsNotVersionedError(unversioned)
598
return filter(self.is_versioned, paths)
600
def _iter_tree_contents(self, include_trees=False):
601
if self.tree is None:
603
return self.store.iter_tree_contents(
604
self.tree, include_trees=include_trees)
606
def annotate_iter(self, path, default_revision=CURRENT_REVISION):
607
"""Return an iterator of revision_id, line tuples.
609
For working trees (and mutable trees in general), the special
610
revision_id 'current:' will be used for lines that are new in this
611
tree, e.g. uncommitted changes.
612
:param default_revision: For lines that don't match a basis, mark them
613
with this revision id. Not all implementations will make use of
616
with self.lock_read():
617
# Now we have the parents of this content
618
from breezy.annotate import Annotator
619
from .annotate import AnnotateProvider
620
annotator = Annotator(AnnotateProvider(
621
self._repository._file_change_scanner))
622
this_key = (path, self.get_file_revision(path))
623
annotations = [(key[-1], line)
624
for key, line in annotator.annotate_flat(this_key)]
627
def _get_rules_searcher(self, default_searcher):
628
return default_searcher
630
def walkdirs(self, prefix=u""):
631
(store, mode, hexsha) = self._lookup_path(prefix)
632
todo = deque([(store, prefix.encode('utf-8'), hexsha, self.path2id(prefix))])
634
store, path, tree_sha, parent_id = todo.popleft()
635
path_decoded = path.decode('utf-8')
636
tree = store[tree_sha]
638
for name, mode, hexsha in tree.iteritems():
639
if self.mapping.is_special_file(name):
641
child_path = posixpath.join(path, name)
642
file_id = self.path2id(child_path.decode('utf-8'))
643
if stat.S_ISDIR(mode):
644
todo.append((store, child_path, hexsha, file_id))
646
(child_path.decode('utf-8'), name.decode('utf-8'),
647
mode_kind(mode), None,
648
file_id, mode_kind(mode)))
649
yield (path_decoded, parent_id), children
652
def tree_delta_from_git_changes(changes, mapping,
653
fileid_maps, specific_files=None,
654
require_versioned=False, include_root=False,
656
"""Create a TreeDelta from two git trees.
658
source and target are iterators over tuples with:
659
(filename, sha, mode)
661
(old_fileid_map, new_fileid_map) = fileid_maps
662
if target_extras is None:
663
target_extras = set()
664
ret = delta.TreeDelta()
665
for (oldpath, newpath), (oldmode, newmode), (oldsha, newsha) in changes:
666
if newpath == b'' and not include_root:
669
oldpath_encoded = None
671
oldpath_decoded = oldpath.decode('utf-8')
673
newpath_decoded = None
675
newpath_decoded = newpath.decode('utf-8')
676
if not (specific_files is None or
677
(oldpath is not None and osutils.is_inside_or_parent_of_any(specific_files, oldpath_decoded)) or
678
(newpath is not None and osutils.is_inside_or_parent_of_any(specific_files, newpath_decoded))):
680
if mapping.is_special_file(oldpath):
682
if mapping.is_special_file(newpath):
684
if oldpath is None and newpath is None:
687
if newpath in target_extras:
688
ret.unversioned.append(
689
(osutils.normalized_filename(newpath)[0], None, mode_kind(newmode)))
691
file_id = new_fileid_map.lookup_file_id(newpath_decoded)
692
ret.added.append((newpath_decoded, file_id, mode_kind(newmode)))
693
elif newpath is None or newmode == 0:
694
file_id = old_fileid_map.lookup_file_id(oldpath_decoded)
695
ret.removed.append((oldpath_decoded, file_id, mode_kind(oldmode)))
696
elif oldpath != newpath:
697
file_id = old_fileid_map.lookup_file_id(oldpath_decoded)
699
(oldpath_decoded, newpath.decode('utf-8'), file_id,
700
mode_kind(newmode), (oldsha != newsha),
701
(oldmode != newmode)))
702
elif mode_kind(oldmode) != mode_kind(newmode):
703
file_id = new_fileid_map.lookup_file_id(newpath_decoded)
704
ret.kind_changed.append(
705
(newpath_decoded, file_id, mode_kind(oldmode),
707
elif oldsha != newsha or oldmode != newmode:
708
if stat.S_ISDIR(oldmode) and stat.S_ISDIR(newmode):
710
file_id = new_fileid_map.lookup_file_id(newpath_decoded)
712
(newpath_decoded, file_id, mode_kind(newmode),
713
(oldsha != newsha), (oldmode != newmode)))
715
file_id = new_fileid_map.lookup_file_id(newpath_decoded)
716
ret.unchanged.append((newpath_decoded, file_id, mode_kind(newmode)))
721
def changes_from_git_changes(changes, mapping, specific_files=None, include_unchanged=False,
723
"""Create a iter_changes-like generator from a git stream.
725
source and target are iterators over tuples with:
726
(filename, sha, mode)
728
if target_extras is None:
729
target_extras = set()
730
for (oldpath, newpath), (oldmode, newmode), (oldsha, newsha) in changes:
731
if oldpath is not None:
732
oldpath_decoded = oldpath.decode('utf-8')
734
oldpath_decoded = None
735
if newpath is not None:
736
newpath_decoded = newpath.decode('utf-8')
738
newpath_decoded = None
739
if not (specific_files is None or
740
(oldpath_decoded is not None and osutils.is_inside_or_parent_of_any(specific_files, oldpath_decoded)) or
741
(newpath_decoded is not None and osutils.is_inside_or_parent_of_any(specific_files, newpath_decoded))):
743
if oldpath is not None and mapping.is_special_file(oldpath):
745
if newpath is not None and mapping.is_special_file(newpath):
747
if oldpath_decoded is None:
748
fileid = mapping.generate_file_id(newpath_decoded)
757
oldexe = mode_is_executable(oldmode)
758
oldkind = mode_kind(oldmode)
762
if oldpath_decoded == u'':
766
(oldparentpath, oldname) = osutils.split(oldpath_decoded)
767
oldparent = mapping.generate_file_id(oldparentpath)
768
fileid = mapping.generate_file_id(oldpath_decoded)
769
if newpath_decoded is None:
776
newversioned = (newpath_decoded not in target_extras)
778
newexe = mode_is_executable(newmode)
779
newkind = mode_kind(newmode)
783
if newpath_decoded == u'':
787
newparentpath, newname = osutils.split(newpath_decoded)
788
newparent = mapping.generate_file_id(newparentpath)
789
if (not include_unchanged and
790
oldkind == 'directory' and newkind == 'directory' and
791
oldpath_decoded == newpath_decoded):
793
yield (fileid, (oldpath_decoded, newpath_decoded), (oldsha != newsha),
794
(oldversioned, newversioned),
795
(oldparent, newparent), (oldname, newname),
796
(oldkind, newkind), (oldexe, newexe))
799
class InterGitTrees(_mod_tree.InterTree):
800
"""InterTree that works between two git trees."""
802
_matching_from_tree_format = None
803
_matching_to_tree_format = None
804
_test_mutable_trees_to_test_trees = None
807
def is_compatible(cls, source, target):
808
return (isinstance(source, GitRevisionTree) and
809
isinstance(target, GitRevisionTree))
811
def compare(self, want_unchanged=False, specific_files=None,
812
extra_trees=None, require_versioned=False, include_root=False,
813
want_unversioned=False):
814
with self.lock_read():
815
changes, target_extras = self._iter_git_changes(
816
want_unchanged=want_unchanged,
817
require_versioned=require_versioned,
818
specific_files=specific_files,
819
extra_trees=extra_trees,
820
want_unversioned=want_unversioned)
821
source_fileid_map = self.source._fileid_map
822
target_fileid_map = self.target._fileid_map
823
return tree_delta_from_git_changes(changes, self.target.mapping,
824
(source_fileid_map, target_fileid_map),
825
specific_files=specific_files, include_root=include_root,
826
target_extras=target_extras)
828
def iter_changes(self, include_unchanged=False, specific_files=None,
829
pb=None, extra_trees=[], require_versioned=True,
830
want_unversioned=False):
831
with self.lock_read():
832
changes, target_extras = self._iter_git_changes(
833
want_unchanged=include_unchanged,
834
require_versioned=require_versioned,
835
specific_files=specific_files,
836
extra_trees=extra_trees,
837
want_unversioned=want_unversioned)
838
return changes_from_git_changes(
839
changes, self.target.mapping,
840
specific_files=specific_files,
841
include_unchanged=include_unchanged,
842
target_extras=target_extras)
844
def _iter_git_changes(self, want_unchanged=False, specific_files=None,
845
require_versioned=False, extra_trees=None,
846
want_unversioned=False):
847
raise NotImplementedError(self._iter_git_changes)
850
class InterGitRevisionTrees(InterGitTrees):
851
"""InterTree that works between two git revision trees."""
853
_matching_from_tree_format = None
854
_matching_to_tree_format = None
855
_test_mutable_trees_to_test_trees = None
858
def is_compatible(cls, source, target):
859
return (isinstance(source, GitRevisionTree) and
860
isinstance(target, GitRevisionTree))
862
def _iter_git_changes(self, want_unchanged=False, specific_files=None,
863
require_versioned=True, extra_trees=None,
864
want_unversioned=False):
865
trees = [self.source]
866
if extra_trees is not None:
867
trees.extend(extra_trees)
868
if specific_files is not None:
869
specific_files = self.target.find_related_paths_across_trees(
870
specific_files, trees,
871
require_versioned=require_versioned)
873
if self.source._repository._git.object_store != self.target._repository._git.object_store:
874
store = OverlayObjectStore([self.source._repository._git.object_store,
875
self.target._repository._git.object_store])
877
store = self.source._repository._git.object_store
878
return self.source._repository._git.object_store.tree_changes(
879
self.source.tree, self.target.tree, want_unchanged=want_unchanged,
880
include_trees=True, change_type_same=True), set()
883
_mod_tree.InterTree.register_optimiser(InterGitRevisionTrees)
886
class MutableGitIndexTree(mutabletree.MutableTree):
889
self._lock_mode = None
891
self._versioned_dirs = None
892
self._index_dirty = False
894
def is_versioned(self, path):
895
with self.lock_read():
896
path = path.rstrip('/').encode('utf-8')
897
(index, subpath) = self._lookup_index(path)
898
return (subpath in index or self._has_dir(path))
900
def _has_dir(self, path):
901
if not isinstance(path, bytes):
902
raise TypeError(path)
905
if self._versioned_dirs is None:
907
return path in self._versioned_dirs
909
def _load_dirs(self):
910
if self._lock_mode is None:
911
raise errors.ObjectNotLocked(self)
912
self._versioned_dirs = set()
913
# TODO(jelmer): Browse over all indexes
914
for p, i in self._recurse_index_entries():
915
self._ensure_versioned_dir(posixpath.dirname(p))
917
def _ensure_versioned_dir(self, dirname):
918
if not isinstance(dirname, bytes):
919
raise TypeError(dirname)
920
if dirname in self._versioned_dirs:
923
self._ensure_versioned_dir(posixpath.dirname(dirname))
924
self._versioned_dirs.add(dirname)
926
def path2id(self, path):
927
with self.lock_read():
928
path = path.rstrip('/')
929
if self.is_versioned(path.rstrip('/')):
930
return self._fileid_map.lookup_file_id(osutils.safe_unicode(path))
933
def has_id(self, file_id):
935
self.id2path(file_id)
936
except errors.NoSuchId:
941
def id2path(self, file_id):
944
if type(file_id) is not bytes:
945
raise TypeError(file_id)
946
with self.lock_read():
948
path = self._fileid_map.lookup_path(file_id)
950
raise errors.NoSuchId(self, file_id)
951
if self.is_versioned(path):
953
raise errors.NoSuchId(self, file_id)
955
def _set_root_id(self, file_id):
956
self._fileid_map.set_file_id("", file_id)
958
def get_root_id(self):
959
return self.path2id(u"")
961
def _add(self, files, ids, kinds):
962
for (path, file_id, kind) in zip(files, ids, kinds):
963
if file_id is not None:
964
raise workingtree.SettingFileIdUnsupported()
965
path, can_access = osutils.normalized_filename(path)
967
raise errors.InvalidNormalization(path)
968
self._index_add_entry(path, kind)
970
def _read_submodule_head(self, path):
971
raise NotImplementedError(self._read_submodule_head)
973
def _lookup_index(self, encoded_path):
974
if not isinstance(encoded_path, bytes):
975
raise TypeError(encoded_path)
976
# TODO(jelmer): Look in other indexes
977
return self.index, encoded_path
979
def _index_del_entry(self, index, path):
981
# TODO(jelmer): Keep track of dirty per index
982
self._index_dirty = True
984
def _index_add_entry(self, path, kind, flags=0, reference_revision=None):
985
if kind == "directory":
986
# Git indexes don't contain directories
991
file, stat_val = self.get_file_with_stat(path)
992
except (errors.NoSuchFile, IOError):
993
# TODO: Rather than come up with something here, use the old index
995
stat_val = os.stat_result(
996
(stat.S_IFREG | 0o644, 0, 0, 0, 0, 0, 0, 0, 0, 0))
998
blob.set_raw_string(file.read())
999
# Add object to the repository if it didn't exist yet
1000
if not blob.id in self.store:
1001
self.store.add_object(blob)
1003
elif kind == "symlink":
1006
stat_val = self._lstat(path)
1007
except EnvironmentError:
1008
# TODO: Rather than come up with something here, use the
1010
stat_val = os.stat_result(
1011
(stat.S_IFLNK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
1012
blob.set_raw_string(
1013
self.get_symlink_target(path).encode("utf-8"))
1014
# Add object to the repository if it didn't exist yet
1015
if not blob.id in self.store:
1016
self.store.add_object(blob)
1018
elif kind == "tree-reference":
1019
if reference_revision is not None:
1020
hexsha = self.branch.lookup_bzr_revision_id(reference_revision)[0]
1022
hexsha = self._read_submodule_head(path)
1024
raise errors.NoCommits(path)
1026
stat_val = self._lstat(path)
1027
except EnvironmentError:
1028
stat_val = os.stat_result(
1029
(S_IFGITLINK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
1030
stat_val = os.stat_result((S_IFGITLINK, ) + stat_val[1:])
1032
raise AssertionError("unknown kind '%s'" % kind)
1033
# Add an entry to the index or update the existing entry
1034
ensure_normalized_path(path)
1035
encoded_path = path.encode("utf-8")
1036
if b'\r' in encoded_path or b'\n' in encoded_path:
1037
# TODO(jelmer): Why do we need to do this?
1038
trace.mutter('ignoring path with invalid newline in it: %r', path)
1040
(index, index_path) = self._lookup_index(encoded_path)
1041
index[index_path] = index_entry_from_stat(stat_val, hexsha, flags)
1042
self._index_dirty = True
1043
if self._versioned_dirs is not None:
1044
self._ensure_versioned_dir(index_path)
1046
def _recurse_index_entries(self, index=None, basepath=b""):
1047
# Iterate over all index entries
1048
with self.lock_read():
1051
for path, value in index.items():
1052
yield (posixpath.join(basepath, path), value)
1053
(ctime, mtime, dev, ino, mode, uid, gid, size, sha, flags) = value
1054
if S_ISGITLINK(mode):
1055
pass # TODO(jelmer): dive into submodule
1058
def iter_entries_by_dir(self, specific_files=None, yield_parents=False):
1060
raise NotImplementedError(self.iter_entries_by_dir)
1061
with self.lock_read():
1062
if specific_files is not None:
1063
specific_files = set(specific_files)
1065
specific_files = None
1066
root_ie = self._get_dir_ie(u"", None)
1068
if specific_files is None or u"" in specific_files:
1069
ret[(u"", u"")] = root_ie
1070
dir_ids = {u"": root_ie.file_id}
1071
for path, value in self._recurse_index_entries():
1072
if self.mapping.is_special_file(path):
1074
path = path.decode("utf-8")
1075
if specific_files is not None and not path in specific_files:
1077
(parent, name) = posixpath.split(path)
1079
file_ie = self._get_file_ie(name, path, value, None)
1080
except errors.NoSuchFile:
1082
if yield_parents or specific_files is None:
1083
for (dir_path, dir_ie) in self._add_missing_parent_ids(parent,
1085
ret[(posixpath.dirname(dir_path), dir_path)] = dir_ie
1086
file_ie.parent_id = self.path2id(parent)
1087
ret[(posixpath.dirname(path), path)] = file_ie
1088
return ((path, ie) for ((_, path), ie) in sorted(viewitems(ret)))
1090
def iter_references(self):
1091
# TODO(jelmer): Implement a more efficient version of this
1092
for path, entry in self.iter_entries_by_dir():
1093
if entry.kind == 'tree-reference':
1094
yield path, self.mapping.generate_file_id(b'')
1096
def _get_dir_ie(self, path, parent_id):
1097
file_id = self.path2id(path)
1098
return GitTreeDirectory(file_id,
1099
posixpath.basename(path).strip("/"), parent_id)
1101
def _get_file_ie(self, name, path, value, parent_id):
1102
if not isinstance(name, text_type):
1103
raise TypeError(name)
1104
if not isinstance(path, text_type):
1105
raise TypeError(path)
1106
if not isinstance(value, tuple) or len(value) != 10:
1107
raise TypeError(value)
1108
(ctime, mtime, dev, ino, mode, uid, gid, size, sha, flags) = value
1109
file_id = self.path2id(path)
1110
if not isinstance(file_id, bytes):
1111
raise TypeError(file_id)
1112
kind = mode_kind(mode)
1113
ie = entry_factory[kind](file_id, name, parent_id)
1114
if kind == 'symlink':
1115
ie.symlink_target = self.get_symlink_target(path)
1116
elif kind == 'tree-reference':
1117
ie.reference_revision = self.get_reference_revision(path)
1120
data = self.get_file_text(path)
1121
except errors.NoSuchFile:
1123
except IOError as e:
1124
if e.errno != errno.ENOENT:
1128
data = self.branch.repository._git.object_store[sha].data
1129
ie.text_sha1 = osutils.sha_string(data)
1130
ie.text_size = len(data)
1131
ie.executable = bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
1134
def _add_missing_parent_ids(self, path, dir_ids):
1137
parent = posixpath.dirname(path).strip("/")
1138
ret = self._add_missing_parent_ids(parent, dir_ids)
1139
parent_id = dir_ids[parent]
1140
ie = self._get_dir_ie(path, parent_id)
1141
dir_ids[path] = ie.file_id
1142
ret.append((path, ie))
1145
def _comparison_data(self, entry, path):
1147
return None, False, None
1148
return entry.kind, entry.executable, None
1150
def _unversion_path(self, path):
1151
if self._lock_mode is None:
1152
raise errors.ObjectNotLocked(self)
1153
encoded_path = path.encode("utf-8")
1155
(index, subpath) = self._lookup_index(encoded_path)
1157
self._index_del_entry(index, encoded_path)
1159
# A directory, perhaps?
1160
# TODO(jelmer): Deletes that involve submodules?
1161
for p in list(index):
1162
if p.startswith(subpath+b"/"):
1164
self._index_del_entry(index, p)
1167
self._versioned_dirs = None
1170
def unversion(self, paths):
1171
with self.lock_tree_write():
1173
if self._unversion_path(path) == 0:
1174
raise errors.NoSuchFile(path)
1175
self._versioned_dirs = None
1181
def update_basis_by_delta(self, revid, delta):
1182
# TODO(jelmer): This shouldn't be called, it's inventory specific.
1183
for (old_path, new_path, file_id, ie) in delta:
1184
if old_path is not None:
1185
(index, old_subpath) = self._lookup_index(old_path.encode('utf-8'))
1186
if old_subpath in index:
1187
self._index_del_entry(index, old_subpath)
1188
self._versioned_dirs = None
1189
if new_path is not None and ie.kind != 'directory':
1190
self._index_add_entry(new_path, ie.kind)
1192
self._set_merges_from_parent_ids([])
1194
def move(self, from_paths, to_dir=None, after=None):
1196
with self.lock_tree_write():
1197
to_abs = self.abspath(to_dir)
1198
if not os.path.isdir(to_abs):
1199
raise errors.BzrMoveFailedError('', to_dir,
1200
errors.NotADirectory(to_abs))
1202
for from_rel in from_paths:
1203
from_tail = os.path.split(from_rel)[-1]
1204
to_rel = os.path.join(to_dir, from_tail)
1205
self.rename_one(from_rel, to_rel, after=after)
1206
rename_tuples.append((from_rel, to_rel))
1208
return rename_tuples
1210
def rename_one(self, from_rel, to_rel, after=None):
1211
from_path = from_rel.encode("utf-8")
1212
to_rel, can_access = osutils.normalized_filename(to_rel)
1214
raise errors.InvalidNormalization(to_rel)
1215
to_path = to_rel.encode("utf-8")
1216
with self.lock_tree_write():
1218
# Perhaps it's already moved?
1220
not self.has_filename(from_rel) and
1221
self.has_filename(to_rel) and
1222
not self.is_versioned(to_rel))
1224
if not self.has_filename(to_rel):
1225
raise errors.BzrMoveFailedError(from_rel, to_rel,
1226
errors.NoSuchFile(to_rel))
1227
if self.basis_tree().is_versioned(to_rel):
1228
raise errors.BzrMoveFailedError(from_rel, to_rel,
1229
errors.AlreadyVersionedError(to_rel))
1231
kind = self.kind(to_rel)
1234
to_kind = self.kind(to_rel)
1235
except errors.NoSuchFile:
1236
exc_type = errors.BzrRenameFailedError
1239
exc_type = errors.BzrMoveFailedError
1240
if self.is_versioned(to_rel):
1241
raise exc_type(from_rel, to_rel,
1242
errors.AlreadyVersionedError(to_rel))
1243
if not self.has_filename(from_rel):
1244
raise errors.BzrMoveFailedError(from_rel, to_rel,
1245
errors.NoSuchFile(from_rel))
1246
kind = self.kind(from_rel)
1247
if not self.is_versioned(from_rel) and kind != 'directory':
1248
raise exc_type(from_rel, to_rel,
1249
errors.NotVersionedError(from_rel))
1250
if self.has_filename(to_rel):
1251
raise errors.RenameFailedFilesExist(
1252
from_rel, to_rel, errors.FileExists(to_rel))
1254
kind = self.kind(from_rel)
1256
if not after and kind != 'directory':
1257
(index, from_subpath) = self._lookup_index(from_path)
1258
if from_subpath not in index:
1260
raise errors.BzrMoveFailedError(from_rel, to_rel,
1261
errors.NotVersionedError(path=from_rel))
1265
self._rename_one(from_rel, to_rel)
1266
except OSError as e:
1267
if e.errno == errno.ENOENT:
1268
raise errors.BzrMoveFailedError(from_rel, to_rel,
1269
errors.NoSuchFile(to_rel))
1271
if kind != 'directory':
1272
(index, from_index_path) = self._lookup_index(from_path)
1274
self._index_del_entry(index, from_path)
1277
self._index_add_entry(to_rel, kind)
1279
todo = [(p, i) for (p, i) in self._recurse_index_entries() if p.startswith(from_path+b'/')]
1280
for child_path, child_value in todo:
1281
(child_to_index, child_to_index_path) = self._lookup_index(
1282
posixpath.join(to_path, posixpath.relpath(child_path, from_path)))
1283
child_to_index[child_to_index_path] = child_value
1284
# TODO(jelmer): Mark individual index as dirty
1285
self._index_dirty = True
1286
(child_from_index, child_from_index_path) = self._lookup_index(child_path)
1287
self._index_del_entry(child_from_index, child_from_index_path)
1289
self._versioned_dirs = None
1292
def find_related_paths_across_trees(self, paths, trees=[],
1293
require_versioned=True):
1297
if require_versioned:
1298
trees = [self] + (trees if trees is not None else [])
1302
if t.is_versioned(p):
1307
raise errors.PathsNotVersionedError(unversioned)
1309
return filter(self.is_versioned, paths)
1311
def path_content_summary(self, path):
1312
"""See Tree.path_content_summary."""
1314
stat_result = self._lstat(path)
1315
except OSError as e:
1316
if getattr(e, 'errno', None) == errno.ENOENT:
1318
return ('missing', None, None, None)
1319
# propagate other errors
1321
kind = mode_kind(stat_result.st_mode)
1323
return self._file_content_summary(path, stat_result)
1324
elif kind == 'directory':
1325
# perhaps it looks like a plain directory, but it's really a
1327
if self._directory_is_tree_reference(path):
1328
kind = 'tree-reference'
1329
return kind, None, None, None
1330
elif kind == 'symlink':
1331
target = osutils.readlink(self.abspath(path))
1332
return ('symlink', None, None, target)
1334
return (kind, None, None, None)
1336
def kind(self, relpath):
1337
kind = osutils.file_kind(self.abspath(relpath))
1338
if kind == 'directory':
1339
(index, index_path) = self._lookup_index(relpath.encode('utf-8'))
1343
mode = index[index_path].mode
1347
if S_ISGITLINK(mode):
1348
return 'tree-reference'
1353
def _live_entry(self, relpath):
1354
raise NotImplementedError(self._live_entry)
1357
class InterIndexGitTree(InterGitTrees):
1358
"""InterTree that works between a Git revision tree and an index."""
1360
def __init__(self, source, target):
1361
super(InterIndexGitTree, self).__init__(source, target)
1362
self._index = target.index
1365
def is_compatible(cls, source, target):
1366
return (isinstance(source, GitRevisionTree) and
1367
isinstance(target, MutableGitIndexTree))
1369
def _iter_git_changes(self, want_unchanged=False, specific_files=None,
1370
require_versioned=False, extra_trees=None,
1371
want_unversioned=False):
1372
trees = [self.source]
1373
if extra_trees is not None:
1374
trees.extend(extra_trees)
1375
if specific_files is not None:
1376
specific_files = self.target.find_related_paths_across_trees(
1377
specific_files, trees,
1378
require_versioned=require_versioned)
1379
# TODO(jelmer): Restrict to specific_files, for performance reasons.
1380
with self.lock_read():
1381
return changes_between_git_tree_and_working_copy(
1382
self.source.store, self.source.tree,
1383
self.target, want_unchanged=want_unchanged,
1384
want_unversioned=want_unversioned)
1387
_mod_tree.InterTree.register_optimiser(InterIndexGitTree)
1390
def changes_between_git_tree_and_working_copy(store, from_tree_sha, target,
1391
want_unchanged=False, want_unversioned=False):
1392
"""Determine the changes between a git tree and a working tree with index.
1397
# Report dirified directories to commit_tree first, so that they can be
1398
# replaced with non-empty directories if they have contents.
1400
for path, index_entry in target._recurse_index_entries():
1402
live_entry = target._live_entry(path)
1403
except EnvironmentError as e:
1404
if e.errno == errno.ENOENT:
1405
# Entry was removed; keep it listed, but mark it as gone.
1406
blobs[path] = (ZERO_SHA, 0)
1407
elif e.errno == errno.EISDIR:
1408
# Entry was turned into a directory
1409
dirified.append((path, Tree().id, stat.S_IFDIR))
1410
store.add_object(Tree())
1414
blobs[path] = (live_entry.sha, cleanup_mode(live_entry.mode))
1415
if want_unversioned:
1416
for e in target.extras():
1417
st = target._lstat(e)
1419
np, accessible = osutils.normalized_filename(e)
1420
except UnicodeDecodeError:
1421
raise errors.BadFilenameEncoding(
1423
if stat.S_ISDIR(st.st_mode):
1426
blob = blob_from_path_and_stat(target.abspath(e).encode(osutils._fs_enc), st)
1427
store.add_object(blob)
1428
np = np.encode('utf-8')
1429
blobs[np] = (blob.id, cleanup_mode(st.st_mode))
1431
to_tree_sha = commit_tree(store, dirified + [(p, s, m) for (p, (s, m)) in blobs.items()])
1432
return store.tree_changes(
1433
from_tree_sha, to_tree_sha, include_trees=True,
1434
want_unchanged=want_unchanged, change_type_same=True), extras
added
removed
breezy/git/tree.py
