/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: 2017-11-19 18:35:20 UTC
  • mfrom: (6809.4.27 swap-arguments)
  • Revision ID: jelmer@jelmer.uk-20171119183520-fmw89uw30e0tbhwz
Merge lp:~jelmer/brz/swap-arguments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/fetch.py
217
217
        revision_root = {}
218
218
        for tree in self.iter_rev_trees(revs):
219
219
            root_id = tree.get_root_id()
220
 
            revision_id = tree.get_file_revision(root_id, u"")
 
220
            revision_id = tree.get_file_revision(u'', root_id)
221
221
            revision_root[revision_id] = root_id
222
222
        # Find out which parents we don't already know root ids for
223
223
        parents = set(viewvalues(parent_map))
323
323
                pass
324
324
            else:
325
325
                try:
326
 
                    parent_ids.append(tree.get_file_revision(root_id))
 
326
                    parent_ids.append(tree.get_file_revision(u'', root_id))
327
327
                except errors.NoSuchId:
328
328
                    # not in the tree
329
329
                    pass