opendev/gerrit
Code Issues Proposed changes

Merge changes from topic 'change-kind-in-revision-info'

Browse Source 
* changes:
  ChangeJson: Include change kind in revision info
  ChangeKindCache: Add method to get kind with already opened repo
  ChangeJson: Only open the repository once when creating revision info
  H2CacheImpl: Ignore errors due to renamed classes
  ChangeKind: Move to extension API
This commit is contained in:
Dave Borowitz
2016-07-01 13:57:10 +00:00
committed by Gerrit Code Review
parent d4c01e0bda 4de41115b1
commit 97efc2c000
11 changed files with 116 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/ChangeKind.java Normal file
View File

@@ -0,0 +1,33 @@
// Copyright (C) 2013 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.extensions.client;
/** Operation performed by a change relative to its parent. */
public enum ChangeKind {
/** Nontrivial content changes. */
REWORK,
/** Conflict-free merge between the new parent and the prior patch set. */
TRIVIAL_REBASE,
/** Conflict-free change of first (left) parent of a merge commit. */
MERGE_FIRST_PARENT_UPDATE,
/** Same tree and same parent tree. */
NO_CODE_CHANGE,
/** Same tree, parent tree, same commit message. */
NO_CHANGE
}

3
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/RevisionInfo.java
View File

@@ -14,12 +14,15 @@
package com.google.gerrit.extensions.common;
import com.google.gerrit.extensions.client.ChangeKind;
import java.sql.Timestamp;
import java.util.Map;
public class RevisionInfo {
public transient boolean isCurrent;
public Boolean draft;
public ChangeKind kind;
public int _number;
public Timestamp created;
public AccountInfo uploader;