Merge lp:~jelmer/launchpad/update-bzr-git into lp:launchpad

[Jelmer Vernooij]

Update to newer versions of dulwich and bzr-git.

Update the versions of bzr-git and dulwich used.

This fixes two bugs, which should get ~15 of the 35 currently failing imports working again (the rest are probably caused by the remote host no longer existing, running a git server or the remote branch having disappeared).

[Tim Penhey (thumper)]

review: Approve

[Māris Fogels (mars)]

As stated on IRC, the test fixes look ok, but I recommend moving the import statements up to the top of the file, and using .getUniqueString() for the message instead of 'dsadsa'.

Good to go, r=mars

Maris

review: Approve

=== modified file 'lib/lp/codehosting/codeimport/tests/servers.py'
--- lib/lp/codehosting/codeimport/tests/servers.py	2010-02-01 04:15:51 +0000
+++ lib/lp/codehosting/codeimport/tests/servers.py	2010-08-18 14:18:47 +0000
@@ -22,6 +22,7 @@
 import time
 
 import CVS
+from dulwich.repo import Repo as GitRepo
 import pysvn
 import svn_oo
 
@@ -199,11 +200,11 @@
         self.repo_url = repo_url
 
     def makeRepo(self, tree_contents):
-        from bzrlib.plugins.git.tests import GitBranchBuilder, run_git
+        from bzrlib.plugins.git.tests import GitBranchBuilder
         wd = os.getcwd()
         try:
             os.chdir(self.repo_url)
-            run_git('init')
+            GitRepo.init(".")
             builder = GitBranchBuilder()
             for filename, contents in tree_contents:
                 builder.set_file(filename, contents, False)

=== modified file 'lib/lp/codehosting/codeimport/tests/test_worker.py'
--- lib/lp/codehosting/codeimport/tests/test_worker.py	2010-08-04 15:59:53 +0000
+++ lib/lp/codehosting/codeimport/tests/test_worker.py	2010-08-18 14:18:47 +0000
@@ -23,6 +23,8 @@
 
 from CVS import Repository, tree as CVSTree
 
+from dulwich.repo import Repo as GitRepo
+
 from canonical.config import config
 from canonical.launchpad.scripts.logger import QuietFakeLogger
 from canonical.testing import BaseLayer
@@ -1027,15 +1029,10 @@
 
     def makeForeignCommit(self, source_details):
         """Change the foreign tree, generating exactly one commit."""
-        from bzrlib.plugins.git.tests import run_git
-        wd = os.getcwd()
-        os.chdir(source_details.url)
-        try:
-            run_git('config', 'user.name', 'Joe Random Hacker')
-            run_git('commit', '-m', 'dsadas')
-            self.foreign_commit_count += 1
-        finally:
-            os.chdir(wd)
+        repo = GitRepo(source_details.url)
+        repo.do_commit(message=self.factory.getUniqueString(),
+            committer="Joe Random Hacker <[e-mail]>")
+        self.foreign_commit_count += 1
 
     def makeSourceDetails(self, branch_name, files):
         """Make a Git `CodeImportSourceDetails` pointing at a real Git repo.

=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2010-08-17 04:40:01 +0000
+++ utilities/sourcedeps.conf	2010-08-18 14:18:47 +0000
@@ -1,10 +1,10 @@
 bzr-builder lp:~launchpad-pqm/bzr-builder/trunk;revno=65
-bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=257
+bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=258
 bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=282
 bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=48
 bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2709
 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=432
-dulwich lp:~launchpad-pqm/dulwich/devel;revno=423
+dulwich lp:~launchpad-pqm/dulwich/devel;revno=424
 loggerhead lp:~launchpad-pqm/loggerhead/devel;revno=176
 lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=23
 mailman lp:~launchpad-pqm/mailman/2.1;revno=976