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

Create cache dir if it doesn't exist yet.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
17
17
"""Push implementation that simply prints message saying push is not supported."""
18
18
 
19
19
from bzrlib import (
20
 
    errors,
21
20
    ui,
22
21
    )
23
22
from bzrlib.repository import (
30
29
from bzrlib.plugins.git.errors import (
31
30
    NoPushSupport,
32
31
    )
 
32
from bzrlib.plugins.git.mapping import (
 
33
    extract_unusual_modes,
 
34
    )
33
35
from bzrlib.plugins.git.object_store import (
34
36
    BazaarObjectStore,
35
37
    )
54
56
        """
55
57
        self.source = source
56
58
        self._object_store = store
 
59
        self._revids = set()
 
60
        self._sent_shas = set()
57
61
        self._pending = []
58
62
        self.pb = pb
59
63
 
60
64
    def import_revisions(self, revids):
 
65
        self._revids.update(revids)
61
66
        for i, revid in enumerate(revids):
62
67
            if self.pb:
63
68
                self.pb.update("pushing revisions", i, len(revids))
64
69
            git_commit = self.import_revision(revid)
65
70
            yield (revid, git_commit)
66
71
 
 
72
    def need_sha(self, sha):
 
73
        if sha in self._sent_shas:
 
74
            return False
 
75
        (type, (fileid, revid)) = self._object_store._idmap.lookup_git_sha(sha)
 
76
        assert type in ("blob", "tree")
 
77
        if revid in self._revids:
 
78
            # Not sent yet, and part of the set of revisions to send
 
79
            return True
 
80
        # Not changed in the revisions to send, so either not necessary
 
81
        # or already present remotely (as git doesn't do ghosts)
 
82
        return False
 
83
 
 
84
    def queue(self, sha, obj, path, ie=None, inv=None):
 
85
        if obj is None:
 
86
            obj = (ie, inv)
 
87
        self._pending.append((obj, path))
 
88
        self._sent_shas.add(sha)
 
89
 
67
90
    def import_revision(self, revid):
68
91
        """Import the gist of a revision into this Git repository.
69
92
 
70
93
        """
71
 
        tree = self._object_store.tree_cache.revision_tree(revid)
 
94
        inv = self.source.get_inventory(revid)
72
95
        rev = self.source.get_revision(revid)
73
 
        commit = None
74
 
        for path, obj, ie in self._object_store._revision_to_objects(rev, tree):
75
 
            if obj.type_name == "commit":
76
 
                commit = obj
77
 
            self._pending.append((obj, path))
 
96
        unusual_modes = extract_unusual_modes(rev)
 
97
        todo = [inv.root]
 
98
        tree_sha = None
 
99
        while todo:
 
100
            ie = todo.pop()
 
101
            (sha, object) = self._object_store._get_ie_object_or_sha1(ie, inv, unusual_modes)
 
102
            if ie.parent_id is None:
 
103
                tree_sha = sha
 
104
            if not self.need_sha(sha):
 
105
                continue
 
106
            self.queue(sha, object, inv.id2path(ie.file_id), ie, inv)
 
107
            if ie.kind == "directory":
 
108
                todo.extend(ie.children.values())
 
109
        assert tree_sha is not None
 
110
        commit = self._object_store._get_commit(rev, tree_sha)
 
111
        self.queue(commit.id, commit, None)
78
112
        return commit.id
79
113
 
80
114
    def __len__(self):
81
115
        return len(self._pending)
82
116
 
83
117
    def __iter__(self):
84
 
        return iter(self._pending)
 
118
        for i, (object, path) in enumerate(self._pending):
 
119
            if self.pb:
 
120
                self.pb.update("writing pack objects", i, len(self))
 
121
            if isinstance(object, tuple):
 
122
                object = self._object_store._get_ie_object(*object)
 
123
            yield (object, path)   
85
124
 
86
125
 
87
126
class InterToGitRepository(InterRepository):
102
141
        """See InterRepository.copy_content."""
103
142
        self.fetch(revision_id, pb, find_ghosts=False)
104
143
 
105
 
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
 
144
    def fetch(self, revision_id=None, pb=None, find_ghosts=False, 
106
145
            fetch_spec=None):
107
146
        raise NoPushSupport()
108
147
 
123
162
            pb.finished()
124
163
 
125
164
    def dfetch_refs(self, refs):
126
 
        old_refs = self.target._git.get_refs()
127
165
        new_refs = {}
128
166
        revidmap, gitidmap = self.dfetch(refs.values())
129
167
        for name, revid in refs.iteritems():
133
171
                gitid = self.source_store._lookup_revision_sha1(revid)
134
172
            self.target._git.refs[name] = gitid
135
173
            new_refs[name] = gitid
136
 
        return revidmap, old_refs, new_refs
 
174
        return revidmap, new_refs
137
175
 
138
176
    def dfetch(self, stop_revisions):
139
177
        """Import the gist of the ancestry of a particular revision."""
145
183
            def check_revid(revid):
146
184
                if revid == NULL_REVISION:
147
185
                    return True
148
 
                try:
149
 
                    return (self.source_store._lookup_revision_sha1(revid) in target_store)
150
 
                except errors.NoSuchRevision:
151
 
                    # Ghost, can't dpush
152
 
                    return True
 
186
                return (self.source_store._lookup_revision_sha1(revid) in target_store)
153
187
            todo = list(self.missing_revisions(stop_revisions, check_revid))
154
188
            pb = ui.ui_factory.nested_progress_bar()
155
189
            try:
159
193
                    new_bzr_revid = self.mapping.revision_id_foreign_to_bzr(git_commit)
160
194
                    revidmap[old_bzr_revid] = new_bzr_revid
161
195
                    gitidmap[old_bzr_revid] = git_commit
162
 
                target_store.add_objects(object_generator)
 
196
                target_store.add_objects(object_generator) 
163
197
            finally:
164
198
                pb.finished()
165
199
        finally:
169
203
    @staticmethod
170
204
    def is_compatible(source, target):
171
205
        """Be compatible with GitRepository."""
172
 
        return (not isinstance(source, GitRepository) and
 
206
        return (not isinstance(source, GitRepository) and 
173
207
                isinstance(target, LocalGitRepository))
174
208
 
175
209
 
178
212
    def dfetch_refs(self, new_refs):
179
213
        """Import the gist of the ancestry of a particular revision."""
180
214
        revidmap = {}
181
 
        old_refs = {}
182
215
        def determine_wants(refs):
183
216
            ret = {}
184
 
            old_refs.update(new_refs)
185
217
            for name, revid in new_refs.iteritems():
186
218
                ret[name] = self.source_store._lookup_revision_sha1(revid)
187
219
            return ret
191
223
                    self.source_store.generate_pack_contents)
192
224
        finally:
193
225
            self.source.unlock()
194
 
        return revidmap, old_refs, new_refs
 
226
        return revidmap, new_refs
195
227
 
196
228
    @staticmethod
197
229
    def is_compatible(source, target):
198
230
        """Be compatible with GitRepository."""
199
 
        return (not isinstance(source, GitRepository) and
 
231
        return (not isinstance(source, GitRepository) and 
200
232
                isinstance(target, RemoteGitRepository))