Merge lp:~zyga/bzr-fastimport/fixes into lp:bzr-fastimport

[Zygmunt Krynicki]

This branch fixes some of the bugs I've seen when interacting with git.

[Richard Wilbur (richard-wilbur)]

What are the bugs you've seen when interacting with git? Have any of them been reported in the bazaar bug database? If so, a bug reference here would be helpful for reviewers.

If the bug reports appear in the bug database, it is normal practice to create one or more tests to validate the code. Test(s) fail without the patch and pass with it.

If this test requirement turns out to be a barrier to development, point us to the bug reports and we should be able to help create the tests.

[Richard Wilbur (richard-wilbur)]

I didn't read the revision comment till just now as it wasn't in the E-mail message sent to the bazaar-core dev group. Looks like this is fixing code rot in bzr-fastimport and thus would not need a test.

Please add a comment with the bug reference from bzr-stat that you mentioned.

review: Needs Information

[Zygmunt Krynicki (zyga)]

> What are the bugs you've seen when interacting with git? Have any of them
> been reported in the bazaar bug database? If so, a bug reference here would
> be helpful for reviewers.

As mentioned in the commit message, it replaces usage of get_ancestry(), which no longer exists, with the equivalent code that works with the current API. The relevant bug for that in bzr-stat is:

https://bugs.launchpad.net/ubuntu/+source/bzr-stats/+bug/1040560

If you want to write a test case for that sure, right now merging this is better than not merging it at all since get_ancestry is clearly gone and the code cannot be more broken.

Thanks
ZK

[Richard Wilbur (richard-wilbur)]

Thanks for the reference to the bzr-stat bug and for cleaning up the code rot. I wholeheartedly approve this merge!
+2

review: Approve

=== modified file 'branch_updater.py'
--- branch_updater.py	2011-10-06 00:11:52 +0000
+++ branch_updater.py	2012-12-03 11:12:39 +0000
@@ -165,7 +165,8 @@
         # apply tags known in this branch
         my_tags = {}
         if self.tags:
-            ancestry = self.repo.get_ancestry(last_rev_id)
+            graph = self.repo.get_graph()
+            ancestry = [r for (r, ps) in graph.iter_ancestry([last_rev_id]) if ps is not None]
             for tag,rev in self.tags.items():
                 if rev in ancestry:
                     my_tags[tag] = rev