Skip to content

Commit 6db65ba

Browse files
committed
improved comments- include vote breakdown table
1 parent 98512af commit 6db65ba

File tree

1 file changed

+37
-24
lines changed

1 file changed

+37
-24
lines changed

gitconsensus/repository.py

Lines changed: 37 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,21 @@
55
import requests
66
import yaml
77

8+
message_template = """
9+
This Pull Request has been %s by [GitConsensus](https://github.com/tedivm/GitConsensus).
10+
11+
## Vote Totals
12+
13+
| Yes | No | Total |
14+
| --- | -- | ----- |
15+
| %s | %s | %s |
16+
17+
## Vote Breakdown
18+
19+
%s
20+
"""
21+
22+
823
def githubApiRequest(url):
924
auth = config.getGitToken()
1025
headers = {
@@ -142,22 +157,13 @@ def shouldClose(self):
142157

143158
def close(self):
144159
self.pr.close()
145-
message = """
146-
This Pull Request has been closed by [GitConsensus](https://github.com/tedivm/GitConsensus).
147-
148-
|||
149-
| ------ | --- |
150-
| Yes | %s |
151-
| No | %s |
152-
| Total | %s |
153-
154-
""" % (str(len(self.yes)), str(len(self.no)), str(len(self.users)))
160+
self.addLabels(['gc-closed'])
161+
table = self.buildVoteTable()
162+
message = message_template % ('closed', str(len(self.yes)), str(len(self.no)), str(len(self.users)), table)
155163
self.addComment(message)
156164

157-
158165
def vote_merge(self):
159-
160-
self.pr.merge('Consensus Merge')
166+
self.pr.merge('GitConsensus Merge')
161167
self.addLabels(['gc-merged'])
162168

163169
if 'extra_labels' in self.repository.rules and self.repository.rules['extra_labels']:
@@ -167,19 +173,26 @@ def vote_merge(self):
167173
'gc-no %s' % (len(self.no),),
168174
'gc-age %s' % (self.daysSinceLastUpdate(),)
169175
])
170-
171-
message = """
172-
This Pull Request has been merged by [GitConsensus](https://github.com/tedivm/GitConsensus).
173-
174-
|||
175-
| ------ | --- |
176-
| Yes | %s |
177-
| No | %s |
178-
| Total | %s |
179-
180-
""" % (str(len(self.yes)), str(len(self.no)), str(len(self.users)))
176+
table = self.buildVoteTable()
177+
message = message_template % ('merged', str(len(self.yes)), str(len(self.no)), str(len(self.users)), table)
181178
self.addComment(message)
182179

180+
def buildVoteTable(self):
181+
table = '| User | Yes | No |\n|--------|-----|----|'
182+
for user in self.users:
183+
if user in self.yes:
184+
yes = 'Yes'
185+
else:
186+
yes = ' '
187+
if user in self.no:
188+
no = 'No'
189+
else:
190+
no = ' '
191+
user_label = '[%s](https://github.com/%s)' % (user, user)
192+
row = "| %s | %s | %s |" % (user_label, yes, no)
193+
table = "%s\n%s" % (table, row)
194+
return table
195+
183196

184197
def addLabels(self, labels):
185198
issue = self.getIssue()

0 commit comments

Comments
 (0)