/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/diff.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-16 15:19:49 UTC
  • mfrom: (7141.7.6 no-file-ids)
  • Revision ID: breezy.the.bot@gmail.com-20181116151949-hrmuv6s7ow1cqdhi
Drop file_id argument from read functions in Tree.

Merged from https://code.launchpad.net/~jelmer/brz/no-file-ids/+merge/357984

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/diff.py
476
476
def _patch_header_date(tree, file_id, path):
477
477
    """Returns a timestamp suitable for use in a patch header."""
478
478
    try:
479
 
        mtime = tree.get_file_mtime(path, file_id)
 
479
        mtime = tree.get_file_mtime(path)
480
480
    except FileTimestampUnavailable:
481
481
        mtime = 0
482
482
    return timestamp.format_patch_date(mtime)
596
596
        if 'symlink' not in (old_kind, new_kind):
597
597
            return self.CANNOT_DIFF
598
598
        if old_kind == 'symlink':
599
 
            old_target = self.old_tree.get_symlink_target(old_path, file_id)
 
599
            old_target = self.old_tree.get_symlink_target(old_path)
600
600
        elif old_kind is None:
601
601
            old_target = None
602
602
        else:
603
603
            return self.CANNOT_DIFF
604
604
        if new_kind == 'symlink':
605
 
            new_target = self.new_tree.get_symlink_target(new_path, file_id)
 
605
            new_target = self.new_tree.get_symlink_target(new_path)
606
606
        elif new_kind is None:
607
607
            new_target = None
608
608
        else:
689
689
        def _get_text(tree, file_id, path):
690
690
            if file_id is None:
691
691
                return []
692
 
            return tree.get_file_lines(path, file_id)
 
692
            return tree.get_file_lines(path)
693
693
        try:
694
694
            from_text = _get_text(self.old_tree, from_file_id, from_path)
695
695
            to_text = _get_text(self.new_tree, to_file_id, to_path)
814
814
        except OSError as e:
815
815
            if e.errno != errno.EEXIST:
816
816
                raise
817
 
        source = tree.get_file(relpath, file_id)
 
817
        source = tree.get_file(relpath)
818
818
        try:
819
819
            with open(full_path, 'wb') as target:
820
820
                osutils.pumpfile(source, target)
821
821
        finally:
822
822
            source.close()
823
823
        try:
824
 
            mtime = tree.get_file_mtime(relpath, file_id)
 
824
            mtime = tree.get_file_mtime(relpath)
825
825
        except FileTimestampUnavailable:
826
826
            pass
827
827
        else:
1034
1034
        if old_path is None:
1035
1035
            old_kind = None
1036
1036
        else:
1037
 
            old_kind = self.old_tree.kind(old_path, file_id)
 
1037
            old_kind = self.old_tree.kind(old_path)
1038
1038
        if new_path is None:
1039
1039
            new_kind = None
1040
1040
        else:
1041
 
            new_kind = self.new_tree.kind(new_path, file_id)
 
1041
            new_kind = self.new_tree.kind(new_path)
1042
1042
        self._diff(old_path, new_path, old_kind, new_kind, file_id=file_id)
1043
1043
 
1044
1044
    def _diff(self, old_path, new_path, old_kind, new_kind, file_id):