[PATCH 1/2] gitview: Fix the blame interface.
- From
Aneesh Kumar K.V <aneesh.kumar@gmail.com>
- Date
- Jun 12, 2007, 17:35 UTC
- Message-ID
- <11816697213806-git-send-email-aneesh.kumar@gmail.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 <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