Skip to content

Bug 1970967 - add git revision to bugzilla comment by bugherder #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Archaeopteryx wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bug 1970967 - add git revision to bugzilla comment by bugherder #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bugherder/js/Config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ var Config = {
inMaintenanceMode : false,

treeName: 'mozilla-central',
gitRevURL: "https://github.com/mozilla-firefox/firefox/commit/",
hgBaseURL: "https://hg.mozilla.org/",
hgURL: "https://hg.mozilla.org/mozilla-central/",
hgRevURL: "https://hg.mozilla.org/mozilla-central/rev/",
Expand Down
2 changes: 2 additions & 0 deletions bugherder/js/PushData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,9 @@ var PushData = {
makePush: function PD_makePush(cset) {
var push = {};
push.cset = cset.node.substring(0,12);
push.cset_git = cset.git_node;
push.hgLink = Config.hgRevURL + push.cset;
push.gitLink = push.cset_git ? Config.gitRevURL + push.cset_git : null;
// Only use the first line of the commit message, to avoid false
// positives when checking for bug numbers and backouts later.
push.desc = UI.htmlEncode(cset.desc.split('\n', 1)[0]);
Expand Down
6 changes: 5 additions & 1 deletion bugherder/js/Step.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,11 @@ Step.prototype.attachBugToCset = function Step_attachBugToCset(index, bugID) {
var attached = {};
var isMC = Config.treeName == 'mozilla-central';

attached.comment = PushData.allPushes[index].hgLink;
attached.comment = '';
if (PushData.allPushes[index].gitLink) {
attached.comment = `${PushData.allPushes[index].gitLink}\n`;
}
attached.comment += PushData.allPushes[index].hgLink;

if (bugID in BugData.bugs) {
attached.shouldComment = !(PushData.allPushes[index].backedOut);
Expand Down