Mercurial > hg
comparison mercurial/sshserver.py @ 15585:a348739da8f0
addchangegroup: remove the lock argument on the addchangegroup methods
This argument is no longer require. post lock release code is now handled with
dedicated post release callback code in lock itself.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Mon, 28 Nov 2011 01:32:13 +0100 |
| parents | f4522df38c65 |
| children | 46db0ec640f3 |
comparison
equal
deleted
inserted
replaced
| 15584:9df9444e96ec | 15585:a348739da8f0 |
|---|---|
| 140 self.sendresponse("not locked") | 140 self.sendresponse("not locked") |
| 141 return | 141 return |
| 142 | 142 |
| 143 self.sendresponse("") | 143 self.sendresponse("") |
| 144 cg = changegroup.unbundle10(self.fin, "UN") | 144 cg = changegroup.unbundle10(self.fin, "UN") |
| 145 r = self.repo.addchangegroup(cg, 'serve', self._client(), | 145 r = self.repo.addchangegroup(cg, 'serve', self._client()) |
| 146 lock=self.lock) | 146 self.lock.release() |
| 147 return str(r) | 147 return str(r) |
| 148 | 148 |
| 149 def _client(self): | 149 def _client(self): |
| 150 client = os.environ.get('SSH_CLIENT', '').split(' ', 1)[0] | 150 client = os.environ.get('SSH_CLIENT', '').split(' ', 1)[0] |
| 151 return 'remote:ssh:' + client | 151 return 'remote:ssh:' + client |