/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-11-16 18:35:30 UTC
  • mfrom: (7143.15.15 more-cleanups)
  • mto: This revision was merged to the branch mainline in revision 7178.
  • Revision ID: jelmer@jelmer.uk-20181116183530-ue8yx60h5tinl2wy
Merge more-cleanups.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/diff.py
480
480
def _patch_header_date(tree, file_id, path):
481
481
    """Returns a timestamp suitable for use in a patch header."""
482
482
    try:
483
 
        mtime = tree.get_file_mtime(path, file_id)
 
483
        mtime = tree.get_file_mtime(path)
484
484
    except FileTimestampUnavailable:
485
485
        mtime = 0
486
486
    return timestamp.format_patch_date(mtime)
601
601
        if 'symlink' not in (old_kind, new_kind):
602
602
            return self.CANNOT_DIFF
603
603
        if old_kind == 'symlink':
604
 
            old_target = self.old_tree.get_symlink_target(old_path, file_id)
 
604
            old_target = self.old_tree.get_symlink_target(old_path)
605
605
        elif old_kind is None:
606
606
            old_target = None
607
607
        else:
608
608
            return self.CANNOT_DIFF
609
609
        if new_kind == 'symlink':
610
 
            new_target = self.new_tree.get_symlink_target(new_path, file_id)
 
610
            new_target = self.new_tree.get_symlink_target(new_path)
611
611
        elif new_kind is None:
612
612
            new_target = None
613
613
        else:
694
694
        def _get_text(tree, file_id, path):
695
695
            if file_id is None:
696
696
                return []
697
 
            return tree.get_file_lines(path, file_id)
 
697
            return tree.get_file_lines(path)
698
698
        try:
699
699
            from_text = _get_text(self.old_tree, from_file_id, from_path)
700
700
            to_text = _get_text(self.new_tree, to_file_id, to_path)
819
819
        except OSError as e:
820
820
            if e.errno != errno.EEXIST:
821
821
                raise
822
 
        source = tree.get_file(relpath, file_id)
 
822
        source = tree.get_file(relpath)
823
823
        try:
824
824
            with open(full_path, 'wb') as target:
825
825
                osutils.pumpfile(source, target)
826
826
        finally:
827
827
            source.close()
828
828
        try:
829
 
            mtime = tree.get_file_mtime(relpath, file_id)
 
829
            mtime = tree.get_file_mtime(relpath)
830
830
        except FileTimestampUnavailable:
831
831
            pass
832
832
        else:
1044
1044
        if old_path is None:
1045
1045
            old_kind = None
1046
1046
        else:
1047
 
            old_kind = self.old_tree.kind(old_path, file_id)
 
1047
            old_kind = self.old_tree.kind(old_path)
1048
1048
        if new_path is None:
1049
1049
            new_kind = None
1050
1050
        else:
1051
 
            new_kind = self.new_tree.kind(new_path, file_id)
 
1051
            new_kind = self.new_tree.kind(new_path)
1052
1052
        self._diff(old_path, new_path, old_kind, new_kind, file_id=file_id)
1053
1053
 
1054
1054
    def _diff(self, old_path, new_path, old_kind, new_kind, file_id):