/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

Add basic infrastructure for dpush.

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
 
from bzrlib.plugins.git import ids
 
26
from bzrlib.trace import mutter
 
27
 
 
28
from bzrlib.plugins.git.foreign import ForeignBranch
 
29
from bzrlib.plugins.git.errors import LightWeightCheckoutsNotSupported
 
30
 
 
31
from dulwich.objects import (
 
32
        Commit,
 
33
        Tag,
 
34
        )
 
35
 
 
36
class GitTagDict(tag.BasicTags):
 
37
 
 
38
    def __init__(self, branch):
 
39
        self.branch = branch
 
40
        self.repository = branch.repository
 
41
 
 
42
    def get_tag_dict(self):
 
43
        ret = {}
 
44
        for k,v in self.repository._git.tags.iteritems():
 
45
            obj = self.repository._git.get_object(v)
 
46
            while isinstance(obj, Tag):
 
47
                v = obj.object[1]
 
48
                obj = self.repository._git.get_object(v)
 
49
            if not isinstance(obj, Commit):
 
50
                mutter("Tag %s points at object %r that is not a commit, ignoring", k, obj)
 
51
                continue
 
52
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
 
53
        return ret
 
54
 
 
55
    def set_tag(self, name, revid):
 
56
        self.repository._git.tags[name] = revid
27
57
 
28
58
 
29
59
class GitBranchConfig(config.BranchConfig):
34
64
        # do not provide a BranchDataConfig
35
65
        self.option_sources = self.option_sources[0], self.option_sources[2]
36
66
 
37
 
    def set_user_option(self, name, value, local=False):
 
67
    def set_user_option(self, name, value, store=config.STORE_BRANCH, warn_masked=False):
38
68
        """Force local to True"""
39
 
        config.BranchConfig.set_user_option(self, name, value, local=True)
 
69
        config.BranchConfig.set_user_option(self, name, value, store=config.STORE_LOCATION, warn_masked=warn_masked)
40
70
 
41
71
 
42
72
class GitBranchFormat(branch.BranchFormat):
43
73
 
44
 
    def get_branch_description(self):
 
74
    def get_format_description(self):
45
75
        return 'Git Branch'
46
76
 
47
 
 
48
 
class GitBranch(branch.Branch):
 
77
    def supports_tags(self):
 
78
        return True
 
79
 
 
80
 
 
81
class GitBranch(ForeignBranch):
49
82
    """An adapter to git repositories for bzr Branch objects."""
50
83
 
51
 
    def __init__(self, gitdir, lockfiles):
52
 
        from bzrlib.plugins.git import git_repository
53
 
        self.bzrdir = gitdir
 
84
    def __init__(self, bzrdir, repository, name, head, lockfiles):
 
85
        self.repository = repository
 
86
        super(GitBranch, self).__init__(repository.get_mapping())
54
87
        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)
 
88
        self.bzrdir = bzrdir
 
89
        self.name = name
 
90
        self.head = head
 
91
        self.base = bzrdir.transport.base
59
92
        self._format = GitBranchFormat()
60
93
 
 
94
    def dpull(self, source, stop_revision=None):
 
95
        if stop_revision is None:
 
96
            stop_revision = source.last_revision()
 
97
        # FIXME: Check for diverged branches
 
98
        revidmap = self.repository.dfetch(source.repository, stop_revision)
 
99
        self.head, self.mapping = self.mapping.revision_id_bzr_to_foreign(revidmap[stop_revision])
 
100
        return revidmap
 
101
 
61
102
    def lock_write(self):
62
103
        self.control_files.lock_write()
63
104
 
 
105
    def get_stacked_on_url(self):
 
106
        # Git doesn't do stacking (yet...)
 
107
        return None
 
108
 
 
109
    def get_parent(self):
 
110
        """See Branch.get_parent()."""
 
111
        return None
 
112
 
 
113
    def set_parent(self, url):
 
114
        pass
 
115
 
 
116
    def lock_read(self):
 
117
        self.control_files.lock_read()
 
118
 
 
119
    def unlock(self):
 
120
        self.control_files.unlock()
 
121
 
 
122
    def get_physical_lock_status(self):
 
123
        return False
 
124
 
 
125
 
 
126
class LocalGitBranch(GitBranch):
 
127
 
64
128
    @needs_read_lock
65
129
    def last_revision(self):
66
130
        # perhaps should escape this ?
67
 
        head_git_id = self.repository._git.get_head()
68
 
        if head_git_id is None:
 
131
        if self.head is None:
69
132
            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:
 
133
        return self.mapping.revision_id_foreign_to_bzr(self.head)
 
134
 
 
135
    def create_checkout(self, to_location, revision_id=None, 
 
136
                        lightweight=False, accelerator_tree=None, hardlink=False):
 
137
        if lightweight:
 
138
            raise LightWeightCheckoutsNotSupported()
 
139
        return self._create_heavyweight_checkout(to_location, revision_id, hardlink)
 
140
 
 
141
    def _create_heavyweight_checkout(self, to_location, revision_id=None, 
 
142
                                     hardlink=False):
 
143
        """Create a new heavyweight checkout of this branch.
 
144
 
 
145
        :param to_location: URL of location to create the new checkout in.
 
146
        :param revision_id: Revision that should be the tip of the checkout.
 
147
        :param hardlink: Whether to hardlink
 
148
        :return: WorkingTree object of checkout.
 
149
        """
 
150
        checkout_branch = BzrDir.create_branch_convenience(
 
151
            to_location, force_new_tree=False, format=get_rich_root_format())
 
152
        checkout = checkout_branch.bzrdir
 
153
        checkout_branch.bind(self)
 
154
        # pull up to the specified revision_id to set the initial 
 
155
        # branch tip correctly, and seed it with history.
 
156
        checkout_branch.pull(self, stop_revision=revision_id)
 
157
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
 
158
 
 
159
    def _make_tags(self):
 
160
        return GitTagDict(self)
 
161
 
 
162
    def _gen_revision_history(self):
 
163
        if self.head is None:
76
164
            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))
 
165
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
 
166
        ret.reverse()
 
167
        return ret
86
168
 
87
169
    def get_config(self):
88
170
        return GitBranchConfig(self)
89
171
 
90
 
    def lock_read(self):
91
 
        self.control_files.lock_read()
92
 
 
93
 
    def unlock(self):
94
 
        self.control_files.unlock()
95
 
 
96
172
    def get_push_location(self):
97
173
        """See Branch.get_push_location."""
98
174
        push_loc = self.get_config().get_user_option('push_location')
101
177
    def set_push_location(self, location):
102
178
        """See Branch.set_push_location."""
103
179
        self.get_config().set_user_option('push_location', location,
104
 
                                          local=True)
 
180
                                          store=config.STORE_LOCATION)
 
181
 
 
182
    def supports_tags(self):
 
183
        return True
 
184
 
 
185
    def sprout(self, to_bzrdir, revision_id=None):
 
186
        """See Branch.sprout()."""
 
187
        result = to_bzrdir.create_branch()
 
188
        self.copy_content_into(result, revision_id=revision_id)
 
189
        result.set_parent(self.bzrdir.root_transport.base)
 
190
        return result
 
191