opendev/gerrit
Code Issues Proposed changes

Merge "SideBySide2: Respect base diff revision for files REST call"

Browse Source
This commit is contained in:
Shawn Pearce
2014-01-27 23:39:36 +00:00
committed by Gerrit Code Review
parent 730725e62b 6d898112f1
commit 057b3e0ed5
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffApi.java
View File

@@ -35,6 +35,15 @@ public class DiffApi {
api.get(NativeMap.copyKeysIntoChildren("path", cb));
}
public static void list(PatchSet.Id id, PatchSet.Id base,
AsyncCallback<NativeMap<FileInfo>> cb) {
RestApi api = ChangeApi.revision(id).view("files");
if (base != null) {
api.addParameter("base", base.get());
}
api.get(NativeMap.copyKeysIntoChildren("path", cb));
}
public static DiffApi diff(PatchSet.Id id, String path) {
return new DiffApi(ChangeApi.revision(id)
.view("files").id(path)

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Header.java
View File

@@ -129,11 +129,9 @@ class Header extends Composite {
@Override
protected void onLoad() {
ChangeApi.revision(patchSetId).view("files").get(
new GerritCallback<NativeMap<FileInfo>>() {
DiffApi.list(patchSetId, base, new GerritCallback<NativeMap<FileInfo>>() {
@Override
public void onSuccess(NativeMap<FileInfo> result) {
result.copyKeysIntoChildren("path");
JsArray<FileInfo> files = result.values();
FileInfo.sortFileInfoByPath(files);
int index = 0; // TODO: Maybe use patchIndex.