← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-12-21 06:49:33 UTC
  • mfrom: (3118.3.3 smart-break-lock-bug)
  • Revision ID: pqm@pqm.ubuntu.com-20071221064933-tsmn13951il1c01q
(andrew) Reduce lockdir timeout to 0 seconds in cmd_serve.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3718
3718
        ]
3719
3719
 
3720
3720
    def run(self, port=None, inet=False, directory=None, allow_writes=False):
 
3721
        from bzrlib import lockdir
3721
3722
        from bzrlib.smart import medium, server
3722
3723
        from bzrlib.transport import get_transport
3723
3724
        from bzrlib.transport.chroot import ChrootServer
3748
3749
        # be changed with care though, as we dont want to use bandwidth sending
3749
3750
        # progress over stderr to smart server clients!
3750
3751
        old_factory = ui.ui_factory
 
3752
        old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
3751
3753
        try:
3752
3754
            ui.ui_factory = ui.SilentUIFactory()
 
3755
            lockdir._DEFAULT_TIMEOUT_SECONDS = 0
3753
3756
            smart_server.serve()
3754
3757
        finally:
3755
3758
            ui.ui_factory = old_factory
 
3759
            lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
3756
3760
 
3757
3761
 
3758
3762
class cmd_join(Command):