/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/errors.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
2176
2176
 
2177
2177
    def __init__(self, repo):
2178
2178
        BzrError.__init__(self)
2179
 
        self.repo_path = repo.bzrdir.root_transport.base
 
2179
        self.repo_path = repo.user_url
2180
2180
 
2181
2181
 
2182
2182
class InconsistentDelta(BzrError):
2754
2754
 
2755
2755
    def __init__(self, bzrdir):
2756
2756
        import bzrlib.urlutils as urlutils
2757
 
        display_url = urlutils.unescape_for_display(bzrdir.root_transport.base,
 
2757
        display_url = urlutils.unescape_for_display(bzrdir.user_url,
2758
2758
                                                    'ascii')
2759
2759
        BzrError.__init__(self, bzrdir=bzrdir, display_url=display_url)
2760
2760
 
2835
2835
            more = ' ' + more
2836
2836
        import bzrlib.urlutils as urlutils
2837
2837
        display_url = urlutils.unescape_for_display(
2838
 
            tree.bzrdir.root_transport.base, 'ascii')
 
2838
            tree.user_url, 'ascii')
2839
2839
        BzrError.__init__(self, tree=tree, display_url=display_url, more=more)
2840
2840
 
2841
2841