/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 repository.py

use mapping object.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
35
35
from bzrlib.transport import get_transport
36
36
 
37
37
from bzrlib.plugins.git import (
38
 
    ids,
39
38
    versionedfiles
40
39
    )
 
40
from bzrlib.plugins.git.mapping import default_mapping
41
41
 
42
42
 
43
43
class GitRepository(repository.Repository):
66
66
        while cms != []:
67
67
            cms = self._git.commits("--all", max_count=max_count, skip=skip)
68
68
            skip += max_count
69
 
            ret.update([ids.convert_revision_id_git_to_bzr(cm.id) for cm in cms])
 
69
            ret.update([default_mapping.convert_revision_id_git_to_bzr(cm.id) for cm in cms])
70
70
        return ret
71
71
 
72
72
    def is_shared(self):
88
88
            max_count = 1000
89
89
            cms = None
90
90
            while cms != []:
91
 
                cms = self._git.commits(ids.convert_revision_id_bzr_to_git(revision_id), max_count=max_count, skip=skip)
 
91
                cms = self._git.commits(default_mapping.convert_revision_id_bzr_to_git(revision_id), max_count=max_count, skip=skip)
92
92
                skip += max_count
93
 
                ret += [ids.convert_revision_id_git_to_bzr(cm.id) for cm in cms]
 
93
                ret += [default_mapping.convert_revision_id_git_to_bzr(cm.id) for cm in cms]
94
94
        return [None] + ret
95
95
 
96
96
    def get_signature_text(self, revision_id):
105
105
            if revid == revision.NULL_REVISION:
106
106
                ret[revid] = ()
107
107
            else:
108
 
                commit = self._git.commit(ids.convert_revision_id_bzr_to_git(revid))
109
 
                ret[revid] = tuple([ids.convert_revision_id_git_to_bzr(p.id) for p in commit.parents])
 
108
                commit = self._git.commit(default_mapping.convert_revision_id_bzr_to_git(revid))
 
109
                ret[revid] = tuple([default_mapping.convert_revision_id_git_to_bzr(p.id) for p in commit.parents])
110
110
        return ret
111
111
 
112
112
    def get_revision(self, revision_id):
113
 
        git_commit_id = ids.convert_revision_id_bzr_to_git(revision_id)
 
113
        git_commit_id = default_mapping.convert_revision_id_bzr_to_git(revision_id)
114
114
        commit = self._git.commit(git_commit_id)
115
115
        # print "fetched revision:", git_commit_id
116
116
        revision = self._parse_rev(commit)
133
133
 
134
134
        :return: a `bzrlib.revision.Revision` object.
135
135
        """
136
 
        rev = revision.Revision(ids.convert_revision_id_git_to_bzr(commit.id))
137
 
        rev.parent_ids = tuple([ids.convert_revision_id_git_to_bzr(p.id) for p in commit.parents])
 
136
        rev = revision.Revision(default_mapping.convert_revision_id_git_to_bzr(commit.id))
 
137
        rev.parent_ids = tuple([default_mapping.convert_revision_id_git_to_bzr(p.id) for p in commit.parents])
138
138
        rev.inventory_sha1 = ""
139
139
        rev.message = commit.message.decode("utf-8", "replace")
140
140
        rev.committer = str(commit.committer)
175
175
    def __init__(self, repository, revision_id):
176
176
        self._repository = repository
177
177
        self.revision_id = revision_id
178
 
        git_id = ids.convert_revision_id_bzr_to_git(revision_id)
 
178
        git_id = default_mapping.convert_revision_id_bzr_to_git(revision_id)
179
179
        self.tree = repository._git.commit(git_id).tree
180
180
        self._inventory = inventory.Inventory(revision_id=revision_id)
181
181
        self._inventory.root.revision = revision_id