@matheusbsbs / matheus-bagliano / commits / 9e4f522da7
Fork 0

gitview: Code cleanup

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>

Aneesh Kumar K.V committed Feb 24, 2006 at 21:49 UTC 9e4f522da7da8bf5f9018927c82b12e6b02b9058
1 file changed +21 -27
contrib/gitview/gitview
+21 -27
@@ -870,21 +870,22 @@ class GitView:
870
871 # Reset nodepostion
872 if (last_nodepos > 5):
873 - last_nodepos = 0
873 + last_nodepos = -1
874
875 # Add the incomplete lines of the last cell in this
876 try:
877 colour = self.colours[commit.commit_sha1]
878 except KeyError:
879 - last_colour +=1
880 - self.colours[commit.commit_sha1] = last_colour
881 - colour = last_colour
879 + self.colours[commit.commit_sha1] = last_colour+1
880 + last_colour = self.colours[commit.commit_sha1]
881 + colour = self.colours[commit.commit_sha1]
882 +
883 try:
884 node_pos = self.nodepos[commit.commit_sha1]
885 except KeyError:
885 - last_nodepos +=1
886 - self.nodepos[commit.commit_sha1] = last_nodepos
887 - node_pos = last_nodepos
886 + self.nodepos[commit.commit_sha1] = last_nodepos+1
887 + last_nodepos = self.nodepos[commit.commit_sha1]
888 + node_pos = self.nodepos[commit.commit_sha1]
889
890 #The first parent always continue on the same line
891 try:
@@ -895,32 +896,25 @@ class GitView:
896 self.nodepos[commit.parent_sha1[0]] = node_pos
897
898 for sha1 in self.incomplete_line.keys():
898 - if ( sha1 != commit.commit_sha1):
899 + if (sha1 != commit.commit_sha1):
900 self.draw_incomplete_line(sha1, node_pos,
901 out_line, in_line, index)
902 else:
903 del self.incomplete_line[sha1]
904
905
905 - in_line.append((node_pos, self.nodepos[commit.parent_sha1[0]],
906 - self.colours[commit.parent_sha1[0]]))
907 -
908 - self.add_incomplete_line(commit.parent_sha1[0], index+1)
909 -
910 - if (len(commit.parent_sha1) > 1):
911 - for parent_id in commit.parent_sha1[1:]:
912 - try:
913 - tmp_node_pos = self.nodepos[parent_id]
914 - except KeyError:
915 - last_colour += 1;
916 - self.colours[parent_id] = last_colour
917 - last_nodepos +=1
918 - self.nodepos[parent_id] = last_nodepos
919 -
920 - in_line.append((node_pos, self.nodepos[parent_id],
921 - self.colours[parent_id]))
922 - self.add_incomplete_line(parent_id, index+1)
906 + for parent_id in commit.parent_sha1:
907 + try:
908 + tmp_node_pos = self.nodepos[parent_id]
909 + except KeyError:
910 + self.colours[parent_id] = last_colour+1
911 + last_colour = self.colours[parent_id]
912 + self.nodepos[parent_id] = last_nodepos+1
913 + last_nodepos = self.nodepos[parent_id]
914
915 + in_line.append((node_pos, self.nodepos[parent_id],
916 + self.colours[parent_id]))
917 + self.add_incomplete_line(parent_id)
918
919 try:
920 branch_tag = self.bt_sha1[commit.commit_sha1]
@@ -935,7 +929,7 @@ class GitView:
929
930 return (in_line, last_colour, last_nodepos)
931
938 - def add_incomplete_line(self, sha1, index):
932 + def add_incomplete_line(self, sha1):
933 try:
934 self.incomplete_line[sha1].append(self.nodepos[sha1])
935 except KeyError: