Merge branch 'stable-2.8'
* stable-2.8: Only add "cherry picked from" when cherry picking a merged change Change-Id: Ia07a4dc78e96eeb2b439329c92c73be8f73c2e98
This commit is contained in:
commit
e994c16df9
@ -21,6 +21,7 @@ import com.google.gerrit.client.changes.Util;
|
|||||||
import com.google.gerrit.client.rpc.GerritCallback;
|
import com.google.gerrit.client.rpc.GerritCallback;
|
||||||
import com.google.gerrit.client.ui.CherryPickDialog;
|
import com.google.gerrit.client.ui.CherryPickDialog;
|
||||||
import com.google.gerrit.common.PageLinks;
|
import com.google.gerrit.common.PageLinks;
|
||||||
|
import com.google.gerrit.reviewdb.client.Change;
|
||||||
import com.google.gerrit.reviewdb.client.Project;
|
import com.google.gerrit.reviewdb.client.Project;
|
||||||
import com.google.gwt.user.client.ui.Button;
|
import com.google.gwt.user.client.ui.Button;
|
||||||
|
|
||||||
@ -32,7 +33,7 @@ class CherryPickAction {
|
|||||||
new CherryPickDialog(b, new Project.NameKey(project)) {
|
new CherryPickDialog(b, new Project.NameKey(project)) {
|
||||||
{
|
{
|
||||||
sendButton.setText(Util.C.buttonCherryPickChangeSend());
|
sendButton.setText(Util.C.buttonCherryPickChangeSend());
|
||||||
if (info.status().isClosed()) {
|
if (info.status() == Change.Status.MERGED) {
|
||||||
message.setText(Util.M.cherryPickedChangeDefaultMessage(
|
message.setText(Util.M.cherryPickedChangeDefaultMessage(
|
||||||
commitMessage.trim(),
|
commitMessage.trim(),
|
||||||
revision));
|
revision));
|
||||||
|
Loading…
Reference in New Issue
Block a user