Add contrib/gitview from Aneesh.

Signed-off-by: Junio C Hamano <junkio@cox.net>

1 files changed, 992 insertions, 0 deletions

diff --git a/contrib/gitview/gitview b/contrib/gitview/gitview
new file mode 100755
index 000000000..5862fcca4
--- /dev/null
+++ b/contrib/gitview/gitview
@@ -0,0 +1,992 @@
+#! /usr/bin/env python
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+""" gitview
+GUI browser for git repository
+This program is based on bzrk by Scott James Remnant <scott@ubuntu.com>
+"""
+__copyright__ = "Copyright (C) 2006 Hewlett-Packard Development Company, L.P."
+__author__    = "Aneesh Kumar K.V <aneesh.kumar@hp.com>"
+
+
+import sys
+import os
+import gtk
+import pygtk
+import pango
+import re
+import time
+import gobject
+import cairo
+import math
+import string
+
+try:
+    import gtksourceview
+    have_gtksourceview = True
+except ImportError:
+    have_gtksourceview = False
+    print "Running without gtksourceview module"
+
+re_ident = re.compile('(author|committer) (?P<ident>.*) (?P<epoch>\d+) (?P<tz>[+-]\d{4})')
+
+def list_to_string(args, skip):
+	count = len(args)
+	i = skip
+	str_arg=" "
+	while (i < count ):
+		str_arg = str_arg + args[i]
+		str_arg = str_arg + " "
+		i = i+1
+
+	return str_arg
+
+def show_date(epoch, tz):
+	secs = float(epoch)
+	tzsecs = float(tz[1:3]) * 3600
+	tzsecs += float(tz[3:5]) * 60
+	if (tz[0] == "+"):
+		secs += tzsecs
+	else:
+		secs -= tzsecs
+
+	return time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(secs))
+
+def get_sha1_from_tags(line):
+	fp = os.popen("git cat-file -t " + line)
+	entry = string.strip(fp.readline())
+	fp.close()
+	if (entry == "commit"):
+		return line
+	elif (entry == "tag"):
+		fp = os.popen("git cat-file tag "+ line)
+		entry = string.strip(fp.readline())
+		fp.close()
+		obj = re.split(" ", entry)
+		if (obj[0] == "object"):
+			return obj[1]
+	return None
+
+class CellRendererGraph(gtk.GenericCellRenderer):
+	"""Cell renderer for directed graph.
+
+	This module contains the implementation of a custom GtkCellRenderer that
+	draws part of the directed graph based on the lines suggested by the code
+	in graph.py.
+
+	Because we're shiny, we use Cairo to do this, and because we're naughty
+	we cheat and draw over the bits of the TreeViewColumn that are supposed to
+	just be for the background.
+
+	Properties:
+	node              (column, colour, [ names ]) tuple to draw revision node,
+	in_lines          (start, end, colour) tuple list to draw inward lines,
+	out_lines         (start, end, colour) tuple list to draw outward lines.
+	"""
+
+	__gproperties__ = {
+	"node":         ( gobject.TYPE_PYOBJECT, "node",
+			  "revision node instruction",
+			  gobject.PARAM_WRITABLE
+			),
+	"in-lines":     ( gobject.TYPE_PYOBJECT, "in-lines",
+			  "instructions to draw lines into the cell",
+			  gobject.PARAM_WRITABLE
+			),
+	"out-lines":    ( gobject.TYPE_PYOBJECT, "out-lines",
+			  "instructions to draw lines out of the cell",
+			  gobject.PARAM_WRITABLE
+			),
+	}
+
+	def do_set_property(self, property, value):
+		"""Set properties from GObject properties."""
+		if property.name == "node":
+			self.node = value
+		elif property.name == "in-lines":
+			self.in_lines = value
+		elif property.name == "out-lines":
+			self.out_lines = value
+		else:
+			raise AttributeError, "no such property: '%s'" % property.name
+
+	def box_size(self, widget):
+		"""Calculate box size based on widget's font.
+
+		Cache this as it's probably expensive to get.  It ensures that we
+		draw the graph at least as large as the text.
+		"""
+		try:
+			return self._box_size
+		except AttributeError:
+			pango_ctx = widget.get_pango_context()
+			font_desc = widget.get_style().font_desc
+			metrics = pango_ctx.get_metrics(font_desc)
+
+			ascent = pango.PIXELS(metrics.get_ascent())
+			descent = pango.PIXELS(metrics.get_descent())
+
+			self._box_size = ascent + descent + 6
+			return self._box_size
+
+	def set_colour(self, ctx, colour, bg, fg):
+		"""Set the context source colour.
+
+		Picks a distinct colour based on an internal wheel; the bg
+		parameter provides the value that should be assigned to the 'zero'
+		colours and the fg parameter provides the multiplier that should be
+		applied to the foreground colours.
+		"""
+		colours = [
+		    ( 1.0, 0.0, 0.0 ),
+		    ( 1.0, 1.0, 0.0 ),
+		    ( 0.0, 1.0, 0.0 ),
+		    ( 0.0, 1.0, 1.0 ),
+		    ( 0.0, 0.0, 1.0 ),
+		    ( 1.0, 0.0, 1.0 ),
+		    ]
+
+		colour %= len(colours)
+		red   = (colours[colour][0] * fg) or bg
+		green = (colours[colour][1] * fg) or bg
+		blue  = (colours[colour][2] * fg) or bg
+
+		ctx.set_source_rgb(red, green, blue)
+
+	def on_get_size(self, widget, cell_area):
+		"""Return the size we need for this cell.
+
+		Each cell is drawn individually and is only as wide as it needs
+		to be, we let the TreeViewColumn take care of making them all
+		line up.
+		"""
+		box_size = self.box_size(widget)
+
+		cols = self.node[0]
+		for start, end, colour in self.in_lines + self.out_lines:
+			cols = max(cols, start, end)
+
+		(column, colour, names) = self.node
+		names_len = 0
+		if (len(names) != 0):
+			for item in names:
+				names_len += len(item)/3
+
+		width = box_size * (cols + 1 + names_len )
+		height = box_size
+
+		# FIXME I have no idea how to use cell_area properly
+		return (0, 0, width, height)
+
+	def on_render(self, window, widget, bg_area, cell_area, exp_area, flags):
+		"""Render an individual cell.
+
+		Draws the cell contents using cairo, taking care to clip what we
+		do to within the background area so we don't draw over other cells.
+		Note that we're a bit naughty there and should really be drawing
+		in the cell_area (or even the exposed area), but we explicitly don't
+		want any gutter.
+
+		We try and be a little clever, if the line we need to draw is going
+		to cross other columns we actually draw it as in the .---' style
+		instead of a pure diagonal ... this reduces confusion by an
+		incredible amount.
+		"""
+		ctx = window.cairo_create()
+		ctx.rectangle(bg_area.x, bg_area.y, bg_area.width, bg_area.height)
+		ctx.clip()
+
+		box_size = self.box_size(widget)
+
+		ctx.set_line_width(box_size / 8)
+		ctx.set_line_cap(cairo.LINE_CAP_SQUARE)
+
+		# Draw lines into the cell
+		for start, end, colour in self.in_lines:
+			ctx.move_to(cell_area.x + box_size * start + box_size / 2,
+					bg_area.y - bg_area.height / 2)
+
+			if start - end > 1:
+				ctx.line_to(cell_area.x + box_size * start, bg_area.y)
+				ctx.line_to(cell_area.x + box_size * end + box_size, bg_area.y)
+			elif start - end < -1:
+				ctx.line_to(cell_area.x + box_size * start + box_size,
+						bg_area.y)
+				ctx.line_to(cell_area.x + box_size * end, bg_area.y)
+
+			ctx.line_to(cell_area.x + box_size * end + box_size / 2,
+					bg_area.y + bg_area.height / 2)
+
+			self.set_colour(ctx, colour, 0.0, 0.65)
+			ctx.stroke()
+
+		# Draw lines out of the cell
+		for start, end, colour in self.out_lines:
+			ctx.move_to(cell_area.x + box_size * start + box_size / 2,
+					bg_area.y + bg_area.height / 2)
+
+			if start - end > 1:
+				ctx.line_to(cell_area.x + box_size * start,
+						bg_area.y + bg_area.height)
+				ctx.line_to(cell_area.x + box_size * end + box_size,
+						bg_area.y + bg_area.height)
+			elif start - end < -1:
+				ctx.line_to(cell_area.x + box_size * start + box_size,
+						bg_area.y + bg_area.height)
+				ctx.line_to(cell_area.x + box_size * end,
+						bg_area.y + bg_area.height)
+
+			ctx.line_to(cell_area.x + box_size * end + box_size / 2,
+					bg_area.y + bg_area.height / 2 + bg_area.height)
+
+			self.set_colour(ctx, colour, 0.0, 0.65)
+			ctx.stroke()
+
+		# Draw the revision node in the right column
+		(column, colour, names) = self.node
+		ctx.arc(cell_area.x + box_size * column + box_size / 2,
+				cell_area.y + cell_area.height / 2,
+				box_size / 4, 0, 2 * math.pi)
+
+
+		if (len(names) != 0):
+			name = " "
+			for item in names:
+				name = name + item + " "
+
+			ctx.text_path(name)
+
+		self.set_colour(ctx, colour, 0.0, 0.5)
+		ctx.stroke_preserve()
+
+		self.set_colour(ctx, colour, 0.5, 1.0)
+		ctx.fill()
+
+class Commit:
+	""" This represent a commit object obtained after parsing the git-rev-list
+	output """
+
+	children_sha1 = {}
+
+	def __init__(self, commit_lines):
+		self.message 		= ""
+		self.author		= ""
+		self.date 		= ""
+		self.committer 		= ""
+		self.commit_date 	= ""
+		self.commit_sha1	= ""
+		self.parent_sha1	= [ ]
+		self.parse_commit(commit_lines)
+
+
+	def parse_commit(self, commit_lines):
+
+		# First line is the sha1 lines
+		line = string.strip(commit_lines[0])
+		sha1 = re.split(" ", line)
+		self.commit_sha1 = sha1[0]
+		self.parent_sha1 = sha1[1:]
+
+		#build the child list
+		for parent_id in self.parent_sha1:
+			try:
+				Commit.children_sha1[parent_id].append(self.commit_sha1)
+			except KeyError:
+				Commit.children_sha1[parent_id] = [self.commit_sha1]
+
+		# IF we don't have parent
+		if (len(self.parent_sha1) == 0):
+			self.parent_sha1 = [0]
+
+		for line in commit_lines[1:]:
+			m = re.match("^ ", line)
+			if (m != None):
+				# First line of the commit message used for short log
+				if self.message == "":
+					self.message = string.strip(line)
+				continue
+
+			m = re.match("tree", line)
+			if (m != None):
+				continue
+
+			m = re.match("parent", line)
+			if (m != None):
+				continue
+
+			m = re_ident.match(line)
+			if (m != None):
+				date = show_date(m.group('epoch'), m.group('tz'))
+				if m.group(1) == "author":
+					self.author = m.group('ident')
+					self.date = date
+				elif m.group(1) == "committer":
+					self.committer = m.group('ident')
+					self.commit_date = date
+
+				continue
+
+	def get_message(self, with_diff=0):
+		if (with_diff == 1):
+			message = self.diff_tree()
+		else:
+			fp = os.popen("git cat-file commit " + self.commit_sha1)
+			message = fp.read()
+			fp.close()
+
+		return message
+
+	def diff_tree(self):
+		fp = os.popen("git diff-tree --pretty --cc  -v -p --always " +  self.commit_sha1)
+		diff = fp.read()
+		fp.close()
+		return diff
+
+class DiffWindow:
+	"""Diff window.
+	This object represents and manages a single window containing the
+	differences between two revisions on a branch.
+	"""
+
+	def __init__(self):
+		self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
+		self.window.set_border_width(0)
+		self.window.set_title("Git repository browser diff window")
+
+		# Use two thirds of the screen by default
+		screen = self.window.get_screen()
+		monitor = screen.get_monitor_geometry(0)
+		width = int(monitor.width * 0.66)
+		height = int(monitor.height * 0.66)
+		self.window.set_default_size(width, height)
+
+		self.construct()
+
+	def construct(self):
+		"""Construct the window contents."""
+		vbox = gtk.VBox()
+		self.window.add(vbox)
+		vbox.show()
+
+		menu_bar = gtk.MenuBar()
+		save_menu = gtk.ImageMenuItem(gtk.STOCK_SAVE)
+		save_menu.connect("activate", self.save_menu_response, "save")
+		save_menu.show()
+		menu_bar.append(save_menu)
+		vbox.pack_start(menu_bar, False, False, 2)
+		menu_bar.show()
+
+		scrollwin = gtk.ScrolledWindow()
+		scrollwin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+		scrollwin.set_shadow_type(gtk.SHADOW_IN)
+		vbox.pack_start(scrollwin, expand=True, fill=True)
+		scrollwin.show()
+
+		if have_gtksourceview:
+			self.buffer = gtksourceview.SourceBuffer()
+			slm = gtksourceview.SourceLanguagesManager()
+			gsl = slm.get_language_from_mime_type("text/x-patch")
+			self.buffer.set_highlight(True)
+			self.buffer.set_language(gsl)
+			sourceview = gtksourceview.SourceView(self.buffer)
+		else:
+			self.buffer = gtk.TextBuffer()
+			sourceview = gtk.TextView(self.buffer)
+
+		sourceview.set_editable(False)
+		sourceview.modify_font(pango.FontDescription("Monospace"))
+		scrollwin.add(sourceview)
+		sourceview.show()
+
+
+	def set_diff(self, commit_sha1, parent_sha1):
+		"""Set the differences showed by this window.
+		Compares the two trees and populates the window with the
+		differences.
+		"""
+		# Diff with the first commit or the last commit shows nothing
+		if (commit_sha1 == 0 or parent_sha1 == 0 ):
+			return
+
+		fp = os.popen("git diff-tree -p " + parent_sha1 + " " + commit_sha1)
+		self.buffer.set_text(fp.read())
+		fp.close()
+		self.window.show()
+
+	def save_menu_response(self, widget, string):
+		dialog = gtk.FileChooserDialog("Save..", None, gtk.FILE_CHOOSER_ACTION_SAVE,
+				(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
+					gtk.STOCK_SAVE, gtk.RESPONSE_OK))
+		dialog.set_default_response(gtk.RESPONSE_OK)
+		response = dialog.run()
+		if response == gtk.RESPONSE_OK:
+			patch_buffer = self.buffer.get_text(self.buffer.get_start_iter(),
+					self.buffer.get_end_iter())
+			fp = open(dialog.get_filename(), "w")
+			fp.write(patch_buffer)
+			fp.close()
+		dialog.destroy()
+
+class GitView:
+	""" This is the main class
+	"""
+	version = "0.6"
+
+	def __init__(self, with_diff=0):
+		self.with_diff = with_diff
+		self.window =  	gtk.Window(gtk.WINDOW_TOPLEVEL)
+		self.window.set_border_width(0)
+		self.window.set_title("Git repository browser")
+
+		self.get_bt_sha1()
+
+		# Use three-quarters of the screen by default
+		screen = self.window.get_screen()
+		monitor = screen.get_monitor_geometry(0)
+		width = int(monitor.width * 0.75)
+		height = int(monitor.height * 0.75)
+		self.window.set_default_size(width, height)
+
+		# FIXME AndyFitz!
+		icon = self.window.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
+		self.window.set_icon(icon)
+
+		self.accel_group = gtk.AccelGroup()
+		self.window.add_accel_group(self.accel_group)
+
+		self.construct()
+
+	def get_bt_sha1(self):
+		""" Update the bt_sha1 dictionary with the
+		respective sha1 details """
+
+		self.bt_sha1 = { }
+		git_dir = os.getenv("GIT_DIR")
+		if (git_dir == None):
+			git_dir = ".git"
+
+		#FIXME the path seperator
+		ref_files = os.listdir(git_dir + "/refs/tags")
+		for file in ref_files:
+			fp = open(git_dir + "/refs/tags/"+file)
+			sha1 = get_sha1_from_tags(string.strip(fp.readline()))
+			try:
+				self.bt_sha1[sha1].append(file)
+			except KeyError:
+				self.bt_sha1[sha1] = [file]
+			fp.close()
+
+
+		#FIXME the path seperator
+		ref_files = os.listdir(git_dir + "/refs/heads")
+		for file in ref_files:
+			fp = open(git_dir + "/refs/heads/" + file)
+			sha1 = get_sha1_from_tags(string.strip(fp.readline()))
+			try:
+				self.bt_sha1[sha1].append(file)
+			except KeyError:
+				self.bt_sha1[sha1] = [file]
+			fp.close()
+
+
+	def construct(self):
+		"""Construct the window contents."""
+		paned = gtk.VPaned()
+		paned.pack1(self.construct_top(), resize=False, shrink=True)
+		paned.pack2(self.construct_bottom(), resize=False, shrink=True)
+		self.window.add(paned)
+		paned.show()
+
+
+	def construct_top(self):
+		"""Construct the top-half of the window."""
+		vbox = gtk.VBox(spacing=6)
+		vbox.set_border_width(12)
+		vbox.show()
+
+		menu_bar = gtk.MenuBar()
+		menu_bar.set_pack_direction(gtk.PACK_DIRECTION_RTL)
+		help_menu = gtk.MenuItem("Help")
+		menu = gtk.Menu()
+		about_menu = gtk.MenuItem("About")
+		menu.append(about_menu)
+		about_menu.connect("activate", self.about_menu_response, "about")
+		about_menu.show()
+		help_menu.set_submenu(menu)
+		help_menu.show()
+		menu_bar.append(help_menu)
+		vbox.pack_start(menu_bar, False, False, 2)
+		menu_bar.show()
+
+		scrollwin = gtk.ScrolledWindow()
+		scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
+		scrollwin.set_shadow_type(gtk.SHADOW_IN)
+		vbox.pack_start(scrollwin, expand=True, fill=True)
+		scrollwin.show()
+
+		self.treeview = gtk.TreeView()
+		self.treeview.set_rules_hint(True)
+		self.treeview.set_search_column(4)
+		self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
+		scrollwin.add(self.treeview)
+		self.treeview.show()
+
+		cell = CellRendererGraph()
+		column = gtk.TreeViewColumn()
+		column.set_resizable(False)
+		column.pack_start(cell, expand=False)
+		column.add_attribute(cell, "node", 1)
+		column.add_attribute(cell, "in-lines", 2)
+		column.add_attribute(cell, "out-lines", 3)
+		self.treeview.append_column(column)
+
+		cell = gtk.CellRendererText()
+		cell.set_property("width-chars", 65)
+		cell.set_property("ellipsize", pango.ELLIPSIZE_END)
+		column = gtk.TreeViewColumn("Message")
+		column.set_resizable(True)
+		column.pack_start(cell, expand=True)
+		column.add_attribute(cell, "text", 4)
+		self.treeview.append_column(column)
+
+		cell = gtk.CellRendererText()
+		cell.set_property("width-chars", 40)
+		cell.set_property("ellipsize", pango.ELLIPSIZE_END)
+		column = gtk.TreeViewColumn("Author")
+		column.set_resizable(True)
+		column.pack_start(cell, expand=True)
+		column.add_attribute(cell, "text", 5)
+		self.treeview.append_column(column)
+
+		cell = gtk.CellRendererText()
+		cell.set_property("ellipsize", pango.ELLIPSIZE_END)
+		column = gtk.TreeViewColumn("Date")
+		column.set_resizable(True)
+		column.pack_start(cell, expand=True)
+		column.add_attribute(cell, "text", 6)
+		self.treeview.append_column(column)
+
+		return vbox
+
+	def about_menu_response(self, widget, string):
+		dialog = gtk.AboutDialog()
+		dialog.set_name("Gitview")
+		dialog.set_version(GitView.version)
+		dialog.set_authors(["Aneesh Kumar K.V <aneesh.kumar@hp.com>"])
+		dialog.set_website("http://www.kernel.org/pub/software/scm/git/")
+		dialog.set_copyright("Use and distribute under the terms of the GNU General Public License")
+		dialog.set_wrap_license(True)
+		dialog.run()
+		dialog.destroy()
+
+
+	def construct_bottom(self):
+		"""Construct the bottom half of the window."""
+		vbox = gtk.VBox(False, spacing=6)
+		vbox.set_border_width(12)
+		(width, height) = self.window.get_size()
+		vbox.set_size_request(width, int(height / 2.5))
+		vbox.show()
+
+		self.table = gtk.Table(rows=4, columns=4)
+		self.table.set_row_spacings(6)
+		self.table.set_col_spacings(6)
+		vbox.pack_start(self.table, expand=False, fill=True)
+		self.table.show()
+
+		align = gtk.Alignment(0.0, 0.5)
+		label = gtk.Label()
+		label.set_markup("<b>Revision:</b>")
+		align.add(label)
+		self.table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
+		label.show()
+		align.show()
+
+		align = gtk.Alignment(0.0, 0.5)
+		self.revid_label = gtk.Label()
+		self.revid_label.set_selectable(True)
+		align.add(self.revid_label)
+		self.table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
+		self.revid_label.show()
+		align.show()
+
+		align = gtk.Alignment(0.0, 0.5)
+		label = gtk.Label()
+		label.set_markup("<b>Committer:</b>")
+		align.add(label)
+		self.table.attach(align, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
+		label.show()
+		align.show()
+
+		align = gtk.Alignment(0.0, 0.5)
+		self.committer_label = gtk.Label()
+		self.committer_label.set_selectable(True)
+		align.add(self.committer_label)
+		self.table.attach(align, 1, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
+		self.committer_label.show()
+		align.show()
+
+		align = gtk.Alignment(0.0, 0.5)
+		label = gtk.Label()
+		label.set_markup("<b>Timestamp:</b>")
+		align.add(label)
+		self.table.attach(align, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
+		label.show()
+		align.show()
+
+		align = gtk.Alignment(0.0, 0.5)
+		self.timestamp_label = gtk.Label()
+		self.timestamp_label.set_selectable(True)
+		align.add(self.timestamp_label)
+		self.table.attach(align, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
+		self.timestamp_label.show()
+		align.show()
+
+		align = gtk.Alignment(0.0, 0.5)
+		label = gtk.Label()
+		label.set_markup("<b>Parents:</b>")
+		align.add(label)
+		self.table.attach(align, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
+		label.show()
+		align.show()
+		self.parents_widgets = []
+
+		align = gtk.Alignment(0.0, 0.5)
+		label = gtk.Label()
+		label.set_markup("<b>Children:</b>")
+		align.add(label)
+		self.table.attach(align, 2, 3, 3, 4, gtk.FILL, gtk.FILL)
+		label.show()
+		align.show()
+		self.children_widgets = []
+
+		scrollwin = gtk.ScrolledWindow()
+		scrollwin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+		scrollwin.set_shadow_type(gtk.SHADOW_IN)
+		vbox.pack_start(scrollwin, expand=True, fill=True)
+		scrollwin.show()
+
+		if have_gtksourceview:
+			self.message_buffer = gtksourceview.SourceBuffer()
+			slm = gtksourceview.SourceLanguagesManager()
+			gsl = slm.get_language_from_mime_type("text/x-patch")
+			self.message_buffer.set_highlight(True)
+			self.message_buffer.set_language(gsl)
+			sourceview = gtksourceview.SourceView(self.message_buffer)
+		else:
+			self.message_buffer = gtk.TextBuffer()
+			sourceview = gtk.TextView(self.message_buffer)
+
+		sourceview.set_editable(False)
+		sourceview.modify_font(pango.FontDescription("Monospace"))
+		scrollwin.add(sourceview)
+		sourceview.show()
+
+		return vbox
+
+	def _treeview_cursor_cb(self, *args):
+		"""Callback for when the treeview cursor changes."""
+		(path, col) = self.treeview.get_cursor()
+		commit = self.model[path][0]
+
+		if commit.committer is not None:
+			committer = commit.committer
+			timestamp = commit.commit_date
+			message   =  commit.get_message(self.with_diff)
+			revid_label = commit.commit_sha1
+		else:
+			committer = ""
+			timestamp = ""
+			message = ""
+			revid_label = ""
+
+		self.revid_label.set_text(revid_label)
+		self.committer_label.set_text(committer)
+		self.timestamp_label.set_text(timestamp)
+		self.message_buffer.set_text(message)
+
+		for widget in self.parents_widgets:
+			self.table.remove(widget)
+
+		self.parents_widgets = []
+		self.table.resize(4 + len(commit.parent_sha1) - 1, 4)
+		for idx, parent_id in enumerate(commit.parent_sha1):
+			self.table.set_row_spacing(idx + 3, 0)
+
+			align = gtk.Alignment(0.0, 0.0)
+			self.parents_widgets.append(align)
+			self.table.attach(align, 1, 2, idx + 3, idx + 4,
+					gtk.EXPAND | gtk.FILL, gtk.FILL)
+			align.show()
+
+			hbox = gtk.HBox(False, 0)
+			align.add(hbox)
+			hbox.show()
+
+			label = gtk.Label(parent_id)
+			label.set_selectable(True)
+			hbox.pack_start(label, expand=False, fill=True)
+			label.show()
+
+			image = gtk.Image()
+			image.set_from_stock(gtk.STOCK_JUMP_TO, gtk.ICON_SIZE_MENU)
+			image.show()
+
+			button = gtk.Button()
+			button.add(image)
+			button.set_relief(gtk.RELIEF_NONE)
+			button.connect("clicked", self._go_clicked_cb, parent_id)
+			hbox.pack_start(button, expand=False, fill=True)
+			button.show()
+
+			image = gtk.Image()
+			image.set_from_stock(gtk.STOCK_FIND, gtk.ICON_SIZE_MENU)
+			image.show()
+
+			button = gtk.Button()
+			button.add(image)
+			button.set_relief(gtk.RELIEF_NONE)
+			button.set_sensitive(True)
+			button.connect("clicked", self._show_clicked_cb,
+					commit.commit_sha1, parent_id)
+			hbox.pack_start(button, expand=False, fill=True)
+			button.show()
+
+		# Populate with child details
+		for widget in self.children_widgets:
+			self.table.remove(widget)
+
+		self.children_widgets = []
+		try:
+			child_sha1 = Commit.children_sha1[commit.commit_sha1]
+		except KeyError:
+			# We don't have child
+			child_sha1 = [ 0 ]
+
+		if ( len(child_sha1) > len(commit.parent_sha1)):
+			self.table.resize(4 + len(child_sha1) - 1, 4)
+
+		for idx, child_id in enumerate(child_sha1):
+			self.table.set_row_spacing(idx + 3, 0)
+
+			align = gtk.Alignment(0.0, 0.0)
+			self.children_widgets.append(align)
+			self.table.attach(align, 3, 4, idx + 3, idx + 4,
+					gtk.EXPAND | gtk.FILL, gtk.FILL)
+			align.show()
+
+			hbox = gtk.HBox(False, 0)
+			align.add(hbox)
+			hbox.show()
+
+			label = gtk.Label(child_id)
+			label.set_selectable(True)
+			hbox.pack_start(label, expand=False, fill=True)
+			label.show()
+
+			image = gtk.Image()
+			image.set_from_stock(gtk.STOCK_JUMP_TO, gtk.ICON_SIZE_MENU)
+			image.show()
+
+			button = gtk.Button()
+			button.add(image)
+			button.set_relief(gtk.RELIEF_NONE)
+			button.connect("clicked", self._go_clicked_cb, child_id)
+			hbox.pack_start(button, expand=False, fill=True)
+			button.show()
+
+			image = gtk.Image()
+			image.set_from_stock(gtk.STOCK_FIND, gtk.ICON_SIZE_MENU)
+			image.show()
+
+			button = gtk.Button()
+			button.add(image)
+			button.set_relief(gtk.RELIEF_NONE)
+			button.set_sensitive(True)
+			button.connect("clicked", self._show_clicked_cb,
+					child_id, commit.commit_sha1)
+			hbox.pack_start(button, expand=False, fill=True)
+			button.show()
+
+	def _destroy_cb(self, widget):
+		"""Callback for when a window we manage is destroyed."""
+		self.quit()
+
+
+	def quit(self):
+		"""Stop the GTK+ main loop."""
+		gtk.main_quit()
+
+	def run(self, args):
+		self.set_branch(args)
+		self.window.connect("destroy", self._destroy_cb)
+		self.window.show()
+		gtk.main()
+
+	def set_branch(self, args):
+		"""Fill in different windows with info from the reposiroty"""
+		fp = os.popen("git rev-parse --sq --default HEAD " + list_to_string(args, 1))
+		git_rev_list_cmd = fp.read()
+		fp.close()
+		fp = os.popen("git rev-list  --header --topo-order --parents " + git_rev_list_cmd)
+		self.update_window(fp)
+
+	def update_window(self, fp):
+		commit_lines = []
+
+		self.model = gtk.ListStore(gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT,
+				gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT, str, str, str)
+
+		# used for cursor positioning
+		self.index = {}
+
+		self.colours = {}
+		self.nodepos = {}
+		self.incomplete_line = {}
+
+		index = 0
+		last_colour = 0
+		last_nodepos = -1
+		out_line = []
+		input_line = fp.readline()
+		while (input_line != ""):
+			# The commit header ends with '\0'
+			# This NULL is immediately followed by the sha1 of the
+			# next commit
+			if (input_line[0] != '\0'):
+				commit_lines.append(input_line)
+				input_line = fp.readline()
+				continue;
+
+			commit = Commit(commit_lines)
+			if (commit != None ):
+				(out_line, last_colour, last_nodepos) = self.draw_graph(commit,
+										index, out_line,
+										last_colour,
+										last_nodepos)
+				self.index[commit.commit_sha1] = index
+				index += 1
+
+			# Skip the '\0
+			commit_lines = []
+			commit_lines.append(input_line[1:])
+			input_line = fp.readline()
+
+		fp.close()
+
+		self.treeview.set_model(self.model)
+		self.treeview.show()
+
+	def draw_graph(self, commit, index, out_line, last_colour, last_nodepos):
+		in_line=[]
+
+		#   |   -> outline
+		#   X
+		#   |\  <- inline
+
+		# Reset nodepostion
+		if (last_nodepos > 5):
+			last_nodepos = 0
+
+		# Add the incomplete lines of the last cell in this
+		for sha1 in self.incomplete_line.keys():
+			if ( sha1 != commit.commit_sha1):
+				for pos in self.incomplete_line[sha1]:
+					in_line.append((pos, pos, self.colours[sha1]))
+			else:
+				del self.incomplete_line[sha1]
+
+		try:
+			colour = self.colours[commit.commit_sha1]
+		except KeyError:
+			last_colour +=1
+			self.colours[commit.commit_sha1] = last_colour
+			colour =  last_colour
+		try:
+			node_pos = self.nodepos[commit.commit_sha1]
+		except KeyError:
+			last_nodepos +=1
+			self.nodepos[commit.commit_sha1] = last_nodepos
+			node_pos = last_nodepos
+
+		#The first parent always continue on the same line
+		try:
+			# check we alreay have the value
+			tmp_node_pos = self.nodepos[commit.parent_sha1[0]]
+		except KeyError:
+			self.colours[commit.parent_sha1[0]] = colour
+			self.nodepos[commit.parent_sha1[0]] = node_pos
+
+		in_line.append((node_pos, self.nodepos[commit.parent_sha1[0]],
+					self.colours[commit.parent_sha1[0]]))
+
+		self.add_incomplete_line(commit.parent_sha1[0], index+1)
+
+		if (len(commit.parent_sha1) > 1):
+			for parent_id in commit.parent_sha1[1:]:
+				try:
+					tmp_node_pos = self.nodepos[parent_id]
+				except KeyError:
+					last_colour += 1;
+					self.colours[parent_id] = last_colour
+					last_nodepos +=1
+					self.nodepos[parent_id] = last_nodepos
+
+				in_line.append((node_pos, self.nodepos[parent_id],
+							self.colours[parent_id]))
+				self.add_incomplete_line(parent_id, index+1)
+
+
+		try:
+			branch_tag = self.bt_sha1[commit.commit_sha1]
+		except KeyError:
+			branch_tag = [ ]
+
+
+		node = (node_pos, colour, branch_tag)
+
+		self.model.append([commit, node, out_line, in_line,
+				commit.message, commit.author, commit.date])
+
+		return (in_line, last_colour, last_nodepos)
+
+	def add_incomplete_line(self, sha1, index):
+		try:
+			self.incomplete_line[sha1].append(self.nodepos[sha1])
+		except KeyError:
+			self.incomplete_line[sha1] = [self.nodepos[sha1]]
+
+
+	def _go_clicked_cb(self, widget, revid):
+		"""Callback for when the go button for a parent is clicked."""
+		try:
+			self.treeview.set_cursor(self.index[revid])
+		except KeyError:
+			print "Revision %s not present in the list" % revid
+			# revid == 0 is the parent of the first commit
+			if (revid != 0 ):
+				print "Try running gitview without any options"
+
+		self.treeview.grab_focus()
+
+	def _show_clicked_cb(self, widget,  commit_sha1, parent_sha1):
+		"""Callback for when the show button for a parent is clicked."""
+		window = DiffWindow()
+		window.set_diff(commit_sha1, parent_sha1)
+		self.treeview.grab_focus()
+
+if __name__ == "__main__":
+	without_diff = 0
+
+	if (len(sys.argv) > 1 ):
+		if (sys.argv[1] == "--without-diff"):
+			without_diff = 1
+
+	view = GitView( without_diff != 1)
+	view.run(sys.argv[without_diff:])
+
+