/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

Fix RevisionTree.get_file_text().

Show diffs side-by-side

added added

removed removed

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