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

pass update_refs to dfetch_refs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
692
692
        result.source_branch = self.source
693
693
        result.target_branch = self.target
694
694
        # FIXME: Check for diverged branches
695
 
        refs, main_ref = self._get_new_refs(stop_revision)
696
 
        result.revidmap, old_refs, new_refs = self.interrepo.dfetch_refs(refs)
 
695
        new_refs, main_ref = self._get_new_refs(stop_revision)
 
696
        def update_refs(old_refs):
 
697
            refs = dict(old_refs)
 
698
            refs.update(new_refs)
 
699
            return refs
 
700
        result.revidmap, old_refs, new_refs = self.interrepo.dfetch_refs(
 
701
            update_refs)
697
702
        result.old_revid = self.target.lookup_foreign_revision_id(
698
703
            old_refs.get(self.target.ref, ZERO_SHA))
699
704
        result.new_revid = self.target.lookup_foreign_revision_id(