/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

Use standard names for lookup functions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
367
367
                raise NoSuchRef(self.source.name, heads.keys())
368
368
            if stop_revision is not None:
369
369
                self._last_revid = stop_revision
370
 
                self._head, mapping = self.source.repository.lookup_git_revid(
 
370
                self._head, mapping = self.source.repository.lookup_bzr_revision_id(
371
371
                    stop_revision)
372
372
            else:
373
373
                self._head = heads[self.source.name]
468
468
        # FIXME: Check for diverged branches
469
469
        def get_changed_refs(old_refs):
470
470
            result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(old_refs.get("refs/heads/master", "0" * 40))
471
 
            refs = { "refs/heads/master": self.source.repository.lookup_git_revid(stop_revision)[0] }
 
471
            refs = { "refs/heads/master": self.source.repository.lookup_bzr_revision_id(stop_revision)[0] }
472
472
            result.new_revid = stop_revision
473
473
            for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
474
474
                refs["refs/tags/%s" % name] = sha