Merge lp:~jelmer/brz/no-such-revision into lp:brz/3.1

[Jelmer Vernooij]

Raise NoSuchRevision rather than KeyError.

Raise NoSuchRevision rather than KeyError.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/155/

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2020-06-21 22:11:03 +0000
+++ breezy/git/remote.py	2020-06-25 00:07:00 +0000
@@ -593,6 +593,9 @@
             # No revision supplied by the user, default to the branch
             # revision
             revision_id = source.last_revision()
+        else:
+            if not source.repository.has_revision(revision_id):
+                raise NoSuchRevision(source, revision_id)
 
         push_result = GitPushResult()
         push_result.workingtree_updated = None
@@ -645,6 +648,9 @@
                             new_sha = repo.lookup_bzr_revision_id(revid)[0]
                         except errors.NoSuchRevision:
                             continue
+                        else:
+                            if not source.repository.has_revision(revid):
+                                continue
                     ret[tag_name_to_ref(tagname)] = new_sha
             return ret
         with source_store.lock_read():
 
=== modified file 'breezy/tests/per_controldir/test_push.py'
--- breezy/tests/per_controldir/test_push.py	2020-02-19 04:50:09 +0000
+++ breezy/tests/per_controldir/test_push.py	2020-06-25 00:07:00 +0000
@@ -19,6 +19,7 @@
 from ...errors import (
     LossyPushToSameVCS,
     TagsNotSupported,
+    NoSuchRevision,
     )
 from ...revision import NULL_REVISION
 from .. import TestNotApplicable
@@ -46,6 +47,13 @@
         self.assertEqual(dir.open_branch().base,
                          tree.branch.get_push_location())
 
+    def test_push_no_such_revision(self):
+        tree, rev_1 = self.create_simple_tree()
+        dir = self.make_repository('dir').controldir
+        self.assertRaises(
+            NoSuchRevision, dir.push_branch,
+            tree.branch, revision_id=b'idonotexist')
+
     def test_push_new_branch_fetch_tags(self):
         builder = self.make_branch_builder('from')
         builder.start_series()