[PATCH 1/2] gitview: Fix the blame interface.

[PATCH 1/2] gitview: Fix the blame interface.

[Aneesh Kumar K.V]

The async reading from the pipe was skipping some of the
input lines. Fix the same by making sure that we add the
partial content of the previous read to the newly read
data.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
---
 contrib/gitview/gitview |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/contrib/gitview/gitview b/contrib/gitview/gitview
index 098cb01..286e974 100755
--- a/contrib/gitview/gitview
+++ b/contrib/gitview/gitview
@@ -352,6 +352,7 @@ class AnnotateWindow(object):
 		self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
 		self.window.set_border_width(0)
 		self.window.set_title("Git repository browser annotation window")
+		self.prev_read = ""
 
 		# Use two thirds of the screen by default
 		screen = self.window.get_screen()
@@ -401,7 +402,11 @@ class AnnotateWindow(object):
 	def data_ready(self, source, condition):
 		while (1):
 			try :
-				buffer = source.read(8192)
+				# A simple readline doesn't work
+				# a readline bug ??
+				buffer=""
+				buffer = source.read(100)
+
 			except:
 				# resource temporary not available
 				return True
@@ -411,6 +416,14 @@ class AnnotateWindow(object):
 				source.close()
 				return False
 
+			if (self.prev_read != ""):
+				buffer = self.prev_read + buffer
+				self.prev_read = ""
+
+			if (buffer[len(buffer) -1] != '\n'):
+				self.prev_read = buffer[buffer.rindex("\n"):(len(buffer))]
+				buffer = buffer[0:buffer.rindex("\n")]
+
 			for buff in buffer.split("\n"):
 				annotate_line = re.compile('^([0-9a-f]{40}) (.+) (.+) (.+)$')
 				m = annotate_line.match(buff)
@@ -419,7 +432,8 @@ class AnnotateWindow(object):
 					m = annotate_line.match(buff)
 					if not m:
 						continue
-					filename = m.group(2)
+					else:
+						filename = m.group(2)
 				else:
 					self.commit_sha1 = m.group(1)
 					self.source_line = int(m.group(2))
-- 
1.5.2.1.239.g75d8-dirty

[PATCH 2/2] gitview: run blame with -M and -C

[Aneesh Kumar K.V]

From: Aneesh Kumar K.V <aneesh.kumar@gmail.com>

pass -M  and -C option to git-blame so that blame browsing
works when the data is copied over from other files.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
---
 contrib/gitview/gitview |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/contrib/gitview/gitview b/contrib/gitview/gitview
index 286e974..01128f4 100755
--- a/contrib/gitview/gitview
+++ b/contrib/gitview/gitview
@@ -530,7 +530,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 -M -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)
-- 
1.5.2.1.239.g75d8-dirty

Re: [PATCH 1/2] gitview: Fix the blame interface.

[Junio C Hamano]

"Aneesh Kumar K.V" <aneesh.kumar@gmail.com> writes:

> @@ -401,7 +402,11 @@ class AnnotateWindow(object):
>  	def data_ready(self, source, condition):
>  		while (1):
>  			try :
> -				buffer = source.read(8192)
> +				# A simple readline doesn't work
> +				# a readline bug ??
> +				buffer=""
> +				buffer = source.read(100)
> +

Are you sure about the first assignment?

> @@ -419,7 +432,8 @@ class AnnotateWindow(object):
>  					m = annotate_line.match(buff)
>  					if not m:
>  						continue
> -					filename = m.group(2)
> +					else:
> +						filename = m.group(2)
>  				else:
>  					self.commit_sha1 = m.group(1)
>  					self.source_line = int(m.group(2))

The script is in contrib/ so I probably shouldn't be nitpicking,
but for this particular hunk, I think (1) this is a no-op
change, and (2) the original is easier to read.

Re: [PATCH 2/2] gitview: run blame with -M and -C

[Junio C Hamano]

"Aneesh Kumar K.V" <aneesh.kumar@gmail.com> writes:

> From: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
>
> pass -M  and -C option to git-blame so that blame browsing
> works when the data is copied over from other files.
>
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
> ---
>  contrib/gitview/gitview |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/contrib/gitview/gitview b/contrib/gitview/gitview
> index 286e974..01128f4 100755
> --- a/contrib/gitview/gitview
> +++ b/contrib/gitview/gitview
> @@ -530,7 +530,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 -M -C -C -- " + filename + " " + commit_sha1)

You do not have to say "-M -C -C"; "-C" would imply "-M"
anyway.

Re: [PATCH 1/2] gitview: Fix the blame interface.

[Aneesh Kumar]

On 6/13/07, Junio C Hamano <gitster@pobox.com> wrote:
> "Aneesh Kumar K.V" <aneesh.kumar@gmail.com> writes:
>
> > @@ -401,7 +402,11 @@ class AnnotateWindow(object):
> >       def data_ready(self, source, condition):
> >               while (1):
> >                       try :
> > -                             buffer = source.read(8192)
> > +                             # A simple readline doesn't work
> > +                             # a readline bug ??
> > +                             buffer=""
> > +                             buffer = source.read(100)
> > +
>
> Are you sure about the first assignment?
>

That was a debug left over i guess. I will send an update patch which
removed the same.
The problem was an interrupted source.read/readline was returning old values.



> > @@ -419,7 +432,8 @@ class AnnotateWindow(object):
> >                                       m = annotate_line.match(buff)
> >                                       if not m:
> >                                               continue
> > -                                     filename = m.group(2)
> > +                                     else:
> > +                                             filename = m.group(2)
> >                               else:
> >                                       self.commit_sha1 = m.group(1)
> >                                       self.source_line = int(m.group(2))
>
> The script is in contrib/ so I probably shouldn't be nitpicking,
> but for this particular hunk, I think (1) this is a no-op
> change, and (2) the original is easier to read.
>
>


I will update if you feel that way

-aneesh

[PATCH 1/2] gitview: Fix the blame interface.

[Aneesh Kumar K.V]

The async reading from the pipe was skipping some of the
input lines. Fix the same by making sure that we add the
partial content of the previous read to the newly read
data.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
---
 contrib/gitview/gitview |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/contrib/gitview/gitview b/contrib/gitview/gitview
index 098cb01..93ecfc1 100755
--- a/contrib/gitview/gitview
+++ b/contrib/gitview/gitview
@@ -352,6 +352,7 @@ class AnnotateWindow(object):
 		self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
 		self.window.set_border_width(0)
 		self.window.set_title("Git repository browser annotation window")
+		self.prev_read = ""
 
 		# Use two thirds of the screen by default
 		screen = self.window.get_screen()
@@ -401,7 +402,10 @@ class AnnotateWindow(object):
 	def data_ready(self, source, condition):
 		while (1):
 			try :
-				buffer = source.read(8192)
+				# A simple readline doesn't work
+				# a readline bug ??
+				buffer = source.read(100)
+
 			except:
 				# resource temporary not available
 				return True
@@ -411,6 +415,19 @@ class AnnotateWindow(object):
 				source.close()
 				return False
 
+			if (self.prev_read != ""):
+				buffer = self.prev_read + buffer
+				self.prev_read = ""
+
+			if (buffer[len(buffer) -1] != '\n'):
+				try:
+					newline_index = buffer.rindex("\n")
+				except ValueError:
+					newline_index = 0
+
+				self.prev_read = buffer[newline_index:(len(buffer))]
+				buffer = buffer[0:newline_index]
+
 			for buff in buffer.split("\n"):
 				annotate_line = re.compile('^([0-9a-f]{40}) (.+) (.+) (.+)$')
 				m = annotate_line.match(buff)
-- 
1.5.2.1.255.gca6c0-dirty