Merge lp:~ace17/bzr-git/dulwich into lp:bzr-git

[Sebastien Alaiwan]

Allow to do a checkout when dulwich version is 0.9.5 (Debian testing).

[Sergei Golubchik (sergii)]

This patch isn't quite correct. The old code in dulwich was

 def get_graph_walker(self, heads):
     return ObjectStoreGraphWalker(heads, lambda sha: self[sha].parents)

But this patch does

- graph_walker = store.get_graph_walker(list)
+ graph_walker = ObjectStoreGraphWalker(heads, list)

The correct replacement is

 graph_walker = ObjectStoreGraphWalker(
         [store._lookup_revision_sha1(head) for head in heads],
         lambda sha: store[sha].parents)

[lp:~ace17/bzr-git/dulwich]

1632. By Sebastien Alaiwan on 2014-05-05

Fix call to ObjectStoreGraphWalker

[Sebastien Alaiwan (ace17)]

> This patch isn't quite correct. The old code in dulwich was
>
> def get_graph_walker(self, heads):
> return ObjectStoreGraphWalker(heads, lambda sha: self[sha].parents)
>
> But this patch does
>
> - graph_walker = store.get_graph_walker(list)
> + graph_walker = ObjectStoreGraphWalker(heads, list)
>
> The correct replacement is
>
> graph_walker = ObjectStoreGraphWalker(
> [store._lookup_revision_sha1(head) for head in heads],
> lambda sha: store[sha].parents)
Done, thanks for your feedback!

[Richard Wilbur (richard-wilbur)]

Thanks Sebastien for the good work updating bzr-git to work with changes in dulwich! Unfortunately I got to this merge request too slowly and the changes you proposed have already been merged on other branches.

I'm disapproving this merge request as I don't have the option to mark it 'Superseded'.

I look forward to your next contribution, which I will try to move on more quickly.

review: Disapprove (superseded)

[Richard Wilbur (richard-wilbur)]

On the other hand, I guess I could just as easily mark this 'Approved' since all the changes have been approved and 'Merged' since they have already been merge.

review: Approve (already merged)

[Sebastien Alaiwan (ace17)]

Nice to learn git checkouts are going to work again! :-)

=== modified file 'fetch.py'
--- fetch.py	2012-03-11 15:08:14 +0000
+++ fetch.py	2014-05-05 18:26:08 +0000
@@ -25,6 +25,7 @@
     ZERO_SHA,
     )
 from dulwich.object_store import (
+    ObjectStoreGraphWalker,
     tree_lookup_path,
     )
 from dulwich.walk import Walker
@@ -702,8 +703,9 @@
         store.lock_write()
         try:
             heads = self.get_target_heads()
-            graph_walker = store.get_graph_walker(
-                    [store._lookup_revision_sha1(head) for head in heads])
+            graph_walker = ObjectStoreGraphWalker(
+                [store._lookup_revision_sha1(head) for head in heads],
+                lambda sha: store[sha].parents)
             wants_recorder = DetermineWantsRecorder(determine_wants)
 
             pb = ui.ui_factory.nested_progress_bar()
 
=== modified file 'tests/test_transportgit.py'
--- tests/test_transportgit.py	2010-12-25 01:23:48 +0000
+++ tests/test_transportgit.py	2014-05-05 18:26:08 +0000
@@ -18,7 +18,7 @@
 
 
 from dulwich.tests.test_object_store import PackBasedObjectStoreTests
-from dulwich.tests.test_repository import RefsContainerTests
+from dulwich.tests.test_refs import RefsContainerTests
 
 from bzrlib.tests import TestCaseWithTransport