equal
deleted
inserted
replaced
131 # This little dance should be dropped eventually when the API |
131 # This little dance should be dropped eventually when the API |
132 # is finally improved. |
132 # is finally improved. |
133 stream = util.chunkbuffer(ret.getchunks()) |
133 stream = util.chunkbuffer(ret.getchunks()) |
134 ret = bundle2.unbundle20(self.ui, stream) |
134 ret = bundle2.unbundle20(self.ui, stream) |
135 return ret |
135 return ret |
136 except exchange.PushRaced, exc: |
136 except error.PushRaced, exc: |
137 raise error.ResponseError(_('push failed:'), exc.message) |
137 raise error.ResponseError(_('push failed:'), exc.message) |
138 |
138 |
139 def lock(self): |
139 def lock(self): |
140 return self._repo.lock() |
140 return self._repo.lock() |
141 |
141 |