/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: 2018-06-09 09:28:31 UTC
  • Revision ID: jelmer@jelmer.uk-20180609092831-fce99rq1m3020ttx
Make svn_transport a separate variable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
188
188
    """
189
189
    for (name, value) in revprops.iteritems():
190
190
        try:
191
 
            repository.transport.change_rev_prop(revnum, name, value)
 
191
            repository.svn_transport.change_rev_prop(revnum, name, value)
192
192
        except SubversionException, (_, num):
193
193
            if num == ERR_REPOS_DISABLED_FEATURE:
194
194
                raise RevpropChangeFailed(name)
441
441
        self.new_inventory = None
442
442
        self._any_changes = False
443
443
 
444
 
        self.conn = self.repository.transport.get_connection()
 
444
        self.conn = self.repository.svn_transport.get_connection()
445
445
 
446
446
        # revision ids are either specified or predictable
447
447
        self.revmeta = None
485
485
            self._base_revmeta = self.repository._revmeta_provider.lookup_revision(
486
486
                self.base_path, self.base_revnum)
487
487
            self._base_branch_props = self._base_revmeta.get_fileprops()
488
 
            self.base_url = urlutils.join(self.repository.transport.svn_url,
 
488
            self.base_url = urlutils.join(self.repository.svn_transport.svn_url,
489
489
                                          self.base_path)
490
490
 
491
491
        self.mapping = self.repository.get_mapping()
506
506
        self._touched_dirs = set()
507
507
        self._will_record_deletes = False
508
508
        self.modified_files = {}
509
 
        self.supports_custom_revprops = self.repository.transport.has_capability(
 
509
        self.supports_custom_revprops = self.repository.svn_transport.has_capability(
510
510
            "commit-revprops")
511
511
        if (self.supports_custom_revprops is None and
512
512
            self.mapping.can_use_revprops and
532
532
            # Set hint for potential clients that they have to check revision
533
533
            # properties
534
534
            if (not self.set_custom_fileprops and
535
 
                not self.repository.transport.has_capability("log-revprops")):
 
535
                not self.repository.svn_transport.has_capability("log-revprops")):
536
536
                # Tell clients about first approximate use of revision
537
537
                # properties
538
538
                self.mapping.export_revprop_redirect(
677
677
            if tree is None:
678
678
                tree = self.repository.revision_tree(p)
679
679
            ret.append((tree,
680
 
                urlutils.join(self.repository.transport.svn_url, base_path),
 
680
                urlutils.join(self.repository.svn_transport.svn_url, base_path),
681
681
                base_revnum))
682
682
        return ret
683
683
 
763
763
        self._update_properties()
764
764
        self._check_properties()
765
765
        bp_parts = self.branch_path.split("/")
766
 
        lock = self.repository.transport.lock_write(".")
767
766
 
768
767
        self._changed_fileprops = {}
769
768
 
875
874
                editor.abort()
876
875
                raise
877
876
        finally:
878
 
            self.repository.transport.add_connection(self.conn)
 
877
            self.repository.svn_transport.add_connection(self.conn)
879
878
            self.conn = None
880
 
            lock.unlock()
881
879
 
882
880
        (result_revision, result_date, result_author) = self.revision_metadata
883
881
        self.result_foreign_revid = (self.repository.uuid, self.branch_path,
958
956
 
959
957
    def abort(self):
960
958
        if self.conn is not None:
961
 
            self.repository.transport.add_connection(self.conn)
 
959
            self.repository.svn_transport.add_connection(self.conn)
962
960
        if self.repository.is_in_write_group():
963
961
            self.repository.abort_write_group()
964
962