58
61
trees or versioned trees.
64
def has_versioned_directories(self):
65
"""Whether this tree can contain explicitly versioned directories.
67
This defaults to True, but some implementations may want to override
61
72
def changes_from(self, other, want_unchanged=False, specific_files=None,
62
73
extra_trees=None, require_versioned=False, include_root=False,
63
74
want_unversioned=False):
127
138
def has_id(self, file_id):
128
139
raise NotImplementedError(self.has_id)
141
@deprecated_method(deprecated_in((2, 4, 0)))
130
142
def __contains__(self, file_id):
131
143
return self.has_id(file_id)
297
312
return osutils.split_lines(self.get_file_text(file_id, path))
314
def get_file_verifier(self, file_id, path=None, stat_value=None):
315
"""Return a verifier for a file.
317
The default implementation returns a sha1.
319
:param file_id: The handle for this file.
320
:param path: The path that this file can be found at.
321
These must point to the same object.
322
:param stat_value: Optional stat value for the object
323
:return: Tuple with verifier name and verifier data
325
return ("SHA1", self.get_file_sha1(file_id, path=path,
326
stat_value=stat_value))
299
328
def get_file_sha1(self, file_id, path=None, stat_value=None):
300
329
"""Return the SHA1 file for a file.
331
:note: callers should use get_file_verifier instead
332
where possible, as the underlying repository implementation may
333
have quicker access to a non-sha1 verifier.
302
335
:param file_id: The handle for this file.
303
336
:param path: The path that this file can be found at.
304
337
These must point to the same object.
325
358
raise NotImplementedError(self.get_file_size)
327
def get_file_by_path(self, path):
328
raise NotImplementedError(self.get_file_by_path)
330
360
def is_executable(self, file_id, path=None):
331
361
"""Check if a file is executable.
601
631
prefs = self.iter_search_rules([path], filter_pref_names).next()
602
632
stk = filters._get_filter_stack_for(prefs)
603
633
if 'filters' in debug.debug_flags:
604
trace.note("*** %s content-filter: %s => %r" % (path,prefs,stk))
634
trace.note(gettext("*** {0} content-filter: {1} => {2!r}").format(path,prefs,stk))
607
637
def _content_filter_stack_provider(self):
796
826
return self.inventory.iter_entries_by_dir(
797
827
specific_file_ids=specific_file_ids, yield_parents=yield_parents)
829
@deprecated_method(deprecated_in((2, 5, 0)))
799
830
def get_file_by_path(self, path):
800
return self.get_file(self._inventory.path2id(path), path)
803
######################################################################
806
# TODO: Merge these two functions into a single one that can operate
807
# on either a whole tree or a set of files.
809
# TODO: Return the diff in order by filename, not by category or in
810
# random order. Can probably be done by lock-stepping through the
811
# filenames from both trees.
814
def file_status(filename, old_tree, new_tree):
815
"""Return single-letter status, old and new names for a file.
817
The complexity here is in deciding how to represent renames;
818
many complex cases are possible.
820
old_inv = old_tree.inventory
821
new_inv = new_tree.inventory
822
new_id = new_inv.path2id(filename)
823
old_id = old_inv.path2id(filename)
825
if not new_id and not old_id:
826
# easy: doesn't exist in either; not versioned at all
827
if new_tree.is_ignored(filename):
828
return 'I', None, None
830
return '?', None, None
832
# There is now a file of this name, great.
835
# There is no longer a file of this name, but we can describe
836
# what happened to the file that used to have
837
# this name. There are two possibilities: either it was
838
# deleted entirely, or renamed.
839
if new_inv.has_id(old_id):
840
return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
842
return 'D', old_inv.id2path(old_id), None
844
# if the file_id is new in this revision, it is added
845
if new_id and not old_inv.has_id(new_id):
848
# if there used to be a file of this name, but that ID has now
849
# disappeared, it is deleted
850
if old_id and not new_inv.has_id(old_id):
831
return self.get_file(self.path2id(path), path)
856
834
def find_ids_across_trees(filenames, trees, require_versioned=True):
1004
982
if source_kind != target_kind:
1005
983
changed_content = True
1006
984
elif source_kind == 'file':
1007
if (self.source.get_file_sha1(file_id, source_path, source_stat) !=
1008
self.target.get_file_sha1(file_id, target_path, target_stat)):
985
if not self.file_content_matches(file_id, file_id, source_path,
986
target_path, source_stat, target_stat):
1009
987
changed_content = True
1010
988
elif source_kind == 'symlink':
1011
989
if (self.source.get_symlink_target(file_id) !=
1324
1302
changed_file_ids.add(result[0])
1306
def file_content_matches(self, source_file_id, target_file_id,
1307
source_path=None, target_path=None, source_stat=None, target_stat=None):
1308
"""Check if two files are the same in the source and target trees.
1310
This only checks that the contents of the files are the same,
1311
it does not touch anything else.
1313
:param source_file_id: File id of the file in the source tree
1314
:param target_file_id: File id of the file in the target tree
1315
:param source_path: Path of the file in the source tree
1316
:param target_path: Path of the file in the target tree
1317
:param source_stat: Optional stat value of the file in the source tree
1318
:param target_stat: Optional stat value of the file in the target tree
1319
:return: Boolean indicating whether the files have the same contents
1321
source_verifier_kind, source_verifier_data = self.source.get_file_verifier(
1322
source_file_id, source_path, source_stat)
1323
target_verifier_kind, target_verifier_data = self.target.get_file_verifier(
1324
target_file_id, target_path, target_stat)
1325
if source_verifier_kind == target_verifier_kind:
1326
return (source_verifier_data == target_verifier_data)
1327
# Fall back to SHA1 for now
1328
if source_verifier_kind != "SHA1":
1329
source_sha1 = self.source.get_file_sha1(source_file_id,
1330
source_path, source_stat)
1332
source_sha1 = source_verifier_data
1333
if target_verifier_kind != "SHA1":
1334
target_sha1 = self.target.get_file_sha1(target_file_id,
1335
target_path, target_stat)
1337
target_sha1 = target_verifier_data
1338
return (source_sha1 == target_sha1)
1328
1340
InterTree.register_optimiser(InterTree)
added
removed
bzrlib/tree.py
