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

Proper branch names.

Show diffs side-by-side

added added

removed removed

Lines of Context:
79
79
        return get_rich_root_format(stacked)
80
80
 
81
81
    def _branch_name_to_ref(self, name):
82
 
        if name is None or name == "HEAD":
83
 
            return "HEAD"
84
 
        if not "/" in name:
85
 
            return "refs/heads/%s" % name
86
 
        else:
87
 
            return name
 
82
        from bzrlib.plugins.git.branch import branch_name_to_ref
 
83
        return branch_name_to_ref(name)
88
84
 
89
85
 
90
86
class LocalGitDir(GitDir):
140
136
    def list_branches(self):
141
137
        ret = []
142
138
        for name in self._git.get_refs():
143
 
            if name.startswith("refs/heads/"):
 
139
            if name.startswith("refs/heads/") or name == "HEAD":
144
140
                ret.append(self.open_branch(name=name))
145
 
            elif name == "HEAD":
146
 
                ret.append(self.open_branch(name=None))
147
141
        return ret
148
142
 
149
143
    def open_repository(self, shared=False):