mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitview: Code cleanup

Browse Source 
Rearrange the code little bit so that it is easier to read

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Aneesh Kumar K.V
2006-02-24 21:49:54 +05:30
committed by Junio C Hamano
parent 6ee9240f63
commit 9e4f522da7
1 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
contrib/gitview/gitview
View File

@ -870,21 +870,22 @@ class GitView:
# Reset nodepostion # Reset nodepostion
if (last_nodepos > 5): if (last_nodepos > 5):
last_nodepos = 0 last_nodepos = -1
# Add the incomplete lines of the last cell in this # Add the incomplete lines of the last cell in this
try: try:
colour = self.colours[commit.commit_sha1] colour = self.colours[commit.commit_sha1]
except KeyError: except KeyError:
last_colour +=1 self.colours[commit.commit_sha1] = last_colour+1
self.colours[commit.commit_sha1] = last_colour last_colour = self.colours[commit.commit_sha1]
colour = last_colour colour = self.colours[commit.commit_sha1]
try: try:
node_pos = self.nodepos[commit.commit_sha1] node_pos = self.nodepos[commit.commit_sha1]
except KeyError: except KeyError:
last_nodepos +=1 self.nodepos[commit.commit_sha1] = last_nodepos+1
self.nodepos[commit.commit_sha1] = last_nodepos last_nodepos = self.nodepos[commit.commit_sha1]
node_pos = last_nodepos node_pos = self.nodepos[commit.commit_sha1]
#The first parent always continue on the same line #The first parent always continue on the same line
try: try:
@ -895,32 +896,25 @@ class GitView:
self.nodepos[commit.parent_sha1[0]] = node_pos self.nodepos[commit.parent_sha1[0]] = node_pos
for sha1 in self.incomplete_line.keys(): for sha1 in self.incomplete_line.keys():
if ( sha1 != commit.commit_sha1): if (sha1 != commit.commit_sha1):
self.draw_incomplete_line(sha1, node_pos, self.draw_incomplete_line(sha1, node_pos,
out_line, in_line, index) out_line, in_line, index)
else: else:
del self.incomplete_line[sha1] del self.incomplete_line[sha1]
in_line.append((node_pos, self.nodepos[commit.parent_sha1[0]], for parent_id in commit.parent_sha1:
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: try:
tmp_node_pos = self.nodepos[parent_id] tmp_node_pos = self.nodepos[parent_id]
except KeyError: except KeyError:
last_colour += 1; self.colours[parent_id] = last_colour+1
self.colours[parent_id] = last_colour last_colour = self.colours[parent_id]
last_nodepos +=1 self.nodepos[parent_id] = last_nodepos+1
self.nodepos[parent_id] = last_nodepos last_nodepos = self.nodepos[parent_id]
in_line.append((node_pos, self.nodepos[parent_id], in_line.append((node_pos, self.nodepos[parent_id],
self.colours[parent_id])) self.colours[parent_id]))
self.add_incomplete_line(parent_id, index+1) self.add_incomplete_line(parent_id)
try: try:
branch_tag = self.bt_sha1[commit.commit_sha1] branch_tag = self.bt_sha1[commit.commit_sha1]
@ -935,7 +929,7 @@ class GitView:
return (in_line, last_colour, last_nodepos) return (in_line, last_colour, last_nodepos)
def add_incomplete_line(self, sha1, index): def add_incomplete_line(self, sha1):
try: try:
self.incomplete_line[sha1].append(self.nodepos[sha1]) self.incomplete_line[sha1].append(self.nodepos[sha1])
except KeyError: except KeyError: