/breezy-svn/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy-svn/trunk

« back to all changes in this revision

Viewing changes to commit.py

  • Committer: Jelmer Vernooij
  • Date: 2019-03-04 09:14:51 UTC
  • Revision ID: jelmer@jelmer.uk-20190304091451-qqpl4nz7uh8dhplu
Adapt to new brz interface.

Show diffs side-by-side

added added

removed removed

Lines of Context:
993
993
            if (ptree.path2id(osutils.dirname(ppath)) == new_ie.parent_id and
994
994
                osutils.basename(ppath) == new_ie.name and (
995
995
                 (new_ie.kind == 'file' and ptree.kind(ppath) == 'file' and
996
 
                  ptree.get_file_sha1(ppath, new_ie.file_id) == new_ie.text_sha1 and
997
 
                  ptree.is_executable(ppath, new_ie.file_id) == new_ie.executable) or
 
996
                  ptree.get_file_sha1(ppath) == new_ie.text_sha1 and
 
997
                  ptree.is_executable(ppath) == new_ie.executable) or
998
998
                 (new_ie.kind == 'symlink' and ptree.kind(ppath) == 'symlink' and
999
999
                  ptree.get_symlink_target(ppath) == new_ie.symlink_target) or
1000
1000
                 (new_ie.kind == 'directory' and ptree.kind(ppath) == 'directory'))):
1047
1047
            self.modified_files[file_id] = get_svn_file_delta_transmitter(
1048
1048
                tree, self.old_tree, file_id, old_path, new_path, new_ie)
1049
1049
            if new_ie.revision is None:
1050
 
                yield file_id, new_path, (new_ie.text_sha1, stat_val)
 
1050
                yield new_path, new_ie.text_sha1
1051
1051
        elif new_kind == 'symlink':
1052
1052
            new_ie.symlink_target = tree.get_symlink_target(new_path)
1053
1053
            new_ie.revision, unusual_text_parents = self._get_text_revision(