Do not add original description to reverts. Leave that for plugins.
Bug: Issue 4731
Change-Id: Ice55a064ae0812b2126f3eadc3056e017df4c731
diff --git a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.js b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.js
index 2260b38..9960f90 100644
--- a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.js
+++ b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.js
@@ -283,7 +283,7 @@
_modifyRevertMsg: function() {
return this.$.jsAPI.modifyRevertMsg(this.change,
- this.$.confirmRevertDialog.message);
+ this.$.confirmRevertDialog.message, this.commitMessage);
},
showRevertDialog: function() {
diff --git a/polygerrit-ui/app/elements/change/gr-confirm-revert-dialog/gr-confirm-revert-dialog.js b/polygerrit-ui/app/elements/change/gr-confirm-revert-dialog/gr-confirm-revert-dialog.js
index 06775d7..8f621f0 100644
--- a/polygerrit-ui/app/elements/change/gr-confirm-revert-dialog/gr-confirm-revert-dialog.js
+++ b/polygerrit-ui/app/elements/change/gr-confirm-revert-dialog/gr-confirm-revert-dialog.js
@@ -42,13 +42,10 @@
return;
}
var revertCommitText = 'This reverts commit ' + commitHash + '.';
- // Add '> ' in front of the original commit text.
- var originalCommitText = message.replace(/^/gm, '> ');
this.message = revertTitle + '\n\n' +
revertCommitText + '\n\n' +
- 'Reason for revert: <INSERT REASONING HERE>\n\n' +
- 'Original change\'s description:\n' + originalCommitText;
+ 'Reason for revert: <INSERT REASONING HERE>\n';
},
_handleConfirmTap: function(e) {
diff --git a/polygerrit-ui/app/elements/change/gr-confirm-revert-dialog/gr-confirm-revert-dialog_test.html b/polygerrit-ui/app/elements/change/gr-confirm-revert-dialog/gr-confirm-revert-dialog_test.html
index 5e6c53fb..f5672d3 100644
--- a/polygerrit-ui/app/elements/change/gr-confirm-revert-dialog/gr-confirm-revert-dialog_test.html
+++ b/polygerrit-ui/app/elements/change/gr-confirm-revert-dialog/gr-confirm-revert-dialog_test.html
@@ -53,10 +53,7 @@
'abcd123');
var expected = 'Revert "one line commit"\n\n' +
'This reverts commit abcd123.\n\n' +
- 'Reason for revert: <INSERT REASONING HERE>\n\n' +
- 'Original change\'s description:\n' +
- '> one line commit\n> \n' +
- '> Change-Id: abcdefg\n> ';
+ 'Reason for revert: <INSERT REASONING HERE>\n';
assert.equal(element.message, expected);
});
@@ -67,10 +64,7 @@
'abcd123');
var expected = 'Revert "many lines"\n\n' +
'This reverts commit abcd123.\n\n' +
- 'Reason for revert: <INSERT REASONING HERE>\n\n' +
- 'Original change\'s description:\n' +
- '> many lines\n> commit\n> \n> message\n> \n' +
- '> Change-Id: abcdefg\n> ';
+ 'Reason for revert: <INSERT REASONING HERE>\n';
assert.equal(element.message, expected);
});
@@ -81,11 +75,7 @@
'abcd123');
var expected = 'Revert "much lines"\n\n' +
'This reverts commit abcd123.\n\n' +
- 'Reason for revert: <INSERT REASONING HERE>\n\n' +
- 'Original change\'s description:\n' +
- '> much lines\n> very\n> \n> commit\n> \n' +
- '> Bug: Issue 42\n' +
- '> Change-Id: abcdefg\n> ';
+ 'Reason for revert: <INSERT REASONING HERE>\n';
assert.equal(element.message, expected);
});
@@ -96,10 +86,7 @@
'abcd123');
var expected = 'Revert "Revert "one line commit""\n\n' +
'This reverts commit abcd123.\n\n' +
- 'Reason for revert: <INSERT REASONING HERE>\n\n' +
- 'Original change\'s description:\n' +
- '> Revert "one line commit"\n> \n' +
- '> Change-Id: abcdefg\n> ';
+ 'Reason for revert: <INSERT REASONING HERE>\n';
assert.equal(element.message, expected);
});
});
diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-js-api-interface.js b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-js-api-interface.js
index 06b25de..bb407aa 100644
--- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-js-api-interface.js
+++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-js-api-interface.js
@@ -150,15 +150,15 @@
});
},
- modifyRevertMsg: function(change, msg) {
+ modifyRevertMsg: function(change, revertMsg, origMsg) {
this._getEventCallbacks(EventType.REVERT).forEach(function(callback) {
try {
- msg = callback(change, msg);
+ revertMsg = callback(change, revertMsg, origMsg);
} catch (err) {
console.error(err);
}
});
- return msg;
+ return revertMsg;
},
getLabelValuesPostRevert: function(change) {
diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-js-api-interface_test.html b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-js-api-interface_test.html
index 2e7c53d..766da84 100644
--- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-js-api-interface_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-js-api-interface_test.html
@@ -103,21 +103,23 @@
});
test('revert event', function(done) {
- function appendToRevertMsg(c, msg) {
- return msg + '\ninfo';
+ function appendToRevertMsg(c, revertMsg, originalMsg) {
+ return revertMsg + '\n' + originalMsg.replace(/^/gm, '> ') + '\ninfo';
}
done();
- assert.equal(element.modifyRevertMsg(null, 'test'), 'test');
+ assert.equal(element.modifyRevertMsg(null, 'test', 'origTest'), 'test');
assert.equal(errorStub.callCount, 0);
plugin.on(element.EventType.REVERT, throwErrFn);
plugin.on(element.EventType.REVERT, appendToRevertMsg);
- assert.equal(element.modifyRevertMsg(null, 'test'), 'test\ninfo');
+ assert.equal(element.modifyRevertMsg(null, 'test', 'origTest'),
+ 'test\n> origTest\ninfo');
assert.isTrue(errorStub.calledOnce);
plugin.on(element.EventType.REVERT, appendToRevertMsg);
- assert.equal(element.modifyRevertMsg(null, 'test'), 'test\ninfo\ninfo');
+ assert.equal(element.modifyRevertMsg(null, 'test', 'origTest'),
+ 'test\n> origTest\ninfo\n> origTest\ninfo');
assert.isTrue(errorStub.calledTwice);
});
