Merge lp:~jelmer/brz/vfrepo-insert-stream into lp:brz

[Jelmer Vernooij]

Only check for specific behaviour over HPSS for VF repositories.

Only check for specific behaviour over HPSS for VF repositories.

i.e. don't expect pushes to git repositories to use the
Repository.insert_record_stream_1.19 HPSS call.

[Martin Packman (gz)]

Thanks.

review: Approve

=== modified file 'breezy/tests/per_interbranch/test_push.py'
--- breezy/tests/per_interbranch/test_push.py	2018-03-02 00:38:34 +0000
+++ breezy/tests/per_interbranch/test_push.py	2018-03-04 18:28:20 +0000
@@ -267,6 +267,9 @@
         remote_bzrdir = local.controldir.sprout(
             self.get_url('remote'), revision_id=third)
         remote = remote_bzrdir.open_branch()
+        if not remote.repository._format.supports_full_versioned_files:
+            raise tests.TestNotApplicable(
+                'remote is not a VersionedFile repository')
         # Push fourth revision
         self.reset_smart_call_log()
         self.disableOptimisticGetParentMap()