← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/pathfilter.py

  • Committer: Vincent Ladeuil
  • Date: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/pathfilter.py
16
16
 
17
17
"""A transport decorator that filters all paths that are passed to it."""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
 
21
from bzrlib import urlutils
19
22
 
20
23
from bzrlib.transport import (
21
 
    get_transport,
22
24
    register_transport,
23
25
    Server,
24
26
    Transport,
82
84
        self.scheme = self.server.scheme
83
85
 
84
86
    def _relpath_from_server_root(self, relpath):
85
 
        unfiltered_path = self._combine_paths(self.base_path, relpath)
 
87
        unfiltered_path = urlutils.URL._combine_paths(self.base_path, relpath)
86
88
        if not unfiltered_path.startswith('/'):
87
89
            raise ValueError(unfiltered_path)
88
90
        return unfiltered_path[1:]