jhbuild r1959 - in trunk: . jhbuild/versioncontrol

[malureau svn gnome org]

Author: malureau
Date: Thu Mar 20 21:49:55 2008
New Revision: 1959
URL: http://svn.gnome.org/viewvc/jhbuild?rev=1959&view=rev

Log:
2008-03-20  Marc-Andre Lureau  <marcandre lureau gmail com>

        * jhbuild/versioncontrol/git.py (GitCvsBranch._checkout): improve
        git-cvsimport support.


Modified:
   trunk/ChangeLog
   trunk/jhbuild/versioncontrol/git.py

Modified: trunk/jhbuild/versioncontrol/git.py
==============================================================================
--- trunk/jhbuild/versioncontrol/git.py	(original)
+++ trunk/jhbuild/versioncontrol/git.py	Thu Mar 20 21:49:55 2008
@@ -298,18 +298,14 @@
     branchname = property(branchname)
 
     def _checkout(self, buildscript, copydir=None):
-        cmd = ['git-cvsimport', '-k', '-o' + self.branchname, '-v', '-d', self.repository.cvsroot, '-C']
+
+        cmd = ['git-cvsimport', '-r', 'cvs', '-p', 'b,HEAD', '-k', '-m', '-a', '-v', '-d', self.repository.cvsroot, '-C']
 
         if self.checkoutdir:
             cmd.append(self.checkoutdir)
         else:
             cmd.append(self.module)
 
-        if self.revision:
-            cmd.append('-p b,' + self.revision)
-        else:
-            cmd.append('-p b,HEAD')
-
         cmd.append(self.module)
 
         if copydir:
@@ -321,29 +317,10 @@
         if self.config.sticky_date:
             raise FatalError('date based checkout not yet supported\n')
 
-        cwd = self.get_checkoutdir()
-
         # stash uncommitted changes on the current branch
         cmd = ['git', 'stash', 'save', 'jhbuild-build']
-        buildscript.execute(cmd, 'git stash', cwd=cwd)
-
-        cmd = ['git', 'checkout', self.branchname]
-        buildscript.execute(cmd, 'git checkout ' + self.branchname, cwd=cwd)
-
-        cmd = ['git-cvsimport', '-k', '-o' + self.branchname, '-v', '-d', self.repository.cvsroot, '-C']
-
-        if self.checkoutdir:
-            cmd.append(self.checkoutdir)
-        else:
-            cmd.append(self.module)
-
-        if self.revision:
-            cmd.append('-p b,' + self.revision)
-        else:
-            cmd.append('-p b,HEAD')
-
-        cmd.append(self.module)
+        buildscript.execute(cmd, 'git stash', cwd=self.get_checkoutdir())
 
-        buildscript.execute(cmd, 'git-cvsimport', cwd=self.checkoutroot)
+        self._checkout(buildscript, copydir)
 
 register_repo_type('git', GitRepository)