/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

Fix reporting of git commits in 'bzr log'.

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 git
19
20
import os
20
21
import time
21
22
 
23
24
from bzrlib import (
24
25
    deprecated_graph,
25
26
    errors,
26
 
    graph,
 
27
    foreign,
27
28
    inventory,
28
29
    osutils,
29
30
    repository,
32
33
    urlutils,
33
34
    versionedfile,
34
35
    )
35
 
from bzrlib.foreign import (
36
 
        ForeignRepository,
37
 
        )
38
 
from bzrlib.trace import mutter
39
36
from bzrlib.transport import get_transport
40
37
 
41
38
from bzrlib.plugins.git.foreign import (
43
40
    )
44
41
from bzrlib.plugins.git.mapping import default_mapping
45
42
 
46
 
from bzrlib.plugins.git import git
47
 
 
48
 
 
49
 
class GitTags(object):
50
 
 
51
 
    def __init__(self, tags):
52
 
        self._tags = tags
53
 
 
54
 
    def __iter__(self):
55
 
        return iter(self._tags)
56
 
 
57
 
 
58
 
class GitRepository(ForeignRepository):
 
43
 
 
44
class GitRepository(repository.Repository):
59
45
    """An adapter to git repositories for bzr."""
60
46
 
61
47
    _serializer = None
62
48
 
63
49
    def __init__(self, gitdir, lockfiles):
64
 
        ForeignRepository.__init__(self, GitFormat(), gitdir, lockfiles)
65
 
        from bzrlib.plugins.git import fetch
66
 
        repository.InterRepository.register_optimiser(fetch.InterGitRepository)
67
 
 
68
 
    def is_shared(self):
69
 
        return True
70
 
 
71
 
    def supports_rich_root(self):
72
 
        return True
73
 
 
74
 
    def _warn_if_deprecated(self):
75
 
        # This class isn't deprecated
76
 
        pass
77
 
 
78
 
    def get_mapping(self):
79
 
        return default_mapping
80
 
 
81
 
    def make_working_trees(self):
82
 
        return True
83
 
 
84
 
 
85
 
class LocalGitRepository(GitRepository):
86
 
 
87
 
    def __init__(self, gitdir, lockfiles):
88
 
        # FIXME: This also caches negatives. Need to be more careful 
89
 
        # about this once we start writing to git
90
 
        self._parents_provider = graph.CachingParentsProvider(self)
91
 
        GitRepository.__init__(self, gitdir, lockfiles)
92
50
        self.base = gitdir.root_transport.base
 
51
        self.bzrdir = gitdir
 
52
        self.control_files = lockfiles
93
53
        self._git = gitdir._git
94
54
        self.texts = None
95
55
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
96
56
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
97
 
        self.tags = GitTags(self._git.get_tags())
 
57
        self._format = GitFormat()
 
58
        self._fallback_repositories = []
98
59
 
99
 
    def all_revision_ids(self):
100
 
        ret = set([revision.NULL_REVISION])
101
 
        if self._git.heads() == []:
102
 
            return ret
103
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
104
 
        ret = set(bzr_heads)
105
 
        graph = self.get_graph()
106
 
        for rev, parents in graph.iter_ancestry(bzr_heads):
107
 
            ret.add(rev)
 
60
    def _all_revision_ids(self):
 
61
        if self._git.heads == []:
 
62
            return set()
 
63
        ret = set()
 
64
        skip = 0
 
65
        max_count = 1000
 
66
        cms = None
 
67
        while cms != []:
 
68
            cms = self._git.commits("--all", max_count=max_count, skip=skip)
 
69
            skip += max_count
 
70
            ret.update([default_mapping.revision_id_foreign_to_bzr(cm.id) for cm in cms])
108
71
        return ret
109
72
 
 
73
    def is_shared(self):
 
74
        return True
 
75
 
 
76
    def supports_rich_root(self):
 
77
        return False
 
78
 
110
79
    #def get_revision_delta(self, revision_id):
111
80
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
112
81
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
113
82
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
114
83
 
115
 
    def _make_parents_provider(self):
116
 
        """See Repository._make_parents_provider()."""
117
 
        return self._parents_provider
118
 
 
119
 
    def get_parent_map(self, revids):
120
 
        parent_map = {}
121
 
        mutter("get_parent_map(%r)", revids)
122
 
        for revision_id in revids:
123
 
            assert isinstance(revision_id, str)
124
 
            if revision_id == revision.NULL_REVISION:
125
 
                parent_map[revision_id] = ()
126
 
                continue
127
 
            hexsha = self.lookup_git_revid(revision_id, self.get_mapping())
128
 
            commit  = self._git.commit(hexsha)
129
 
            if commit is None:
130
 
                continue
131
 
            else:
132
 
                parent_map[revision_id] = [self.get_mapping().revision_id_foreign_to_bzr(p) for p in commit.parents]
133
 
        return parent_map
134
 
 
135
 
    def get_ancestry(self, revision_id, topo_sorted=True):
136
 
        """See Repository.get_ancestry().
137
 
        """
138
 
        if revision_id is None:
139
 
            return self._all_revision_ids()
140
 
        assert isinstance(revision_id, str)
141
 
        ancestry = []
142
 
        graph = self.get_graph()
143
 
        for rev, parents in graph.iter_ancestry([revision_id]):
144
 
            if rev == revision.NULL_REVISION:
145
 
                rev = None
146
 
            ancestry.append(rev)
147
 
        ancestry.reverse()
148
 
        return ancestry
 
84
    def get_ancestry(self, revision_id):
 
85
        revision_id = revision.ensure_null(revision_id)
 
86
        ret = []
 
87
        if revision_id != revision.NULL_REVISION:
 
88
            skip = 0
 
89
            max_count = 1000
 
90
            cms = None
 
91
            while cms != []:
 
92
                cms = self._git.commits(self.lookup_git_revid(revision_id, default_mapping), max_count=max_count, skip=skip)
 
93
                skip += max_count
 
94
                ret += [default_mapping.revision_id_foreign_to_bzr(cm.id) for cm in cms]
 
95
        return [None] + ret
149
96
 
150
97
    def get_signature_text(self, revision_id):
151
98
        raise errors.NoSuchRevision(self, revision_id)
152
99
 
153
 
    def lookup_revision_id(self, revid):
154
 
        """Lookup a revision id.
155
 
        
156
 
        :param revid: Bazaar revision id.
157
 
        :return: Tuple with git revisionid and mapping.
158
 
        """
159
 
        # Yes, this doesn't really work, but good enough as a stub
160
 
        return osutils.sha(rev_id).hexdigest(), self.get_mapping()
161
 
 
162
100
    def has_signature_for_revision_id(self, revision_id):
163
101
        return False
164
102
 
 
103
    def get_parent_map(self, revision_ids):
 
104
        ret = {}
 
105
        for revid in revision_ids:
 
106
            if revid == revision.NULL_REVISION:
 
107
                ret[revid] = ()
 
108
            else:
 
109
                commit = self._git.commit(self.lookup_git_revid(revid, default_mapping))
 
110
                ret[revid] = tuple([default_mapping.revision_id_foreign_to_bzr(p.id) for p in commit.parents])
 
111
        return ret
 
112
 
165
113
    def lookup_git_revid(self, bzr_revid, mapping):
166
114
        try:
167
115
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
168
116
        except errors.InvalidRevisionId:
169
 
            raise errors.NoSuchRevision(self, bzr_revid)
 
117
            raise errors.NoSuchRevision(bzr_revid, self)
170
118
 
171
119
    def get_revision(self, revision_id):
172
 
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
173
 
        try:
174
 
            commit = self._git.commit(git_commit_id)
175
 
        except KeyError:
176
 
            raise errors.NoSuchRevision(self, revision_id)
 
120
        git_commit_id = self.lookup_git_revid(revision_id, default_mapping)
 
121
        commit = self._git.commit(git_commit_id)
177
122
        # print "fetched revision:", git_commit_id
178
 
        revision = self.get_mapping().import_commit(commit)
179
 
        assert revision is not None
 
123
        revision = self._parse_rev(commit)
180
124
        return revision
181
125
 
182
126
    def has_revision(self, revision_id):
183
127
        try:
184
128
            self.get_revision(revision_id)
185
 
        except errors.NoSuchRevision:
 
129
        except NoSuchRevision:
186
130
            return False
187
131
        else:
188
132
            return True
189
133
 
190
 
    def get_revisions(self, revids):
191
 
        return [self.get_revision(r) for r in revids]
 
134
    def get_revisions(self, revisions):
 
135
        return [self.get_revision(r) for r in revisions]
 
136
 
 
137
    @classmethod
 
138
    def _parse_rev(klass, commit):
 
139
        """Convert a git commit to a bzr revision.
 
140
 
 
141
        :return: a `bzrlib.revision.Revision` object.
 
142
        """
 
143
        rev = foreign.ForeignRevision(commit.id, default_mapping, default_mapping.revision_id_foreign_to_bzr(commit.id))
 
144
        rev.parent_ids = tuple([default_mapping.revision_id_foreign_to_bzr(p.id) for p in commit.parents])
 
145
        rev.inventory_sha1 = ""
 
146
        rev.message = commit.message.decode("utf-8", "replace")
 
147
        rev.committer = str(commit.committer).decode("utf-8", "replace")
 
148
        rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
 
149
        rev.timestamp = time.mktime(commit.committed_date)
 
150
        rev.timezone = 0
 
151
        return rev
192
152
 
193
153
    def revision_trees(self, revids):
194
154
        for revid in revids:
202
162
            inv.revision_id = revision_id
203
163
            return revisiontree.RevisionTree(self, inv, revision_id)
204
164
 
205
 
        return GitRevisionTree(self, self.get_mapping(), revision_id)
 
165
        return GitRevisionTree(self, revision_id)
206
166
 
207
167
    def get_inventory(self, revision_id):
208
168
        assert revision_id != None
211
171
    def set_make_working_trees(self, trees):
212
172
        pass
213
173
 
214
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
215
 
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
 
174
 
 
175
def escape_file_id(file_id):
 
176
    return file_id.replace('_', '__').replace(' ', '_s')
 
177
 
 
178
 
 
179
def unescape_file_id(file_id):
 
180
    return file_id.replace("_s", " ").replace("__", "_")
216
181
 
217
182
 
218
183
class GitRevisionTree(revisiontree.RevisionTree):
219
184
 
220
 
    def __init__(self, repository, mapping, revision_id):
 
185
    def __init__(self, repository, revision_id):
221
186
        self._repository = repository
222
187
        self.revision_id = revision_id
223
 
        assert isinstance(revision_id, str)
224
 
        self.mapping = mapping
225
 
        git_id = repository.lookup_git_revid(revision_id, self.mapping)
226
 
        try:
227
 
            commit = repository._git.commit(git_id)
228
 
        except KeyError, r:
229
 
            raise errors.NoSuchRevision(repository, revision_id)
230
 
        self.tree = commit.tree
 
188
        git_id = repository.lookup_git_revid(revision_id, default_mapping)
 
189
        self.tree = repository._git.commit(git_id).tree
231
190
        self._inventory = inventory.Inventory(revision_id=revision_id)
232
191
        self._inventory.root.revision = revision_id
233
192
        self._build_inventory(self.tree, self._inventory.root, "")
238
197
    def get_file_text(self, file_id):
239
198
        entry = self._inventory[file_id]
240
199
        if entry.kind == 'directory': return ""
241
 
        return self._repository._git.get_blob(entry.text_id).data
 
200
        return self._repository._git.blob(entry.text_id).data
242
201
 
243
 
    def _build_inventory(self, tree_id, ie, path):
 
202
    def _build_inventory(self, tree, ie, path):
244
203
        assert isinstance(path, str)
245
 
        tree = self._repository._git.tree(tree_id)
246
 
        for mode, name, hexsha in tree.entries():
247
 
            basename = name.decode("utf-8")
 
204
        for key in tree:
 
205
            b = tree.get(key)
 
206
            basename = b.name.decode("utf-8")
248
207
            if path == "":
249
 
                child_path = name
 
208
                child_path = b.name
250
209
            else:
251
 
                child_path = urlutils.join(path, name)
252
 
            file_id = self.mapping.generate_file_id(child_path)
253
 
            entry_kind = (mode & 0700000) / 0100000
254
 
            if entry_kind == 0:
 
210
                child_path = urlutils.join(path, b.name)
 
211
            file_id = escape_file_id(child_path.encode('utf-8'))
 
212
            if b.mode[0] == '0':
255
213
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
256
 
            elif entry_kind == 1:
257
 
                file_kind = (mode & 070000) / 010000
258
 
                b = self._repository._git.get_blob(hexsha)
259
 
                if file_kind == 0:
 
214
            elif b.mode[0] == '1':
 
215
                if b.mode[1] == '0':
260
216
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
261
217
                    child_ie.text_sha1 = osutils.sha_string(b.data)
262
 
                elif file_kind == 2:
 
218
                elif b.mode[1] == '2':
263
219
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
264
220
                    child_ie.text_sha1 = osutils.sha_string("")
265
221
                else:
266
222
                    raise AssertionError(
267
 
                        "Unknown file kind, perms=%o." % (mode,))
 
223
                        "Unknown file kind, perms=%r." % (b.mode,))
268
224
                child_ie.text_id = b.id
269
 
                child_ie.text_size = len(b.data)
 
225
                child_ie.text_size = b.size
270
226
            else:
271
227
                raise AssertionError(
272
 
                    "Unknown blob kind, perms=%r." % (mode,))
273
 
            fs_mode = mode & 0777
274
 
            child_ie.executable = bool(fs_mode & 0111)
 
228
                    "Unknown blob kind, perms=%r." % (b.mode,))
 
229
            child_ie.executable = bool(int(b.mode[3:], 8) & 0111)
275
230
            child_ie.revision = self.revision_id
276
231
            self._inventory.add(child_ie)
277
 
            if entry_kind == 0:
278
 
                self._build_inventory(hexsha, child_ie, child_path)
 
232
            if b.mode[0] == '0':
 
233
                self._build_inventory(b, child_ie, child_path)
279
234
 
280
235
 
281
236
class GitFormat(object):
282
237
 
283
238
    supports_tree_reference = False
284
 
    rich_root_data = True
285
239
 
286
240
    def get_format_description(self):
287
241
        return "Git Repository"
288
 
 
289
 
    def initialize(self, url, shared=False, _internal=False):
290
 
        raise bzr_errors.UninitializableFormat(self)
291
 
 
292
 
    def check_conversion_target(self, target_repo_format):
293
 
        return target_repo_format.rich_root_data