/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

Add tests for revspec.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dir.py
21
21
    errors as bzr_errors,
22
22
    lockable_files,
23
23
    urlutils,
 
24
    version_info as bzrlib_version,
24
25
    )
25
26
 
26
27
LockWarner = getattr(lockable_files, "_LockWarner", None)
77
78
    def cloning_metadir(self, stacked=False):
78
79
        return get_rich_root_format(stacked)
79
80
 
 
81
    def _branch_name_to_ref(self, name):
 
82
        from bzrlib.plugins.git.branch import branch_name_to_ref
 
83
        return branch_name_to_ref(name)
 
84
 
 
85
    if bzrlib_version >= (2, 2):
 
86
        def open_branch(self, name=None, ignore_fallbacks=None,
 
87
            unsupported=False):
 
88
            return self._open_branch(name=name,
 
89
                ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
 
90
    else:
 
91
        def open_branch(self, ignore_fallbacks=None, unsupported=False):
 
92
            return self._open_branch(name=None,
 
93
                ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
 
94
 
80
95
 
81
96
class LocalGitDir(GitDir):
82
97
    """An adapter to the '.git' dir used by git."""
111
126
    get_repository_transport = get_branch_transport
112
127
    get_workingtree_transport = get_branch_transport
113
128
 
114
 
    def open_branch(self, ignore_fallbacks=None):
 
129
    def _open_branch(self, name=None, ignore_fallbacks=None, unsupported=False):
115
130
        """'create' a branch for this dir."""
116
131
        repo = self.open_repository()
117
132
        from bzrlib.plugins.git.branch import LocalGitBranch
118
 
        return LocalGitBranch(self, repo, "HEAD", self._lockfiles)
 
133
        return LocalGitBranch(self, repo, self._branch_name_to_ref(name),
 
134
            self._lockfiles)
 
135
 
 
136
    def destroy_branch(self, name=None):
 
137
        del self._git.refs[self._branch_name_to_ref(name)]
 
138
 
 
139
    def list_branches(self):
 
140
        ret = []
 
141
        for name in self._git.get_refs():
 
142
            if name.startswith("refs/heads/") or name == "HEAD":
 
143
                ret.append(self.open_branch(name=name))
 
144
        return ret
119
145
 
120
146
    def open_repository(self, shared=False):
121
147
        """'open' a repository for this dir."""
122
148
        return self._gitrepository_class(self, self._lockfiles)
123
149
 
124
150
    def open_workingtree(self, recommend_upgrade=True):
125
 
        if not self._git.bare and self._git.has_index():
126
 
            from bzrlib.plugins.git.workingtree import GitWorkingTree
127
 
            return GitWorkingTree(self, self.open_repository(),
128
 
                                                  self.open_branch())
 
151
        if not self._git.bare:
 
152
            from dulwich.errors import NoIndexPresent
 
153
            repo = self.open_repository()
 
154
            try:
 
155
                index = repo._git.open_index()
 
156
            except NoIndexPresent:
 
157
                pass
 
158
            else:
 
159
                from bzrlib.plugins.git.workingtree import GitWorkingTree
 
160
                return GitWorkingTree(self, repo, self.open_branch(), index)
129
161
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
130
162
        raise bzr_errors.NoWorkingTree(loc)
131
163
 
132
164
    def create_repository(self, shared=False):
133
165
        return self.open_repository()
134
166
 
135
 
    def create_branch(self):
136
 
        return self.open_branch()
 
167
    def create_branch(self, name=None):
 
168
        refname = self._branch_name_to_ref(name)
 
169
        self._git.refs[refname] = "0" * 40
 
170
        return self.open_branch(name)
137
171
 
138
172
    def backup_bzrdir(self):
139
173
        if self._git.bare: