Merge branch 'work' into windows

commits_by_year.plot

@@ -1,5 +0,0 @@
-set terminal png
-set size 0.5,0.5
-set output 'commits_by_year.png'
-unset key
-plot 'commits_by_year.dat' using 1:2 w lp

commits_by_year_month.plot

@@ -1,8 +0,0 @@
-set terminal png
-set size 0.5,0.5
-set output 'commits_by_year_month.png'
-unset key
-set xdata time
-set timefmt "%Y-%m"
-set format x "%Y-%m"
-plot 'commits_by_year_month.dat' using 1:2 w lp

day_of_week.plot

@@ -1,6 +0,0 @@
-set terminal png
-set size 0.5,0.5
-set output 'day_of_week.png'
-unset key
-set xrange [0.5:7.5]
-plot 'day_of_week.dat' using 1:2:(0.5) w boxes fs solid

gitstats

@@ -51,7 +51,6 @@ class DataCollector:
 	"""Manages data collection from a revision control repository."""
 	def __init__(self):
 		self.stamp_created = time.time()
-		pass
 	
 	##
 	# This should be the main function to extract data from the repository.
@@ -150,7 +149,6 @@ class GitDataCollector(DataCollector):
 				except ValueError:
 					stamp = 0
 				self.tags[tag] = { 'stamp': stamp, 'hash' : hash, 'date' : datetime.datetime.fromtimestamp(stamp).strftime('%Y-%m-%d') }
-			pass
 
 		# Collect revision statistics
 		# Outputs "<stamp> <author>"
@@ -208,7 +206,7 @@ class GitDataCollector(DataCollector):
 			# author stats
 			if author not in self.authors:
 				self.authors[author] = {}
-			# TODO commits
+			# commits
 			if 'last_commit_stamp' not in self.authors[author]:
 				self.authors[author]['last_commit_stamp'] = stamp
 			self.authors[author]['first_commit_stamp'] = stamp
@@ -249,11 +247,11 @@ class GitDataCollector(DataCollector):
 		# TODO Optimize this, it's the worst bottleneck
 		# outputs "<stamp> <files>" for each revision
 		self.files_by_stamp = {} # stamp -> files
-		revlines = getpipeoutput(['git-rev-list --pretty=format:"%at %H" HEAD', 'grep -v ^commit']).strip().split('\n')
+		revlines = getpipeoutput(['git-rev-list --pretty=format:"%at %T" HEAD', 'grep -v ^commit']).strip().split('\n')
 		lines = []
 		for revline in revlines:
 			time, rev = revline.split(' ')
-			linecount = int(getpipeoutput(['git-ls-tree -r "%s"' % rev, 'wc -l']).split('\n')[0])
+			linecount = int(getpipeoutput(['git-ls-tree -r --name-only "%s"' % rev, 'wc -l']).split('\n')[0])
 			lines.append('%d %d' % (int(time), linecount))
 
 		self.total_commits = len(lines)
@@ -304,8 +302,11 @@ class GitDataCollector(DataCollector):
 			if line.find('files changed,') == -1:
 				pos = line.find(' ')
 				if pos != -1:
-					(stamp, author) = (int(line[:pos]), line[pos+1:])
-					self.changes_by_date[stamp] = { 'files': files, 'ins': inserted, 'del': deleted, 'lines': total_lines }
+					try:
+						(stamp, author) = (int(line[:pos]), line[pos+1:])
+						self.changes_by_date[stamp] = { 'files': files, 'ins': inserted, 'del': deleted, 'lines': total_lines }
+					except ValueError:
+						print 'Warning: unexpected line "%s"' % line
 				else:
 					print 'Warning: unexpected line "%s"' % line
 			else:
@@ -400,11 +401,10 @@ class HTMLReportCreator(ReportCreator):
 		ReportCreator.create(self, data, path)
 		self.title = data.projectname
 
-		# TODO copy the CSS if it does not exist
+		# copy the CSS if it does not exist
 		if not os.path.exists(path + '/gitstats.css'):
 			basedir = os.path.dirname(os.path.abspath(__file__))
 			shutil.copyfile(basedir + '/gitstats.css', path + '/gitstats.css')
-			pass
 
 		f = open(path + "/index.html", 'w')
 		format = '%Y-%m-%d %H:%m:%S'
@@ -689,7 +689,6 @@ class HTMLReportCreator(ReportCreator):
 		f.close()
 
 		self.createGraphs(path)
-	pass
 	
 	def createGraphs(self, path):
 		print 'Generating graphs...'