/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.910 by Jelmer Vernooij
update copyright years
1
# Copyright (C) 2009-2010 Jelmer Vernooij <jelmer@samba.org>
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""Push implementation that simply prints message saying push is not supported."""
18
0.200.357 by Jelmer Vernooij
Move push code to push.py.
19
from bzrlib import (
0.200.598 by Jelmer Vernooij
Cope with ghosts.
20
    errors,
0.200.357 by Jelmer Vernooij
Move push code to push.py.
21
    ui,
22
    )
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
23
from bzrlib.repository import (
24
    InterRepository,
25
    )
0.200.371 by Jelmer Vernooij
Add progress bar when determining revisions to dpush
26
from bzrlib.revision import (
27
    NULL_REVISION,
28
    )
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
29
30
from bzrlib.plugins.git.errors import (
31
    NoPushSupport,
32
    )
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
33
from bzrlib.plugins.git.object_store import (
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
34
    get_object_store,
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
35
    )
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
36
from bzrlib.plugins.git.repository import (
37
    GitRepository,
0.200.425 by Jelmer Vernooij
Split out push to remote git repositories.
38
    LocalGitRepository,
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
39
    GitRepositoryFormat,
40
    )
0.200.425 by Jelmer Vernooij
Split out push to remote git repositories.
41
from bzrlib.plugins.git.remote import (
42
    RemoteGitRepository,
43
    )
0.200.1292 by Jelmer Vernooij
Fix repeeling objects when determining what to send.
44
from bzrlib.plugins.git.unpeel_map import (
0.200.1065 by Jelmer Vernooij
Don't peel tags automatically when pushing back.
45
    UnpeelMap,
0.200.1061 by Jelmer Vernooij
Add support for using unpeel map.
46
    )
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
47
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
48
49
class MissingObjectsIterator(object):
50
    """Iterate over git objects that are missing from a target repository.
51
52
    """
53
0.200.525 by Jelmer Vernooij
Simplify push a bit further, make dpush without rebase faster.
54
    def __init__(self, store, source, pb=None):
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
55
        """Create a new missing objects iterator.
56
57
        """
58
        self.source = source
0.200.525 by Jelmer Vernooij
Simplify push a bit further, make dpush without rebase faster.
59
        self._object_store = store
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
60
        self._pending = []
0.200.369 by Jelmer Vernooij
Report on pack objects progress.
61
        self.pb = pb
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
62
0.252.4 by Jelmer Vernooij
More work on roundtripping.
63
    def import_revisions(self, revids, roundtrip):
0.200.947 by Jelmer Vernooij
Add convenience method for getting missing objects iterator.
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
        """
0.200.369 by Jelmer Vernooij
Report on pack objects progress.
69
        for i, revid in enumerate(revids):
70
            if self.pb:
71
                self.pb.update("pushing revisions", i, len(revids))
0.252.4 by Jelmer Vernooij
More work on roundtripping.
72
            git_commit = self.import_revision(revid, roundtrip)
0.252.6 by Jelmer Vernooij
Roundtripping support for revision ids works.
73
            yield (revid, git_commit)
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
74
0.252.4 by Jelmer Vernooij
More work on roundtripping.
75
    def import_revision(self, revid, roundtrip):
0.200.947 by Jelmer Vernooij
Add convenience method for getting missing objects iterator.
76
        """Import a revision into this Git repository.
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
77
0.200.947 by Jelmer Vernooij
Add convenience method for getting missing objects iterator.
78
        :param revid: Revision id of the revision
79
        :param roundtrip: Whether to roundtrip bzr metadata
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
80
        """
0.200.852 by Jelmer Vernooij
Cache trees rather than inventories.
81
        tree = self._object_store.tree_cache.revision_tree(revid)
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
82
        rev = self.source.get_revision(revid)
0.200.784 by Jelmer Vernooij
Use common object generation code in push.
83
        commit = None
0.252.4 by Jelmer Vernooij
More work on roundtripping.
84
        for path, obj, ie in self._object_store._revision_to_objects(rev, tree,
85
            roundtrip):
0.200.829 by Jelmer Vernooij
Cope with the fact that _type is gone in upstream dulwich.
86
            if obj.type_name == "commit":
0.200.784 by Jelmer Vernooij
Use common object generation code in push.
87
                commit = obj
0.200.786 by Jelmer Vernooij
Simplify push code.
88
            self._pending.append((obj, path))
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
89
        return commit.id
90
91
    def __len__(self):
92
        return len(self._pending)
93
94
    def __iter__(self):
0.200.786 by Jelmer Vernooij
Simplify push code.
95
        return iter(self._pending)
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
96
97
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
98
class InterToGitRepository(InterRepository):
99
    """InterRepository that copies into a Git repository."""
100
101
    _matching_repo_format = GitRepositoryFormat()
102
0.200.435 by Jelmer Vernooij
Remember mapping per InterRepository.
103
    def __init__(self, source, target):
104
        super(InterToGitRepository, self).__init__(source, target)
105
        self.mapping = self.target.get_mapping()
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
106
        self.source_store = get_object_store(self.source, self.mapping)
0.200.435 by Jelmer Vernooij
Remember mapping per InterRepository.
107
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
108
    @staticmethod
109
    def _get_repo_format_to_test():
110
        return None
111
112
    def copy_content(self, revision_id=None, pb=None):
113
        """See InterRepository.copy_content."""
114
        self.fetch(revision_id, pb, find_ghosts=False)
115
0.200.1323 by Jelmer Vernooij
Simplify push handling.
116
    def fetch_refs(self, update_refs, lossy):
117
        """Fetch possibly roundtripped revisions into the target repository
118
        and update refs.
0.200.943 by Jelmer Vernooij
Add stubs.
119
0.200.1036 by Jelmer Vernooij
More work on roundtrip push support.
120
        :param update_refs: Generate refs to fetch. Receives dictionary
121
            with old refs (git shas), returns dictionary of new names to
0.200.943 by Jelmer Vernooij
Add stubs.
122
            git shas.
0.200.1323 by Jelmer Vernooij
Simplify push handling.
123
        :param lossy: Whether to roundtrip
0.200.943 by Jelmer Vernooij
Add stubs.
124
        :return: old refs, new refs
125
        """
126
        raise NotImplementedError(self.fetch_refs)
127
0.200.425 by Jelmer Vernooij
Split out push to remote git repositories.
128
129
class InterToLocalGitRepository(InterToGitRepository):
0.200.966 by Jelmer Vernooij
Some more docstrings.
130
    """InterBranch implementation between a Bazaar and a Git repository."""
0.200.425 by Jelmer Vernooij
Split out push to remote git repositories.
131
0.252.3 by Jelmer Vernooij
Refactor revision finding code.
132
    def __init__(self, source, target):
133
        super(InterToLocalGitRepository, self).__init__(source, target)
134
        self.target_store = self.target._git.object_store
0.252.6 by Jelmer Vernooij
Roundtripping support for revision ids works.
135
        self.target_refs = self.target._git.refs
0.252.3 by Jelmer Vernooij
Refactor revision finding code.
136
0.200.1036 by Jelmer Vernooij
More work on roundtrip push support.
137
    def _revision_needs_fetching(self, sha_id, revid):
0.200.968 by Jelmer Vernooij
Add more tests, simplify push code.
138
        if revid == NULL_REVISION:
139
            return False
0.200.1036 by Jelmer Vernooij
More work on roundtrip push support.
140
        if sha_id is None:
141
            try:
142
                sha_id = self.source_store._lookup_revision_sha1(revid)
143
            except KeyError:
144
                return False
0.200.968 by Jelmer Vernooij
Add more tests, simplify push code.
145
        try:
146
            return (sha_id not in self.target_store)
147
        except errors.NoSuchRevision:
148
            # Ghost, can't push
149
            return False
150
151
    def missing_revisions(self, stop_revisions):
0.200.966 by Jelmer Vernooij
Some more docstrings.
152
        """Find the revisions that are missing from the target repository.
153
0.200.1036 by Jelmer Vernooij
More work on roundtrip push support.
154
        :param stop_revisions: Revisions to check for (tuples with
0.200.1030 by Jelmer Vernooij
More work on supporting roundtripping push.
155
            Git SHA1, bzr revid)
0.200.966 by Jelmer Vernooij
Some more docstrings.
156
        :return: sequence of missing revisions, in topological order
0.200.968 by Jelmer Vernooij
Add more tests, simplify push code.
157
        :raise: NoSuchRevision if the stop_revisions are not present in
158
            the source
0.200.966 by Jelmer Vernooij
Some more docstrings.
159
        """
0.200.1036 by Jelmer Vernooij
More work on roundtrip push support.
160
        revid_sha_map = {}
161
        stop_revids = []
162
        stop_sha1s = []
163
        for (sha1, revid) in stop_revisions:
164
            if sha1 is not None and revid is not None:
165
                revid_sha_map[revid] = sha1
166
            elif sha1 is not None:
167
                stop_sha1s.append(sha1)
168
            else:
169
                assert revid is not None
170
                stop_revids.append(revid)
0.200.357 by Jelmer Vernooij
Move push code to push.py.
171
        missing = []
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
172
        graph = self.source.get_graph()
0.200.371 by Jelmer Vernooij
Add progress bar when determining revisions to dpush
173
        pb = ui.ui_factory.nested_progress_bar()
174
        try:
0.200.1030 by Jelmer Vernooij
More work on supporting roundtripping push.
175
            for revid, _ in graph.iter_ancestry(stop_revids):
0.200.969 by Jelmer Vernooij
Use tuples with bzr revid and git sha to avoid lookups.
176
                assert type(revid) is str
0.200.371 by Jelmer Vernooij
Add progress bar when determining revisions to dpush
177
                pb.update("determining revisions to fetch", len(missing))
0.200.1036 by Jelmer Vernooij
More work on roundtrip push support.
178
                sha1 = revid_sha_map.get(revid)
179
                if self._revision_needs_fetching(sha1, revid):
0.200.371 by Jelmer Vernooij
Add progress bar when determining revisions to dpush
180
                    missing.append(revid)
181
        finally:
182
            pb.finished()
0.200.1036 by Jelmer Vernooij
More work on roundtrip push support.
183
        for sha1 in stop_sha1s:
184
            try:
0.200.1167 by Jelmer Vernooij
Fix use of lookup_git_sha during push.
185
                for (kind, (revid, tree_sha, verifiers)) in self.source_store.lookup_git_sha(sha1):
186
                    missing.append(revid)
187
                    revid_sha_map[revid] = sha1
0.200.1036 by Jelmer Vernooij
More work on roundtrip push support.
188
            except KeyError:
189
                continue
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
190
        return graph.iter_topo_order(missing)
0.200.357 by Jelmer Vernooij
Move push code to push.py.
191
0.200.969 by Jelmer Vernooij
Use tuples with bzr revid and git sha to avoid lookups.
192
    def _get_target_bzr_refs(self):
193
        """Return a dictionary with references.
194
195
        :return: Dictionary with reference names as keys and tuples
196
            with Git SHA, Bazaar revid as values.
197
        """
198
        bzr_refs = {}
0.263.1 by Jelmer Vernooij
Fix dpush for certain branches.
199
        refs = {}
200
        for k in self.target._git.refs.allkeys():
201
            v = self.target._git.refs.read_ref(k)
0.200.1180 by Jelmer Vernooij
Some dpush fixes.
202
            try:
203
                for (kind, type_data) in self.source_store.lookup_git_sha(v):
0.200.1181 by Jelmer Vernooij
Simplify dfetch_refs for local git repositories.
204
                    if kind == "commit" and self.source.has_revision(type_data[0]):
0.200.1180 by Jelmer Vernooij
Some dpush fixes.
205
                        revid = type_data[0]
0.200.1181 by Jelmer Vernooij
Simplify dfetch_refs for local git repositories.
206
                        break
207
                else:
208
                    revid = None
0.200.1180 by Jelmer Vernooij
Some dpush fixes.
209
            except KeyError:
210
                revid = None
0.200.969 by Jelmer Vernooij
Use tuples with bzr revid and git sha to avoid lookups.
211
            bzr_refs[k] = (v, revid)
212
        return bzr_refs
213
0.200.1323 by Jelmer Vernooij
Simplify push handling.
214
    def fetch_refs(self, update_refs, lossy):
215
        self.source_store.lock_read()
216
        try:
217
            old_refs = self._get_target_bzr_refs()
218
            new_refs = update_refs(old_refs)
219
            revidmap = self.fetch_objects(new_refs.values(), roundtrip=not lossy)
0.200.969 by Jelmer Vernooij
Use tuples with bzr revid and git sha to avoid lookups.
220
            for name, (gitid, revid) in new_refs.iteritems():
0.200.1182 by Jelmer Vernooij
Fix local dpush.
221
                if gitid is None:
222
                    try:
0.200.1323 by Jelmer Vernooij
Simplify push handling.
223
                        gitid = revidmap[revid][0]
0.200.1182 by Jelmer Vernooij
Fix local dpush.
224
                    except KeyError:
225
                        gitid = self.source_store._lookup_revision_sha1(revid)
0.200.1323 by Jelmer Vernooij
Simplify push handling.
226
                assert len(gitid) == 40
0.200.1182 by Jelmer Vernooij
Fix local dpush.
227
                self.target_refs[name] = gitid
0.200.969 by Jelmer Vernooij
Use tuples with bzr revid and git sha to avoid lookups.
228
        finally:
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
229
            self.source_store.unlock()
0.200.822 by Jelmer Vernooij
Fix indication of number of revisions pushed in dpush.
230
        return revidmap, old_refs, new_refs
0.200.428 by Jelmer Vernooij
use dfetch_refs, to prepare for dpush to remote repositories.
231
0.200.1323 by Jelmer Vernooij
Simplify push handling.
232
    def fetch_objects(self, revs, roundtrip):
233
        todo = list(self.missing_revisions(revs))
234
        revidmap = {}
235
        pb = ui.ui_factory.nested_progress_bar()
236
        try:
237
            object_generator = self._get_missing_objects_iterator(pb)
238
            for (old_revid, git_sha) in object_generator.import_revisions(
239
                todo, roundtrip=roundtrip):
240
                try:
241
                    self.mapping.revision_id_bzr_to_foreign(old_revid)
242
                except errors.InvalidRevisionId:
243
                    self.target_refs[self.mapping.revid_as_refname(old_revid)] = git_sha
244
                if not roundtrip:
245
                    new_revid = self.mapping.revision_id_foreign_to_bzr(git_sha)
246
                else:
247
                    new_revid = old_revid
248
                revidmap[old_revid] = (git_sha, new_revid)
249
            self.target_store.add_objects(object_generator)
250
            return revidmap
251
        finally:
252
            pb.finished()
253
0.200.947 by Jelmer Vernooij
Add convenience method for getting missing objects iterator.
254
    def _get_missing_objects_iterator(self, pb):
255
        return MissingObjectsIterator(self.source_store, self.source, pb)
256
0.200.524 by Jelmer Vernooij
Simplify dpushing multiple heads.
257
    def dfetch(self, stop_revisions):
0.200.357 by Jelmer Vernooij
Move push code to push.py.
258
        """Import the gist of the ancestry of a particular revision."""
259
0.252.4 by Jelmer Vernooij
More work on roundtripping.
260
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
0.200.1030 by Jelmer Vernooij
More work on supporting roundtripping push.
261
            fetch_spec=None, mapped_refs=None):
0.200.1156 by Jelmer Vernooij
Disable push.
262
        if not self.mapping.roundtripping:
263
            raise NoPushSupport()
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
264
        self.source_store.lock_read()
0.252.4 by Jelmer Vernooij
More work on roundtripping.
265
        try:
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
266
            if mapped_refs is not None:
267
                stop_revisions = mapped_refs
268
            elif revision_id is not None:
269
                stop_revisions = [(None, revision_id)]
270
            elif fetch_spec is not None:
271
                stop_revisions = [(None, revid) for revid in fetch_spec.heads]
272
            else:
273
                stop_revisions = [(None, revid) for revid in self.source.all_revision_ids()]
0.200.1323 by Jelmer Vernooij
Simplify push handling.
274
            self.fetch_objects(stop_revisions, roundtrip=True)
0.252.4 by Jelmer Vernooij
More work on roundtripping.
275
        finally:
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
276
            self.source_store.unlock()
0.252.4 by Jelmer Vernooij
More work on roundtripping.
277
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
278
    @staticmethod
279
    def is_compatible(source, target):
280
        """Be compatible with GitRepository."""
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
281
        return (not isinstance(source, GitRepository) and
0.200.425 by Jelmer Vernooij
Split out push to remote git repositories.
282
                isinstance(target, LocalGitRepository))
283
284
285
class InterToRemoteGitRepository(InterToGitRepository):
286
0.200.1323 by Jelmer Vernooij
Simplify push handling.
287
    def fetch_refs(self, update_refs, lossy):
0.200.425 by Jelmer Vernooij
Split out push to remote git repositories.
288
        """Import the gist of the ancestry of a particular revision."""
0.200.1323 by Jelmer Vernooij
Simplify push handling.
289
        if not lossy:
290
            raise NoPushSupport()
0.200.1065 by Jelmer Vernooij
Don't peel tags automatically when pushing back.
291
        unpeel_map = UnpeelMap.from_repository(self.source)
0.200.425 by Jelmer Vernooij
Split out push to remote git repositories.
292
        revidmap = {}
0.200.942 by Jelmer Vernooij
pass update_refs to dfetch_refs.
293
        def determine_wants(old_refs):
0.200.429 by Jelmer Vernooij
get remote dpush to a point where we now what to send.
294
            ret = {}
0.200.1052 by Jelmer Vernooij
Fix too many values to unpack error.
295
            self.old_refs = dict([(k, (v, None)) for (k, v) in old_refs.iteritems()])
0.200.942 by Jelmer Vernooij
pass update_refs to dfetch_refs.
296
            self.new_refs = update_refs(self.old_refs)
0.200.970 by Jelmer Vernooij
Fix dpush to remote locations.
297
            for name, (gitid, revid) in self.new_refs.iteritems():
298
                if gitid is None:
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
299
                    git_sha = self.source_store._lookup_revision_sha1(revid)
300
                    ret[name] = unpeel_map.re_unpeel_tag(git_sha, old_refs.get(name))
0.200.970 by Jelmer Vernooij
Fix dpush to remote locations.
301
                else:
302
                    ret[name] = gitid
0.200.429 by Jelmer Vernooij
get remote dpush to a point where we now what to send.
303
            return ret
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
304
        self.source_store.lock_read()
0.200.425 by Jelmer Vernooij
Split out push to remote git repositories.
305
        try:
0.200.460 by Jelmer Vernooij
Somewhat fix commit in git working trees.
306
            new_refs = self.target.send_pack(determine_wants,
0.252.37 by Jelmer Vernooij
Factor out some common code for finding refs to send.
307
                    self.source_store.generate_lossy_pack_contents)
0.200.425 by Jelmer Vernooij
Split out push to remote git repositories.
308
        finally:
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
309
            self.source_store.unlock()
0.200.1323 by Jelmer Vernooij
Simplify push handling.
310
        # FIXME: revidmap?
0.200.942 by Jelmer Vernooij
pass update_refs to dfetch_refs.
311
        return revidmap, self.old_refs, self.new_refs
0.200.425 by Jelmer Vernooij
Split out push to remote git repositories.
312
313
    @staticmethod
314
    def is_compatible(source, target):
315
        """Be compatible with GitRepository."""
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
316
        return (not isinstance(source, GitRepository) and
0.200.425 by Jelmer Vernooij
Split out push to remote git repositories.
317
                isinstance(target, RemoteGitRepository))