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

Merge James.

Show diffs side-by-side

added added

removed removed

Lines of Context:
git_branch.py
20
20
    branch,
21
21
    config,
22
22
    revision,
23
 
    tag,
24
23
    )
25
24
from bzrlib.decorators import needs_read_lock
26
25
 
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)
 
26
from bzrlib.plugins.git import ids
44
27
 
45
28
 
46
29
class GitBranchConfig(config.BranchConfig):
58
41
 
59
42
class GitBranchFormat(branch.BranchFormat):
60
43
 
61
 
    def get_format_description(self):
 
44
    def get_branch_description(self):
62
45
        return 'Git Branch'
63
46
 
64
 
    def supports_tags(self):
65
 
        return True
66
 
 
67
 
 
68
 
class GitBranch(ForeignBranch):
 
47
 
 
48
class GitBranch(branch.Branch):
69
49
    """An adapter to git repositories for bzr Branch objects."""
70
50
 
71
 
    def __init__(self, bzrdir, repository, name, head, lockfiles):
72
 
        self.repository = repository
73
 
        super(GitBranch, self).__init__(default_mapping)
 
51
    def __init__(self, gitdir, lockfiles):
 
52
        super(GitBranch, self).__init__()
 
53
        from bzrlib.plugins.git import git_repository
 
54
        self.bzrdir = gitdir
74
55
        self.control_files = lockfiles
75
 
        self.bzrdir = bzrdir
76
 
        self.name = name
77
 
        self.head = head
78
 
        self.base = bzrdir.transport.base
 
56
        self.repository = git_repository.GitRepository(gitdir, lockfiles)
 
57
        self.base = gitdir.root_transport.base
 
58
        if '.git' not in gitdir.root_transport.list_dir('.'):
 
59
            raise errors.NotBranchError(self.base)
79
60
        self._format = GitBranchFormat()
80
61
 
81
62
    def lock_write(self):
82
63
        self.control_files.lock_write()
83
64
 
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
 
 
104
65
    @needs_read_lock
105
66
    def last_revision(self):
106
67
        # perhaps should escape this ?
107
 
        if self.head is None:
 
68
        head_git_id = self.repository._git.get_head()
 
69
        if head_git_id is None:
108
70
            return 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:
 
71
        return ids.convert_revision_id_git_to_bzr(head_git_id)
 
72
 
 
73
    @needs_read_lock
 
74
    def revision_history(self):
 
75
        node = self.last_revision()
 
76
        if node == revision.NULL_REVISION:
116
77
            return []
117
 
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
118
 
        ret.reverse()
119
 
        return ret
 
78
        ancestors = self.repository.get_revision_graph(node)
 
79
        history = []
 
80
        while node is not None:
 
81
            history.append(node)
 
82
            if len(ancestors[node]) > 0:
 
83
                node = ancestors[node][0]
 
84
            else:
 
85
                node = None
 
86
        return list(reversed(history))
120
87
 
121
88
    def get_config(self):
122
89
        return GitBranchConfig(self)
123
90
 
 
91
    def lock_read(self):
 
92
        self.control_files.lock_read()
 
93
 
 
94
    def unlock(self):
 
95
        self.control_files.unlock()
 
96
 
124
97
    def get_push_location(self):
125
98
        """See Branch.get_push_location."""
126
99
        push_loc = self.get_config().get_user_option('push_location')
132
105
                                          local=True)
133
106
 
134
107
    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
 
 
 
108
        return False