Merge lp:~jelmer/brz/push-non-mainline-to-git into lp:brz

[Jelmer Vernooij]

Fix pushing non-mainline revisions from bzr to git.

Fix pushing non-mainline revisions from bzr to git.

[Jelmer Vernooij (jelmer)]

review: Approve

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

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

=== modified file 'breezy/git/branch.py'
--- breezy/git/branch.py	2019-03-04 05:10:44 +0000
+++ breezy/git/branch.py	2019-06-01 01:24:57 +0000
@@ -1254,7 +1254,10 @@
         if stop_revision is None:
             (stop_revno, stop_revision) = self.source.last_revision_info()
         elif stop_revno is None:
-            stop_revno = self.source.revision_id_to_revno(stop_revision)
+            try:
+                stop_revno = self.source.revision_id_to_revno(stop_revision)
+            except errors.NoSuchRevision:
+                stop_revno = None
         if not isinstance(stop_revision, bytes):
             raise TypeError(stop_revision)
         main_ref = self.target.ref
 
=== modified file 'breezy/git/tests/test_blackbox.py'
--- breezy/git/tests/test_blackbox.py	2019-05-27 23:59:12 +0000
+++ breezy/git/tests/test_blackbox.py	2019-06-01 01:24:57 +0000
@@ -150,6 +150,22 @@
         self.assertEqual(b"", output)
         self.assertTrue(error.endswith(b"Created new branch.\n"))
 
+    def test_push_lossy_non_mainline(self):
+        self.run_bzr(['init', '--git', 'bla'])
+        self.run_bzr(['init', 'foo'])
+        self.run_bzr(['commit', '--unchanged', '-m', 'bla', 'foo'])
+        self.run_bzr(['branch', 'foo', 'foo1'])
+        self.run_bzr(['commit', '--unchanged', '-m', 'bla', 'foo1'])
+        self.run_bzr(['commit', '--unchanged', '-m', 'bla', 'foo'])
+        self.run_bzr(['merge', '-d', 'foo', 'foo1'])
+        self.run_bzr(['commit', '--unchanged', '-m', 'merge', 'foo'])
+        output, error = self.run_bzr(['push', '--lossy', '-r1.1.1', '-d', 'foo', 'bla'])
+        self.assertEqual("", output)
+        self.assertEqual(
+            'Pushing from a Bazaar to a Git repository. For better '
+            'performance, push into a Bazaar repository.\n'
+            'Pushed up to revision 2.\n', error)
+
     def test_log(self):
         # Smoke test for "bzr log" in a git repository.
         self.simple_commit()