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

  • Committer: Jelmer Vernooij
  • Date: 2018-07-03 01:42:53 UTC
  • mto: This revision was merged to the branch mainline in revision 7027.
  • Revision ID: jelmer@jelmer.uk-20180703014253-zjckmhgnmb2qsn6x
Disable some flaky tests on python3, allow running without fastimport.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/branch.py
1017
1017
                    raise errors.DivergedBranches(self.source, self.target)
1018
1018
            refs = { self.target.ref: new_ref }
1019
1019
            result.new_revid = stop_revision
1020
 
            for name, sha in viewitems(self.source.repository._git.refs.as_dict("refs/tags")):
 
1020
            for name, sha in viewitems(self.source.repository._git.refs.as_dict(b"refs/tags")):
1021
1021
                refs[tag_name_to_ref(name)] = sha
1022
1022
            return refs
1023
1023
        self.target.repository.send_pack(get_changed_refs,
1199
1199
            # that hasn't actually been updated.
1200
1200
            return False
1201
1201
        # FIXME: Check for diverged branches
1202
 
        for ref, (git_sha, revid) in new_refs.iteritems():
 
1202
        for ref, (git_sha, revid) in viewitems(new_refs):
1203
1203
            if ref_equals(ret, ref, git_sha, revid):
1204
1204
                # Already up to date
1205
1205
                if git_sha is None: