← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

(gz) Never raise KnownFailure in tests,
 use knownFailure method instead (Martin [gz])

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
137
137
        )
138
138
from bzrlib.trace import mutter, note
139
139
from bzrlib.osutils import format_delta, rand_chars, get_host_name
140
 
from bzrlib.i18n import gettext
141
140
 
142
141
from bzrlib.lazy_import import lazy_import
143
142
lazy_import(globals(), """
296
295
        """
297
296
        if (other_holder is not None):
298
297
            if other_holder.is_lock_holder_known_dead():
299
 
                if self.get_config().get('locks.steal_dead'):
 
298
                if self.get_config().get_user_option_as_bool(
 
299
                    'locks.steal_dead',
 
300
                    default=False):
300
301
                    ui.ui_factory.show_user_warning(
301
302
                        'locks_steal_dead',
302
303
                        lock_url=urlutils.join(self.transport.base, self.path),
317
318
            self.transport.delete(tmpname + self.__INFO_NAME)
318
319
            self.transport.rmdir(tmpname)
319
320
        except PathError, e:
320
 
            note(gettext("error removing pending lock: %s"), e)
 
321
            note("error removing pending lock: %s", e)
321
322
 
322
323
    def _create_pending_dir(self):
323
324
        tmpname = '%s/%s.tmp' % (self.path, rand_chars(10))
612
613
            new_info = self.peek()
613
614
            if new_info is not None and new_info != last_info:
614
615
                if last_info is None:
615
 
                    start = gettext('Unable to obtain')
 
616
                    start = 'Unable to obtain'
616
617
                else:
617
 
                    start = gettext('Lock owner changed for')
 
618
                    start = 'Lock owner changed for'
618
619
                last_info = new_info
619
 
                msg = gettext('{0} lock {1} {2}.').format(start, lock_url,
620
 
                                                                    new_info)
 
620
                msg = u'%s lock %s %s.' % (start, lock_url, new_info)
621
621
                if deadline_str is None:
622
622
                    deadline_str = time.strftime('%H:%M:%S',
623
623
                                                    time.localtime(deadline))
624
624
                if timeout > 0:
625
 
                    msg += '\n' + gettext(
626
 
                             'Will continue to try until %s, unless '
627
 
                             'you press Ctrl-C.') % deadline_str
628
 
                msg += '\n' + gettext('See "bzr help break-lock" for more.')
 
625
                    msg += ('\nWill continue to try until %s, unless '
 
626
                        'you press Ctrl-C.'
 
627
                        % deadline_str)
 
628
                msg += '\nSee "bzr help break-lock" for more.'
629
629
                self._report_function(msg)
630
630
            if (max_attempts is not None) and (attempt_count >= max_attempts):
631
631
                self._trace("exceeded %d attempts")
709
709
        """Get the configuration that governs this lockdir."""
710
710
        # XXX: This really should also use the locationconfig at least, but
711
711
        # that seems a bit hard to hook up at the moment. -- mbp 20110329
712
 
        # FIXME: The above is still true ;) -- vila 20110811
713
 
        return config.GlobalStack()
 
712
        return config.GlobalConfig()
714
713
 
715
714
 
716
715
class LockHeldInfo(object):
734
733
    def __unicode__(self):
735
734
        """Return a user-oriented description of this object."""
736
735
        d = self.to_readable_dict()
737
 
        return ( gettext(
 
736
        return (
738
737
            u'held by %(user)s on %(hostname)s (process #%(pid)s), '
739
 
            u'acquired %(time_ago)s') % d)
 
738
            u'acquired %(time_ago)s' % d)
740
739
 
741
740
    def to_readable_dict(self):
742
741
        """Turn the holder info into a dict of human-readable attributes.