opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.6'

Browse Source 
* stable-2.6:
  Enable expanding skipped lines even if 'Syntax Coloring' is off
  Fix: `gerrit review` with --message does not work with no labels
  Reword 'Working ...' message changes in 2.6 release notes
  TrivialRebase: Support custom labels
  MergeUtil: Remove legacy label ID
  TrivialRebase: Call gerrit review instead of approve
This commit is contained in:
Shawn Pearce
2013-04-22 10:40:10 -07:00
parent 932bfbae82 dbc2f75dc9
commit ec82f0de4f
6 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java
View File

@@ -218,10 +218,8 @@ public class ReviewCommand extends SshCommand {
private void applyReview(final ChangeControl ctl, final PatchSet patchSet,
final PostReview.Input review) throws Exception {
if (!review.labels.isEmpty()) {
reviewProvider.get().apply(new RevisionResource(
new ChangeResource(ctl), patchSet), review);
}
reviewProvider.get().apply(new RevisionResource(
new ChangeResource(ctl), patchSet), review);
}
private void approveOne(final PatchSet patchSet) throws Exception {
@@ -246,7 +244,7 @@ public class ReviewCommand extends SshCommand {
// If review labels are being applied, the comment will be included
// on the review note. We don't need to add it again on the abandon
// or restore comment.
if (!review.labels.isEmpty()) {
if (!review.labels.isEmpty() && (abandonChange || restoreChange)) {
changeComment = null;
}