← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/memory.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-03 01:53:30 UTC
  • mfrom: (2955.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20071103015330-pt1tec7wyxwwcey8
Fix #158972 don't use timeout for HttpServer

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/memory.py
261
261
    def _abspath(self, relpath):
262
262
        """Generate an internal absolute path."""
263
263
        relpath = urlutils.unescape(relpath)
264
 
        if relpath[:1] == '/':
 
264
        if relpath.find('..') != -1:
 
265
            raise AssertionError('relpath contains ..')
 
266
        if relpath == '':
 
267
            return '/'
 
268
        if relpath[0] == '/':
265
269
            return relpath
266
 
        cwd_parts = self._cwd.split('/')
267
 
        rel_parts = relpath.split('/')
268
 
        r = []
269
 
        for i in cwd_parts + rel_parts:
270
 
            if i == '..':
271
 
                if not r:
272
 
                    raise ValueError("illegal relpath %r under %r"
273
 
                        % (relpath, self._cwd))
274
 
                r = r[:-1]
275
 
            elif i == '.' or i == '':
276
 
                pass
277
 
            else:
278
 
                r.append(i)
279
 
        return '/' + '/'.join(r)
 
270
        if relpath == '.':
 
271
            if (self._cwd == '/'):
 
272
                return self._cwd
 
273
            return self._cwd[:-1]
 
274
        if relpath.endswith('/'):
 
275
            relpath = relpath[:-1]
 
276
        if relpath.startswith('./'):
 
277
            relpath = relpath[2:]
 
278
        return self._cwd + relpath
280
279
 
281
280
 
282
281
class _MemoryLock(object):
283
282
    """This makes a lock."""
284
283
 
285
284
    def __init__(self, path, transport):
 
285
        assert isinstance(transport, MemoryTransport)
286
286
        self.path = path
287
287
        self.transport = transport
288
288
        if self.path in self.transport._locks: