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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-24 12:34:34 UTC
  • mfrom: (6874.2.9 iter-files-bytes)
  • Revision ID: breezy.the.bot@gmail.com-20180324123434-zogy2xskr96vv5xm
Change Tree.iter_files_bytes() to take a (path, identifier) list rather than a (file_id, identifier) list.

Merged from https://code.launchpad.net/~jelmer/brz/iter-files-bytes/+merge/340578

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/merge.py
1876
1876
        with ui.ui_factory.nested_progress_bar() as child_pb:
1877
1877
            entries = self._entries_to_incorporate()
1878
1878
            entries = list(entries)
1879
 
            for num, (entry, parent_id, path) in enumerate(entries):
 
1879
            for num, (entry, parent_id, relpath) in enumerate(entries):
1880
1880
                child_pb.update(gettext('Preparing file merge'), num, len(entries))
1881
1881
                parent_trans_id = self.tt.trans_id_file_id(parent_id)
 
1882
                path = osutils.pathjoin(self._source_subpath, relpath)
1882
1883
                trans_id = transform.new_by_entry(path, self.tt, entry,
1883
1884
                    parent_trans_id, self.other_tree)
1884
1885
        self._finish_computing_transform()