/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-05-05 09:58:55 UTC
  • mto: (0.200.912 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100505095855-i0165hooflvk9chy
Ignore control files in inventories.

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):
67
64
        for i, revid in enumerate(revids):
68
65
            if self.pb:
69
66
                self.pb.update("pushing revisions", i, len(revids))
70
 
            git_commit = self.import_revision(revid)
 
67
            git_commit = self.import_revision(revid, roundtrip)
71
68
            yield (revid, git_commit)
72
69
 
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):
 
70
    def import_revision(self, revid, roundtrip):
98
71
        """Import the gist of a revision into this Git repository.
99
72
 
100
73
        """
101
 
        inv = self.source.get_inventory(revid)
 
74
        tree = self._object_store.tree_cache.revision_tree(revid)
102
75
        rev = self.source.get_revision(revid)
103
 
        invshamap = self._object_store._idmap.get_inventory_sha_map(revid)
104
 
        unusual_modes = extract_unusual_modes(rev)
105
 
        todo = [inv.root]
106
 
        tree_sha = None
107
 
        while todo:
108
 
            ie = todo.pop()
109
 
            (sha, object) = self._object_store._get_ie_object_or_sha1(ie, inv, invshamap, unusual_modes)
110
 
            if ie.parent_id is None:
111
 
                tree_sha = sha
112
 
            if not self.need_sha(sha):
113
 
                continue
114
 
            self.queue(sha, object, inv.id2path(ie.file_id), ie, inv, unusual_modes)
115
 
            if ie.kind == "directory":
116
 
                todo.extend(ie.children.values())
117
 
        assert tree_sha is not None
118
 
        commit = self._object_store._get_commit(rev, tree_sha)
119
 
        self.queue(commit.id, commit, None, None)
 
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))
120
82
        return commit.id
121
83
 
122
84
    def __len__(self):
123
85
        return len(self._pending)
124
86
 
125
87
    def __iter__(self):
126
 
        for i, (object, path) in enumerate(self._pending):
127
 
            if self.pb:
128
 
                self.pb.update("writing pack objects", i, len(self))
129
 
            if isinstance(object, tuple):
130
 
                object = self._object_store._get_ie_object(*object)
131
 
            yield (object, path)
 
88
        return iter(self._pending)
132
89
 
133
90
 
134
91
class InterToGitRepository(InterRepository):
149
106
        """See InterRepository.copy_content."""
150
107
        self.fetch(revision_id, pb, find_ghosts=False)
151
108
 
152
 
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
153
 
            fetch_spec=None):
154
 
        raise NoPushSupport()
155
 
 
156
109
 
157
110
class InterToLocalGitRepository(InterToGitRepository):
158
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
 
159
117
    def missing_revisions(self, stop_revisions, check_revid):
160
118
        missing = []
161
119
        pb = ui.ui_factory.nested_progress_bar()
169
127
        finally:
170
128
            pb.finished()
171
129
 
 
130
    def fetch_refs(self, refs):
 
131
        fetch_spec = PendingAncestryResult(refs.values(), self.source)
 
132
        self.fetch(fetch_spec=fetch_spec)
 
133
 
172
134
    def dfetch_refs(self, refs):
 
135
        old_refs = self.target._git.get_refs()
173
136
        new_refs = {}
174
137
        revidmap, gitidmap = self.dfetch(refs.values())
175
138
        for name, revid in refs.iteritems():
179
142
                gitid = self.source_store._lookup_revision_sha1(revid)
180
143
            self.target._git.refs[name] = gitid
181
144
            new_refs[name] = gitid
182
 
        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
            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))
183
157
 
184
158
    def dfetch(self, stop_revisions):
185
159
        """Import the gist of the ancestry of a particular revision."""
187
161
        revidmap = {}
188
162
        self.source.lock_read()
189
163
        try:
190
 
            target_store = self.target._git.object_store
191
 
            def check_revid(revid):
192
 
                if revid == NULL_REVISION:
193
 
                    return True
194
 
                try:
195
 
                    return (self.source_store._lookup_revision_sha1(revid) in target_store)
196
 
                except errors.NoSuchRevision:
197
 
                    # Ghost, can't dpush
198
 
                    return True
199
 
            todo = list(self.missing_revisions(stop_revisions, check_revid))
 
164
            todo = self._find_missing_revs(stop_revisions)
200
165
            pb = ui.ui_factory.nested_progress_bar()
201
166
            try:
202
 
                object_generator = MissingObjectsIterator(self.source_store, self.source, pb)
 
167
                object_generator = MissingObjectsIterator(self.source_store,
 
168
                    self.source, pb)
203
169
                for old_bzr_revid, git_commit in object_generator.import_revisions(
204
 
                    todo):
 
170
                    todo, roundtrip=False):
205
171
                    new_bzr_revid = self.mapping.revision_id_foreign_to_bzr(git_commit)
206
172
                    revidmap[old_bzr_revid] = new_bzr_revid
207
173
                    gitidmap[old_bzr_revid] = git_commit
208
 
                target_store.add_objects(object_generator)
 
174
                self.target_store.add_objects(object_generator)
209
175
            finally:
210
176
                pb.finished()
211
177
        finally:
212
178
            self.source.unlock()
213
179
        return revidmap, gitidmap
214
180
 
 
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
 
215
208
    @staticmethod
216
209
    def is_compatible(source, target):
217
210
        """Be compatible with GitRepository."""
224
217
    def dfetch_refs(self, new_refs):
225
218
        """Import the gist of the ancestry of a particular revision."""
226
219
        revidmap = {}
 
220
        old_refs = {}
227
221
        def determine_wants(refs):
228
222
            ret = {}
 
223
            old_refs.update(new_refs)
229
224
            for name, revid in new_refs.iteritems():
230
225
                ret[name] = self.source_store._lookup_revision_sha1(revid)
231
226
            return ret
235
230
                    self.source_store.generate_pack_contents)
236
231
        finally:
237
232
            self.source.unlock()
238
 
        return revidmap, new_refs
 
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()
239
238
 
240
239
    @staticmethod
241
240
    def is_compatible(source, target):