/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

Merge new dulwich.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
16
16
 
17
17
"""An adapter between a Git Repository and a Bazaar Branch"""
18
18
 
 
19
import os
 
20
import time
 
21
 
 
22
import bzrlib
19
23
from bzrlib import (
20
24
    deprecated_graph,
 
25
    errors,
 
26
    inventory,
 
27
    osutils,
21
28
    repository,
 
29
    revision,
 
30
    revisiontree,
22
31
    urlutils,
23
 
    )
24
 
 
25
 
from bzrlib.plugins.git.gitlib import (
26
 
    ids,
27
 
    model,
28
 
    )
29
 
 
30
 
 
31
 
class GitRepository(repository.Repository):
 
32
    versionedfile,
 
33
    )
 
34
from bzrlib.foreign import (
 
35
        ForeignRevision,
 
36
        )
 
37
from bzrlib.transport import get_transport
 
38
 
 
39
from bzrlib.plugins.git.foreign import (
 
40
    ForeignRepository,
 
41
    versionedfiles,
 
42
    )
 
43
from bzrlib.plugins.git.mapping import default_mapping
 
44
 
 
45
from bzrlib.plugins.git import git
 
46
 
 
47
 
 
48
class GitTags(object):
 
49
 
 
50
    def __init__(self, tags):
 
51
        self._tags = tags
 
52
 
 
53
    def __iter__(self):
 
54
        return iter(self._tags)
 
55
 
 
56
 
 
57
class GitRepository(ForeignRepository):
32
58
    """An adapter to git repositories for bzr."""
33
59
 
 
60
    _serializer = None
 
61
 
34
62
    def __init__(self, gitdir, lockfiles):
 
63
        self.base = gitdir.root_transport.base
35
64
        self.bzrdir = gitdir
36
65
        self.control_files = lockfiles
37
 
        gitdirectory = gitdir.transport.local_abspath('.')
38
 
        self._git = model.GitModel(gitdirectory)
39
 
        self._revision_cache = {}
 
66
        self._git = gitdir._git
 
67
        self.texts = None
 
68
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
 
69
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
 
70
        self._format = GitFormat()
 
71
        self._fallback_repositories = []
 
72
        self.tags = GitTags(self._git.get_tags())
40
73
 
41
 
    def _ancestor_revisions(self, revision_ids):
42
 
        if revision_ids is not None:
43
 
            git_revisions = [gitrevid_from_bzr(r) for r in revision_ids]
44
 
        else:
45
 
            git_revisions = None
46
 
        for lines in self._git.ancestor_lines(git_revisions):
47
 
            yield self.parse_rev(lines)
 
74
    def _all_revision_ids(self):
 
75
        if self._git.heads == []:
 
76
            return set()
 
77
        ret = set()
 
78
        skip = 0
 
79
        max_count = 1000
 
80
        cms = None
 
81
        while cms != []:
 
82
            cms = self._git.commits("--all", max_count=max_count, skip=skip)
 
83
            skip += max_count
 
84
            ret.update([self.get_mapping().revision_id_foreign_to_bzr(cm.id) for cm in cms])
 
85
        return ret
48
86
 
49
87
    def is_shared(self):
50
88
        return True
51
89
 
52
 
    def get_revision_graph(self, revision_id=None):
53
 
        result = {}
54
 
        if revision_id is not None:
55
 
            param = [ids.convert_revision_id_bzr_to_git(revision_id)]
56
 
        else:
57
 
            param = None
58
 
        for node, parents in self._git.ancestry(param).iteritems():
59
 
            bzr_node = ids.convert_revision_id_git_to_bzr(node)
60
 
            bzr_parents = [ids.convert_revision_id_git_to_bzr(n)
61
 
                           for n in parents]
62
 
            result[bzr_node] = bzr_parents
63
 
        return result
64
 
 
65
 
    def get_revision_graph_with_ghosts(self, revision_ids=None):
66
 
        graph = deprecated_graph.Graph()
67
 
        if revision_ids is not None:
68
 
            revision_ids = [ids.convert_revision_id_bzr_to_git(r)
69
 
                            for r in revision_ids]
70
 
        for node, parents in self._git.ancestry(revision_ids).iteritems():
71
 
            bzr_node = ids.convert_revision_id_git_to_bzr(node)
72
 
            bzr_parents = [ids.convert_revision_id_git_to_bzr(n)
73
 
                           for n in parents]
74
 
 
75
 
            graph.add_node(bzr_node, bzr_parents)
76
 
        return graph
 
90
    def supports_rich_root(self):
 
91
        return False
 
92
 
 
93
    #def get_revision_delta(self, revision_id):
 
94
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
 
95
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
 
96
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
 
97
 
 
98
    def get_ancestry(self, revision_id):
 
99
        revision_id = revision.ensure_null(revision_id)
 
100
        ret = []
 
101
        if revision_id != revision.NULL_REVISION:
 
102
            skip = 0
 
103
            max_count = 1000
 
104
            cms = None
 
105
            while cms != []:
 
106
                cms = self._git.commits(self.lookup_git_revid(revision_id, self.get_mapping()), max_count=max_count, skip=skip)
 
107
                skip += max_count
 
108
                ret += [self.get_mapping().revision_id_foreign_to_bzr(cm.id) for cm in cms]
 
109
        return [None] + ret
 
110
 
 
111
    def get_signature_text(self, revision_id):
 
112
        raise errors.NoSuchRevision(self, revision_id)
 
113
 
 
114
    def lookup_revision_id(self, revid):
 
115
        """Lookup a revision id.
 
116
        
 
117
        :param revid: Bazaar revision id.
 
118
        :return: Tuple with git revisionid and mapping.
 
119
        """
 
120
        # Yes, this doesn't really work, but good enough as a stub
 
121
        return osutils.sha(rev_id).hexdigest(), self.get_mapping()
 
122
 
 
123
    def has_signature_for_revision_id(self, revision_id):
 
124
        return False
 
125
 
 
126
    def get_mapping(self):
 
127
        return default_mapping
 
128
 
 
129
    def get_parent_map(self, revision_ids):
 
130
        ret = {}
 
131
        for revid in revision_ids:
 
132
            if revid == revision.NULL_REVISION:
 
133
                ret[revid] = ()
 
134
            else:
 
135
                git_commit_id = self.lookup_git_revid(revid, self.get_mapping())
 
136
                commit = self._git.commit(git_commit_id)
 
137
                ret[revid] = tuple([self.get_mapping().revision_id_foreign_to_bzr(p.id) for p in commit.parents])
 
138
        return ret
 
139
 
 
140
    def lookup_git_revid(self, bzr_revid, mapping):
 
141
        try:
 
142
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
 
143
        except errors.InvalidRevisionId:
 
144
            raise errors.NoSuchRevision(bzr_revid, self)
77
145
 
78
146
    def get_revision(self, revision_id):
79
 
        if revision_id in self._revision_cache:
80
 
            return self._revision_cache[revision_id]
81
 
        raw = self._git.rev_list([gitrevid_from_bzr(revision_id)], max_count=1,
82
 
                                 header=True)
83
 
        return self.parse_rev(raw)
 
147
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
 
148
        commit = self._git.commit(git_commit_id)
 
149
        # print "fetched revision:", git_commit_id
 
150
        revision = self._parse_rev(commit, self.get_mapping())
 
151
        return revision
84
152
 
85
153
    def has_revision(self, revision_id):
86
154
        try:
93
161
    def get_revisions(self, revisions):
94
162
        return [self.get_revision(r) for r in revisions]
95
163
 
96
 
    def parse_rev(self, raw):
97
 
        # first field is the rev itself.
98
 
        # then its 'field value'
99
 
        # until the EOF??
100
 
        parents = []
101
 
        log = []
102
 
        in_log = False
103
 
        committer = None
104
 
        revision_id = bzrrevid_from_git(raw[0][:-1])
105
 
        for field in raw[1:]:
106
 
            #if field.startswith('author '):
107
 
            #    committer = field[7:]
108
 
            if field.startswith('parent '):
109
 
                parents.append(bzrrevid_from_git(field.split()[1]))
110
 
            elif field.startswith('committer '):
111
 
                commit_fields = field.split()
112
 
                if committer is None:
113
 
                    committer = ' '.join(commit_fields[1:-3])
114
 
                timestamp = commit_fields[-2]
115
 
                timezone = commit_fields[-1]
116
 
            elif field.startswith('tree '):
117
 
                tree_id = field.split()[1]
118
 
            elif in_log:
119
 
                log.append(field[4:])
120
 
            elif field == '\n':
121
 
                in_log = True
 
164
    @classmethod
 
165
    def _parse_rev(klass, commit, mapping):
 
166
        """Convert a git commit to a bzr revision.
122
167
 
123
 
        log = ''.join(log)
124
 
        result = Revision(revision_id)
125
 
        result.parent_ids = parents
126
 
        result.message = log
127
 
        result.inventory_sha1 = ""
128
 
        result.timezone = timezone and int(timezone)
129
 
        result.timestamp = float(timestamp)
130
 
        result.committer = committer
131
 
        result.properties['git-tree-id'] = tree_id
132
 
        return result
 
168
        :return: a `bzrlib.revision.Revision` object.
 
169
        """
 
170
        if commit is None:
 
171
            raise AssertionError("Commit object can't be None")
 
172
        rev = ForeignRevision(commit.id, mapping, mapping.revision_id_foreign_to_bzr(commit.id))
 
173
        rev.parent_ids = tuple([mapping.revision_id_foreign_to_bzr(p.id) for p in commit.parents])
 
174
        rev.message = commit.message.decode("utf-8", "replace")
 
175
        rev.committer = str(commit.committer).decode("utf-8", "replace")
 
176
        rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
 
177
        rev.timestamp = time.mktime(commit.committed_date)
 
178
        rev.timezone = 0
 
179
        return rev
133
180
 
134
181
    def revision_trees(self, revids):
135
182
        for revid in revids:
136
183
            yield self.revision_tree(revid)
137
184
 
138
185
    def revision_tree(self, revision_id):
 
186
        revision_id = revision.ensure_null(revision_id)
 
187
 
 
188
        if revision_id == revision.NULL_REVISION:
 
189
            inv = inventory.Inventory(root_id=None)
 
190
            inv.revision_id = revision_id
 
191
            return revisiontree.RevisionTree(self, inv, revision_id)
 
192
 
139
193
        return GitRevisionTree(self, revision_id)
140
194
 
141
195
    def get_inventory(self, revision_id):
142
 
        revision = self.get_revision(revision_id)
143
 
        inventory = GitInventory(revision_id)
144
 
        tree_id = revision.properties['git-tree-id']
145
 
        type_map = {'blob': 'file', 'tree': 'directory' }
146
 
        def get_inventory(tree_id, prefix):
147
 
            for perms, type, obj_id, name in self._git.get_inventory(tree_id):
148
 
                full_path = prefix + name
149
 
                if type == 'blob':
150
 
                    text_sha1 = obj_id
151
 
                else:
152
 
                    text_sha1 = None
153
 
                executable = (perms[-3] in ('1', '3', '5', '7'))
154
 
                entry = GitEntry(full_path, type_map[type], revision_id,
155
 
                                 text_sha1, executable)
156
 
                inventory.entries[full_path] = entry
157
 
                if type == 'tree':
158
 
                    get_inventory(obj_id, full_path+'/')
159
 
        get_inventory(tree_id, '')
160
 
        return inventory
161
 
 
162
 
 
163
 
class GitRevisionTree(object):
 
196
        assert revision_id != None
 
197
        return self.revision_tree(revision_id).inventory
 
198
 
 
199
    def set_make_working_trees(self, trees):
 
200
        pass
 
201
 
 
202
 
 
203
def escape_file_id(file_id):
 
204
    return file_id.replace('_', '__').replace(' ', '_s')
 
205
 
 
206
 
 
207
def unescape_file_id(file_id):
 
208
    return file_id.replace("_s", " ").replace("__", "_")
 
209
 
 
210
 
 
211
class GitRevisionTree(revisiontree.RevisionTree):
164
212
 
165
213
    def __init__(self, repository, revision_id):
166
 
        self.repository = repository
 
214
        self._repository = repository
167
215
        self.revision_id = revision_id
168
 
        self.inventory = repository.get_inventory(revision_id)
169
 
 
170
 
    def get_file(self, file_id):
171
 
        return iterablefile.IterableFile(self.get_file_lines(file_id))
172
 
 
173
 
    def get_file_lines(self, file_id):
174
 
        obj_id = self.inventory[file_id].text_sha1
175
 
        return self.repository._git.cat_file('blob', obj_id)
176
 
 
177
 
    def is_executable(self, file_id):
178
 
        return self.inventory[file_id].executable
179
 
 
180
 
 
181
 
class GitInventory(object):
182
 
 
183
 
    def __init__(self, revision_id):
184
 
        self.entries = {}
185
 
        self.root = GitEntry('', 'directory', revision_id)
186
 
        self.entries[''] = self.root
187
 
 
188
 
    def __getitem__(self, key):
189
 
        return self.entries[key]
190
 
 
191
 
    def iter_entries(self):
192
 
        return iter(sorted(self.entries.items()))
193
 
 
194
 
    def iter_entries_by_dir(self):
195
 
        return self.iter_entries()
196
 
 
197
 
    def __len__(self):
198
 
        return len(self.entries)
199
 
 
200
 
 
201
 
class GitEntry(object):
202
 
 
203
 
    def __init__(self, path, kind, revision, text_sha1=None, executable=False,
204
 
                 text_size=None):
205
 
        self.path = path
206
 
        self.file_id = path
207
 
        self.kind = kind
208
 
        self.executable = executable
209
 
        self.name = osutils.basename(path)
210
 
        if path == '':
211
 
            self.parent_id = None
212
 
        else:
213
 
            self.parent_id = osutils.dirname(path)
214
 
        self.revision = revision
215
 
        self.symlink_target = None
216
 
        self.text_sha1 = text_sha1
217
 
        self.text_size = None
218
 
 
219
 
    def __repr__(self):
220
 
        return "GitEntry(%r, %r, %r, %r)" % (self.path, self.kind,
221
 
                                             self.revision, self.parent_id)
222
 
 
223
 
 
 
216
        git_id = repository.lookup_git_revid(revision_id, repository.get_mapping())
 
217
        self.tree = repository._git.commit(git_id).tree
 
218
        self._inventory = inventory.Inventory(revision_id=revision_id)
 
219
        self._inventory.root.revision = revision_id
 
220
        self._build_inventory(self.tree, self._inventory.root, "")
 
221
 
 
222
    def get_revision_id(self):
 
223
        return self.revision_id
 
224
 
 
225
    def get_file_text(self, file_id):
 
226
        entry = self._inventory[file_id]
 
227
        if entry.kind == 'directory': return ""
 
228
        return self._repository._git.blob(entry.text_id).data
 
229
 
 
230
    def _build_inventory(self, tree, ie, path):
 
231
        assert isinstance(path, str)
 
232
        for name, mode, hexsha in tree.entries():
 
233
            basename = name.decode("utf-8")
 
234
            if path == "":
 
235
                child_path = name
 
236
            else:
 
237
                child_path = urlutils.join(path, name)
 
238
            file_id = escape_file_id(child_path.encode('utf-8'))
 
239
            if mode[0] == '0':
 
240
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
 
241
            elif mode[0] == '1':
 
242
                if mode[1] == '0':
 
243
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
 
244
                    child_ie.text_sha1 = osutils.sha_string(b.data)
 
245
                elif mode[1] == '2':
 
246
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
 
247
                    child_ie.text_sha1 = osutils.sha_string("")
 
248
                else:
 
249
                    raise AssertionError(
 
250
                        "Unknown file kind, perms=%r." % (mode,))
 
251
                child_ie.text_id = b.id
 
252
                child_ie.text_size = b.size
 
253
            else:
 
254
                raise AssertionError(
 
255
                    "Unknown blob kind, perms=%r." % (mode,))
 
256
            child_ie.executable = bool(int(mode[3:], 8) & 0111)
 
257
            child_ie.revision = self.revision_id
 
258
            self._inventory.add(child_ie)
 
259
            if mode[0] == '0':
 
260
                self._build_inventory(b, child_ie, child_path)
 
261
 
 
262
 
 
263
class GitFormat(object):
 
264
 
 
265
    supports_tree_reference = False
 
266
 
 
267
    def get_format_description(self):
 
268
        return "Git Repository"