{"thread":{"id":"3456","subject":"gitview: Code cleanup","startedAt":"2006-02-24T16:19:54Z","lastAt":"2006-02-24T16:19:54Z","messageCount":1,"participants":["Aneesh Kumar K.V"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"16681","messageId":"43FF322A.5020809@gmail.com","threadId":"3456","inReplyTo":null,"subject":"gitview: Code cleanup","fromName":"Aneesh Kumar K.V","fromEmail":"aneesh.kumar@gmail.com","sentAt":"2006-02-24T16:19:54Z","receivedAt":"2006-02-24T16:19:54Z","isPatch":false,"sender":{"key":"aneesh.kumar@gmail.com","avatar":"https://gravatar.com/avatar/0621fc0b2f14ead1e9024382f16053a808c148596da30c1b92572fa075621f68?d=mp&s=160"},"body":"\n\nSubject: gitview: Code cleanup\n\nRearrange the code little bit so that it is easier to read\n\nSigned-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>\n\n---\n\n contrib/gitview/gitview |   50 +++++++++++++++++++++--------------------------\n 1 files changed, 22 insertions(+), 28 deletions(-)\n\n1dd075c97bae172d0c1b6f31897fec962217aab2\ndiff --git a/contrib/gitview/gitview b/contrib/gitview/gitview\nindex 02e2445..2cde71e 100755\n--- a/contrib/gitview/gitview\n+++ b/contrib/gitview/gitview\n@@ -870,21 +870,22 @@ class GitView:\n \n \t\t# Reset nodepostion\n \t\tif (last_nodepos > 5):\n-\t\t\tlast_nodepos = 0\n+\t\t\tlast_nodepos = -1 \n \n \t\t# Add the incomplete lines of the last cell in this\n \t\ttry:\n \t\t\tcolour = self.colours[commit.commit_sha1]\n \t\texcept KeyError:\n-\t\t\tlast_colour +=1\n-\t\t\tself.colours[commit.commit_sha1] = last_colour\n-\t\t\tcolour =  last_colour\n+\t\t\tself.colours[commit.commit_sha1] = last_colour+1\n+\t\t\tlast_colour = self.colours[commit.commit_sha1] \n+\t\t\tcolour =   self.colours[commit.commit_sha1] \n+\n \t\ttry:\n \t\t\tnode_pos = self.nodepos[commit.commit_sha1]\n \t\texcept KeyError:\n-\t\t\tlast_nodepos +=1\n-\t\t\tself.nodepos[commit.commit_sha1] = last_nodepos\n-\t\t\tnode_pos = last_nodepos\n+\t\t\tself.nodepos[commit.commit_sha1] = last_nodepos+1\n+\t\t\tlast_nodepos = self.nodepos[commit.commit_sha1]\n+\t\t\tnode_pos =  self.nodepos[commit.commit_sha1]\n \n \t\t#The first parent always continue on the same line\n \t\ttry:\n@@ -895,32 +896,25 @@ class GitView:\n \t\t\tself.nodepos[commit.parent_sha1[0]] = node_pos\n \n \t\tfor sha1 in self.incomplete_line.keys():\n-\t\t\tif ( sha1 != commit.commit_sha1):\n+\t\t\tif (sha1 != commit.commit_sha1):\n \t\t\t\tself.draw_incomplete_line(sha1, node_pos,\n \t\t\t\t\t\tout_line, in_line, index)\n \t\t\telse:\n \t\t\t\tdel self.incomplete_line[sha1]\n \n \n-\t\tin_line.append((node_pos, self.nodepos[commit.parent_sha1[0]],\n-\t\t\t\t\tself.colours[commit.parent_sha1[0]]))\n-\n-\t\tself.add_incomplete_line(commit.parent_sha1[0], index+1)\n-\n-\t\tif (len(commit.parent_sha1) > 1):\n-\t\t\tfor parent_id in commit.parent_sha1[1:]:\n-\t\t\t\ttry:\n-\t\t\t\t\ttmp_node_pos = self.nodepos[parent_id]\n-\t\t\t\texcept KeyError:\n-\t\t\t\t\tlast_colour += 1;\n-\t\t\t\t\tself.colours[parent_id] = last_colour\n-\t\t\t\t\tlast_nodepos +=1\n-\t\t\t\t\tself.nodepos[parent_id] = last_nodepos\n-\n-\t\t\t\tin_line.append((node_pos, self.nodepos[parent_id],\n-\t\t\t\t\t\t\tself.colours[parent_id]))\n-\t\t\t\tself.add_incomplete_line(parent_id, index+1)\n-\n+\t\tfor parent_id in commit.parent_sha1:\n+\t\t\ttry:\n+\t\t\t\ttmp_node_pos = self.nodepos[parent_id]\n+\t\t\texcept KeyError:\n+\t\t\t\tself.colours[parent_id] = last_colour+1\n+\t\t\t\tlast_colour = self.colours[parent_id]\n+\t\t\t\tself.nodepos[parent_id] = last_nodepos+1\n+\t\t\t\tlast_nodepos = self.nodepos[parent_id] \n+\n+\t\t\tin_line.append((node_pos, self.nodepos[parent_id],\n+\t\t\t\t\t\tself.colours[parent_id]))\n+\t\t\tself.add_incomplete_line(parent_id)\n \n \t\ttry:\n \t\t\tbranch_tag = self.bt_sha1[commit.commit_sha1]\n@@ -935,7 +929,7 @@ class GitView:\n \n \t\treturn (in_line, last_colour, last_nodepos)\n \n-\tdef add_incomplete_line(self, sha1, index):\n+\tdef add_incomplete_line(self, sha1):\n \t\ttry:\n \t\t\tself.incomplete_line[sha1].append(self.nodepos[sha1])\n \t\texcept KeyError:\n-- \n1.2.3.g2cf3-dirty\n\n"}]}