/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

Implement to_files() for git merge directives.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
1
 
# Copyright (C) 2009-2010 Jelmer Vernooij <jelmer@samba.org>
 
1
# Copyright (C) 2009 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
 
    )
26
23
from bzrlib.repository import (
27
24
    InterRepository,
28
25
    )
33
30
from bzrlib.plugins.git.errors import (
34
31
    NoPushSupport,
35
32
    )
 
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()
60
62
        self._pending = []
61
63
        self.pb = pb
62
64
 
63
 
    def import_revisions(self, revids, roundtrip):
 
65
    def import_revisions(self, revids):
 
66
        self._revids.update(revids)
64
67
        for i, revid in enumerate(revids):
65
68
            if self.pb:
66
69
                self.pb.update("pushing revisions", i, len(revids))
67
 
            git_commit = self.import_revision(revid, roundtrip)
 
70
            git_commit = self.import_revision(revid)
68
71
            yield (revid, git_commit)
69
72
 
70
 
    def import_revision(self, revid, roundtrip):
 
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):
71
98
        """Import the gist of a revision into this Git repository.
72
99
 
73
100
        """
74
 
        tree = self._object_store.tree_cache.revision_tree(revid)
 
101
        inv = self.source.get_inventory(revid)
75
102
        rev = self.source.get_revision(revid)
76
 
        commit = None
77
 
        for path, obj, ie in self._object_store._revision_to_objects(rev, tree,
78
 
            roundtrip):
79
 
            if obj.type_name == "commit":
80
 
                commit = obj
81
 
            self._pending.append((obj, path))
 
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)
82
119
        return commit.id
83
120
 
84
121
    def __len__(self):
85
122
        return len(self._pending)
86
123
 
87
124
    def __iter__(self):
88
 
        return iter(self._pending)
 
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)
89
131
 
90
132
 
91
133
class InterToGitRepository(InterRepository):
106
148
        """See InterRepository.copy_content."""
107
149
        self.fetch(revision_id, pb, find_ghosts=False)
108
150
 
 
151
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
 
152
            fetch_spec=None):
 
153
        raise NoPushSupport()
 
154
 
109
155
 
110
156
class InterToLocalGitRepository(InterToGitRepository):
111
157
 
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
 
 
117
158
    def missing_revisions(self, stop_revisions, check_revid):
118
159
        missing = []
119
160
        pb = ui.ui_factory.nested_progress_bar()
127
168
        finally:
128
169
            pb.finished()
129
170
 
130
 
    def fetch_refs(self, refs):
131
 
        fetch_spec = PendingAncestryResult(refs.values(), self.source)
132
 
        self.fetch(fetch_spec=fetch_spec)
133
 
 
134
171
    def dfetch_refs(self, refs):
135
 
        old_refs = self.target._git.get_refs()
136
172
        new_refs = {}
137
173
        revidmap, gitidmap = self.dfetch(refs.values())
138
174
        for name, revid in refs.iteritems():
142
178
                gitid = self.source_store._lookup_revision_sha1(revid)
143
179
            self.target._git.refs[name] = gitid
144
180
            new_refs[name] = gitid
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
 
            try:
152
 
                return (self.source_store._lookup_revision_sha1(revid) in self.target_store)
153
 
            except errors.NoSuchRevision:
154
 
                # Ghost, can't dpush
155
 
                return True
156
 
        return list(self.missing_revisions(stop_revisions, check_revid))
 
181
        return revidmap, new_refs
157
182
 
158
183
    def dfetch(self, stop_revisions):
159
184
        """Import the gist of the ancestry of a particular revision."""
161
186
        revidmap = {}
162
187
        self.source.lock_read()
163
188
        try:
164
 
            todo = self._find_missing_revs(stop_revisions)
 
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))
165
199
            pb = ui.ui_factory.nested_progress_bar()
166
200
            try:
167
 
                object_generator = MissingObjectsIterator(self.source_store,
168
 
                    self.source, pb)
 
201
                object_generator = MissingObjectsIterator(self.source_store, self.source, pb)
169
202
                for old_bzr_revid, git_commit in object_generator.import_revisions(
170
 
                    todo, roundtrip=False):
 
203
                    todo):
171
204
                    new_bzr_revid = self.mapping.revision_id_foreign_to_bzr(git_commit)
172
205
                    revidmap[old_bzr_revid] = new_bzr_revid
173
206
                    gitidmap[old_bzr_revid] = git_commit
174
 
                self.target_store.add_objects(object_generator)
 
207
                target_store.add_objects(object_generator)
175
208
            finally:
176
209
                pb.finished()
177
210
        finally:
178
211
            self.source.unlock()
179
212
        return revidmap, gitidmap
180
213
 
181
 
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
182
 
            fetch_spec=None):
183
 
        if revision_id is not None:
184
 
            stop_revisions = [revision_id]
185
 
        elif fetch_spec is not None:
186
 
            stop_revisions = fetch_spec.heads
187
 
        else:
188
 
            stop_revisions = self.source.all_revision_ids()
189
 
        self.source.lock_read()
190
 
        try:
191
 
            todo = self._find_missing_revs(stop_revisions)
192
 
            pb = ui.ui_factory.nested_progress_bar()
193
 
            try:
194
 
                object_generator = MissingObjectsIterator(self.source_store,
195
 
                    self.source, pb)
196
 
                for (revid, git_sha) in object_generator.import_revisions(
197
 
                    todo, roundtrip=True):
198
 
                    try:
199
 
                        self.mapping.revision_id_bzr_to_foreign(revid)
200
 
                    except errors.InvalidRevisionId:
201
 
                        self.target_refs[self.mapping.revid_as_refname(revid)] = git_sha
202
 
                self.target_store.add_objects(object_generator)
203
 
            finally:
204
 
                pb.finished()
205
 
        finally:
206
 
            self.source.unlock()
207
 
 
208
214
    @staticmethod
209
215
    def is_compatible(source, target):
210
216
        """Be compatible with GitRepository."""
217
223
    def dfetch_refs(self, new_refs):
218
224
        """Import the gist of the ancestry of a particular revision."""
219
225
        revidmap = {}
220
 
        old_refs = {}
221
226
        def determine_wants(refs):
222
227
            ret = {}
223
 
            old_refs.update(new_refs)
224
228
            for name, revid in new_refs.iteritems():
225
229
                ret[name] = self.source_store._lookup_revision_sha1(revid)
226
230
            return ret
230
234
                    self.source_store.generate_pack_contents)
231
235
        finally:
232
236
            self.source.unlock()
233
 
        return revidmap, old_refs, new_refs
234
 
 
235
 
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
236
 
            fetch_spec=None):
237
 
        raise NoPushSupport()
 
237
        return revidmap, new_refs
238
238
 
239
239
    @staticmethod
240
240
    def is_compatible(source, target):