← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

Merge description into dont-add-conflict-helpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
534
534
                    deadline_str = time.strftime('%H:%M:%S',
535
535
                                                 time.localtime(deadline))
536
536
                lock_url = self.transport.abspath(self.path)
 
537
                # See <https://bugs.edge.launchpad.net/bzr/+bug/250451>
 
538
                # the URL here is sometimes not one that is useful to the
 
539
                # user, perhaps being wrapped in a lp-%d or chroot decorator,
 
540
                # especially if this error is issued from the server.
537
541
                self._report_function('%s %s\n'
538
 
                                      '%s\n' # held by
539
 
                                      '%s\n' # locked ... ago
540
 
                                      'Will continue to try until %s, unless '
541
 
                                      'you press Ctrl-C\n'
542
 
                                      'If you\'re sure that it\'s not being '
543
 
                                      'modified, use bzr break-lock %s',
544
 
                                      start,
545
 
                                      formatted_info[0],
546
 
                                      formatted_info[1],
547
 
                                      formatted_info[2],
548
 
                                      deadline_str,
549
 
                                      lock_url)
 
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
                    )
550
553
 
551
554
            if (max_attempts is not None) and (attempt_count >= max_attempts):
552
555
                self._trace("exceeded %d attempts")