/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/plugins/weave_fmt/bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:52:08 UTC
  • mfrom: (6675 work)
  • mto: (6670.4.8 move-bzr)
  • mto: This revision was merged to the branch mainline in revision 6681.
  • Revision ID: jelmer@jelmer.uk-20170610005208-dthx80fkolfpsenj
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/weave_fmt/bzrdir.py
435
435
            self.text_weaves[file_id] = w
436
436
        text_changed = False
437
437
        parent_candiate_entries = ie.parent_candidates(parent_invs)
438
 
        heads = graph.Graph(self).heads(parent_candiate_entries.keys())
 
438
        heads = graph.Graph(self).heads(parent_candiate_entries)
439
439
        # XXX: Note that this is unordered - and this is tolerable because
440
440
        # the previous code was also unordered.
441
441
        previous_entries = dict((head, parent_candiate_entries[head]) for head
457
457
        # save against.
458
458
        #ie.snapshot(rev, PATH, previous_revisions, REVISION_TREE, InMemoryWeaveStore(self.text_weaves))
459
459
        if len(previous_revisions) == 1:
460
 
            previous_ie = previous_revisions.values()[0]
 
460
            previous_ie = next(iter(previous_revisions.values()))
461
461
            if ie._unchanged(previous_ie):
462
462
                ie.revision = previous_ie.revision
463
463
                return
479
479
        The order must be such that an revision is imported after all
480
480
        its (present) parents.
481
481
        """
482
 
        todo = set(self.revisions.keys())
 
482
        todo = set(self.revisions)
483
483
        done = self.absent_revisions.copy()
484
484
        order = []
485
485
        while todo:
925
925
        return result
926
926
 
927
927
    def set_branch_reference(self, target_branch, name=None):
928
 
        from ...branch import BranchReferenceFormat
 
928
        from ...bzrbranch import BranchReferenceFormat
929
929
        if name is not None:
930
930
            raise errors.NoColocatedBranchSupport(self)
931
931
        raise errors.IncompatibleFormat(BranchReferenceFormat, self._format)