jhbuild r2712 - in trunk: . jhbuild/versioncontrol

[fpeters svn gnome org]

Author: fpeters
Date: Tue Feb 10 12:37:29 2009
New Revision: 2712
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2712&view=rev

Log:
* jhbuild/versioncontrol/git.py: hint user about the switch from svn to
git when a git module is missing .git.  (closes: #570858)



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	Tue Feb 10 12:37:29 2009
@@ -196,6 +196,12 @@
 
     def _update(self, buildscript, copydir=None):
         cwd = self.get_checkoutdir(copydir)
+
+        if not os.path.exists(os.path.join(cwd, '.git')):
+            if os.path.exists(os.path.join(cwd, '.svn')):
+                raise CommandError(_('Failed to update module as it switched to git (you should check for changes then remove the directory).'))
+            raise CommandError(_('Failed to update module (missing .git) (you should check for changes then remove the directory).'))
+
         buildscript.execute(['git', 'fetch'], cwd=cwd)
 
         # stash uncommitted changes on the current branch