/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

Merge in dulwich.

Show diffs side-by-side

added added

removed removed

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