/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
1
# Copyright (C) 2007 Canonical Ltd
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""An adapter between a Git Repository and a Bazaar Branch"""
18
19
from bzrlib import (
0.200.20 by John Arbash Meinel
All tests are passing again
20
    deprecated_graph,
0.200.38 by David Allouche
Reimplement GitRepository.get_inventory, simpler and faster.
21
    inventory,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
22
    repository,
0.200.29 by David Allouche
Smoke test for GitRepository.get_revision, and corresponding fixes.
23
    revision,
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
24
    revisiontree,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
25
    urlutils,
26
    )
27
0.200.27 by David Allouche
Flat is better than nested, remove the gitlib hierarchy.
28
from bzrlib.plugins.git import (
0.200.20 by John Arbash Meinel
All tests are passing again
29
    ids,
30
    model,
31
    )
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
32
33
34
class GitRepository(repository.Repository):
35
    """An adapter to git repositories for bzr."""
36
0.200.41 by David Allouche
Define _serializer = None in GitRepository.
37
    # To make bzrlib happy
38
    _serializer = None
39
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
40
    def __init__(self, gitdir, lockfiles):
41
        self.bzrdir = gitdir
42
        self.control_files = lockfiles
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
43
        gitdirectory = gitdir.transport.local_abspath('.')
44
        self._git = model.GitModel(gitdirectory)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
45
        self._revision_cache = {}
46
47
    def _ancestor_revisions(self, revision_ids):
48
        if revision_ids is not None:
49
            git_revisions = [gitrevid_from_bzr(r) for r in revision_ids]
50
        else:
51
            git_revisions = None
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
52
        for lines in self._git.ancestor_lines(git_revisions):
0.200.30 by David Allouche
Rename GitRepository.parse_rev to ._parse_rev.
53
            yield self._parse_rev(lines)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
54
55
    def is_shared(self):
56
        return True
57
0.200.40 by David Allouche
GitRepository.supports_rich_root() => False
58
    def supports_rich_root(self):
59
        return False
60
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
61
    def get_revision_graph(self, revision_id=None):
0.200.20 by John Arbash Meinel
All tests are passing again
62
        result = {}
0.200.21 by John Arbash Meinel
Fix Repository.get_revision_graph()
63
        if revision_id is not None:
64
            param = [ids.convert_revision_id_bzr_to_git(revision_id)]
65
        else:
66
            param = None
0.200.42 by David Allouche
Rename GitModel.ancestry to .get_revision_graph.
67
        git_graph = self._git.get_revision_graph(param)
68
        for node, parents in git_graph.iteritems():
0.200.20 by John Arbash Meinel
All tests are passing again
69
            bzr_node = ids.convert_revision_id_git_to_bzr(node)
70
            bzr_parents = [ids.convert_revision_id_git_to_bzr(n)
71
                           for n in parents]
72
            result[bzr_node] = bzr_parents
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
73
        return result
74
0.200.21 by John Arbash Meinel
Fix Repository.get_revision_graph()
75
    def get_revision_graph_with_ghosts(self, revision_ids=None):
76
        graph = deprecated_graph.Graph()
77
        if revision_ids is not None:
78
            revision_ids = [ids.convert_revision_id_bzr_to_git(r)
79
                            for r in revision_ids]
0.200.42 by David Allouche
Rename GitModel.ancestry to .get_revision_graph.
80
        git_graph = self._git.get_revision_graph(revision_ids)
81
        for node, parents in git_graph.iteritems():
0.200.21 by John Arbash Meinel
Fix Repository.get_revision_graph()
82
            bzr_node = ids.convert_revision_id_git_to_bzr(node)
83
            bzr_parents = [ids.convert_revision_id_git_to_bzr(n)
84
                           for n in parents]
85
86
            graph.add_node(bzr_node, bzr_parents)
87
        return graph
88
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
89
    def get_revision(self, revision_id):
90
        if revision_id in self._revision_cache:
91
            return self._revision_cache[revision_id]
0.200.29 by David Allouche
Smoke test for GitRepository.get_revision, and corresponding fixes.
92
        raw = self._git.rev_list(
93
            [ids.convert_revision_id_bzr_to_git(revision_id)],
94
            max_count=1, header=True)
0.200.30 by David Allouche
Rename GitRepository.parse_rev to ._parse_rev.
95
        return self._parse_rev(raw)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
96
97
    def has_revision(self, revision_id):
98
        try:
99
            self.get_revision(revision_id)
100
        except NoSuchRevision:
101
            return False
102
        else:
103
            return True
104
105
    def get_revisions(self, revisions):
106
        return [self.get_revision(r) for r in revisions]
107
0.200.32 by David Allouche
Rewrite GitRepository._parse_rev, with unit tests.
108
    @classmethod
109
    def _parse_rev(klass, raw):
110
        """Parse a single git revision.
111
112
        * The first line is the git commit id.
113
        * Following lines conform to the 'name value' structure, until the
114
          first blank line.
115
        * All lines after the first blank line and until the NULL line have 4
116
          leading spaces and constitute the commit message.
117
118
        :param raw: sequence of newline-terminated strings, its last item is a
119
            single NULL character.
120
        :return: a `bzrlib.revision.Revision` object.
121
        """
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
122
        parents = []
0.200.32 by David Allouche
Rewrite GitRepository._parse_rev, with unit tests.
123
        message_lines = []
124
        in_message = False
125
        committer_was_set = False
0.200.29 by David Allouche
Smoke test for GitRepository.get_revision, and corresponding fixes.
126
        revision_id = ids.convert_revision_id_git_to_bzr(raw[0][:-1])
0.200.32 by David Allouche
Rewrite GitRepository._parse_rev, with unit tests.
127
        rev = revision.Revision(revision_id)
128
        rev.inventory_sha1 = ""
129
        assert raw[-1] == '\x00', (
130
            "Last item of raw was not a single NULL character.")
131
        for line in raw[1:-1]:
132
            if in_message:
133
                assert line[:4] == '    ', (
134
                    "Unexpected line format in commit message: %r" % line)
135
                message_lines.append(line[4:])
136
                continue
137
            if line == '\n':
138
                in_message = True
139
                continue
140
            name, value = line[:-1].split(' ', 1)
141
            if name == 'parent':
142
                rev.parent_ids.append(
143
                    ids.convert_revision_id_git_to_bzr(value))
144
                continue
145
            if name == 'author':
146
                author, timestamp, timezone = value.rsplit(' ', 2)
147
                rev.properties['author'] = author
148
                rev.properties['git-author-timestamp'] = timestamp
149
                rev.properties['git-author-timezone'] = timezone
150
                if not committer_was_set:
151
                    rev.committer = author
152
                    rev.timestamp = float(timestamp)
0.200.35 by David Allouche
GitRepository._parse_rev sets Revision.timezone to a float instead of a string.
153
                    rev.timezone = klass._parse_tz(timezone)
0.200.32 by David Allouche
Rewrite GitRepository._parse_rev, with unit tests.
154
                continue
155
            if name == 'committer':
156
                committer_was_set = True
157
                committer, timestamp, timezone = value.rsplit(' ', 2)
158
                rev.committer = committer
159
                rev.timestamp = float(timestamp)
0.200.35 by David Allouche
GitRepository._parse_rev sets Revision.timezone to a float instead of a string.
160
                rev.timezone = klass._parse_tz(timezone)
0.200.32 by David Allouche
Rewrite GitRepository._parse_rev, with unit tests.
161
                continue
162
            if name == 'tree':
163
                rev.properties['git-tree-id'] = value
164
                continue
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
165
0.200.32 by David Allouche
Rewrite GitRepository._parse_rev, with unit tests.
166
        rev.message = ''.join(message_lines)
167
        return rev
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
168
0.200.35 by David Allouche
GitRepository._parse_rev sets Revision.timezone to a float instead of a string.
169
    @classmethod
170
    def _parse_tz(klass, tz):
171
        """Parse a timezone specification in the [+|-]HHMM format.
172
173
        :return: the timezone offset in seconds.
174
        """
175
        assert len(tz) == 5
176
        sign = {'+': +1, '-': -1}[tz[0]]
177
        hours = int(tz[1:3])
178
        minutes = int(tz[3:])
179
        return float(sign * 60 * (60 * hours + minutes))
180
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
181
    def revision_trees(self, revids):
182
        for revid in revids:
183
            yield self.revision_tree(revid)
184
185
    def revision_tree(self, revision_id):
186
        return GitRevisionTree(self, revision_id)
187
188
    def get_inventory(self, revision_id):
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
189
        if revision_id is None:
190
            revision_id = revision.NULL_REVISION
191
        if revision_id == revision.NULL_REVISION:
192
            return inventory.Inventory(
193
                revision_id=revision_id, root_id=None)
0.200.38 by David Allouche
Reimplement GitRepository.get_inventory, simpler and faster.
194
        git_commit = ids.convert_revision_id_bzr_to_git(revision_id)
195
        git_inventory = self._git.get_inventory(git_commit)
196
        return self._parse_inventory(revision_id, git_inventory)
197
198
    @classmethod
199
    def _parse_inventory(klass, revid, git_inv):
200
        # For now, git inventory do not have root ids. It is not clear that we
201
        # can reliably support root ids. -- David Allouche 2007-12-28
202
        inv = inventory.Inventory(revision_id=revid)
203
        for perms, git_kind, git_id, path in git_inv:
204
            text_sha1 = None
205
            executable = False
206
            if git_kind == 'blob':
207
                text_sha1 = git_id
208
                if perms[1] == '0':
209
                    kind = 'file'
210
                    executable = bool(int(perms[-3:], 8) & 0111)
211
                elif perms[1] == '2':
212
                    kind = 'symlink'
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
213
                else:
0.200.38 by David Allouche
Reimplement GitRepository.get_inventory, simpler and faster.
214
                    raise AssertionError(
215
                        "Unknown blob kind, perms=%r." % (perms,))
216
            elif git_kind == 'tree':
217
                kind = 'directory'
218
            else:
219
                raise AssertionError(
220
                    "Unknown git entry kind: %r" % (git_kind,))
221
            # XXX: Maybe the file id should be prefixed by file kind, so when
222
            # the kind of path changes, the id changes too.
223
            # -- David Allouche 2007-12-28.
224
            entry = inv.add_path(path, kind, file_id=path.encode('utf-8'))
225
            entry.text_sha1 = text_sha1
226
            entry.executable = executable
227
        return inv
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
228
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
229
230
class GitRevisionTree(revisiontree.RevisionTree):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
231
232
    def __init__(self, repository, revision_id):
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
233
        if revision_id is None:
234
            revision_id = revision.NULL_REVISION
235
        self._inventory = repository.get_inventory(revision_id)
236
        self._repository = repository
237
        self._revision_id = revision_id
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
238
239
    def get_file_lines(self, file_id):
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
240
        obj_id = self._inventory[file_id].text_sha1
241
        return self._repository._git.cat_file('blob', obj_id)