# [PATCH 1/2] gitview: Fix the blame interface. 5 messages from 2007-06-12 to 2007-06-13. Participants: Aneesh Kumar K.V, Junio C Hamano, Aneesh Kumar. Thread: https://gitlist.dev/t/8574 ## Aneesh Kumar K.V, 2007-06-12 17:35 Subject: [PATCH 1/2] gitview: Fix the blame interface. Message-ID: <11816697213806-git-send-email-aneesh.kumar@gmail.com> URL: https://gitlist.dev/e/11816697213806-git-send-email-aneesh.kumar%40gmail.com ``` 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 --- 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 ``` ## Aneesh Kumar K.V, 2007-06-12 17:35 Subject: [PATCH 2/2] gitview: run blame with -M and -C Message-ID: <1181669728642-git-send-email-aneesh.kumar@gmail.com> URL: https://gitlist.dev/e/1181669728642-git-send-email-aneesh.kumar%40gmail.com In-Reply-To: <11816697213806-git-send-email-aneesh.kumar@gmail.com> ``` From: Aneesh Kumar K.V 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 --- 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 ``` ## Junio C Hamano, 2007-06-13 04:58 Subject: Re: [PATCH 1/2] gitview: Fix the blame interface. Message-ID: <7vmyz4h2nb.fsf@assigned-by-dhcp.pobox.com> URL: https://gitlist.dev/e/7vmyz4h2nb.fsf%40assigned-by-dhcp.pobox.com In-Reply-To: <11816697213806-git-send-email-aneesh.kumar@gmail.com> ``` "Aneesh Kumar K.V" 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. ``` ## Junio C Hamano, 2007-06-13 04:59 Subject: Re: [PATCH 2/2] gitview: run blame with -M and -C Message-ID: <7vir9sh2l5.fsf@assigned-by-dhcp.pobox.com> URL: https://gitlist.dev/e/7vir9sh2l5.fsf%40assigned-by-dhcp.pobox.com In-Reply-To: <1181669728642-git-send-email-aneesh.kumar@gmail.com> ``` "Aneesh Kumar K.V" writes: > From: Aneesh Kumar K.V > > 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 > --- > 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. ``` ## Aneesh Kumar, 2007-06-13 08:33 Subject: Re: [PATCH 1/2] gitview: Fix the blame interface. Message-ID: URL: https://gitlist.dev/e/cc723f590706130133v3952e38yc4ceecc6cdc44365%40mail.gmail.com In-Reply-To: <7vmyz4h2nb.fsf@assigned-by-dhcp.pobox.com> ``` On 6/13/07, Junio C Hamano wrote: > "Aneesh Kumar K.V" 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 ```