/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 breezy/fetch.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/fetch.py
97
97
        # assert not missing
98
98
        self.count_total = 0
99
99
        self.file_ids_names = {}
100
 
        pb = ui.ui_factory.nested_progress_bar()
101
 
        pb.show_pct = pb.show_count = False
102
 
        try:
 
100
        with ui.ui_factory.nested_progress_bar() as pb:
 
101
            pb.show_pct = pb.show_count = False
103
102
            pb.update(gettext("Finding revisions"), 0, 2)
104
103
            search_result = self._revids_to_fetch()
105
104
            mutter('fetching: %s', search_result)
107
106
                return
108
107
            pb.update(gettext("Fetching revisions"), 1, 2)
109
108
            self._fetch_everything_for_search(search_result)
110
 
        finally:
111
 
            pb.finished()
112
109
 
113
110
    def _fetch_everything_for_search(self, search):
114
111
        """Fetch all data for the given set of revisions."""
125
122
            raise errors.IncompatibleRepositories(
126
123
                self.from_repository, self.to_repository,
127
124
                "different rich-root support")
128
 
        pb = ui.ui_factory.nested_progress_bar()
129
 
        try:
 
125
        with ui.ui_factory.nested_progress_bar() as pb:
130
126
            pb.update("Get stream source")
131
127
            source = self.from_repository._get_source(
132
128
                self.to_repository._format)
151
147
                        resume_tokens,))
152
148
            pb.update("Finishing stream")
153
149
            self.sink.finished()
154
 
        finally:
155
 
            pb.finished()
156
150
 
157
151
    def _revids_to_fetch(self):
158
152
        """Determines the exact revisions needed from self.from_repository to
323
317
                pass
324
318
            else:
325
319
                try:
326
 
                    parent_ids.append(tree.get_file_revision(u'', root_id))
 
320
                    parent_ids.append(tree.get_file_revision(tree.id2path(root_id), root_id))
327
321
                except errors.NoSuchId:
328
322
                    # not in the tree
329
323
                    pass