Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/localrepo.py @ 1788:750b9cd83965
change the default timeout to 600 seconds
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Tue, 21 Feb 2006 23:50:53 +0100 |
| parents | e431344e604c |
| children | d5248726d22f |
comparison
equal
deleted
inserted
replaced
| 1787:e431344e604c | 1788:750b9cd83965 |
|---|---|
| 260 except lock.LockHeld, inst: | 260 except lock.LockHeld, inst: |
| 261 if not wait: | 261 if not wait: |
| 262 raise inst | 262 raise inst |
| 263 self.ui.warn(_("waiting for lock held by %s\n") % inst.args[0]) | 263 self.ui.warn(_("waiting for lock held by %s\n") % inst.args[0]) |
| 264 try: | 264 try: |
| 265 # default to 1024 seconds timeout | 265 # default to 600 seconds timeout |
| 266 l = lock.lock(self.join(lockname), | 266 l = lock.lock(self.join(lockname), |
| 267 int(self.ui.config("ui", "timeout") or 1024), | 267 int(self.ui.config("ui", "timeout") or 600), |
| 268 releasefn) | 268 releasefn) |
| 269 except lock.LockHeld, inst: | 269 except lock.LockHeld, inst: |
| 270 raise util.Abort(_("timeout while waiting for " | 270 raise util.Abort(_("timeout while waiting for " |
| 271 "lock held by %s") % inst.args[0]) | 271 "lock held by %s") % inst.args[0]) |
| 272 if acquirefn: | 272 if acquirefn: |