/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

Cope with newer *system* dulwich

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
25
25
from bzrlib.decorators import needs_read_lock
26
26
 
27
27
from bzrlib.plugins.git.foreign import ForeignBranch
28
 
from bzrlib.plugins.git.mapping import default_mapping
29
28
 
30
29
class GitTagDict(tag.BasicTags):
31
30
 
35
34
 
36
35
    def get_tag_dict(self):
37
36
        ret = {}
38
 
        for tag in self.repository._git.tags:
39
 
            ret[tag.name] = self.branch.mapping.revision_id_foreign_to_bzr(tag.ref)
 
37
        for k,v in self.repository._git.tags.iteritems():
 
38
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
40
39
        return ret
41
40
 
42
41
    def set_tag(self, name, revid):
43
 
        raise NotImplementedError(self.set_tag)
 
42
        self.repository._git.tags[name] = revid
44
43
 
45
44
 
46
45
class GitBranchConfig(config.BranchConfig):
68
67
class GitBranch(ForeignBranch):
69
68
    """An adapter to git repositories for bzr Branch objects."""
70
69
 
71
 
    def __init__(self, bzrdir, repository, head, base, lockfiles):
 
70
    def __init__(self, bzrdir, repository, name, head, lockfiles):
72
71
        self.repository = repository
73
 
        super(GitBranch, self).__init__(default_mapping)
 
72
        super(GitBranch, self).__init__(repository.get_mapping())
74
73
        self.control_files = lockfiles
75
74
        self.bzrdir = bzrdir
 
75
        self.name = name
76
76
        self.head = head
77
 
        self.base = base
 
77
        self.base = bzrdir.transport.base
78
78
        self._format = GitBranchFormat()
79
79
 
80
80
    def lock_write(self):
81
81
        self.control_files.lock_write()
82
82
 
 
83
    def get_stacked_on_url(self):
 
84
        # Git doesn't do stacking (yet...)
 
85
        return None
 
86
 
 
87
    def get_parent(self):
 
88
        """See Branch.get_parent()."""
 
89
        return None
 
90
 
 
91
    def set_parent(self, url):
 
92
        pass
 
93
 
 
94
    def lock_read(self):
 
95
        self.control_files.lock_read()
 
96
 
 
97
    def unlock(self):
 
98
        self.control_files.unlock()
 
99
 
 
100
    def get_physical_lock_status(self):
 
101
        return False
 
102
 
 
103
 
 
104
class LocalGitBranch(GitBranch):
 
105
 
83
106
    @needs_read_lock
84
107
    def last_revision(self):
85
108
        # perhaps should escape this ?
90
113
    def _make_tags(self):
91
114
        return GitTagDict(self)
92
115
 
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
 
 
100
116
    def _gen_revision_history(self):
101
117
        if self.head is None:
102
118
            return []
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
 
119
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
118
120
        ret.reverse()
119
121
        return ret
120
122
 
121
123
    def get_config(self):
122
124
        return GitBranchConfig(self)
123
125
 
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
 
 
133
126
    def get_push_location(self):
134
127
        """See Branch.get_push_location."""
135
128
        push_loc = self.get_config().get_user_option('push_location')