/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transport/memory.py

  • Committer: Patch Queue Manager
  • Date: 2011-11-29 11:13:07 UTC
  • mfrom: (6321.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20111129111307-5aj61u7nfe43cla7
(vila) Smarter .po file merging with merge hook as a plugin: po_merge
 (lazy options). (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/memory.py
81
81
 
82
82
    def clone(self, offset=None):
83
83
        """See Transport.clone()."""
84
 
        path = self._combine_paths(self._cwd, offset)
 
84
        path = urlutils.URL._combine_paths(self._cwd, offset)
85
85
        if len(path) == 0 or path[-1] != '/':
86
86
            path += '/'
87
87
        url = self._scheme + path
289
289
            raise LockError('File %r already locked' % (self.path,))
290
290
        self.transport._locks[self.path] = self
291
291
 
292
 
    def __del__(self):
293
 
        # Should this warn, or actually try to cleanup?
294
 
        if self.transport:
295
 
            warnings.warn("MemoryLock %r not explicitly unlocked" % (self.path,))
296
 
            self.unlock()
297
 
 
298
292
    def unlock(self):
299
293
        del self.transport._locks[self.path]
300
294
        self.transport = None