/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

Ignore .plugins dir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
git_branch.py
23
23
    tag,
24
24
    )
25
25
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
 
        )
 
26
 
 
27
from bzrlib.plugins.git import ids
34
28
 
35
29
class GitTagDict(tag.BasicTags):
36
30
 
40
34
 
41
35
    def get_tag_dict(self):
42
36
        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)
 
37
        for tag in self.repository._git.tags:
 
38
            ret[tag.name] = ids.convert_revision_id_git_to_bzr(tag.commit.id)
52
39
        return ret
53
40
 
54
41
    def set_tag(self, name, revid):
55
 
        self.repository._git.tags[name] = revid
 
42
        raise NotImplementedError(self.set_tag)
56
43
 
57
44
 
58
45
class GitBranchConfig(config.BranchConfig):
63
50
        # do not provide a BranchDataConfig
64
51
        self.option_sources = self.option_sources[0], self.option_sources[2]
65
52
 
66
 
    def set_user_option(self, name, value, store=config.STORE_BRANCH, warn_masked=False):
 
53
    def set_user_option(self, name, value, local=False):
67
54
        """Force local to True"""
68
 
        config.BranchConfig.set_user_option(self, name, value, store=config.STORE_LOCATION, warn_masked=warn_masked)
 
55
        config.BranchConfig.set_user_option(self, name, value, local=True)
69
56
 
70
57
 
71
58
class GitBranchFormat(branch.BranchFormat):
77
64
        return True
78
65
 
79
66
 
80
 
class GitBranch(ForeignBranch):
 
67
class GitBranch(branch.Branch):
81
68
    """An adapter to git repositories for bzr Branch objects."""
82
69
 
83
 
    def __init__(self, bzrdir, repository, name, head, lockfiles):
 
70
    def __init__(self, bzrdir, repository, head, base, lockfiles):
84
71
        self.repository = repository
85
 
        super(GitBranch, self).__init__(repository.get_mapping())
 
72
        super(GitBranch, self).__init__()
86
73
        self.control_files = lockfiles
87
74
        self.bzrdir = bzrdir
88
 
        self.name = name
89
75
        self.head = head
90
 
        self.base = bzrdir.transport.base
 
76
        self.base = base
91
77
        self._format = GitBranchFormat()
92
78
 
93
79
    def lock_write(self):
94
80
        self.control_files.lock_write()
95
81
 
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
82
    @needs_read_lock
120
83
    def last_revision(self):
121
84
        # perhaps should escape this ?
122
85
        if self.head is None:
123
86
            return revision.NULL_REVISION
124
 
        return self.mapping.revision_id_foreign_to_bzr(self.head)
 
87
        return ids.convert_revision_id_git_to_bzr(self.head)
125
88
 
126
89
    def _make_tags(self):
127
90
        return GitTagDict(self)
128
91
 
 
92
    def get_parent(self):
 
93
        """See Branch.get_parent()."""
 
94
        return None
 
95
 
 
96
    def get_stacked_on_url(self):
 
97
        return None
 
98
 
129
99
    def _gen_revision_history(self):
130
100
        if self.head is None:
131
101
            return []
132
 
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
 
102
        skip = 0
 
103
        cms = None
 
104
        ret = []
 
105
        max_count = 1000
 
106
        nextid = self.head
 
107
        while cms != []:
 
108
            cms = self.repository._git.commits(self.head, max_count=max_count, skip=skip)
 
109
            skip += max_count
 
110
            for cm in cms:
 
111
                if cm.id == nextid:
 
112
                    ret.append(ids.convert_revision_id_git_to_bzr(cm.id))
 
113
                    if cm.parents == []:
 
114
                        nextid = None
 
115
                    else:
 
116
                        nextid = cm.parents[0].id
133
117
        ret.reverse()
134
118
        return ret
135
119
 
136
120
    def get_config(self):
137
121
        return GitBranchConfig(self)
138
122
 
 
123
    def lock_read(self):
 
124
        self.control_files.lock_read()
 
125
 
 
126
    def unlock(self):
 
127
        self.control_files.unlock()
 
128
 
 
129
    def get_physical_lock_status(self):
 
130
        return False
 
131
 
139
132
    def get_push_location(self):
140
133
        """See Branch.get_push_location."""
141
134
        push_loc = self.get_config().get_user_option('push_location')
144
137
    def set_push_location(self, location):
145
138
        """See Branch.set_push_location."""
146
139
        self.get_config().set_user_option('push_location', location,
147
 
                                          store=config.STORE_LOCATION)
 
140
                                          local=True)
148
141
 
149
142
    def supports_tags(self):
150
143
        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