opendev/gerrit
Code Issues Proposed changes

Deprecate IgnoreWhitespace enum in favor of Whitespace enum

Browse Source 
The internal IgnoreWhitespace enum was replaced by a new Whitespace
enum which is available in the extension package. The old enum was
still used for the '--ignore-whitespace' option on the GetDiff REST
endpoint. Deprecate this '--ignore-whitespace' option and replace it
with a new '--whitespace' option. This will allow us to set this
option from the Gerrit API, which doesn't have access to the
IgnoreWhitespace enum.

Adapt the client to use the new '--whitespace' option.

Change-Id: Iba38480fc802c141a676de423e5e9beae0020c11
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2016-02-09 17:13:23 +01:00
parent 2676ba980f
commit 0b7c40fa76
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java
View File

@@ -25,6 +25,7 @@ import com.google.common.collect.Maps;
import com.google.gerrit.common.data.PatchScript;
import com.google.gerrit.common.data.PatchScript.DisplayMethod;
import com.google.gerrit.extensions.client.DiffPreferencesInfo;
import com.google.gerrit.extensions.client.DiffPreferencesInfo.Whitespace;
import com.google.gerrit.extensions.common.ChangeType;
import com.google.gerrit.extensions.common.DiffInfo;
import com.google.gerrit.extensions.common.DiffInfo.ContentEntry;
@@ -89,8 +90,12 @@ public class GetDiff implements RestReadView<FileResource> {
@Option(name = "--base", metaVar = "REVISION")
String base;
@Deprecated
@Option(name = "--ignore-whitespace")
IgnoreWhitespace ignoreWhitespace = IgnoreWhitespace.NONE;
IgnoreWhitespace ignoreWhitespace;
@Option(name = "--whitespace")
Whitespace whitespace;
@Option(name = "--context", handler = ContextOptionHandler.class)
int context = DiffPreferencesInfo.DEFAULT_CONTEXT;
@@ -123,7 +128,13 @@ public class GetDiff implements RestReadView<FileResource> {
basePatchSet = baseResource.getPatchSet();
}
DiffPreferencesInfo prefs = new DiffPreferencesInfo();
prefs.ignoreWhitespace = ignoreWhitespace.whitespace;
if (whitespace != null) {
prefs.ignoreWhitespace = whitespace;
} else if (ignoreWhitespace != null) {
prefs.ignoreWhitespace = ignoreWhitespace.whitespace;
} else {
prefs.ignoreWhitespace = Whitespace.IGNORE_ALL;
}
prefs.context = context;
prefs.intralineDifference = intraline;
@@ -368,6 +379,7 @@ public class GetDiff implements RestReadView<FileResource> {
}
}
@Deprecated
enum IgnoreWhitespace {
NONE(DiffPreferencesInfo.Whitespace.IGNORE_NONE),
TRAILING(DiffPreferencesInfo.Whitespace.IGNORE_TRAILING),