Merge lp:~twom/isitdeployable/short-codes into lp:isitdeployable

Proposed by Tom Wardill
Status: Merged
Approved by: Tom Wardill
Approved revision: 294
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp:~twom/isitdeployable/short-codes
Merge into: lp:isitdeployable
Diff against target: 45 lines (+12/-1)
3 files modified
revtracker/data.py (+1/-0)
revtracker/models.py (+6/-0)
revtracker/templates/revtracker/revision_info.html (+5/-1)
To merge this branch: bzr merge lp:~twom/isitdeployable/short-codes
Reviewer Review Type Date Requested Status
Matias Bordese (community) Approve
Review via email: mp+367645@code.launchpad.net

Commit message

Add 7 char short sha1 codes to git revisions

To post a comment you must log in.
Revision history for this message
Matias Bordese (matiasb) wrote :

LGTM, minor comment.

review: Approve
lp:~twom/isitdeployable/short-codes updated
294. By Tom Wardill

Use better python

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'revtracker/data.py'
2--- revtracker/data.py 2018-10-05 21:16:42 +0000
3+++ revtracker/data.py 2019-05-20 14:48:43 +0000
4@@ -191,6 +191,7 @@
5 info['branch'] = revision.branch
6 info['revno'] = revision.revno
7 info['commit_sha1'] = revision.commit_sha1
8+ info['short_sha1'] = revision.short_sha1
9 info['assignee'] = revision.assignee
10 info['assignee_link'] = revision.assignee_link
11 info['link'] = revision.link
12
13=== modified file 'revtracker/models.py'
14--- revtracker/models.py 2018-10-11 19:19:00 +0000
15+++ revtracker/models.py 2019-05-20 14:48:43 +0000
16@@ -109,6 +109,12 @@
17 return "https://launchpad.net/~%s" % self.assignee
18 return None
19
20+ @property
21+ def short_sha1(self):
22+ if self.commit_sha1:
23+ return self.commit_sha1[:7]
24+ return None
25+
26
27 class DeploymentRequest(models.Model):
28
29
30=== modified file 'revtracker/templates/revtracker/revision_info.html'
31--- revtracker/templates/revtracker/revision_info.html 2016-09-28 11:25:47 +0000
32+++ revtracker/templates/revtracker/revision_info.html 2019-05-20 14:48:43 +0000
33@@ -17,7 +17,11 @@
34 {{/if}}
35 </div>
36 {{/if_include_assignee}}
37-<div class="supplementary nine columns omega"><a href="{{link}}">{{title}}</a>{{#if branch}} of {{branch}}{{/if}}</div>
38+<div class="supplementary nine columns omega">
39+ <a href="{{link}}">{{title}}</a>
40+ {{#if short_sha1}}[{{short_sha1}}]{{/if}}
41+ {{#if branch}} of {{branch}}{{/if}}
42+</div>
43 <div class="commit_message fifteen columns alpha">{{linebreaks commit_message}}</div>
44 {{#if rolled_back_by_revision}}
45 <div class="rollback noaction_status fifteen columns alpha">Rolled back by {{rolled_back_by_revision.description}}</div>

Subscribers

People subscribed via source and target branches