/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

Fix some more tests.

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
    )
57
60
        self._pending = []
58
61
        self.pb = pb
59
62
 
60
 
    def import_revisions(self, revids):
 
63
    def import_revisions(self, revids, roundtrip):
61
64
        for i, revid in enumerate(revids):
62
65
            if self.pb:
63
66
                self.pb.update("pushing revisions", i, len(revids))
64
 
            git_commit = self.import_revision(revid)
 
67
            git_commit = self.import_revision(revid, roundtrip)
65
68
            yield (revid, git_commit)
66
69
 
67
 
    def import_revision(self, revid):
 
70
    def import_revision(self, revid, roundtrip):
68
71
        """Import the gist of a revision into this Git repository.
69
72
 
70
73
        """
71
 
        inv = self._object_store.parent_invs_cache.get_inventory(revid)
 
74
        tree = self._object_store.tree_cache.revision_tree(revid)
72
75
        rev = self.source.get_revision(revid)
73
76
        commit = None
74
 
        for path, obj in self._object_store._revision_to_objects(rev, inv):
75
 
            if obj._type == "commit":
 
77
        for path, obj, ie in self._object_store._revision_to_objects(rev, tree,
 
78
            roundtrip):
 
79
            if obj.type_name == "commit":
76
80
                commit = obj
77
81
            self._pending.append((obj, path))
78
82
        return commit.id
102
106
        """See InterRepository.copy_content."""
103
107
        self.fetch(revision_id, pb, find_ghosts=False)
104
108
 
105
 
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
106
 
            fetch_spec=None):
107
 
        raise NoPushSupport()
108
 
 
109
109
 
110
110
class InterToLocalGitRepository(InterToGitRepository):
111
111
 
 
112
    def __init__(self, source, target):
 
113
        super(InterToLocalGitRepository, self).__init__(source, target)
 
114
        self.target_store = self.target._git.object_store
 
115
        self.target_refs = self.target._git.refs
 
116
 
112
117
    def missing_revisions(self, stop_revisions, check_revid):
113
118
        missing = []
 
119
        graph = self.source.get_graph()
114
120
        pb = ui.ui_factory.nested_progress_bar()
115
121
        try:
116
 
            graph = self.source.get_graph()
117
122
            for revid, _ in graph.iter_ancestry(stop_revisions):
118
123
                pb.update("determining revisions to fetch", len(missing))
119
124
                if not check_revid(revid):
120
125
                    missing.append(revid)
121
 
            return graph.iter_topo_order(missing)
122
126
        finally:
123
127
            pb.finished()
 
128
        return graph.iter_topo_order(missing)
 
129
 
 
130
    def fetch_refs(self, refs):
 
131
        fetch_spec = PendingAncestryResult(refs.values(), self.source)
 
132
        self.fetch(fetch_spec=fetch_spec)
124
133
 
125
134
    def dfetch_refs(self, refs):
126
 
        new_refs = {}
 
135
        old_refs = self.target._git.get_refs()
 
136
        new_refs = dict(old_refs)
127
137
        revidmap, gitidmap = self.dfetch(refs.values())
128
138
        for name, revid in refs.iteritems():
129
 
            if revid in gitidmap:
 
139
            try:
130
140
                gitid = gitidmap[revid]
131
 
            else:
 
141
            except KeyError:
132
142
                gitid = self.source_store._lookup_revision_sha1(revid)
133
143
            self.target._git.refs[name] = gitid
134
144
            new_refs[name] = gitid
135
 
        return revidmap, new_refs
 
145
        return revidmap, old_refs, new_refs
 
146
 
 
147
    def _find_missing_revs(self, stop_revisions):
 
148
        def check_revid(revid):
 
149
            if revid == NULL_REVISION:
 
150
                return True
 
151
            sha_id = self.source_store._lookup_revision_sha1(revid)
 
152
            try:
 
153
                return (sha_id in self.target_store)
 
154
            except errors.NoSuchRevision:
 
155
                # Ghost, can't push
 
156
                return True
 
157
        return list(self.missing_revisions(stop_revisions, check_revid))
136
158
 
137
159
    def dfetch(self, stop_revisions):
138
160
        """Import the gist of the ancestry of a particular revision."""
140
162
        revidmap = {}
141
163
        self.source.lock_read()
142
164
        try:
143
 
            target_store = self.target._git.object_store
144
 
            def check_revid(revid):
145
 
                if revid == NULL_REVISION:
146
 
                    return True
147
 
                try:
148
 
                    return (self.source_store._lookup_revision_sha1(revid) in target_store)
149
 
                except errors.NoSuchRevision:
150
 
                    # Ghost, can't dpush
151
 
                    return True
152
 
            todo = list(self.missing_revisions(stop_revisions, check_revid))
 
165
            todo = self._find_missing_revs(stop_revisions)
153
166
            pb = ui.ui_factory.nested_progress_bar()
154
167
            try:
155
 
                object_generator = MissingObjectsIterator(self.source_store, self.source, pb)
 
168
                object_generator = MissingObjectsIterator(self.source_store,
 
169
                    self.source, pb)
156
170
                for old_bzr_revid, git_commit in object_generator.import_revisions(
157
 
                    todo):
 
171
                    todo, roundtrip=False):
158
172
                    new_bzr_revid = self.mapping.revision_id_foreign_to_bzr(git_commit)
159
173
                    revidmap[old_bzr_revid] = new_bzr_revid
160
174
                    gitidmap[old_bzr_revid] = git_commit
161
 
                target_store.add_objects(object_generator)
 
175
                self.target_store.add_objects(object_generator)
162
176
            finally:
163
177
                pb.finished()
164
178
        finally:
165
179
            self.source.unlock()
166
180
        return revidmap, gitidmap
167
181
 
 
182
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
 
183
            fetch_spec=None):
 
184
        if revision_id is not None:
 
185
            stop_revisions = [revision_id]
 
186
        elif fetch_spec is not None:
 
187
            stop_revisions = fetch_spec.heads
 
188
        else:
 
189
            stop_revisions = self.source.all_revision_ids()
 
190
        self.source.lock_read()
 
191
        try:
 
192
            todo = self._find_missing_revs(stop_revisions)
 
193
            pb = ui.ui_factory.nested_progress_bar()
 
194
            try:
 
195
                object_generator = MissingObjectsIterator(self.source_store,
 
196
                    self.source, pb)
 
197
                for (revid, git_sha) in object_generator.import_revisions(
 
198
                    todo, roundtrip=True):
 
199
                    try:
 
200
                        self.mapping.revision_id_bzr_to_foreign(revid)
 
201
                    except errors.InvalidRevisionId:
 
202
                        self.target_refs[self.mapping.revid_as_refname(revid)] = git_sha
 
203
                self.target_store.add_objects(object_generator)
 
204
            finally:
 
205
                pb.finished()
 
206
        finally:
 
207
            self.source.unlock()
 
208
 
168
209
    @staticmethod
169
210
    def is_compatible(source, target):
170
211
        """Be compatible with GitRepository."""
177
218
    def dfetch_refs(self, new_refs):
178
219
        """Import the gist of the ancestry of a particular revision."""
179
220
        revidmap = {}
 
221
        old_refs = {}
180
222
        def determine_wants(refs):
181
223
            ret = {}
 
224
            old_refs.update(new_refs)
182
225
            for name, revid in new_refs.iteritems():
183
226
                ret[name] = self.source_store._lookup_revision_sha1(revid)
184
227
            return ret
185
228
        self.source.lock_read()
186
229
        try:
187
230
            new_refs = self.target.send_pack(determine_wants,
188
 
                    self.source_store.generate_pack_contents)
 
231
                    self.source_store.generate_lossy_pack_contents)
189
232
        finally:
190
233
            self.source.unlock()
191
 
        return revidmap, new_refs
 
234
        return revidmap, old_refs, new_refs
 
235
 
 
236
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
 
237
            fetch_spec=None):
 
238
        raise NoPushSupport()
192
239
 
193
240
    @staticmethod
194
241
    def is_compatible(source, target):