/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

  • Committer: Andrew Bennetts
  • Date: 2009-07-27 02:06:05 UTC
  • mto: This revision was merged to the branch mainline in revision 4573.
  • Revision ID: andrew.bennetts@canonical.com-20090727020605-s7v27rmvdf0v593f
More conservative fix for LockContention serialisation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
181
181
 
182
182
        self._report_function = note
183
183
 
184
 
    def _url(self):
185
 
        try:
186
 
            url = self.transport.external_url()
187
 
        except errors.InProcessTransport:
188
 
            url = self.transport.base
189
 
        return url
190
 
 
191
184
    def __repr__(self):
192
185
        return '%s(%s%s)' % (self.__class__.__name__,
193
 
                             self._url(), self.path)
 
186
                             self.transport.base,
 
187
                             self.path)
194
188
 
195
189
    is_held = property(lambda self: self._lock_held)
196
190
 
527
521
                if deadline_str is None:
528
522
                    deadline_str = time.strftime('%H:%M:%S',
529
523
                                                 time.localtime(deadline))
530
 
                lock_url = self._url()
 
524
                lock_url = self.transport.abspath(self.path)
531
525
                self._report_function('%s %s\n'
532
526
                                      '%s\n' # held by
533
527
                                      '%s\n' # locked ... ago