Merge pull request #256 from jelmer/dulwich-0.21.6

Fix compatibility with dulwich >= 0.21.6

Cargo.toml

@@ -10,3 +10,5 @@ homepage = "https://github.com/jelmer/xandikos"
 
 [dependencies]
 pyo3 = { version = "0.18", features=["auto-initialize"]}
+clap = "4"
+tokio = { version = "1", features = ["full"] }

pyproject.toml

@@ -22,7 +22,7 @@ requires-python = ">=3.9"
 dependencies = [
     "aiohttp",
     "icalendar>=5.0.4",
-    "dulwich>=0.19.1",
+    "dulwich>=0.21.6",
     "defusedxml",
     "jinja2",
     "multidict",

xandikos/store/git.py

@@ -31,7 +31,7 @@
 
 import dulwich.repo
 from dulwich.file import FileLocked, GitFile
-from dulwich.index import (Index, IndexEntry, index_entry_from_stat,
+from dulwich.index import (Index, index_entry_from_stat,
                            write_index_dict)
 from dulwich.objects import Blob, Tree
 from dulwich.pack import SHA1Writer
@@ -693,9 +693,7 @@ def _import_one(self, name, data, message, author=None):
                 if (encoded_name not in index
                         or blob.id != index[encoded_name].sha):
                     self.repo.object_store.add_object(blob)
-                    index[encoded_name] = IndexEntry(
-                        *index_entry_from_stat(st, blob.id, 0)
-                    )
+                    index[encoded_name] = index_entry_from_stat(st, blob.id)
                     self._commit_tree(
                         index, message.encode(DEFAULT_ENCODING), author=author
                     )