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

  • Committer: Jelmer Vernooij
  • Date: 2018-01-24 07:51:44 UTC
  • mfrom: (7251 work)
  • mto: This revision was merged to the branch mainline in revision 7252.
  • Revision ID: jelmer@jelmer.uk-20180124075144-byhp1hgdjt2jurfo
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/remote.py
476
476
        refname = self._get_selected_ref(name)
477
477
 
478
478
        def get_changed_refs(old_refs):
479
 
            ret = dict(old_refs)
480
 
            if refname not in ret:
 
479
            ret = {}
 
480
            if refname not in old_refs:
481
481
                raise NotBranchError(self.user_url)
482
482
            ret[refname] = dulwich.client.ZERO_SHA
483
483
            return ret
569
569
        with source_store.lock_read():
570
570
            def get_changed_refs(refs):
571
571
                self._refs = remote_refs_dict_to_container(refs)
572
 
                ret = dict(refs)
 
572
                ret = {}
573
573
                # TODO(jelmer): Unpeel if necessary
574
574
                push_result.new_original_revid = revision_id
575
575
                if lossy:
898
898
        ref = tag_name_to_ref(name)
899
899
 
900
900
        def get_changed_refs(old_refs):
901
 
            ret = dict(old_refs)
902
 
            if sha == dulwich.client.ZERO_SHA and ref not in ret:
 
901
            ret = {}
 
902
            if sha == dulwich.client.ZERO_SHA and ref not in old_refs:
903
903
                raise NoSuchTag(name)
904
904
            ret[ref] = sha
905
905
            return ret