Merge lp:~mwhudson/launchpad/fewer-spurious-partial-code-imports-bug-532402 into lp:launchpad

[Michael Hudson-Doyle]

Capture the revision id used for determining whether all revisions were imported before running the import, to avoid semi-spurious reports of partial success.

Hi, see the linked bug for the explanation.

Do you think this needs a test?

[Tim Penhey (thumper)]

Umm, gut says we should have a test, but damn hard to get it right, so... my answer is no.

review: Approve

=== modified file 'lib/lp/codehosting/codeimport/worker.py'
--- lib/lp/codehosting/codeimport/worker.py	2010-03-12 02:29:19 +0000
+++ lib/lp/codehosting/codeimport/worker.py	2010-03-15 23:30:35 +0000
@@ -548,12 +548,13 @@
             else:
                 raise NotBranchError(self.source_details.url)
             foreign_branch = format.open(transport).open_branch()
+            foreign_branch_tip = foreign_branch.last_revision()
             inter_branch = InterBranch.get(foreign_branch, bazaar_tree.branch)
             pull_result = inter_branch.pull(
                 overwrite=True, **self.getExtraPullArgs())
             self.pushBazaarWorkingTree(bazaar_tree)
             last_imported_revison = bazaar_tree.branch.last_revision()
-            if last_imported_revison == foreign_branch.last_revision():
+            if last_imported_revison == foreign_branch_tip:
                 if pull_result.old_revid != pull_result.new_revid:
                     return CodeImportWorkerExitCode.SUCCESS
                 else: