Advertise ofs-delta in server side capabilities.

diff --git a/NEWS b/NEWS
index 01f47ecbb5ef42b1db0657036c8d80b7f13bdcb7..cd4a4f1037cf6509f199bd2b4016ad606e4bae9f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,8 @@
     open resources. (Gary van der Merwe)
   * Support 'git.bat' in SubprocessGitClient on Windows.
     (Stefan Zimmermann)
+  * Advertise 'ofs-delta' capability in receive-pack server side
+    capabilities. (Jelmer Vernooij)
 
  BUG FIXES
 

diff --git a/dulwich/server.py b/dulwich/server.py
index bbb811d2ec6406f52b5b7fb25be85fa492fab48d..6fcae3a99520cfdb227b9f882085e0fbd7086617 100644 (file)
--- a/dulwich/server.py
+++ b/dulwich/server.py
@@ -837,7 +837,7 @@ class ReceivePackHandler(Handler):
     @classmethod
     def capabilities(cls):
         return (CAPABILITY_REPORT_STATUS, CAPABILITY_DELETE_REFS,
-                CAPABILITY_SIDE_BAND_64K, CAPABILITY_NO_DONE)
+                CAPABILITY_OFS_DELTA, CAPABILITY_SIDE_BAND_64K, CAPABILITY_NO_DONE)
 
     def _apply_pack(self, refs):
         all_exceptions = (IOError, OSError, ChecksumMismatch, ApplyDeltaError,

diff --git a/dulwich/tests/test_porcelain.py b/dulwich/tests/test_porcelain.py
index ec60b041e4d7d112f21402bf5aa97bbcaf578227..949ef671386c25a0c556bc20baa4e5a2a1f493c1 100644 (file)
--- a/dulwich/tests/test_porcelain.py
+++ b/dulwich/tests/test_porcelain.py
@@ -644,8 +644,8 @@ class ReceivePackTests(PorcelainTestCase):
         exitcode = porcelain.receive_pack(self.repo.path, BytesIO(b"0000"), outf)
         outlines = outf.getvalue().splitlines()
         self.assertEqual([
-            b'00639e65bdcf4a22cdd4f3700604a275cd2aaf146b23 HEAD\x00 report-status '
-            b'delete-refs side-band-64k no-done',
+            b'006d9e65bdcf4a22cdd4f3700604a275cd2aaf146b23 HEAD\x00 report-status '
+            b'delete-refs ofs-delta side-band-64k no-done',
             b'003f9e65bdcf4a22cdd4f3700604a275cd2aaf146b23 refs/heads/master',
             b'0000'], outlines)
         self.assertEqual(0, exitcode)