/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.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
21
    repository,
0.200.29 by David Allouche
Smoke test for GitRepository.get_revision, and corresponding fixes.
22
    revision,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
23
    urlutils,
24
    )
25
0.200.27 by David Allouche
Flat is better than nested, remove the gitlib hierarchy.
26
from bzrlib.plugins.git import (
0.200.20 by John Arbash Meinel
All tests are passing again
27
    ids,
28
    model,
29
    )
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
30
31
32
class GitRepository(repository.Repository):
33
    """An adapter to git repositories for bzr."""
34
35
    def __init__(self, gitdir, lockfiles):
36
        self.bzrdir = gitdir
37
        self.control_files = lockfiles
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
38
        gitdirectory = gitdir.transport.local_abspath('.')
39
        self._git = model.GitModel(gitdirectory)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
40
        self._revision_cache = {}
41
42
    def _ancestor_revisions(self, revision_ids):
43
        if revision_ids is not None:
44
            git_revisions = [gitrevid_from_bzr(r) for r in revision_ids]
45
        else:
46
            git_revisions = None
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
47
        for lines in self._git.ancestor_lines(git_revisions):
0.200.30 by David Allouche
Rename GitRepository.parse_rev to ._parse_rev.
48
            yield self._parse_rev(lines)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
49
50
    def is_shared(self):
51
        return True
52
53
    def get_revision_graph(self, revision_id=None):
0.200.20 by John Arbash Meinel
All tests are passing again
54
        result = {}
0.200.21 by John Arbash Meinel
Fix Repository.get_revision_graph()
55
        if revision_id is not None:
56
            param = [ids.convert_revision_id_bzr_to_git(revision_id)]
57
        else:
58
            param = None
59
        for node, parents in self._git.ancestry(param).iteritems():
0.200.20 by John Arbash Meinel
All tests are passing again
60
            bzr_node = ids.convert_revision_id_git_to_bzr(node)
61
            bzr_parents = [ids.convert_revision_id_git_to_bzr(n)
62
                           for n in parents]
63
            result[bzr_node] = bzr_parents
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
64
        return result
65
0.200.21 by John Arbash Meinel
Fix Repository.get_revision_graph()
66
    def get_revision_graph_with_ghosts(self, revision_ids=None):
67
        graph = deprecated_graph.Graph()
68
        if revision_ids is not None:
69
            revision_ids = [ids.convert_revision_id_bzr_to_git(r)
70
                            for r in revision_ids]
71
        for node, parents in self._git.ancestry(revision_ids).iteritems():
72
            bzr_node = ids.convert_revision_id_git_to_bzr(node)
73
            bzr_parents = [ids.convert_revision_id_git_to_bzr(n)
74
                           for n in parents]
75
76
            graph.add_node(bzr_node, bzr_parents)
77
        return graph
78
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
79
    def get_revision(self, revision_id):
80
        if revision_id in self._revision_cache:
81
            return self._revision_cache[revision_id]
0.200.29 by David Allouche
Smoke test for GitRepository.get_revision, and corresponding fixes.
82
        raw = self._git.rev_list(
83
            [ids.convert_revision_id_bzr_to_git(revision_id)],
84
            max_count=1, header=True)
0.200.30 by David Allouche
Rename GitRepository.parse_rev to ._parse_rev.
85
        return self._parse_rev(raw)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
86
87
    def has_revision(self, revision_id):
88
        try:
89
            self.get_revision(revision_id)
90
        except NoSuchRevision:
91
            return False
92
        else:
93
            return True
94
95
    def get_revisions(self, revisions):
96
        return [self.get_revision(r) for r in revisions]
97
0.200.32 by David Allouche
Rewrite GitRepository._parse_rev, with unit tests.
98
    @classmethod
99
    def _parse_rev(klass, raw):
100
        """Parse a single git revision.
101
102
        * The first line is the git commit id.
103
        * Following lines conform to the 'name value' structure, until the
104
          first blank line.
105
        * All lines after the first blank line and until the NULL line have 4
106
          leading spaces and constitute the commit message.
107
108
        :param raw: sequence of newline-terminated strings, its last item is a
109
            single NULL character.
110
        :return: a `bzrlib.revision.Revision` object.
111
        """
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
112
        parents = []
0.200.32 by David Allouche
Rewrite GitRepository._parse_rev, with unit tests.
113
        message_lines = []
114
        in_message = False
115
        committer_was_set = False
0.200.29 by David Allouche
Smoke test for GitRepository.get_revision, and corresponding fixes.
116
        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.
117
        rev = revision.Revision(revision_id)
118
        rev.inventory_sha1 = ""
119
        assert raw[-1] == '\x00', (
120
            "Last item of raw was not a single NULL character.")
121
        for line in raw[1:-1]:
122
            if in_message:
123
                assert line[:4] == '    ', (
124
                    "Unexpected line format in commit message: %r" % line)
125
                message_lines.append(line[4:])
126
                continue
127
            if line == '\n':
128
                in_message = True
129
                continue
130
            name, value = line[:-1].split(' ', 1)
131
            if name == 'parent':
132
                rev.parent_ids.append(
133
                    ids.convert_revision_id_git_to_bzr(value))
134
                continue
135
            if name == 'author':
136
                author, timestamp, timezone = value.rsplit(' ', 2)
137
                rev.properties['author'] = author
138
                rev.properties['git-author-timestamp'] = timestamp
139
                rev.properties['git-author-timezone'] = timezone
140
                if not committer_was_set:
141
                    rev.committer = author
142
                    rev.timestamp = float(timestamp)
0.200.35 by David Allouche
GitRepository._parse_rev sets Revision.timezone to a float instead of a string.
143
                    rev.timezone = klass._parse_tz(timezone)
0.200.32 by David Allouche
Rewrite GitRepository._parse_rev, with unit tests.
144
                continue
145
            if name == 'committer':
146
                committer_was_set = True
147
                committer, timestamp, timezone = value.rsplit(' ', 2)
148
                rev.committer = committer
149
                rev.timestamp = float(timestamp)
0.200.35 by David Allouche
GitRepository._parse_rev sets Revision.timezone to a float instead of a string.
150
                rev.timezone = klass._parse_tz(timezone)
0.200.32 by David Allouche
Rewrite GitRepository._parse_rev, with unit tests.
151
                continue
152
            if name == 'tree':
153
                rev.properties['git-tree-id'] = value
154
                continue
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
155
0.200.32 by David Allouche
Rewrite GitRepository._parse_rev, with unit tests.
156
        rev.message = ''.join(message_lines)
157
        return rev
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
158
0.200.35 by David Allouche
GitRepository._parse_rev sets Revision.timezone to a float instead of a string.
159
    @classmethod
160
    def _parse_tz(klass, tz):
161
        """Parse a timezone specification in the [+|-]HHMM format.
162
163
        :return: the timezone offset in seconds.
164
        """
165
        assert len(tz) == 5
166
        sign = {'+': +1, '-': -1}[tz[0]]
167
        hours = int(tz[1:3])
168
        minutes = int(tz[3:])
169
        return float(sign * 60 * (60 * hours + minutes))
170
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
171
    def revision_trees(self, revids):
172
        for revid in revids:
173
            yield self.revision_tree(revid)
174
175
    def revision_tree(self, revision_id):
176
        return GitRevisionTree(self, revision_id)
177
178
    def get_inventory(self, revision_id):
179
        revision = self.get_revision(revision_id)
180
        inventory = GitInventory(revision_id)
181
        tree_id = revision.properties['git-tree-id']
182
        type_map = {'blob': 'file', 'tree': 'directory' }
183
        def get_inventory(tree_id, prefix):
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
184
            for perms, type, obj_id, name in self._git.get_inventory(tree_id):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
185
                full_path = prefix + name
186
                if type == 'blob':
187
                    text_sha1 = obj_id
188
                else:
189
                    text_sha1 = None
190
                executable = (perms[-3] in ('1', '3', '5', '7'))
191
                entry = GitEntry(full_path, type_map[type], revision_id,
192
                                 text_sha1, executable)
193
                inventory.entries[full_path] = entry
194
                if type == 'tree':
195
                    get_inventory(obj_id, full_path+'/')
196
        get_inventory(tree_id, '')
197
        return inventory
198
199
200
class GitRevisionTree(object):
201
202
    def __init__(self, repository, revision_id):
203
        self.repository = repository
204
        self.revision_id = revision_id
205
        self.inventory = repository.get_inventory(revision_id)
206
207
    def get_file(self, file_id):
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
208
        return iterablefile.IterableFile(self.get_file_lines(file_id))
209
210
    def get_file_lines(self, file_id):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
211
        obj_id = self.inventory[file_id].text_sha1
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
212
        return self.repository._git.cat_file('blob', obj_id)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
213
214
    def is_executable(self, file_id):
215
        return self.inventory[file_id].executable
216
217
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
218
class GitInventory(object):
219
220
    def __init__(self, revision_id):
221
        self.entries = {}
222
        self.root = GitEntry('', 'directory', revision_id)
223
        self.entries[''] = self.root
224
225
    def __getitem__(self, key):
226
        return self.entries[key]
227
228
    def iter_entries(self):
229
        return iter(sorted(self.entries.items()))
230
231
    def iter_entries_by_dir(self):
232
        return self.iter_entries()
233
234
    def __len__(self):
235
        return len(self.entries)
236
237
238
class GitEntry(object):
239
240
    def __init__(self, path, kind, revision, text_sha1=None, executable=False,
241
                 text_size=None):
242
        self.path = path
243
        self.file_id = path
244
        self.kind = kind
245
        self.executable = executable
246
        self.name = osutils.basename(path)
247
        if path == '':
248
            self.parent_id = None
249
        else:
250
            self.parent_id = osutils.dirname(path)
251
        self.revision = revision
252
        self.symlink_target = None
253
        self.text_sha1 = text_sha1
254
        self.text_size = None
255
256
    def __repr__(self):
257
        return "GitEntry(%r, %r, %r, %r)" % (self.path, self.kind,
258
                                             self.revision, self.parent_id)
259
260