Merge lp:~jelmer/brz/dulwich-compat into lp:brz/3.2

[Jelmer Vernooij]

Use IndexEntry type when accessing Dulwich indexes.

Use IndexEntry type when accessing Dulwich indexes.

[Jelmer Vernooij (jelmer)]

review: Approve

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

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

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

Project setup failed
https://ci.breezy-vcs.org/job/brz-3.2/job/brz-3.2-land/12/

=== modified file 'breezy/git/tests/test_workingtree.py'
--- breezy/git/tests/test_workingtree.py	2020-08-10 15:00:17 +0000
+++ breezy/git/tests/test_workingtree.py	2021-05-24 23:19:34 +0000
@@ -85,8 +85,8 @@
         self.build_tree(['conflicted'])
         self.tree.add(['conflicted'])
         with self.tree.lock_tree_write():
-            self.tree.index[b'conflicted'] = self.tree.index[b'conflicted'][:9] + \
-                (FLAG_STAGEMASK, )
+            self.tree.index[b'conflicted'] = self.tree.index[b'conflicted']._replace(
+                flags=FLAG_STAGEMASK)
             self.tree._index_dirty = True
         conflicts = self.tree.conflicts()
         self.assertEqual(1, len(conflicts))
@@ -358,7 +358,7 @@
         self.build_tree_contents([('a/.git/HEAD', a.id)])
         with self.wt.lock_tree_write():
             (index, index_path) = self.wt._lookup_index(b'a')
-            index[b'a'] = IndexEntry(0, 0, 0, 0, S_IFGITLINK, 0, 0, 0, a.id, 0)
+            index[b'a'] = IndexEntry(0, 0, 0, 0, S_IFGITLINK, 0, 0, 0, a.id, 0, 0)
             self.wt._index_dirty = True
         t = Tree()
         t.add(b"a", S_IFGITLINK, a.id)
@@ -369,7 +369,7 @@
         a = Blob.from_string(b'irrelevant\n')
         with self.wt.lock_tree_write():
             (index, index_path) = self.wt._lookup_index(b'a')
-            index[b'a'] = IndexEntry(0, 0, 0, 0, S_IFGITLINK, 0, 0, 0, a.id, 0)
+            index[b'a'] = IndexEntry(0, 0, 0, 0, S_IFGITLINK, 0, 0, 0, a.id, 0, 0)
             self.wt._index_dirty = True
         os.mkdir(self.wt.abspath('a'))
         t = Tree()

=== modified file 'breezy/git/workingtree.py'
--- breezy/git/workingtree.py	2021-03-22 21:07:08 +0000
+++ breezy/git/workingtree.py	2021-05-24 23:19:34 +0000
@@ -27,6 +27,7 @@
 from dulwich.file import GitFile, FileLocked
 from dulwich.index import (
     Index,
+    IndexEntry,
     SHA1Writer,
     build_index_from_tree,
     index_entry_from_path,
@@ -981,9 +982,9 @@
         value = self.index[path]
         self._index_dirty = True
         if conflicted:
-            self.index[path] = (value[:9] + (value[9] | FLAG_STAGEMASK, ))
+            self.index[path] = self.index[path]._replace(flags=self.index[path].flags | FLAG_STAGEMASK)
         else:
-            self.index[path] = (value[:9] + (value[9] & ~ FLAG_STAGEMASK, ))
+            self.index[path] = self.index[path]._replace(flags=self.index[path].flags &~ FLAG_STAGEMASK)
 
     def add_conflicts(self, new_conflicts):
         with self.lock_tree_write():
@@ -1139,7 +1140,7 @@
             add_entry(dirname, 'directory')
             dirname = decode_git_path(dirname)
             dir_file_id = self.path2id(dirname)
-            if not isinstance(value, tuple) or len(value) != 10:
+            if not isinstance(value, (tuple, IndexEntry)):
                 raise ValueError(value)
             per_dir[(dirname, dir_file_id)].add(
                 (decode_git_path(path), decode_git_path(child_name),

=== modified file 'setup.py'
--- setup.py	2021-05-02 15:07:21 +0000
+++ setup.py	2021-05-24 23:19:34 +0000
@@ -67,8 +67,7 @@
         'patiencediff',
         # Technically, Breezy works without these two dependencies too. But there's
         # no way to enable them by default and let users opt out.
-        'dulwich>=0.19.12;python_version>="3.5"',
-        'dulwich<0.20,>=0.19.12;python_version<"3.0"',
+        'dulwich>=0.20.22',
         ],
     'extras_require': {
         'cext': ['cython>=0.29'],