← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/fetch.py

  • Committer: Vincent Ladeuil
  • Date: 2011-06-15 11:36:05 UTC
  • mto: This revision was merged to the branch mainline in revision 5975.
  • Revision ID: v.ladeuil+lp@free.fr-20110615113605-p7zyyfry9wy1hquc
https://launchpad.net/bugs/788000
Make ContentConflict resolution more robust

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
37
37
    errors,
38
38
    ui,
39
39
    )
40
 
from bzrlib.i18n import gettext
41
40
from bzrlib.revision import NULL_REVISION
42
41
from bzrlib.trace import mutter
43
42
 
94
93
        pb = ui.ui_factory.nested_progress_bar()
95
94
        pb.show_pct = pb.show_count = False
96
95
        try:
97
 
            pb.update(gettext("Finding revisions"), 0, 2)
 
96
            pb.update("Finding revisions", 0, 2)
98
97
            search_result = self._revids_to_fetch()
99
98
            mutter('fetching: %s', search_result)
100
99
            if search_result.is_empty():
101
100
                return
102
 
            pb.update(gettext("Fetching revisions"), 1, 2)
 
101
            pb.update("Fetching revisions", 1, 2)
103
102
            self._fetch_everything_for_search(search_result)
104
103
        finally:
105
104
            pb.finished()