/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-16 11:31:40 UTC
  • mfrom: (7143.12.3 annotated-tags)
  • Revision ID: breezy.the.bot@gmail.com-20181116113140-618u04763u0dyxnh
Fix fetching of revisions that are referenced by annotated tags.

Merged from https://code.launchpad.net/~jelmer/brz/annotated-tags/+merge/358536

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/branch.py
134
134
                pass
135
135
            elif overwrite or not ref_name in target_repo._git.refs:
136
136
                target_repo._git.refs[ref_name] = unpeeled or peeled
137
 
                updates[tag_name] = self.repository.lookup_foreign_revision_id(peeled)
 
137
                try:
 
138
                    updates[tag_name] = self.repository.lookup_foreign_revision_id(peeled)
 
139
                except KeyError:
 
140
                    trace.warning('%s does not point to a valid object',
 
141
                                  tag_name)
138
142
            else:
139
 
                source_revid = self.repository.lookup_foreign_revision_id(peeled)
140
143
                try:
 
144
                    source_revid = self.repository.lookup_foreign_revision_id(peeled)
141
145
                    target_revid = target_repo.lookup_foreign_revision_id(
142
146
                            target_repo._git.refs[ref_name])
143
147
                except KeyError: