There are a fair amount of mechanical changes (move MemoryTransport => memory.MemoryTransport), but the bulk of the change is just: 255 @@ -315,11 +318,13 @@ 256 result._files = self._files 257 result._locks = self._locks 258 return result 259 - register_transport(self._scheme, memory_factory) 260 + self._memory_factory = memory_factory 261 + register_transport(self._scheme, self._memory_factory) 262 263 def tearDown(self): 264 """See bzrlib.transport.Server.tearDown.""" 265 # unregister this server 266 + unregister_transport(self._scheme, self._memory_factory) 267 268 def get_url(self): 269 """See bzrlib.transport.Server.get_url."""
Which I feel is sufficiently small to warrant merging to 2.0. If Martin feels differently, I'm fine only merging this to 2.1.
« Back to merge proposal
There are a fair amount of mechanical changes (move MemoryTransport => memory. MemoryTransport ), but the bulk of the change is just: transport( self._scheme, memory_factory) factory = memory_factory transport( self._scheme, self._memory_ factory) transport. Server. tearDown. """ transport( self._scheme, self._memory_ factory) transport. Server. get_url. """
255 @@ -315,11 +318,13 @@
256 result._files = self._files
257 result._locks = self._locks
258 return result
259 - register_
260 + self._memory_
261 + register_
262
263 def tearDown(self):
264 """See bzrlib.
265 # unregister this server
266 + unregister_
267
268 def get_url(self):
269 """See bzrlib.
Which I feel is sufficiently small to warrant merging to 2.0. If Martin feels differently, I'm fine only merging this to 2.1.