/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 breezy/git/interrepo.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-14 17:59:16 UTC
  • mto: This revision was merged to the branch mainline in revision 7065.
  • Revision ID: jelmer@jelmer.uk-20180614175916-a2e2xh5k533guq1x
Move breezy.plugins.git to breezy.git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/interrepo.py
16
16
 
17
17
"""InterRepository operations."""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
from io import BytesIO
20
 
import itertools
21
22
 
22
23
from dulwich.errors import (
23
24
    NotCommitError,
29
30
    CAPABILITY_THIN_PACK,
30
31
    ZERO_SHA,
31
32
    )
32
 
from dulwich.refs import (
33
 
    ANNOTATED_TAG_SUFFIX,
34
 
    SYMREF,
35
 
    )
36
33
from dulwich.walk import Walker
37
34
 
38
35
from ..errors import (
44
41
    NoSuchRevision,
45
42
    )
46
43
from ..repository import (
47
 
    FetchResult,
48
44
    InterRepository,
49
45
    )
50
46
from ..revision import (
75
71
    )
76
72
from .refs import (
77
73
    is_tag,
78
 
    ref_to_tag_name,
79
74
    )
80
75
from .repository import (
81
76
    GitRepository,
84
79
    )
85
80
from .remote import (
86
81
    RemoteGitRepository,
87
 
    RemoteGitError,
88
82
    )
89
83
from .unpeel_map import (
90
84
    UnpeelMap,
122
116
        raise NotImplementedError(self.fetch_refs)
123
117
 
124
118
    def search_missing_revision_ids(self,
125
 
                                    find_ghosts=True, revision_ids=None,
126
 
                                    if_present_ids=None, limit=None):
 
119
            find_ghosts=True, revision_ids=None, if_present_ids=None,
 
120
            limit=None):
127
121
        if limit is not None:
128
122
            raise FetchLimitUnsupported(self)
129
123
        git_shas = []
136
130
            for revid in revision_ids:
137
131
                if revid == NULL_REVISION:
138
132
                    continue
139
 
                try:
140
 
                    git_sha = self.source_store._lookup_revision_sha1(revid)
141
 
                except KeyError:
142
 
                    raise NoSuchRevision(revid, self.source)
 
133
                git_sha = self.source_store._lookup_revision_sha1(revid)
143
134
                git_shas.append(git_sha)
144
 
            walker = Walker(
145
 
                self.source_store,
146
 
                include=git_shas,
147
 
                exclude=[
 
135
            walker = Walker(self.source_store,
 
136
                include=git_shas, exclude=[
148
137
                    sha for sha in self.target.controldir.get_refs_container().as_dict().values()
149
138
                    if sha != ZERO_SHA])
150
139
            missing_revids = set()
151
140
            for entry in walker:
152
 
                for (kind, type_data) in self.source_store.lookup_git_sha(
153
 
                        entry.commit.id):
 
141
                for (kind, type_data) in self.source_store.lookup_git_sha(entry.commit.id):
154
142
                    if kind == "commit":
155
143
                        missing_revids.add(type_data[0])
156
 
            return self.source.revision_ids_to_search_result(missing_revids)
 
144
        return self.source.revision_ids_to_search_result(missing_revids)
157
145
 
158
146
    def _warn_slow(self):
159
147
        if not config.GlobalConfig().suppress_warning('slow_intervcs_push'):
213
201
                stop_revids.append(revid)
214
202
        missing = set()
215
203
        graph = self.source.get_graph()
216
 
        with ui.ui_factory.nested_progress_bar() as pb:
 
204
        pb = ui.ui_factory.nested_progress_bar()
 
205
        try:
217
206
            while stop_revids:
218
207
                new_stop_revids = []
219
208
                for revid in stop_revids:
220
209
                    sha1 = revid_sha_map.get(revid)
221
 
                    if (revid not in missing and
222
 
                            self._revision_needs_fetching(sha1, revid)):
 
210
                    if (not revid in missing and
 
211
                        self._revision_needs_fetching(sha1, revid)):
223
212
                        missing.add(revid)
224
213
                        new_stop_revids.append(revid)
225
214
                stop_revids = set()
226
215
                parent_map = graph.get_parent_map(new_stop_revids)
227
 
                for parent_revids in parent_map.values():
 
216
                for parent_revids in parent_map.itervalues():
228
217
                    stop_revids.update(parent_revids)
229
218
                pb.update("determining revisions to fetch", len(missing))
 
219
        finally:
 
220
            pb.finished()
230
221
        return graph.iter_topo_order(missing)
231
222
 
232
223
    def _get_target_bzr_refs(self):
236
227
            with Git SHA, Bazaar revid as values.
237
228
        """
238
229
        bzr_refs = {}
 
230
        refs = {}
239
231
        for k in self.target._git.refs.allkeys():
240
232
            try:
241
 
                v = self.target._git.refs.read_ref(k)
 
233
                v = self.target._git.refs[k]
242
234
            except KeyError:
243
235
                # broken symref?
244
236
                continue
245
 
            revid = None
246
 
            if v and not v.startswith(SYMREF):
247
 
                try:
248
 
                    for (kind, type_data) in self.source_store.lookup_git_sha(
249
 
                            v):
250
 
                        if kind == "commit" and self.source.has_revision(
251
 
                                type_data[0]):
252
 
                            revid = type_data[0]
253
 
                            break
254
 
                except KeyError:
255
 
                    pass
 
237
            try:
 
238
                for (kind, type_data) in self.source_store.lookup_git_sha(v):
 
239
                    if kind == "commit" and self.source.has_revision(type_data[0]):
 
240
                        revid = type_data[0]
 
241
                        break
 
242
                else:
 
243
                    revid = None
 
244
            except KeyError:
 
245
                revid = None
256
246
            bzr_refs[k] = (v, revid)
257
247
        return bzr_refs
258
248
 
259
249
    def fetch_refs(self, update_refs, lossy, overwrite=False):
260
250
        self._warn_slow()
261
 
        result_refs = {}
262
251
        with self.source_store.lock_read():
263
252
            old_refs = self._get_target_bzr_refs()
264
253
            new_refs = update_refs(old_refs)
265
254
            revidmap = self.fetch_objects(
266
 
                [(git_sha, bzr_revid)
267
 
                 for (git_sha, bzr_revid) in new_refs.values()
268
 
                 if git_sha is None or not git_sha.startswith(SYMREF)],
269
 
                lossy=lossy)
270
 
            for name, (gitid, revid) in new_refs.items():
 
255
                [(git_sha, bzr_revid) for (git_sha, bzr_revid) in new_refs.values() if git_sha is None or not git_sha.startswith('ref:')], lossy=lossy)
 
256
            for name, (gitid, revid) in new_refs.iteritems():
271
257
                if gitid is None:
272
258
                    try:
273
259
                        gitid = revidmap[revid][0]
274
260
                    except KeyError:
275
261
                        gitid = self.source_store._lookup_revision_sha1(revid)
276
 
                if gitid.startswith(SYMREF):
277
 
                    self.target_refs.set_symbolic_ref(
278
 
                        name, gitid[len(SYMREF):])
279
 
                else:
280
 
                    try:
281
 
                        old_git_id = old_refs[name][0]
282
 
                    except KeyError:
283
 
                        self.target_refs.add_if_new(name, gitid)
284
 
                    else:
285
 
                        self.target_refs.set_if_equals(name, old_git_id, gitid)
286
 
                    result_refs[name] = (gitid, revid if not lossy else self.mapping.revision_id_foreign_to_bzr(gitid))
287
 
        return revidmap, old_refs, result_refs
 
262
                if len(gitid) != 40 and not gitid.startswith('ref: '):
 
263
                    raise AssertionError("invalid ref contents: %r" % gitid)
 
264
                self.target_refs[name] = gitid
 
265
        return revidmap, old_refs, new_refs
288
266
 
289
267
    def fetch_objects(self, revs, lossy, limit=None):
290
268
        if not lossy and not self.mapping.roundtripping:
291
269
            for git_sha, bzr_revid in revs:
292
 
                if (bzr_revid is not None and
293
 
                        needs_roundtripping(self.source, bzr_revid)):
 
270
                if bzr_revid is not None and needs_roundtripping(self.source, bzr_revid):
294
271
                    raise NoPushSupport(self.source, self.target, self.mapping,
295
272
                                        bzr_revid)
296
273
        with self.source_store.lock_read():
297
274
            todo = list(self.missing_revisions(revs))[:limit]
298
275
            revidmap = {}
299
 
            with ui.ui_factory.nested_progress_bar() as pb:
 
276
            pb = ui.ui_factory.nested_progress_bar()
 
277
            try:
300
278
                object_generator = MissingObjectsIterator(
301
279
                    self.source_store, self.source, pb)
302
280
                for (old_revid, git_sha) in object_generator.import_revisions(
303
 
                        todo, lossy=lossy):
 
281
                    todo, lossy=lossy):
304
282
                    if lossy:
305
 
                        new_revid = self.mapping.revision_id_foreign_to_bzr(
306
 
                            git_sha)
 
283
                        new_revid = self.mapping.revision_id_foreign_to_bzr(git_sha)
307
284
                    else:
308
285
                        new_revid = old_revid
309
286
                        try:
310
287
                            self.mapping.revision_id_bzr_to_foreign(old_revid)
311
288
                        except InvalidRevisionId:
312
 
                            pass
 
289
                            refname = self.mapping.revid_as_refname(old_revid)
 
290
                            self.target_refs[refname] = git_sha
313
291
                    revidmap[old_revid] = (git_sha, new_revid)
314
292
                self.target_store.add_objects(object_generator)
315
293
                return revidmap
 
294
            finally:
 
295
                pb.finished()
316
296
 
317
297
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
318
 
              fetch_spec=None, mapped_refs=None, lossy=False):
 
298
            fetch_spec=None, mapped_refs=None):
319
299
        if mapped_refs is not None:
320
300
            stop_revisions = mapped_refs
321
301
        elif revision_id is not None:
325
305
            if recipe[0] in ("search", "proxy-search"):
326
306
                stop_revisions = [(None, revid) for revid in recipe[1]]
327
307
            else:
328
 
                raise AssertionError(
329
 
                    "Unsupported search result type %s" % recipe[0])
 
308
                raise AssertionError("Unsupported search result type %s" % recipe[0])
330
309
        else:
331
 
            stop_revisions = [(None, revid)
332
 
                              for revid in self.source.all_revision_ids()]
 
310
            stop_revisions = [(None, revid) for revid in self.source.all_revision_ids()]
333
311
        self._warn_slow()
334
312
        try:
335
 
            revidmap = self.fetch_objects(stop_revisions, lossy=lossy)
 
313
            self.fetch_objects(stop_revisions, lossy=False)
336
314
        except NoPushSupport:
337
315
            raise NoRoundtrippingSupport(self.source, self.target)
338
 
        return FetchResult(revidmap)
339
316
 
340
317
    @staticmethod
341
318
    def is_compatible(source, target):
352
329
            raise NoPushSupport(self.source, self.target, self.mapping)
353
330
        unpeel_map = UnpeelMap.from_repository(self.source)
354
331
        revidmap = {}
355
 
 
356
 
        def git_update_refs(old_refs):
 
332
        def determine_wants(old_refs):
357
333
            ret = {}
358
 
            self.old_refs = {
359
 
                k: (v, None) for (k, v) in old_refs.items()}
360
 
            new_refs = update_refs(self.old_refs)
361
 
            for name, (gitid, revid) in new_refs.items():
 
334
            self.old_refs = dict([(k, (v, None)) for (k, v) in old_refs.iteritems()])
 
335
            self.new_refs = update_refs(self.old_refs)
 
336
            for name, (gitid, revid) in self.new_refs.iteritems():
362
337
                if gitid is None:
363
338
                    git_sha = self.source_store._lookup_revision_sha1(revid)
364
 
                    gitid = unpeel_map.re_unpeel_tag(
365
 
                        git_sha, old_refs.get(name))
 
339
                    gitid = unpeel_map.re_unpeel_tag(git_sha, old_refs.get(name))
366
340
                if not overwrite:
367
 
                    if remote_divergence(
368
 
                            old_refs.get(name), gitid, self.source_store):
 
341
                    if remote_divergence(old_refs.get(name), gitid, self.source_store):
369
342
                        raise DivergedBranches(self.source, self.target)
370
343
                ret[name] = gitid
371
344
            return ret
372
345
        self._warn_slow()
373
346
        with self.source_store.lock_read():
374
 
            result = self.target.send_pack(
375
 
                git_update_refs, self.source_store.generate_lossy_pack_data)
376
 
            if result is not None and not isinstance(result, dict):
377
 
                for ref, error in result.ref_status.items():
378
 
                    if error:
379
 
                        raise RemoteGitError(
380
 
                            'unable to update ref %r: %s' % (ref, error))
381
 
                new_refs = result.refs
382
 
            else:  # dulwich < 0.20.3
383
 
                new_refs = result
 
347
            new_refs = self.target.send_pack(determine_wants,
 
348
                    self.source_store.generate_lossy_pack_data)
384
349
        # FIXME: revidmap?
385
 
        return revidmap, self.old_refs, new_refs
 
350
        return revidmap, self.old_refs, self.new_refs
386
351
 
387
352
    @staticmethod
388
353
    def is_compatible(source, target):
391
356
                isinstance(target, RemoteGitRepository))
392
357
 
393
358
 
394
 
class GitSearchResult(object):
395
 
 
396
 
    def __init__(self, start, exclude, keys):
397
 
        self._start = start
398
 
        self._exclude = exclude
399
 
        self._keys = keys
400
 
 
401
 
    def get_keys(self):
402
 
        return self._keys
403
 
 
404
 
    def get_recipe(self):
405
 
        return ('search', self._start, self._exclude, len(self._keys))
406
 
 
407
 
 
408
359
class InterFromGitRepository(InterRepository):
409
360
 
410
361
    _matching_repo_format = GitRepositoryFormat()
412
363
    def _target_has_shas(self, shas):
413
364
        raise NotImplementedError(self._target_has_shas)
414
365
 
415
 
    def get_determine_wants_heads(self, wants, include_tags=False, tag_selector=None):
 
366
    def get_determine_wants_heads(self, wants, include_tags=False):
416
367
        wants = set(wants)
417
 
 
418
368
        def determine_wants(refs):
419
 
            unpeel_lookup = {}
420
 
            for k, v in refs.items():
421
 
                if k.endswith(ANNOTATED_TAG_SUFFIX):
422
 
                    unpeel_lookup[v] = refs[k[:-len(ANNOTATED_TAG_SUFFIX)]]
423
 
            potential = set([unpeel_lookup.get(w, w) for w in wants])
 
369
            potential = set(wants)
424
370
            if include_tags:
425
 
                for k, sha in refs.items():
426
 
                    if k.endswith(ANNOTATED_TAG_SUFFIX):
427
 
                        continue
428
 
                    try:
429
 
                        tag_name = ref_to_tag_name(k)
430
 
                    except ValueError:
431
 
                        continue
432
 
                    if tag_selector and not tag_selector(tag_name):
433
 
                        continue
434
 
                    if sha == ZERO_SHA:
435
 
                        continue
436
 
                    potential.add(sha)
 
371
                for k, unpeeled in refs.iteritems():
 
372
                    if k.endswith("^{}"):
 
373
                        continue
 
374
                    if not is_tag(k):
 
375
                        continue
 
376
                    if unpeeled == ZERO_SHA:
 
377
                        continue
 
378
                    potential.add(unpeeled)
437
379
            return list(potential - self._target_has_shas(potential))
438
380
        return determine_wants
439
381
 
449
391
        self.fetch(revision_id, find_ghosts=False)
450
392
 
451
393
    def search_missing_revision_ids(self,
452
 
                                    find_ghosts=True, revision_ids=None,
453
 
                                    if_present_ids=None, limit=None):
 
394
            find_ghosts=True, revision_ids=None, if_present_ids=None,
 
395
            limit=None):
454
396
        if limit is not None:
455
397
            raise FetchLimitUnsupported(self)
456
 
        if revision_ids is None and if_present_ids is None:
457
 
            todo = set(self.source.all_revision_ids())
458
 
        else:
459
 
            todo = set()
460
 
            if revision_ids is not None:
461
 
                for revid in revision_ids:
462
 
                    if not self.source.has_revision(revid):
463
 
                        raise NoSuchRevision(revid, self.source)
464
 
                todo.update(revision_ids)
465
 
            if if_present_ids is not None:
466
 
                todo.update(if_present_ids)
467
 
        result_set = todo.difference(self.target.all_revision_ids())
468
 
        result_parents = set(itertools.chain.from_iterable(
469
 
            self.source.get_graph().get_parent_map(result_set).values()))
470
 
        included_keys = result_set.intersection(result_parents)
471
 
        start_keys = result_set.difference(included_keys)
472
 
        exclude_keys = result_parents.difference(result_set)
473
 
        return GitSearchResult(start_keys, exclude_keys, result_set)
 
398
        git_shas = []
 
399
        todo = []
 
400
        if revision_ids:
 
401
            todo.extend(revision_ids)
 
402
        if if_present_ids:
 
403
            todo.extend(revision_ids)
 
404
        with self.lock_read():
 
405
            for revid in revision_ids:
 
406
                if revid == NULL_REVISION:
 
407
                    continue
 
408
                git_sha, mapping = self.source.lookup_bzr_revision_id(revid)
 
409
                git_shas.append(git_sha)
 
410
            walker = Walker(self.source._git.object_store,
 
411
                include=git_shas, exclude=[
 
412
                    sha for sha in self.target.controldir.get_refs_container().as_dict().values()
 
413
                    if sha != ZERO_SHA])
 
414
            missing_revids = set()
 
415
            for entry in walker:
 
416
                missing_revids.add(self.source.lookup_foreign_revision_id(entry.commit.id))
 
417
            return self.source.revision_ids_to_search_result(missing_revids)
474
418
 
475
419
 
476
420
class InterGitNonGitRepository(InterFromGitRepository):
491
435
 
492
436
    def determine_wants_all(self, refs):
493
437
        potential = set()
494
 
        for k, v in refs.items():
 
438
        for k, v in refs.iteritems():
495
439
            # For non-git target repositories, only worry about peeled
496
440
            if v == ZERO_SHA:
497
441
                continue
498
442
            potential.add(self.source.controldir.get_peeled(k) or v)
499
443
        return list(potential - self._target_has_shas(potential))
500
444
 
 
445
    def get_determine_wants_heads(self, wants, include_tags=False):
 
446
        wants = set(wants)
 
447
        def determine_wants(refs):
 
448
            potential = set(wants)
 
449
            if include_tags:
 
450
                for k, unpeeled in refs.iteritems():
 
451
                    if not is_tag(k):
 
452
                        continue
 
453
                    if unpeeled == ZERO_SHA:
 
454
                        continue
 
455
                    potential.add(self.source.controldir.get_peeled(k) or unpeeled)
 
456
            return list(potential - self._target_has_shas(potential))
 
457
        return determine_wants
 
458
 
501
459
    def _warn_slow(self):
502
460
        if not config.GlobalConfig().suppress_warning('slow_intervcs_push'):
503
461
            trace.warning(
510
468
        :param determine_wants: determine_wants callback
511
469
        :param mapping: BzrGitMapping to use
512
470
        :param limit: Maximum number of commits to import.
513
 
        :return: Tuple with pack hint, last imported revision id and remote
514
 
            refs
 
471
        :return: Tuple with pack hint, last imported revision id and remote refs
515
472
        """
516
473
        raise NotImplementedError(self.fetch_objects)
517
474
 
518
 
    def get_determine_wants_revids(self, revids, include_tags=False, tag_selector=None):
 
475
    def get_determine_wants_revids(self, revids, include_tags=False):
519
476
        wants = set()
520
477
        for revid in set(revids):
521
478
            if self.target.has_revision(revid):
522
479
                continue
523
480
            git_sha, mapping = self.source.lookup_bzr_revision_id(revid)
524
481
            wants.add(git_sha)
525
 
        return self.get_determine_wants_heads(
526
 
            wants, include_tags=include_tags, tag_selector=tag_selector)
 
482
        return self.get_determine_wants_heads(wants, include_tags=include_tags)
527
483
 
528
484
    def fetch(self, revision_id=None, find_ghosts=False,
529
 
              mapping=None, fetch_spec=None, include_tags=False, lossy=False):
 
485
              mapping=None, fetch_spec=None, include_tags=False):
530
486
        if mapping is None:
531
487
            mapping = self.source.get_mapping()
532
488
        if revision_id is not None:
537
493
                interesting_heads = recipe[1]
538
494
            else:
539
495
                raise AssertionError("Unsupported search result type %s" %
540
 
                                     recipe[0])
 
496
                        recipe[0])
541
497
        else:
542
498
            interesting_heads = None
543
499
 
547
503
        else:
548
504
            determine_wants = self.determine_wants_all
549
505
 
550
 
        (pack_hint, _, remote_refs) = self.fetch_objects(
551
 
            determine_wants, mapping, lossy=lossy)
 
506
        (pack_hint, _, remote_refs) = self.fetch_objects(determine_wants,
 
507
            mapping)
552
508
        if pack_hint is not None and self.target._format.pack_compresses:
553
509
            self.target.pack(hint=pack_hint)
554
 
        result = FetchResult()
555
 
        result.refs = remote_refs
556
 
        return result
 
510
        return remote_refs
557
511
 
558
512
 
559
513
class InterRemoteGitNonGitRepository(InterGitNonGitRepository):
565
519
        all_revs = self.target.all_revision_ids()
566
520
        parent_map = self.target.get_parent_map(all_revs)
567
521
        all_parents = set()
568
 
        for values in parent_map.values():
569
 
            all_parents.update(values)
 
522
        map(all_parents.update, parent_map.itervalues())
570
523
        return set(all_revs) - all_parents
571
524
 
572
525
    def fetch_objects(self, determine_wants, mapping, limit=None, lossy=False):
580
533
                lambda sha: store[sha].parents)
581
534
            wants_recorder = DetermineWantsRecorder(determine_wants)
582
535
 
583
 
            with ui.ui_factory.nested_progress_bar() as pb:
 
536
            pb = ui.ui_factory.nested_progress_bar()
 
537
            try:
584
538
                objects_iter = self.source.fetch_objects(
585
539
                    wants_recorder, graph_walker, store.get_raw)
586
540
                trace.mutter("Importing %d new revisions",
587
541
                             len(wants_recorder.wants))
588
 
                (pack_hint, last_rev) = import_git_objects(
589
 
                    self.target, mapping, objects_iter, store,
590
 
                    wants_recorder.wants, pb, limit)
 
542
                (pack_hint, last_rev) = import_git_objects(self.target,
 
543
                    mapping, objects_iter, store, wants_recorder.wants, pb,
 
544
                    limit)
591
545
                return (pack_hint, last_rev, wants_recorder.remote_refs)
 
546
            finally:
 
547
                pb.finished()
592
548
 
593
549
    @staticmethod
594
550
    def is_compatible(source, target):
613
569
        self._warn_slow()
614
570
        remote_refs = self.source.controldir.get_refs_container().as_dict()
615
571
        wants = determine_wants(remote_refs)
 
572
        create_pb = None
 
573
        pb = ui.ui_factory.nested_progress_bar()
616
574
        target_git_object_retriever = get_object_store(self.target, mapping)
617
 
        with ui.ui_factory.nested_progress_bar() as pb:
 
575
        try:
618
576
            target_git_object_retriever.lock_write()
619
577
            try:
620
 
                (pack_hint, last_rev) = import_git_objects(
621
 
                    self.target, mapping, self.source._git.object_store,
 
578
                (pack_hint, last_rev) = import_git_objects(self.target,
 
579
                    mapping, self.source._git.object_store,
622
580
                    target_git_object_retriever, wants, pb, limit)
623
581
                return (pack_hint, last_rev, remote_refs)
624
582
            finally:
625
583
                target_git_object_retriever.unlock()
 
584
        finally:
 
585
            pb.finished()
626
586
 
627
587
    @staticmethod
628
588
    def is_compatible(source, target):
646
606
            raise LossyPushToSameVCS(self.source, self.target)
647
607
        old_refs = self.target.controldir.get_refs_container()
648
608
        ref_changes = {}
649
 
 
650
609
        def determine_wants(heads):
651
 
            old_refs = dict([(k, (v, None))
652
 
                             for (k, v) in heads.as_dict().items()])
 
610
            old_refs = dict([(k, (v, None)) for (k, v) in heads.as_dict().iteritems()])
653
611
            new_refs = update_refs(old_refs)
654
612
            ref_changes.update(new_refs)
655
 
            return [sha1 for (sha1, bzr_revid) in new_refs.values()]
 
613
            return [sha1 for (sha1, bzr_revid) in new_refs.itervalues()]
656
614
        self.fetch_objects(determine_wants, lossy=lossy)
657
 
        for k, (git_sha, bzr_revid) in ref_changes.items():
 
615
        for k, (git_sha, bzr_revid) in ref_changes.iteritems():
658
616
            self.target._git.refs[k] = git_sha
659
617
        new_refs = self.target.controldir.get_refs_container()
660
618
        return None, old_refs, new_refs
661
619
 
662
 
    def fetch_objects(self, determine_wants, mapping=None, limit=None,
663
 
                      lossy=False):
 
620
    def fetch_objects(self, determine_wants, mapping=None, limit=None, lossy=False):
664
621
        raise NotImplementedError(self.fetch_objects)
665
622
 
666
623
    def _target_has_shas(self, shas):
667
 
        return set(
668
 
            [sha for sha in shas if sha in self.target._git.object_store])
 
624
        return set([sha for sha in shas if sha in self.target._git.object_store])
669
625
 
670
626
    def fetch(self, revision_id=None, find_ghosts=False,
671
 
              mapping=None, fetch_spec=None, branches=None, limit=None,
672
 
              include_tags=False, lossy=False):
 
627
              mapping=None, fetch_spec=None, branches=None, limit=None, include_tags=False):
673
628
        if mapping is None:
674
629
            mapping = self.source.get_mapping()
675
630
        if revision_id is not None:
683
638
                    "Unsupported search result type %s" % recipe[0])
684
639
            args = heads
685
640
        if branches is not None:
686
 
            determine_wants = self.get_determine_wants_branches(
687
 
                branches, include_tags=include_tags)
 
641
            def determine_wants(refs):
 
642
                ret = []
 
643
                for name, value in refs.iteritems():
 
644
                    if value == ZERO_SHA:
 
645
                        continue
 
646
 
 
647
                    if name in branches or (include_tags and is_tag(name)):
 
648
                        ret.append(value)
 
649
                return ret
688
650
        elif fetch_spec is None and revision_id is None:
689
651
            determine_wants = self.determine_wants_all
690
652
        else:
691
 
            determine_wants = self.get_determine_wants_revids(
692
 
                args, include_tags=include_tags)
 
653
            determine_wants = self.get_determine_wants_revids(args, include_tags=include_tags)
693
654
        wants_recorder = DetermineWantsRecorder(determine_wants)
694
 
        self.fetch_objects(wants_recorder, mapping, limit=limit, lossy=lossy)
695
 
        result = FetchResult()
696
 
        result.refs = wants_recorder.remote_refs
697
 
        return result
 
655
        self.fetch_objects(wants_recorder, mapping, limit=limit)
 
656
        return wants_recorder.remote_refs
698
657
 
699
 
    def get_determine_wants_revids(self, revids, include_tags=False, tag_selector=None):
 
658
    def get_determine_wants_revids(self, revids, include_tags=False):
700
659
        wants = set()
701
660
        for revid in set(revids):
702
661
            if revid == NULL_REVISION:
703
662
                continue
704
663
            git_sha, mapping = self.source.lookup_bzr_revision_id(revid)
705
664
            wants.add(git_sha)
706
 
        return self.get_determine_wants_heads(wants, include_tags=include_tags, tag_selector=tag_selector)
707
 
 
708
 
    def get_determine_wants_branches(self, branches, include_tags=False):
709
 
        def determine_wants(refs):
710
 
            ret = []
711
 
            for name, value in refs.items():
712
 
                if value == ZERO_SHA:
713
 
                    continue
714
 
 
715
 
                if name.endswith(ANNOTATED_TAG_SUFFIX):
716
 
                    continue
717
 
 
718
 
                if name in branches or (include_tags and is_tag(name)):
719
 
                    ret.append(value)
720
 
            return ret
721
 
        return determine_wants
 
665
        return self.get_determine_wants_heads(wants, include_tags=include_tags)
722
666
 
723
667
    def determine_wants_all(self, refs):
724
 
        potential = set([
725
 
            v for k, v in refs.items()
726
 
            if not v == ZERO_SHA and not k.endswith(ANNOTATED_TAG_SUFFIX)])
 
668
        potential = set([v for v in refs.values() if not v == ZERO_SHA])
727
669
        return list(potential - self._target_has_shas(potential))
728
670
 
729
671
 
730
672
class InterLocalGitLocalGitRepository(InterGitGitRepository):
731
673
 
732
 
    def fetch_objects(self, determine_wants, mapping=None, limit=None,
733
 
                      lossy=False):
 
674
    def fetch_objects(self, determine_wants, mapping=None, limit=None, lossy=False):
734
675
        if lossy:
735
676
            raise LossyPushToSameVCS(self.source, self.target)
736
677
        if limit is not None:
737
678
            raise FetchLimitUnsupported(self)
738
 
        from .remote import DefaultProgressReporter
739
 
        with ui.ui_factory.nested_progress_bar() as pb:
740
 
            progress = DefaultProgressReporter(pb).progress
741
 
            refs = self.source._git.fetch(
742
 
                self.target._git, determine_wants,
743
 
                progress=progress)
 
679
        refs = self.source._git.fetch(self.target._git, determine_wants)
744
680
        return (None, None, refs)
745
681
 
746
682
    @staticmethod
752
688
 
753
689
class InterRemoteGitLocalGitRepository(InterGitGitRepository):
754
690
 
755
 
    def fetch_objects(self, determine_wants, mapping=None, limit=None,
756
 
                      lossy=False):
 
691
    def fetch_objects(self, determine_wants, mapping=None, limit=None, lossy=False):
757
692
        if lossy:
758
693
            raise LossyPushToSameVCS(self.source, self.target)
759
694
        if limit is not None:
760
695
            raise FetchLimitUnsupported(self)
761
696
        graphwalker = self.target._git.get_graph_walker()
762
 
        if (CAPABILITY_THIN_PACK in
763
 
                self.source.controldir._client._fetch_capabilities):
 
697
        if CAPABILITY_THIN_PACK in self.source.controldir._client._fetch_capabilities:
764
698
            # TODO(jelmer): Avoid reading entire file into memory and
765
699
            # only processing it after the whole file has been fetched.
766
700
            f = BytesIO()