← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-10-01 07:56:03 UTC
  • mfrom: (3224.5.40 faster-startup)
  • Revision ID: pqm@pqm.ubuntu.com-20081001075603-s9nynw8y85fmrprj
Reduce startup time by a small amount. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
105
105
 
106
106
import os
107
107
import time
108
 
from cStringIO import StringIO
109
108
 
110
109
from bzrlib import (
111
110
    debug,
125
124
        PathError,
126
125
        ResourceBusy,
127
126
        TransportError,
128
 
        UnlockableTransport,
129
127
        )
130
128
from bzrlib.hooks import Hooks
131
129
from bzrlib.trace import mutter, note
132
 
from bzrlib.transport import Transport
133
 
from bzrlib.osutils import rand_chars, format_delta, get_host_name
134
 
from bzrlib.rio import read_stanza, Stanza
 
130
from bzrlib.osutils import format_delta, rand_chars, get_host_name
135
131
import bzrlib.ui
136
132
 
 
133
from bzrlib.lazy_import import lazy_import
 
134
lazy_import(globals(), """
 
135
from bzrlib import rio
 
136
""")
137
137
 
138
138
# XXX: At the moment there is no consideration of thread safety on LockDir
139
139
# objects.  This should perhaps be updated - e.g. if two threads try to take a
436
436
            user = config.user_email()
437
437
        except errors.NoEmailInUsername:
438
438
            user = config.username()
439
 
        s = Stanza(hostname=get_host_name(),
 
439
        s = rio.Stanza(hostname=get_host_name(),
440
440
                   pid=str(os.getpid()),
441
441
                   start_time=str(int(time.time())),
442
442
                   nonce=self.nonce,
445
445
        return s.to_string()
446
446
 
447
447
    def _parse_info(self, info_file):
448
 
        return read_stanza(info_file.readlines()).as_dict()
 
448
        return rio.read_stanza(info_file.readlines()).as_dict()
449
449
 
450
450
    def attempt_lock(self):
451
451
        """Take the lock; fail if it's already held.