damned-lies r1458 - in trunk: . stats

[claudep svn gnome org]

Author: claudep
Date: Sun Mar  1 18:35:58 2009
New Revision: 1458
URL: http://svn.gnome.org/viewvc/damned-lies?rev=1458&view=rev

Log:
2009-03-01  Claude Paroz  <claude 2xlibre net>

	* stats/models.py: More info for branch checkout error. Changed git update
	command.

Modified:
   trunk/ChangeLog
   trunk/stats/models.py

Modified: trunk/stats/models.py
==============================================================================
--- trunk/stats/models.py	(original)
+++ trunk/stats/models.py	Sun Mar  1 18:35:58 2009
@@ -130,7 +130,7 @@
             try:
                 model_instance.checkout()
             except:
-                raise ValueError("Branch not valid: error while checking out the branch.")
+                raise ValueError("Branch not valid: error while checking out the branch (%s)." % sys.exc_info()[1])
         return getattr(model_instance, self.attname)
 
 class Branch(models.Model):
@@ -430,7 +430,7 @@
                     "localdir" : modulepath,
                     })
             elif vcs_type == "git":
-                commandList.append("cd \"%(localdir)s\" && git checkout %(branch)s && git reset --hard && git clean -df" % {
+                commandList.append("cd \"%(localdir)s\" && git checkout %(branch)s && git fetch && git reset --hard origin/%(branch)s" % {
                     "localdir" : modulepath,
                     "branch" : self.name,
                     })