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

stgit dependency was removed already

Show diffs side-by-side

added added

removed removed

Lines of Context:
gitlib/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
 
from bzrlib.trace import mutter
27
 
 
28
 
from bzrlib.plugins.git.foreign import ForeignBranch
29
 
 
30
 
from dulwich.objects import (
31
 
        Commit,
32
 
        Tag,
33
 
        )
34
 
 
35
 
class GitTagDict(tag.BasicTags):
36
 
 
37
 
    def __init__(self, branch):
38
 
        self.branch = branch
39
 
        self.repository = branch.repository
40
 
 
41
 
    def get_tag_dict(self):
42
 
        ret = {}
43
 
        for k,v in self.repository._git.tags.iteritems():
44
 
            obj = self.repository._git.get_object(v)
45
 
            while isinstance(obj, Tag):
46
 
                v = obj.object[1]
47
 
                obj = self.repository._git.get_object(v)
48
 
            if not isinstance(obj, Commit):
49
 
                mutter("Tag %s points at object %r that is not a commit, ignoring", k, obj)
50
 
                continue
51
 
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
52
 
        return ret
53
 
 
54
 
    def set_tag(self, name, revid):
55
 
        self.repository._git.tags[name] = revid
 
25
 
 
26
from bzrlib.plugins.git.gitlib import ids
56
27
 
57
28
 
58
29
class GitBranchConfig(config.BranchConfig):
63
34
        # do not provide a BranchDataConfig
64
35
        self.option_sources = self.option_sources[0], self.option_sources[2]
65
36
 
66
 
    def set_user_option(self, name, value, store=config.STORE_BRANCH, warn_masked=False):
 
37
    def set_user_option(self, name, value, local=False):
67
38
        """Force local to True"""
68
 
        config.BranchConfig.set_user_option(self, name, value, store=config.STORE_LOCATION, warn_masked=warn_masked)
 
39
        config.BranchConfig.set_user_option(self, name, value, local=True)
69
40
 
70
41
 
71
42
class GitBranchFormat(branch.BranchFormat):
72
43
 
73
 
    def get_format_description(self):
 
44
    def get_branch_description(self):
74
45
        return 'Git Branch'
75
46
 
76
 
    def supports_tags(self):
77
 
        return True
78
 
 
79
 
 
80
 
class GitBranch(ForeignBranch):
 
47
 
 
48
class GitBranch(branch.Branch):
81
49
    """An adapter to git repositories for bzr Branch objects."""
82
50
 
83
 
    def __init__(self, bzrdir, repository, name, head, lockfiles):
84
 
        self.repository = repository
85
 
        super(GitBranch, self).__init__(repository.get_mapping())
 
51
    def __init__(self, gitdir, lockfiles):
 
52
        from bzrlib.plugins.git.gitlib import git_repository
 
53
        self.bzrdir = gitdir
86
54
        self.control_files = lockfiles
87
 
        self.bzrdir = bzrdir
88
 
        self.name = name
89
 
        self.head = head
90
 
        self.base = bzrdir.transport.base
 
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)
91
59
        self._format = GitBranchFormat()
92
60
 
93
61
    def lock_write(self):
94
62
        self.control_files.lock_write()
95
63
 
96
 
    def get_stacked_on_url(self):
97
 
        # Git doesn't do stacking (yet...)
98
 
        return None
99
 
 
100
 
    def get_parent(self):
101
 
        """See Branch.get_parent()."""
102
 
        return None
103
 
 
104
 
    def set_parent(self, url):
105
 
        pass
106
 
 
107
 
    def lock_read(self):
108
 
        self.control_files.lock_read()
109
 
 
110
 
    def unlock(self):
111
 
        self.control_files.unlock()
112
 
 
113
 
    def get_physical_lock_status(self):
114
 
        return False
115
 
 
116
 
 
117
 
class LocalGitBranch(GitBranch):
118
 
 
119
64
    @needs_read_lock
120
65
    def last_revision(self):
121
66
        # perhaps should escape this ?
122
 
        if self.head is None:
 
67
        head_git_id = self.repository._git.get_head()
 
68
        if head_git_id is None:
123
69
            return revision.NULL_REVISION
124
 
        return self.mapping.revision_id_foreign_to_bzr(self.head)
125
 
 
126
 
    def _make_tags(self):
127
 
        return GitTagDict(self)
128
 
 
129
 
    def _gen_revision_history(self):
130
 
        if self.head is None:
 
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:
131
76
            return []
132
 
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
133
 
        ret.reverse()
134
 
        return ret
 
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))
135
86
 
136
87
    def get_config(self):
137
88
        return GitBranchConfig(self)
138
89
 
 
90
    def lock_read(self):
 
91
        self.control_files.lock_read()
 
92
 
 
93
    def unlock(self):
 
94
        self.control_files.unlock()
 
95
 
139
96
    def get_push_location(self):
140
97
        """See Branch.get_push_location."""
141
98
        push_loc = self.get_config().get_user_option('push_location')
144
101
    def set_push_location(self, location):
145
102
        """See Branch.set_push_location."""
146
103
        self.get_config().set_user_option('push_location', location,
147
 
                                          store=config.STORE_LOCATION)
148
 
 
149
 
    def supports_tags(self):
150
 
        return True
151
 
 
152
 
    def sprout(self, to_bzrdir, revision_id=None):
153
 
        """See Branch.sprout()."""
154
 
        result = to_bzrdir.create_branch()
155
 
        self.copy_content_into(result, revision_id=revision_id)
156
 
        result.set_parent(self.bzrdir.root_transport.base)
157
 
        return result
158
 
 
 
104
                                          local=True)