/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
20
20
    branch,
21
21
    config,
22
22
    revision,
 
23
    tag,
23
24
    )
24
25
from bzrlib.decorators import needs_read_lock
25
26
 
26
 
from bzrlib.plugins.git import ids
 
27
from bzrlib.plugins.git.foreign import ForeignBranch
 
28
 
 
29
class GitTagDict(tag.BasicTags):
 
30
 
 
31
    def __init__(self, branch):
 
32
        self.branch = branch
 
33
        self.repository = branch.repository
 
34
 
 
35
    def get_tag_dict(self):
 
36
        ret = {}
 
37
        for k,v in self.repository._git.tags.iteritems():
 
38
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
 
39
        return ret
 
40
 
 
41
    def set_tag(self, name, revid):
 
42
        self.repository._git.tags[name] = revid
27
43
 
28
44
 
29
45
class GitBranchConfig(config.BranchConfig):
44
60
    def get_format_description(self):
45
61
        return 'Git Branch'
46
62
 
47
 
 
48
 
class GitBranch(branch.Branch):
 
63
    def supports_tags(self):
 
64
        return True
 
65
 
 
66
 
 
67
class GitBranch(ForeignBranch):
49
68
    """An adapter to git repositories for bzr Branch objects."""
50
69
 
51
 
    def __init__(self, bzrdir, repository, head, base, lockfiles):
52
 
        super(GitBranch, self).__init__()
 
70
    def __init__(self, bzrdir, repository, name, head, lockfiles):
 
71
        self.repository = repository
 
72
        super(GitBranch, self).__init__(repository.get_mapping())
53
73
        self.control_files = lockfiles
54
74
        self.bzrdir = bzrdir
55
 
        self.repository = repository
 
75
        self.name = name
56
76
        self.head = head
57
 
        self.base = base
 
77
        self.base = bzrdir.transport.base
58
78
        self._format = GitBranchFormat()
59
79
 
60
80
    def lock_write(self):
61
81
        self.control_files.lock_write()
62
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
 
63
106
    @needs_read_lock
64
107
    def last_revision(self):
65
108
        # perhaps should escape this ?
66
109
        if self.head is None:
67
110
            return revision.NULL_REVISION
68
 
        return ids.convert_revision_id_git_to_bzr(self.head)
69
 
 
70
 
    def get_parent(self):
71
 
        """See Branch.get_parent()."""
72
 
        return None
73
 
 
74
 
    def get_stacked_on_url(self):
75
 
        return None
 
111
        return self.mapping.revision_id_foreign_to_bzr(self.head)
 
112
 
 
113
    def _make_tags(self):
 
114
        return GitTagDict(self)
76
115
 
77
116
    def _gen_revision_history(self):
78
117
        if self.head is None:
79
118
            return []
80
 
        skip = 0
81
 
        cms = None
82
 
        ret = []
83
 
        max_count = 1000
84
 
        nextid = self.head
85
 
        while cms != []:
86
 
            cms = self.repository._git.commits(self.head, max_count=max_count, skip=skip)
87
 
            skip += max_count
88
 
            for cm in cms:
89
 
                if cm.id == nextid:
90
 
                    ret.append(ids.convert_revision_id_git_to_bzr(cm.id))
91
 
                    if cm.parents == []:
92
 
                        nextid = None
93
 
                    else:
94
 
                        nextid = cm.parents[0].id
 
119
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
95
120
        ret.reverse()
96
121
        return ret
97
122
 
98
123
    def get_config(self):
99
124
        return GitBranchConfig(self)
100
125
 
101
 
    def lock_read(self):
102
 
        self.control_files.lock_read()
103
 
 
104
 
    def unlock(self):
105
 
        self.control_files.unlock()
106
 
 
107
 
    def get_physical_lock_status(self):
108
 
        return False
109
 
 
110
126
    def get_push_location(self):
111
127
        """See Branch.get_push_location."""
112
128
        push_loc = self.get_config().get_user_option('push_location')
118
134
                                          local=True)
119
135
 
120
136
    def supports_tags(self):
121
 
        return False
 
137
        return True
 
138
 
 
139
    def sprout(self, to_bzrdir, revision_id=None):
 
140
        """See Branch.sprout()."""
 
141
        result = to_bzrdir.create_branch()
 
142
        self.copy_content_into(result, revision_id=revision_id)
 
143
        result.set_parent(self.bzrdir.root_transport.base)
 
144
        return result
 
145