rebase: define options in OPTIONS_SPEC

diff --git a/contrib/gitview/gitview b/contrib/gitview/gitview
index 93ecfc1bb919162940b7c92493c1cad025ba47cb..4c99dfb9038ca034d86b72cbe342373d12ae8cc6 100755 (executable)
--- a/contrib/gitview/gitview
+++ b/contrib/gitview/gitview
@@ -27,12 +27,17 @@ import math
 import string
 import fcntl
 
+have_gtksourceview2 = False
+have_gtksourceview = False
 try:
-    import gtksourceview
-    have_gtksourceview = True
+    import gtksourceview2
+    have_gtksourceview2 = True
 except ImportError:
-    have_gtksourceview = False
-    print "Running without gtksourceview module"
+    try:
+        import gtksourceview
+        have_gtksourceview = True
+    except ImportError:
+        print "Running without gtksourceview2 or gtksourceview module"
 
 re_ident = re.compile('(author|committer) (?P<ident>.*) (?P<epoch>\d+) (?P<tz>[+-]\d{4})')
 
@@ -58,6 +63,26 @@ def show_date(epoch, tz):
 
        return time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(secs))
 
+def get_source_buffer_and_view():
+       if have_gtksourceview2:
+               buffer = gtksourceview2.Buffer()
+               slm = gtksourceview2.LanguageManager()
+               gsl = slm.get_language("diff")
+               buffer.set_highlight_syntax(True)
+               buffer.set_language(gsl)
+               view = gtksourceview2.View(buffer)
+       elif have_gtksourceview:
+               buffer = gtksourceview.SourceBuffer()
+               slm = gtksourceview.SourceLanguagesManager()
+               gsl = slm.get_language_from_mime_type("text/x-patch")
+               buffer.set_highlight(True)
+               buffer.set_language(gsl)
+               view = gtksourceview.SourceView(buffer)
+       else:
+               buffer = gtk.TextBuffer()
+               view = gtk.TextView(buffer)
+       return (buffer, view)
+
 
 class CellRendererGraph(gtk.GenericCellRenderer):
        """Cell renderer for directed graph.
@@ -533,7 +558,7 @@ class AnnotateWindow(object):
 
                self.add_file_data(filename, commit_sha1, line_num)
 
-               fp = os.popen("git blame --incremental -- " + filename + " " + commit_sha1)
+               fp = os.popen("git blame --incremental -C -C -- " + filename + " " + commit_sha1)
                flags = fcntl.fcntl(fp.fileno(), fcntl.F_GETFL)
                fcntl.fcntl(fp.fileno(), fcntl.F_SETFL, flags | os.O_NONBLOCK)
                self.io_watch_tag = gobject.io_add_watch(fp, gobject.IO_IN, self.data_ready)
@@ -582,17 +607,7 @@ class DiffWindow(object):
                hpan.pack1(scrollwin, True, 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)
-
+               (self.buffer, sourceview) = get_source_buffer_and_view()
 
                sourceview.set_editable(False)
                sourceview.modify_font(pango.FontDescription("Monospace"))
@@ -956,16 +971,7 @@ class GitView(object):
                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)
+               (self.message_buffer, sourceview) = get_source_buffer_and_view()
 
                sourceview.set_editable(False)
                sourceview.modify_font(pango.FontDescription("Monospace"))