/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 formatting, remove catch-all for exceptions when opening local repositories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
20
20
    branch,
21
21
    config,
22
22
    revision,
 
23
    tag,
23
24
    )
24
25
from bzrlib.decorators import needs_read_lock
25
26
 
26
 
from bzrlib.plugins.git import ids
 
27
from bzrlib.plugins.git.foreign import ForeignBranch
 
28
from bzrlib.plugins.git.mapping import default_mapping
 
29
 
 
30
class GitTagDict(tag.BasicTags):
 
31
 
 
32
    def __init__(self, branch):
 
33
        self.branch = branch
 
34
        self.repository = branch.repository
 
35
 
 
36
    def get_tag_dict(self):
 
37
        ret = {}
 
38
        for tag in self.repository._git.tags:
 
39
            ret[tag.name] = self.branch.mapping.revision_id_foreign_to_bzr(tag.ref)
 
40
        return ret
 
41
 
 
42
    def set_tag(self, name, revid):
 
43
        raise NotImplementedError(self.set_tag)
27
44
 
28
45
 
29
46
class GitBranchConfig(config.BranchConfig):
41
58
 
42
59
class GitBranchFormat(branch.BranchFormat):
43
60
 
44
 
    def get_branch_description(self):
 
61
    def get_format_description(self):
45
62
        return 'Git Branch'
46
63
 
47
 
 
48
 
class GitBranch(branch.Branch):
 
64
    def supports_tags(self):
 
65
        return True
 
66
 
 
67
 
 
68
class GitBranch(ForeignBranch):
49
69
    """An adapter to git repositories for bzr Branch objects."""
50
70
 
51
 
    def __init__(self, gitdir, lockfiles):
52
 
        from bzrlib.plugins.git import git_repository
53
 
        self.bzrdir = gitdir
 
71
    def __init__(self, bzrdir, repository, name, head, lockfiles):
 
72
        self.repository = repository
 
73
        super(GitBranch, self).__init__(default_mapping)
54
74
        self.control_files = lockfiles
55
 
        self.repository = git_repository.GitRepository(gitdir, lockfiles)
56
 
        self.base = gitdir.root_transport.base
57
 
        if '.git' not in gitdir.root_transport.list_dir('.'):
58
 
            raise errors.NotBranchError(self.base)
 
75
        self.bzrdir = bzrdir
 
76
        self.name = name
 
77
        self.head = head
 
78
        self.base = bzrdir.transport.base
59
79
        self._format = GitBranchFormat()
60
80
 
61
81
    def lock_write(self):
62
82
        self.control_files.lock_write()
63
83
 
 
84
    def get_stacked_on_url(self):
 
85
        # Git doesn't do stacking (yet...)
 
86
        return None
 
87
 
 
88
    def get_parent(self):
 
89
        """See Branch.get_parent()."""
 
90
        return None
 
91
 
 
92
    def lock_read(self):
 
93
        self.control_files.lock_read()
 
94
 
 
95
    def unlock(self):
 
96
        self.control_files.unlock()
 
97
 
 
98
    def get_physical_lock_status(self):
 
99
        return False
 
100
 
 
101
 
 
102
class LocalGitBranch(GitBranch):
 
103
 
64
104
    @needs_read_lock
65
105
    def last_revision(self):
66
106
        # perhaps should escape this ?
67
 
        head_git_id = self.repository._git.get_head()
68
 
        if head_git_id is None:
 
107
        if self.head is None:
69
108
            return revision.NULL_REVISION
70
 
        return ids.convert_revision_id_git_to_bzr(head_git_id)
71
 
 
72
 
    @needs_read_lock
73
 
    def revision_history(self):
74
 
        node = self.last_revision()
75
 
        if node == revision.NULL_REVISION:
 
109
        return self.mapping.revision_id_foreign_to_bzr(self.head)
 
110
 
 
111
    def _make_tags(self):
 
112
        return GitTagDict(self)
 
113
 
 
114
    def _gen_revision_history(self):
 
115
        if self.head is None:
76
116
            return []
77
 
        ancestors = self.repository.get_revision_graph(node)
78
 
        history = []
79
 
        while node is not None:
80
 
            history.append(node)
81
 
            if len(ancestors[node]) > 0:
82
 
                node = ancestors[node][0]
83
 
            else:
84
 
                node = None
85
 
        return list(reversed(history))
 
117
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
 
118
        ret.reverse()
 
119
        return ret
86
120
 
87
121
    def get_config(self):
88
122
        return GitBranchConfig(self)
89
123
 
90
 
    def lock_read(self):
91
 
        self.control_files.lock_read()
92
 
 
93
 
    def unlock(self):
94
 
        self.control_files.unlock()
95
 
 
96
124
    def get_push_location(self):
97
125
        """See Branch.get_push_location."""
98
126
        push_loc = self.get_config().get_user_option('push_location')
102
130
        """See Branch.set_push_location."""
103
131
        self.get_config().set_user_option('push_location', location,
104
132
                                          local=True)
 
133
 
 
134
    def supports_tags(self):
 
135
        return True
 
136
 
 
137
    def sprout(self, to_bzrdir, revision_id=None):
 
138
        """See Branch.sprout()."""
 
139
        result = to_bzrdir.create_branch()
 
140
        self.copy_content_into(result, revision_id=revision_id)
 
141
        result.set_parent(self.bzrdir.root_transport.base)
 
142
        return result
 
143