/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: Jelmer Vernooij
  • Date: 2018-10-29 11:27:33 UTC
  • mto: This revision was merged to the branch mainline in revision 7170.
  • Revision ID: jelmer@jelmer.uk-20181029112733-bjvm24z12svwl53m
Get rid of file_ids in most of Tree.

Show diffs side-by-side

added added

removed removed

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