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

  • Committer: Martin Pool
  • Date: 2010-02-27 01:34:49 UTC
  • mto: This revision was merged to the branch mainline in revision 5064.
  • Revision ID: mbp@canonical.com-20100227013449-zxostilwfoendxfv
Handle "Directory not empty" from ftp as DirectoryNotEmpty.

FtpTransport._translate_ftp_error can handle all ftp errors; there's no clear
distinction between 'temporary' and 'permament'.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
30
30
    cleanup,
31
31
    errors,
32
32
    ui,
 
33
    repository,
33
34
    )
34
35
from bzrlib.trace import mutter
35
36
from bzrlib.tsort import topo_sort
96
97
    def _reconcile_repository(self):
97
98
        self.repo = self.bzrdir.find_repository()
98
99
        ui.ui_factory.note('Reconciling repository %s' %
99
 
            self.repo.user_url)
 
100
            self.repo.bzrdir.root_transport.base)
100
101
        self.pb.update("Reconciling repository", 0, 1)
101
102
        repo_reconciler = self.repo.reconcile(thorough=True)
102
103
        self.inconsistent_parents = repo_reconciler.inconsistent_parents