← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

  • Committer: Martin Pool
  • Date: 2010-01-15 02:27:31 UTC
  • mto: This revision was merged to the branch mainline in revision 4962.
  • Revision ID: mbp@sourcefrog.net-20100115022731-7f1ulqcu3qas0f8r
Tweak Lockdir contention message to suggest reading help break-lock.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
539
539
                # user, perhaps being wrapped in a lp-%d or chroot decorator,
540
540
                # especially if this error is issued from the server.
541
541
                self._report_function('%s %s\n'
542
 
                                      '%s\n' # held by
543
 
                                      '%s\n' # locked ... ago
544
 
                                      'Will continue to try until %s, unless '
545
 
                                      'you press Ctrl-C\n'
546
 
                                      'If you\'re sure that it\'s not being '
547
 
                                      'modified, use bzr break-lock',
548
 
                                      start,
549
 
                                      formatted_info[0],
550
 
                                      formatted_info[1],
551
 
                                      formatted_info[2],
552
 
                                      deadline_str,
553
 
                                      )
 
542
                    '%s\n' # held by
 
543
                    '%s\n' # locked ... ago
 
544
                    'Will continue to try until %s, unless '
 
545
                    'you press Ctrl-C.\n'
 
546
                    'See "bzr help break-lock" for more.',
 
547
                    start,
 
548
                    formatted_info[0],
 
549
                    formatted_info[1],
 
550
                    formatted_info[2],
 
551
                    deadline_str,
 
552
                    )
554
553
 
555
554
            if (max_attempts is not None) and (attempt_count >= max_attempts):
556
555
                self._trace("exceeded %d attempts")