Merge lp:~jelmer/brz/fetch-limit-unsupported into lp:brz

[Jelmer Vernooij]

Allow InterBranch implementations to not provide support for limit= parameter.

Allow InterBranch implementations to not provide support for limit= parameter.

[Martin Packman (gz)]

Hm, not worth a new class as is, but presume you'll want to catch this exception somewhere outside tests? Where's the code that will raise this live, in foreign format plugins?

review: Approve

[Jelmer Vernooij (jelmer)]

> Hm, not worth a new class as is, but presume you'll want to catch this
> exception somewhere outside tests? Where's the code that will raise this live,
> in foreign format plugins?
Yep, Git will raise this.

=== modified file 'breezy/errors.py'
--- breezy/errors.py	2017-12-23 09:56:39 +0000
+++ breezy/errors.py	2018-02-27 14:41:23 +0000
@@ -1867,6 +1867,14 @@
         self.tname = type(method_self).__name__
 
 
+class FetchLimitUnsupported(UnsupportedOperation):
+
+    fmt = ("InterBranch %(interbranch)r does not support fetching limits.")
+
+    def __init__(self, interbranch):
+        BzrError.__init__(self, interbranch=interbranch)
+
+
 class NonAsciiRevisionId(UnsupportedOperation):
     """Raised when a commit is attempting to set a non-ascii revision id
        but cant.
 
=== modified file 'breezy/tests/per_interbranch/test_fetch.py'
--- breezy/tests/per_interbranch/test_fetch.py	2017-11-12 17:53:35 +0000
+++ breezy/tests/per_interbranch/test_fetch.py	2018-02-27 14:41:23 +0000
@@ -16,7 +16,9 @@
 
 """Tests for InterBranch.fetch."""
 
+from breezy.errors import FetchLimitUnsupported
 from breezy.revision import NULL_REVISION
+from breezy.tests import TestNotApplicable
 from breezy.tests.per_interbranch import (
     TestCaseWithInterBranch,
     )
@@ -55,7 +57,10 @@
         builder.finish_series()
         b1 = builder.get_branch()
         b2 = self.make_to_branch('b2')
-        b2.fetch(b1, limit=1)
+        try:
+            b2.fetch(b1, limit=1)
+        except FetchLimitUnsupported:
+            raise TestNotApplicable('interbranch does not support fetch limits')
 
         # fetch does not update the last revision
         self.assertEqual(NULL_REVISION, b2.last_revision())
@@ -72,7 +77,10 @@
         rev1 = wt.commit('lala!', allow_pointless=False)
 
         b2 = self.make_to_branch('b2')
-        b2.fetch(b1, limit=1)
+        try:
+            b2.fetch(b1, limit=1)
+        except FetchLimitUnsupported:
+            raise TestNotApplicable('interbranch does not support fetch limits')
 
         self.assertEqual(
             {rev1},