/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

Fix colocated remote branches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
76
76
    """
77
77
    if name is None or name == "HEAD":
78
78
        return "HEAD"
79
 
    if not "/" in name:
 
79
    if not name.startswith("refs/"):
80
80
        return "refs/heads/%s" % name
81
81
    else:
82
82
        return name
422
422
        """
423
423
        interrepo = self._get_interrepo(self.source, self.target)
424
424
        def determine_wants(heads):
425
 
            if not self.source.name in heads:
426
 
                raise NoSuchRef(self.source.name, heads.keys())
 
425
            if not self.source.ref in heads:
 
426
                raise NoSuchRef(self.source.ref, heads.keys())
427
427
            if stop_revision is not None:
428
428
                self._last_revid = stop_revision
429
429
                head, mapping = self.source.repository.lookup_bzr_revision_id(
430
430
                    stop_revision)
431
431
            else:
432
 
                head = heads[self.source.name]
 
432
                head = heads[self.source.ref]
433
433
                self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(
434
434
                    head)
435
435
            if self.target.repository.has_revision(self._last_revid):