| commit | 8b88d567fec0a9cfc030820f076fcca7b021f310 | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <david.pursehouse@sonymobile.com> | Fri Feb 27 04:10:51 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Feb 27 04:10:51 2015 +0000 |
| tree | 6a6e089f6c5f882306efeb2fe7d21fcb85545cb2 | |
| parent | 614f128571cf486e95bfaf1daff6745b3b3d2926 [diff] | |
| parent | 1337e9726bea6d6a88364768546f7a22aa09e7b4 [diff] |
Merge "SiteLibraryLoaderUtil: catch NoSuchFileException when scanning for JARs"
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPick.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPick.java index efcd6d9..f4d1e0a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPick.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPick.java
@@ -102,6 +102,7 @@ return new UiAction.Description() .setLabel("Cherry Pick") .setTitle("Cherry pick change to a different branch") - .setVisible(resource.getControl().getProjectControl().canUpload()); + .setVisible(resource.getControl().getProjectControl().canUpload() + && resource.isCurrent()); } }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Rebase.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Rebase.java index 3f61b01..b0392f7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Rebase.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Rebase.java
@@ -184,6 +184,7 @@ .setLabel("Rebase") .setTitle("Rebase onto tip of branch or parent change") .setVisible(resource.getChange().getStatus().isOpen() + && resource.isCurrent() && resource.getControl().canRebase() && hasOneParent(resource.getPatchSet().getId())); }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/RevisionResource.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/RevisionResource.java index e58d1a1..a18df5b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/RevisionResource.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/RevisionResource.java
@@ -104,4 +104,8 @@ } return s; } + + public boolean isCurrent() { + return ps.getId().equals(getChange().currentPatchSetId()); + } }