/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: 2020-06-23 01:02:30 UTC
  • mfrom: (7490.40.27 work)
  • mto: This revision was merged to the branch mainline in revision 7517.
  • Revision ID: jelmer@jelmer.uk-20200623010230-62nnywznmb76h6ut
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/interrepo.py
84
84
    )
85
85
from .remote import (
86
86
    RemoteGitRepository,
 
87
    RemoteGitError,
87
88
    )
88
89
from .unpeel_map import (
89
90
    UnpeelMap,
371
372
            return ret
372
373
        self._warn_slow()
373
374
        with self.source_store.lock_read():
374
 
            new_refs = self.target.send_pack(
 
375
            result = self.target.send_pack(
375
376
                git_update_refs, self.source_store.generate_lossy_pack_data)
 
377
            if result is not None and not isinstance(result, dict):
 
378
                for ref, error in result.ref_status.items():
 
379
                    if error:
 
380
                        raise RemoteGitError(
 
381
                            'unable to update ref %r: %s' % (ref, error))
 
382
                new_refs = result.refs
 
383
            else:  # dulwich < 0.20.3
 
384
                new_refs = result
376
385
        # FIXME: revidmap?
377
386
        return revidmap, self.old_refs, new_refs
378
387