/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 versionedfiles.py

  • Committer: Jelmer Vernooij
  • Author(s): Chadrik
  • Date: 2010-07-26 14:02:05 UTC
  • mto: (0.312.1 master) (6883.23.1 bundle-git)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100726140205-m45dyrhi1ifg0fck
https://launchpad.net/bugs/603800
Fix 'bzr status' after 'bzr add' in native git working trees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
versionedfiles.py
 
1
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
 
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
from dulwich.object_store import (
 
18
    tree_lookup_path,
 
19
    )
 
20
from dulwich.objects import (
 
21
    Blob,
 
22
    Commit,
 
23
    Tree,
 
24
    )
 
25
 
 
26
from bzrlib.versionedfile import (
 
27
    AbsentContentFactory,
 
28
    ChunkedContentFactory,
 
29
    VersionedFiles,
 
30
    )
 
31
 
 
32
 
 
33
class GitRevisions(VersionedFiles):
 
34
 
 
35
    def __init__(self, repository, object_store):
 
36
        self.repository = repository
 
37
        self.object_store = object_store
 
38
 
 
39
    def check(self, progressbar=None):
 
40
        return True
 
41
 
 
42
    def iterkeys(self):
 
43
        for sha in self.object_store:
 
44
            if type(sha) == Commit:
 
45
                yield (sha,)
 
46
 
 
47
    def keys(self):
 
48
        return list(self.iterkeys())
 
49
 
 
50
    def add_mpdiffs(self, records):
 
51
        raise NotImplementedError(self.add_mpdiffs)
 
52
 
 
53
    def get_record_stream(self, keys, ordering, include_delta_closure):
 
54
        for key in keys:
 
55
            (revid,) = key
 
56
            (commit_id, mapping) = self.repository.lookup_bzr_revision_id(revid)
 
57
            try:
 
58
                commit = self.object_store[commit_id]
 
59
            except KeyError:
 
60
                yield AbsentContentFactory(key)
 
61
            else:
 
62
                yield ChunkedContentFactory(key, 
 
63
                    tuple([(self.repository.lookup_foreign_revision_id(p, mapping),) for p in commit.parents]), None, 
 
64
                    commit.as_raw_chunks())
 
65
 
 
66
    def get_parent_map(self, keys):
 
67
        ret = {}
 
68
        for (revid,) in keys:
 
69
            (commit_id, mapping) = self.repository.lookup_bzr_revision_id(revid)
 
70
            try:
 
71
                ret[(revid,)] = [(self.repository.lookup_foreign_revision_id(p, mapping),) for p in self.object_store[commit_id].parents]
 
72
            except KeyError:
 
73
                ret[(revid,)] = None
 
74
        return ret
 
75
 
 
76
 
 
77
class GitTexts(VersionedFiles):
 
78
    """A texts VersionedFiles instance that is backed onto a Git object store."""
 
79
 
 
80
    def __init__(self, repository):
 
81
        self.repository = repository
 
82
        self.object_store = self.repository._git.object_store
 
83
 
 
84
    def check(self, progressbar=None):
 
85
        return True
 
86
 
 
87
    def add_mpdiffs(self, records):
 
88
        raise NotImplementedError(self.add_mpdiffs)
 
89
 
 
90
    def get_record_stream(self, keys, ordering, include_delta_closure):
 
91
        for key in keys:
 
92
            (fileid, revid) = key
 
93
            (commit_id, mapping) = self.repository.lookup_bzr_revision_id(revid)
 
94
            root_tree = self.object_store[commit_id].tree
 
95
            path = mapping.parse_file_id(fileid)
 
96
            try:
 
97
                obj = tree_lookup_path(
 
98
                    self.object_store.__getitem__, root_tree, path)
 
99
                if isinstance(obj, tuple):
 
100
                    (mode, item_id) = obj
 
101
                    obj = self.object_store[item_id]
 
102
            except KeyError:
 
103
                yield AbsentContentFactory(key)
 
104
            else:
 
105
                if isinstance(obj, Tree):
 
106
                    yield ChunkedContentFactory(key, None, None, [])
 
107
                elif isinstance(obj, Blob):
 
108
                    yield ChunkedContentFactory(key, None, None, obj.chunked)
 
109
                else:
 
110
                    raise AssertionError("file text resolved to %r" % obj)
 
111
 
 
112
    def get_parent_map(self, keys):
 
113
        raise NotImplementedError(self.get_parent_map)
 
114