← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

Merge from remote-is-at-least.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
506
506
                if deadline_str is None:
507
507
                    deadline_str = time.strftime('%H:%M:%S',
508
508
                                                 time.localtime(deadline))
 
509
                lock_url = self.transport.abspath(self.path)
509
510
                self._report_function('%s %s\n'
510
511
                                      '%s\n' # held by
511
512
                                      '%s\n' # locked ... ago
512
 
                                      'Will continue to try until %s\n',
 
513
                                      'Will continue to try until %s, unless '
 
514
                                      'you press Ctrl-C\n'
 
515
                                      'If you\'re sure that it\'s not being '
 
516
                                      'modified, use bzr break-lock %s',
513
517
                                      start,
514
518
                                      formatted_info[0],
515
519
                                      formatted_info[1],
516
520
                                      formatted_info[2],
517
 
                                      deadline_str)
 
521
                                      deadline_str,
 
522
                                      lock_url)
518
523
 
519
524
            if (max_attempts is not None) and (attempt_count >= max_attempts):
520
525
                self._trace("exceeded %d attempts")