59
58
trees or versioned trees.
62
def has_versioned_directories(self):
63
"""Whether this tree can contain explicitly versioned directories.
65
This defaults to True, but some implementations may want to override
70
61
def changes_from(self, other, want_unchanged=False, specific_files=None,
71
62
extra_trees=None, require_versioned=False, include_root=False,
72
63
want_unversioned=False):
287
278
:param file_id: The file_id of the file.
288
279
:param path: The path of the file.
290
280
If both file_id and path are supplied, an implementation may use
293
:returns: A single byte string for the whole file.
295
283
my_file = self.get_file(file_id, path)
310
298
return osutils.split_lines(self.get_file_text(file_id, path))
312
def get_file_verifier(self, file_id, path=None, stat_value=None):
313
"""Return a verifier for a file.
315
The default implementation returns a sha1.
317
:param file_id: The handle for this file.
318
:param path: The path that this file can be found at.
319
These must point to the same object.
320
:param stat_value: Optional stat value for the object
321
:return: Tuple with verifier name and verifier data
323
return ("SHA1", self.get_file_sha1(file_id, path=path,
324
stat_value=stat_value))
326
300
def get_file_sha1(self, file_id, path=None, stat_value=None):
327
301
"""Return the SHA1 file for a file.
329
:note: callers should use get_file_verifier instead
330
where possible, as the underlying repository implementation may
331
have quicker access to a non-sha1 verifier.
333
303
:param file_id: The handle for this file.
334
304
:param path: The path that this file can be found at.
335
305
These must point to the same object.
632
602
prefs = self.iter_search_rules([path], filter_pref_names).next()
633
603
stk = filters._get_filter_stack_for(prefs)
634
604
if 'filters' in debug.debug_flags:
635
trace.note(gettext("*** {0} content-filter: {1} => {2!r}").format(path,prefs,stk))
605
trace.note("*** %s content-filter: %s => %r" % (path,prefs,stk))
638
608
def _content_filter_stack_provider(self):
982
952
if source_kind != target_kind:
983
953
changed_content = True
984
954
elif source_kind == 'file':
985
if not self.file_content_matches(file_id, file_id, source_path,
986
target_path, source_stat, target_stat):
955
if (self.source.get_file_sha1(file_id, source_path, source_stat) !=
956
self.target.get_file_sha1(file_id, target_path, target_stat)):
987
957
changed_content = True
988
958
elif source_kind == 'symlink':
989
959
if (self.source.get_symlink_target(file_id) !=
1302
1272
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)
1340
1276
InterTree.register_optimiser(InterTree)