/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/branch.py

  • Committer: Jelmer Vernooij
  • Date: 2020-01-20 00:26:26 UTC
  • mto: This revision was merged to the branch mainline in revision 7457.
  • Revision ID: jelmer@jelmer.uk-20200120002626-n09veohzgzf1q109
Fix git tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/branch.py
1210
1210
        fetch_tags = c.get('branch.fetch_tags')
1211
1211
 
1212
1212
        if stop_revision is None:
1213
 
            refs = interrepo.fetch(branches=[self.source.ref], include_tags=fetch_tags)
 
1213
            result = interrepo.fetch(branches=[self.source.ref], include_tags=fetch_tags)
1214
1214
            try:
1215
 
                head = refs[self.source.ref]
 
1215
                head = result.refs[self.source.ref]
1216
1216
            except KeyError:
1217
1217
                stop_revision = revision.NULL_REVISION
1218
1218
            else:
1219
1219
                stop_revision = self.target.lookup_foreign_revision_id(head)
1220
1220
        else:
1221
 
            refs = interrepo.fetch(
 
1221
            result = interrepo.fetch(
1222
1222
                revision_id=stop_revision, include_tags=fetch_tags)
1223
 
        return refs, stop_revision
 
1223
        return result.refs, stop_revision
1224
1224
 
1225
1225
    def pull(self, stop_revision=None, overwrite=False,
1226
1226
             possible_transports=None, run_hooks=True, local=False):