/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

  • Committer: Jelmer Vernooij
  • Date: 2010-06-28 23:48:36 UTC
  • mto: (0.200.953 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100628234836-96qxjh7g2xxedblp
Fix transportgit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
1
 
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
 
1
# Copyright (C) 2009-2010 Jelmer Vernooij <jelmer@samba.org>
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
20
20
    errors,
21
21
    ui,
22
22
    )
 
23
from bzrlib.graph import (
 
24
    PendingAncestryResult,
 
25
    )
23
26
from bzrlib.repository import (
24
27
    InterRepository,
25
28
    )
30
33
from bzrlib.plugins.git.errors import (
31
34
    NoPushSupport,
32
35
    )
33
 
from bzrlib.plugins.git.mapping import (
34
 
    extract_unusual_modes,
35
 
    )
36
36
from bzrlib.plugins.git.object_store import (
37
37
    BazaarObjectStore,
38
38
    )
57
57
        """
58
58
        self.source = source
59
59
        self._object_store = store
60
 
        self._revids = set()
61
 
        self._sent_shas = set()
62
60
        self._pending = []
63
61
        self.pb = pb
64
62
 
65
 
    def import_revisions(self, revids):
66
 
        self._revids.update(revids)
 
63
    def import_revisions(self, revids, roundtrip):
 
64
        """Import a set of revisions into this git repository.
 
65
 
 
66
        :param revids: Revision ids of revisions to import
 
67
        :param roundtrip: Whether to roundtrip bzr metadata
 
68
        """
67
69
        for i, revid in enumerate(revids):
68
70
            if self.pb:
69
71
                self.pb.update("pushing revisions", i, len(revids))
70
 
            git_commit = self.import_revision(revid)
 
72
            git_commit = self.import_revision(revid, roundtrip)
71
73
            yield (revid, git_commit)
72
74
 
73
 
    def need_sha(self, sha):
74
 
        if sha is None or sha in self._sent_shas:
75
 
            return False
76
 
        (type, (fileid, revid)) = self._object_store._idmap.lookup_git_sha(sha)
77
 
        assert type in ("blob", "tree")
78
 
        if revid in self._revids:
79
 
            # Not sent yet, and part of the set of revisions to send
80
 
            return True
81
 
        # Not changed in the revisions to send, so either not necessary
82
 
        # or already present remotely (as git doesn't do ghosts)
83
 
        return False
84
 
 
85
 
    def queue(self, sha, obj, path, ie=None, inv=None, unusual_modes=None):
86
 
        if obj is None:
87
 
            # Can't lazy-evaluate directories, since they might be eliminated
88
 
            if ie.kind == "directory":
89
 
                obj = self._object_store._get_ie_object(ie, inv, unusual_modes)
90
 
                if obj is None:
91
 
                    return
92
 
            else:
93
 
                obj = (ie, inv, unusual_modes)
94
 
        self._pending.append((obj, path))
95
 
        self._sent_shas.add(sha)
96
 
 
97
 
    def import_revision(self, revid):
98
 
        """Import the gist of a revision into this Git repository.
99
 
 
 
75
    def import_revision(self, revid, roundtrip):
 
76
        """Import a revision into this Git repository.
 
77
 
 
78
        :param revid: Revision id of the revision
 
79
        :param roundtrip: Whether to roundtrip bzr metadata
100
80
        """
101
 
        inv = self.source.get_inventory(revid)
 
81
        tree = self._object_store.tree_cache.revision_tree(revid)
102
82
        rev = self.source.get_revision(revid)
103
 
        unusual_modes = extract_unusual_modes(rev)
104
 
        todo = [inv.root]
105
 
        tree_sha = None
106
 
        while todo:
107
 
            ie = todo.pop()
108
 
            (sha, object) = self._object_store._get_ie_object_or_sha1(ie, inv, unusual_modes)
109
 
            if ie.parent_id is None:
110
 
                tree_sha = sha
111
 
            if not self.need_sha(sha):
112
 
                continue
113
 
            self.queue(sha, object, inv.id2path(ie.file_id), ie, inv, unusual_modes)
114
 
            if ie.kind == "directory":
115
 
                todo.extend(ie.children.values())
116
 
        assert tree_sha is not None
117
 
        commit = self._object_store._get_commit(rev, tree_sha)
118
 
        self.queue(commit.id, commit, None, None)
 
83
        commit = None
 
84
        for path, obj, ie in self._object_store._revision_to_objects(rev, tree,
 
85
            roundtrip):
 
86
            if obj.type_name == "commit":
 
87
                commit = obj
 
88
            self._pending.append((obj, path))
119
89
        return commit.id
120
90
 
121
91
    def __len__(self):
122
92
        return len(self._pending)
123
93
 
124
94
    def __iter__(self):
125
 
        for i, (object, path) in enumerate(self._pending):
126
 
            if self.pb:
127
 
                self.pb.update("writing pack objects", i, len(self))
128
 
            if isinstance(object, tuple):
129
 
                object = self._object_store._get_ie_object(*object)
130
 
            yield (object, path)
 
95
        return iter(self._pending)
131
96
 
132
97
 
133
98
class InterToGitRepository(InterRepository):
148
113
        """See InterRepository.copy_content."""
149
114
        self.fetch(revision_id, pb, find_ghosts=False)
150
115
 
151
 
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
152
 
            fetch_spec=None):
153
 
        raise NoPushSupport()
 
116
    def dfetch_refs(self, update_refs):
 
117
        """Fetch non-roundtripped revisions into the target repository.
 
118
 
 
119
        :param update_refs: Generate refs to fetch. Receives dictionary 
 
120
            with old names to old git shas. Should return a dictionary
 
121
            of new names to Bazaar revision ids.
 
122
        :return: revision id map, old refs dictionary and new refs dictionary
 
123
        """
 
124
        raise NotImplementedError(self.dfetch_refs)
 
125
 
 
126
    def fetch_refs(self, update_refs):
 
127
        """Fetch possibly roundtripped revisions into the target repository.
 
128
 
 
129
        :param update_refs: Generate refs to fetch. Receives dictionary 
 
130
            with old refs (git shas), returns dictionary of new names to 
 
131
            git shas.
 
132
        :return: old refs, new refs
 
133
        """
 
134
        raise NotImplementedError(self.fetch_refs)
154
135
 
155
136
 
156
137
class InterToLocalGitRepository(InterToGitRepository):
157
138
 
 
139
    def __init__(self, source, target):
 
140
        super(InterToLocalGitRepository, self).__init__(source, target)
 
141
        self.target_store = self.target._git.object_store
 
142
        self.target_refs = self.target._git.refs
 
143
 
158
144
    def missing_revisions(self, stop_revisions, check_revid):
159
145
        missing = []
 
146
        graph = self.source.get_graph()
160
147
        pb = ui.ui_factory.nested_progress_bar()
161
148
        try:
162
 
            graph = self.source.get_graph()
163
149
            for revid, _ in graph.iter_ancestry(stop_revisions):
164
150
                pb.update("determining revisions to fetch", len(missing))
165
151
                if not check_revid(revid):
166
152
                    missing.append(revid)
167
 
            return graph.iter_topo_order(missing)
168
153
        finally:
169
154
            pb.finished()
170
 
 
171
 
    def dfetch_refs(self, refs):
172
 
        new_refs = {}
173
 
        revidmap, gitidmap = self.dfetch(refs.values())
174
 
        for name, revid in refs.iteritems():
175
 
            if revid in gitidmap:
 
155
        return graph.iter_topo_order(missing)
 
156
 
 
157
    def fetch_refs(self, update_refs):
 
158
        old_refs = self.target._git.get_refs()
 
159
        new_refs = update_refs(old_refs)
 
160
        fetch_spec = PendingAncestryResult(new_refs.values(), self.source)
 
161
        self.fetch(fetch_spec=fetch_spec)
 
162
        return old_refs, new_refs
 
163
 
 
164
    def dfetch_refs(self, update_refs):
 
165
        old_refs = self.target._git.get_refs()
 
166
        new_refs = update_refs(old_refs)
 
167
        revidmap, gitidmap = self.dfetch(new_refs.values())
 
168
        for name, revid in new_refs.iteritems():
 
169
            try:
176
170
                gitid = gitidmap[revid]
177
 
            else:
 
171
            except KeyError:
178
172
                gitid = self.source_store._lookup_revision_sha1(revid)
179
173
            self.target._git.refs[name] = gitid
180
 
            new_refs[name] = gitid
181
 
        return revidmap, new_refs
 
174
            new_refs[name] = revid
 
175
        return revidmap, old_refs, new_refs
 
176
 
 
177
    def _find_missing_revs(self, stop_revisions):
 
178
        def check_revid(revid):
 
179
            if revid == NULL_REVISION:
 
180
                return True
 
181
            sha_id = self.source_store._lookup_revision_sha1(revid)
 
182
            try:
 
183
                return (sha_id in self.target_store)
 
184
            except errors.NoSuchRevision:
 
185
                # Ghost, can't push
 
186
                return True
 
187
        return list(self.missing_revisions(stop_revisions, check_revid))
 
188
 
 
189
    def _get_missing_objects_iterator(self, pb):
 
190
        return MissingObjectsIterator(self.source_store, self.source, pb)
182
191
 
183
192
    def dfetch(self, stop_revisions):
184
193
        """Import the gist of the ancestry of a particular revision."""
186
195
        revidmap = {}
187
196
        self.source.lock_read()
188
197
        try:
189
 
            target_store = self.target._git.object_store
190
 
            def check_revid(revid):
191
 
                if revid == NULL_REVISION:
192
 
                    return True
193
 
                try:
194
 
                    return (self.source_store._lookup_revision_sha1(revid) in target_store)
195
 
                except errors.NoSuchRevision:
196
 
                    # Ghost, can't dpush
197
 
                    return True
198
 
            todo = list(self.missing_revisions(stop_revisions, check_revid))
 
198
            todo = self._find_missing_revs(stop_revisions)
199
199
            pb = ui.ui_factory.nested_progress_bar()
200
200
            try:
201
 
                object_generator = MissingObjectsIterator(self.source_store, self.source, pb)
 
201
                object_generator = self._get_missing_objects_iterator()
202
202
                for old_bzr_revid, git_commit in object_generator.import_revisions(
203
 
                    todo):
 
203
                    todo, roundtrip=False):
204
204
                    new_bzr_revid = self.mapping.revision_id_foreign_to_bzr(git_commit)
205
205
                    revidmap[old_bzr_revid] = new_bzr_revid
206
206
                    gitidmap[old_bzr_revid] = git_commit
207
 
                target_store.add_objects(object_generator)
 
207
                self.target_store.add_objects(object_generator)
208
208
            finally:
209
209
                pb.finished()
210
210
        finally:
211
211
            self.source.unlock()
212
212
        return revidmap, gitidmap
213
213
 
 
214
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
 
215
            fetch_spec=None):
 
216
        if revision_id is not None:
 
217
            stop_revisions = [revision_id]
 
218
        elif fetch_spec is not None:
 
219
            stop_revisions = fetch_spec.heads
 
220
        else:
 
221
            stop_revisions = self.source.all_revision_ids()
 
222
        self.source.lock_read()
 
223
        try:
 
224
            todo = self._find_missing_revs(stop_revisions)
 
225
            pb = ui.ui_factory.nested_progress_bar()
 
226
            try:
 
227
                object_generator = self._get_missing_objects_iterator(pb)
 
228
                for (revid, git_sha) in object_generator.import_revisions(
 
229
                    todo, roundtrip=True):
 
230
                    try:
 
231
                        self.mapping.revision_id_bzr_to_foreign(revid)
 
232
                    except errors.InvalidRevisionId:
 
233
                        self.target_refs[self.mapping.revid_as_refname(revid)] = git_sha
 
234
                self.target_store.add_objects(object_generator)
 
235
            finally:
 
236
                pb.finished()
 
237
        finally:
 
238
            self.source.unlock()
 
239
 
214
240
    @staticmethod
215
241
    def is_compatible(source, target):
216
242
        """Be compatible with GitRepository."""
220
246
 
221
247
class InterToRemoteGitRepository(InterToGitRepository):
222
248
 
223
 
    def dfetch_refs(self, new_refs):
 
249
    def dfetch_refs(self, update_refs):
224
250
        """Import the gist of the ancestry of a particular revision."""
225
251
        revidmap = {}
226
 
        def determine_wants(refs):
 
252
        def determine_wants(old_refs):
227
253
            ret = {}
228
 
            for name, revid in new_refs.iteritems():
 
254
            self.old_refs = old_refs
 
255
            self.new_refs = update_refs(self.old_refs)
 
256
            for name, revid in self.new_refs.iteritems():
229
257
                ret[name] = self.source_store._lookup_revision_sha1(revid)
230
258
            return ret
231
259
        self.source.lock_read()
232
260
        try:
233
261
            new_refs = self.target.send_pack(determine_wants,
234
 
                    self.source_store.generate_pack_contents)
 
262
                    self.source_store.generate_lossy_pack_contents)
235
263
        finally:
236
264
            self.source.unlock()
237
 
        return revidmap, new_refs
 
265
        return revidmap, self.old_refs, self.new_refs
 
266
 
 
267
    def fetch_refs(self, update_refs):
 
268
        raise NoPushSupport()
238
269
 
239
270
    @staticmethod
240
271
    def is_compatible(source, target):