← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

Merge from BzrNewError.__str__

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
1220
1220
        if relpath is not None and relpath != '.':
1221
1221
            if not base.endswith('/'):
1222
1222
                base = base + '/'
1223
 
            base = base + urlutils.escape(relpath)
 
1223
            # XXX: Really base should be a url; we did after all call
 
1224
            # get_url()!  But sometimes it's just a path (from
 
1225
            # LocalAbspathServer), and it'd be wrong to append urlescaped data
 
1226
            # to a non-escaped local path.
 
1227
            if base.startswith('./') or base.startswith('/'):
 
1228
                base += relpath
 
1229
            else:
 
1230
                base += urlutils.escape(relpath)
1224
1231
        return base
1225
1232
 
1226
1233
    def get_transport(self):