Show More
@@ -249,7 +249,7 b' ui::' | |||||
249 | command to use for SSH connections. Default is 'ssh'. |
|
249 | command to use for SSH connections. Default is 'ssh'. | |
250 | timeout;; |
|
250 | timeout;; | |
251 | The timeout used when a lock is held (in seconds), a negative value |
|
251 | The timeout used when a lock is held (in seconds), a negative value | |
252 |
means no timeout. Default is |
|
252 | means no timeout. Default is 600. | |
253 | username;; |
|
253 | username;; | |
254 | The committer of a changeset created when running "commit". |
|
254 | The committer of a changeset created when running "commit". | |
255 | Typically a person's name and email address, e.g. "Fred Widget |
|
255 | Typically a person's name and email address, e.g. "Fred Widget |
@@ -262,9 +262,9 b' class localrepository(object):' | |||||
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 |
|
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 |
|
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 " |
General Comments 0
You need to be logged in to leave comments.
Login now