/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
37
    def __init__(self, gitdir, lockfiles):
38
        self.bzrdir = gitdir
39
        self.control_files = lockfiles
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
40
        gitdirectory = gitdir.transport.local_abspath('.')
41
        self._git = model.GitModel(gitdirectory)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
42
        self._revision_cache = {}
43
44
    def _ancestor_revisions(self, revision_ids):
45
        if revision_ids is not None:
46
            git_revisions = [gitrevid_from_bzr(r) for r in revision_ids]
47
        else:
48
            git_revisions = None
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
49
        for lines in self._git.ancestor_lines(git_revisions):
0.200.30 by David Allouche
Rename GitRepository.parse_rev to ._parse_rev.
50
            yield self._parse_rev(lines)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
51
52
    def is_shared(self):
53
        return True
54
55
    def get_revision_graph(self, revision_id=None):
0.200.20 by John Arbash Meinel
All tests are passing again
56
        result = {}
0.200.21 by John Arbash Meinel
Fix Repository.get_revision_graph()
57
        if revision_id is not None:
58
            param = [ids.convert_revision_id_bzr_to_git(revision_id)]
59
        else:
60
            param = None
61
        for node, parents in self._git.ancestry(param).iteritems():
0.200.20 by John Arbash Meinel
All tests are passing again
62
            bzr_node = ids.convert_revision_id_git_to_bzr(node)
63
            bzr_parents = [ids.convert_revision_id_git_to_bzr(n)
64
                           for n in parents]
65
            result[bzr_node] = bzr_parents
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
66
        return result
67
0.200.21 by John Arbash Meinel
Fix Repository.get_revision_graph()
68
    def get_revision_graph_with_ghosts(self, revision_ids=None):
69
        graph = deprecated_graph.Graph()
70
        if revision_ids is not None:
71
            revision_ids = [ids.convert_revision_id_bzr_to_git(r)
72
                            for r in revision_ids]
73
        for node, parents in self._git.ancestry(revision_ids).iteritems():
74
            bzr_node = ids.convert_revision_id_git_to_bzr(node)
75
            bzr_parents = [ids.convert_revision_id_git_to_bzr(n)
76
                           for n in parents]
77
78
            graph.add_node(bzr_node, bzr_parents)
79
        return graph
80
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
81
    def get_revision(self, revision_id):
82
        if revision_id in self._revision_cache:
83
            return self._revision_cache[revision_id]
0.200.29 by David Allouche
Smoke test for GitRepository.get_revision, and corresponding fixes.
84
        raw = self._git.rev_list(
85
            [ids.convert_revision_id_bzr_to_git(revision_id)],
86
            max_count=1, header=True)
0.200.30 by David Allouche
Rename GitRepository.parse_rev to ._parse_rev.
87
        return self._parse_rev(raw)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
88
89
    def has_revision(self, revision_id):
90
        try:
91
            self.get_revision(revision_id)
92
        except NoSuchRevision:
93
            return False
94
        else:
95
            return True
96
97
    def get_revisions(self, revisions):
98
        return [self.get_revision(r) for r in revisions]
99
0.200.32 by David Allouche
Rewrite GitRepository._parse_rev, with unit tests.
100
    @classmethod
101
    def _parse_rev(klass, raw):
102
        """Parse a single git revision.
103
104
        * The first line is the git commit id.
105
        * Following lines conform to the 'name value' structure, until the
106
          first blank line.
107
        * All lines after the first blank line and until the NULL line have 4
108
          leading spaces and constitute the commit message.
109
110
        :param raw: sequence of newline-terminated strings, its last item is a
111
            single NULL character.
112
        :return: a `bzrlib.revision.Revision` object.
113
        """
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
114
        parents = []
0.200.32 by David Allouche
Rewrite GitRepository._parse_rev, with unit tests.
115
        message_lines = []
116
        in_message = False
117
        committer_was_set = False
0.200.29 by David Allouche
Smoke test for GitRepository.get_revision, and corresponding fixes.
118
        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.
119
        rev = revision.Revision(revision_id)
120
        rev.inventory_sha1 = ""
121
        assert raw[-1] == '\x00', (
122
            "Last item of raw was not a single NULL character.")
123
        for line in raw[1:-1]:
124
            if in_message:
125
                assert line[:4] == '    ', (
126
                    "Unexpected line format in commit message: %r" % line)
127
                message_lines.append(line[4:])
128
                continue
129
            if line == '\n':
130
                in_message = True
131
                continue
132
            name, value = line[:-1].split(' ', 1)
133
            if name == 'parent':
134
                rev.parent_ids.append(
135
                    ids.convert_revision_id_git_to_bzr(value))
136
                continue
137
            if name == 'author':
138
                author, timestamp, timezone = value.rsplit(' ', 2)
139
                rev.properties['author'] = author
140
                rev.properties['git-author-timestamp'] = timestamp
141
                rev.properties['git-author-timezone'] = timezone
142
                if not committer_was_set:
143
                    rev.committer = author
144
                    rev.timestamp = float(timestamp)
0.200.35 by David Allouche
GitRepository._parse_rev sets Revision.timezone to a float instead of a string.
145
                    rev.timezone = klass._parse_tz(timezone)
0.200.32 by David Allouche
Rewrite GitRepository._parse_rev, with unit tests.
146
                continue
147
            if name == 'committer':
148
                committer_was_set = True
149
                committer, timestamp, timezone = value.rsplit(' ', 2)
150
                rev.committer = committer
151
                rev.timestamp = float(timestamp)
0.200.35 by David Allouche
GitRepository._parse_rev sets Revision.timezone to a float instead of a string.
152
                rev.timezone = klass._parse_tz(timezone)
0.200.32 by David Allouche
Rewrite GitRepository._parse_rev, with unit tests.
153
                continue
154
            if name == 'tree':
155
                rev.properties['git-tree-id'] = value
156
                continue
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
157
0.200.32 by David Allouche
Rewrite GitRepository._parse_rev, with unit tests.
158
        rev.message = ''.join(message_lines)
159
        return rev
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
160
0.200.35 by David Allouche
GitRepository._parse_rev sets Revision.timezone to a float instead of a string.
161
    @classmethod
162
    def _parse_tz(klass, tz):
163
        """Parse a timezone specification in the [+|-]HHMM format.
164
165
        :return: the timezone offset in seconds.
166
        """
167
        assert len(tz) == 5
168
        sign = {'+': +1, '-': -1}[tz[0]]
169
        hours = int(tz[1:3])
170
        minutes = int(tz[3:])
171
        return float(sign * 60 * (60 * hours + minutes))
172
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
173
    def revision_trees(self, revids):
174
        for revid in revids:
175
            yield self.revision_tree(revid)
176
177
    def revision_tree(self, revision_id):
178
        return GitRevisionTree(self, revision_id)
179
180
    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.
181
        if revision_id is None:
182
            revision_id = revision.NULL_REVISION
183
        if revision_id == revision.NULL_REVISION:
184
            return inventory.Inventory(
185
                revision_id=revision_id, root_id=None)
0.200.38 by David Allouche
Reimplement GitRepository.get_inventory, simpler and faster.
186
        git_commit = ids.convert_revision_id_bzr_to_git(revision_id)
187
        git_inventory = self._git.get_inventory(git_commit)
188
        return self._parse_inventory(revision_id, git_inventory)
189
190
    @classmethod
191
    def _parse_inventory(klass, revid, git_inv):
192
        # For now, git inventory do not have root ids. It is not clear that we
193
        # can reliably support root ids. -- David Allouche 2007-12-28
194
        inv = inventory.Inventory(revision_id=revid)
195
        for perms, git_kind, git_id, path in git_inv:
196
            text_sha1 = None
197
            executable = False
198
            if git_kind == 'blob':
199
                text_sha1 = git_id
200
                if perms[1] == '0':
201
                    kind = 'file'
202
                    executable = bool(int(perms[-3:], 8) & 0111)
203
                elif perms[1] == '2':
204
                    kind = 'symlink'
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
205
                else:
0.200.38 by David Allouche
Reimplement GitRepository.get_inventory, simpler and faster.
206
                    raise AssertionError(
207
                        "Unknown blob kind, perms=%r." % (perms,))
208
            elif git_kind == 'tree':
209
                kind = 'directory'
210
            else:
211
                raise AssertionError(
212
                    "Unknown git entry kind: %r" % (git_kind,))
213
            # XXX: Maybe the file id should be prefixed by file kind, so when
214
            # the kind of path changes, the id changes too.
215
            # -- David Allouche 2007-12-28.
216
            entry = inv.add_path(path, kind, file_id=path.encode('utf-8'))
217
            entry.text_sha1 = text_sha1
218
            entry.executable = executable
219
        return inv
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
220
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
221
222
class GitRevisionTree(revisiontree.RevisionTree):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
223
224
    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.
225
        if revision_id is None:
226
            revision_id = revision.NULL_REVISION
227
        self._inventory = repository.get_inventory(revision_id)
228
        self._repository = repository
229
        self._revision_id = revision_id
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
230
231
    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.
232
        obj_id = self._inventory[file_id].text_sha1
233
        return self._repository._git.cat_file('blob', obj_id)