/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: 2017-11-12 17:53:35 UTC
  • mto: This revision was merged to the branch mainline in revision 6819.
  • Revision ID: jelmer@jelmer.uk-20171112175335-d3l6b9sy2qzp27mk
Swap arguments for get_file_*.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/diff.py
482
482
def _patch_header_date(tree, file_id, path):
483
483
    """Returns a timestamp suitable for use in a patch header."""
484
484
    try:
485
 
        mtime = tree.get_file_mtime(file_id, path)
 
485
        mtime = tree.get_file_mtime(path, file_id)
486
486
    except FileTimestampUnavailable:
487
487
        mtime = 0
488
488
    return timestamp.format_patch_date(mtime)
686
686
        :param to_path: The path in the to tree or None if unknown.
687
687
        """
688
688
        def _get_text(tree, file_id, path):
689
 
            if file_id is not None:
690
 
                return tree.get_file_lines(file_id, path)
691
 
            else:
 
689
            try:
 
690
                return tree.get_file_lines(path, file_id)
 
691
            except errors.NoSuchId:
692
692
                return []
693
693
        try:
694
694
            from_text = _get_text(self.old_tree, from_file_id, from_path)
813
813
        except OSError as e:
814
814
            if e.errno != errno.EEXIST:
815
815
                raise
816
 
        source = tree.get_file(file_id, relpath)
 
816
        source = tree.get_file(relpath, file_id)
817
817
        try:
818
818
            target = open(full_path, 'wb')
819
819
            try:
823
823
        finally:
824
824
            source.close()
825
825
        try:
826
 
            mtime = tree.get_file_mtime(file_id)
 
826
            mtime = tree.get_file_mtime(relpath, file_id)
827
827
        except FileTimestampUnavailable:
828
828
            pass
829
829
        else: