/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

Use central git module.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
36
36
    def get_tag_dict(self):
37
37
        ret = {}
38
38
        for tag in self.repository._git.tags:
39
 
            ret[tag.name] = self.branch.mapping.revision_id_foreign_to_bzr(tag.ref)
 
39
            ret[tag.name] = self.branch.mapping.revision_id_foreign_to_bzr(tag.commit.id)
40
40
        return ret
41
41
 
42
42
    def set_tag(self, name, revid):
68
68
class GitBranch(ForeignBranch):
69
69
    """An adapter to git repositories for bzr Branch objects."""
70
70
 
71
 
    def __init__(self, bzrdir, repository, name, head, lockfiles):
 
71
    def __init__(self, bzrdir, repository, head, base, lockfiles):
72
72
        self.repository = repository
73
73
        super(GitBranch, self).__init__(default_mapping)
74
74
        self.control_files = lockfiles
75
75
        self.bzrdir = bzrdir
76
 
        self.name = name
77
76
        self.head = head
78
 
        self.base = bzrdir.transport.base
 
77
        self.base = base
79
78
        self._format = GitBranchFormat()
80
79
 
81
80
    def lock_write(self):
82
81
        self.control_files.lock_write()
83
82
 
84
 
    def get_stacked_on_url(self):
85
 
        # Git doesn't do stacking (yet...)
86
 
        return None
87
 
 
88
 
    def get_parent(self):
89
 
        """See Branch.get_parent()."""
90
 
        return None
91
 
 
92
 
    def lock_read(self):
93
 
        self.control_files.lock_read()
94
 
 
95
 
    def unlock(self):
96
 
        self.control_files.unlock()
97
 
 
98
 
    def get_physical_lock_status(self):
99
 
        return False
100
 
 
101
 
 
102
 
class LocalGitBranch(GitBranch):
103
 
 
104
83
    @needs_read_lock
105
84
    def last_revision(self):
106
85
        # perhaps should escape this ?
111
90
    def _make_tags(self):
112
91
        return GitTagDict(self)
113
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
 
114
100
    def _gen_revision_history(self):
115
101
        if self.head is None:
116
102
            return []
117
 
        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
118
118
        ret.reverse()
119
119
        return ret
120
120
 
121
121
    def get_config(self):
122
122
        return GitBranchConfig(self)
123
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
 
124
133
    def get_push_location(self):
125
134
        """See Branch.get_push_location."""
126
135
        push_loc = self.get_config().get_user_option('push_location')