/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 tree.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:
299
299
        self._rules_searcher = None
300
300
        self.id_map = repository.get_fileid_map(self._revmeta, self.mapping)
301
301
        self.file_properties = {}
302
 
        self.transport = repository.transport.clone(
 
302
        self.transport = repository.svn_transport.clone(
303
303
            self._revmeta.metarev.branch_path)
304
304
 
305
305
    @property
309
309
            return self._bzr_inventory
310
310
        self._bzr_inventory = Inventory()
311
311
        self._bzr_inventory.revision_id = self.get_revision_id()
312
 
        root_repos = self._repository.transport.get_svn_repos_root()
 
312
        root_repos = self._repository.svn_transport.get_svn_repos_root()
313
313
        editor = TreeBuildEditor(self)
314
 
        conn = self._repository.transport.get_connection()
 
314
        conn = self._repository.svn_transport.get_connection()
315
315
        try:
316
316
            reporter = conn.do_switch(
317
317
                self._revmeta.metarev.revnum, "", True,
323
323
                reporter.abort()
324
324
                raise
325
325
        finally:
326
 
            self._repository.transport.add_connection(conn)
 
326
            self._repository.svn_transport.add_connection(conn)
327
327
        return self._bzr_inventory
328
328
 
329
329
    def all_file_ids(self):
609
609
            return ie
610
610
 
611
611
        def find_ids(entry):
612
 
            assert entry.url.startswith(self._repository.transport.svn_url)
613
 
            relpath = urllib.unquote(entry.url[len(self._repository.transport.svn_url):].strip("/"))
 
612
            assert entry.url.startswith(self._repository.svn_transport.svn_url)
 
613
            relpath = urllib.unquote(entry.url[len(self._repository.svn_transport.svn_url):].strip("/"))
614
614
            assert isinstance(relpath, str)
615
615
            if entry.schedule in (wc.SCHEDULE_NORMAL,
616
616
                                  wc.SCHEDULE_DELETE,