Extract unifiedPatchDetail code to make it more reusable
Much of the code (especially related to comment handling and diff parsing) can be reuesd for different types of output, like the N-way merge diffs or the side-by-side display. By extracting this to a new top-level we can hoist some code into a common base Action class. Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
@@ -58,14 +58,14 @@ public class BaseServiceImplementation {
|
||||
}
|
||||
|
||||
/** Exception whose cause is passed into onFailure. */
|
||||
protected static class Failure extends Exception {
|
||||
public static class Failure extends Exception {
|
||||
public Failure(final Throwable why) {
|
||||
super(why);
|
||||
}
|
||||
}
|
||||
|
||||
/** Arbitrary action to run with a database connection. */
|
||||
protected static interface Action<T> {
|
||||
public static interface Action<T> {
|
||||
/**
|
||||
* Perform this action, returning the onSuccess value.
|
||||
*
|
||||
|
||||
@@ -1,233 +0,0 @@
|
||||
// Copyright 2008 Google Inc.
|
||||
//
|
||||
// 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.server;
|
||||
|
||||
import static org.spearce.jgit.util.RawParseUtils.decode;
|
||||
import static org.spearce.jgit.util.RawParseUtils.nextLF;
|
||||
|
||||
import com.google.gerrit.client.data.AccountInfoCacheFactory;
|
||||
import com.google.gerrit.client.data.PatchLine;
|
||||
import com.google.gerrit.client.data.UnifiedPatchDetail;
|
||||
import com.google.gerrit.client.data.PatchLine.Type;
|
||||
import com.google.gerrit.client.patches.PatchDetailService;
|
||||
import com.google.gerrit.client.reviewdb.Account;
|
||||
import com.google.gerrit.client.reviewdb.Patch;
|
||||
import com.google.gerrit.client.reviewdb.PatchContent;
|
||||
import com.google.gerrit.client.reviewdb.PatchLineComment;
|
||||
import com.google.gerrit.client.reviewdb.ReviewDb;
|
||||
import com.google.gerrit.client.rpc.BaseServiceImplementation;
|
||||
import com.google.gerrit.client.rpc.CorruptEntityException;
|
||||
import com.google.gerrit.client.rpc.NoSuchEntityException;
|
||||
import com.google.gerrit.client.rpc.RpcUtil;
|
||||
import com.google.gwt.user.client.rpc.AsyncCallback;
|
||||
import com.google.gwtorm.client.OrmException;
|
||||
import com.google.gwtorm.client.ResultSet;
|
||||
import com.google.gwtorm.client.SchemaFactory;
|
||||
|
||||
import org.spearce.jgit.lib.Constants;
|
||||
import org.spearce.jgit.patch.CombinedFileHeader;
|
||||
import org.spearce.jgit.patch.FileHeader;
|
||||
import org.spearce.jgit.patch.FormatError;
|
||||
import org.spearce.jgit.patch.HunkHeader;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
public class PatchDetailServiceImpl extends BaseServiceImplementation implements
|
||||
PatchDetailService {
|
||||
public PatchDetailServiceImpl(final SchemaFactory<ReviewDb> rdf) {
|
||||
super(rdf);
|
||||
}
|
||||
|
||||
public void unifiedPatchDetail(final Patch.Id key,
|
||||
final AsyncCallback<UnifiedPatchDetail> callback) {
|
||||
run(callback, new Action<UnifiedPatchDetail>() {
|
||||
public UnifiedPatchDetail run(final ReviewDb db) throws OrmException,
|
||||
Failure {
|
||||
final Patch patch = db.patches().get(key);
|
||||
if (patch == null) {
|
||||
throw new Failure(new NoSuchEntityException());
|
||||
}
|
||||
|
||||
final FileHeader fh = parse(patch, read(db, patch));
|
||||
final int fileCnt;
|
||||
if (fh instanceof CombinedFileHeader) {
|
||||
fileCnt = ((CombinedFileHeader) fh).getParentCount() + 1;
|
||||
} else {
|
||||
fileCnt = 2;
|
||||
}
|
||||
|
||||
final AccountInfoCacheFactory acc = new AccountInfoCacheFactory(db);
|
||||
final HashMap<Integer, List<PatchLineComment>> published[];
|
||||
published = new HashMap[fileCnt];
|
||||
for (int n = 0; n < fileCnt; n++) {
|
||||
published[n] = new HashMap<Integer, List<PatchLineComment>>();
|
||||
}
|
||||
indexComments(published, db.patchComments().published(key));
|
||||
|
||||
final Account.Id me = RpcUtil.getAccountId();
|
||||
final HashMap<Integer, List<PatchLineComment>> drafted[];
|
||||
if (me != null) {
|
||||
drafted = new HashMap[fileCnt];
|
||||
for (int n = 0; n < fileCnt; n++) {
|
||||
drafted[n] = new HashMap<Integer, List<PatchLineComment>>();
|
||||
}
|
||||
indexComments(drafted, db.patchComments().draft(key, me));
|
||||
} else {
|
||||
drafted = null;
|
||||
}
|
||||
|
||||
final byte[] buf = fh.getBuffer();
|
||||
int ptr = fh.getStartOffset();
|
||||
final int end = fh.getEndOffset();
|
||||
final int hdrEnd;
|
||||
final ArrayList<PatchLine> lines = new ArrayList<PatchLine>();
|
||||
|
||||
if (fh.getHunks().size() > 0) {
|
||||
hdrEnd = fh.getHunks().get(0).getStartOffset();
|
||||
} else if (fh.getForwardBinaryHunk() != null) {
|
||||
hdrEnd = fh.getForwardBinaryHunk().getStartOffset();
|
||||
} else if (fh.getReverseBinaryHunk() != null) {
|
||||
hdrEnd = fh.getReverseBinaryHunk().getStartOffset();
|
||||
} else {
|
||||
hdrEnd = end;
|
||||
}
|
||||
|
||||
int eol;
|
||||
for (; ptr < hdrEnd; ptr = eol) {
|
||||
eol = nextLF(buf, ptr);
|
||||
lines.add(new PatchLine(0, 0, Type.FILE_HEADER, decode(
|
||||
Constants.CHARSET, buf, ptr, eol)));
|
||||
}
|
||||
|
||||
for (final HunkHeader h : fh.getHunks()) {
|
||||
final int hunkEnd = h.getEndOffset();
|
||||
if (ptr < hunkEnd) {
|
||||
eol = nextLF(buf, ptr);
|
||||
lines.add(new PatchLine(h.getOldImage().getStartLine(), h
|
||||
.getNewStartLine(), Type.HUNK_HEADER, decode(Constants.CHARSET,
|
||||
buf, ptr, eol)));
|
||||
ptr = eol;
|
||||
}
|
||||
int oldLine = h.getOldImage().getStartLine();
|
||||
int newLine = h.getNewStartLine();
|
||||
SCAN: for (; ptr < hunkEnd; ptr = eol) {
|
||||
eol = nextLF(buf, ptr);
|
||||
final PatchLine.Type type;
|
||||
switch (buf[ptr]) {
|
||||
case ' ':
|
||||
case '\n':
|
||||
oldLine++;
|
||||
newLine++;
|
||||
type = Type.CONTEXT;
|
||||
break;
|
||||
case '-':
|
||||
oldLine++;
|
||||
type = Type.PRE_IMAGE;
|
||||
break;
|
||||
case '+':
|
||||
newLine++;
|
||||
type = Type.POST_IMAGE;
|
||||
break;
|
||||
case '\\':
|
||||
type = Type.CONTEXT;
|
||||
break;
|
||||
default:
|
||||
break SCAN;
|
||||
}
|
||||
|
||||
final PatchLine pLine =
|
||||
new PatchLine(oldLine, newLine, type, decode(Constants.CHARSET,
|
||||
buf, ptr, eol));
|
||||
addComments(acc, pLine, published, 0, oldLine);
|
||||
addComments(acc, pLine, published, 1, newLine);
|
||||
if (drafted != null) {
|
||||
addComments(acc, pLine, drafted, 0, oldLine);
|
||||
addComments(acc, pLine, drafted, 1, newLine);
|
||||
}
|
||||
lines.add(pLine);
|
||||
}
|
||||
}
|
||||
|
||||
final UnifiedPatchDetail d;
|
||||
d = new UnifiedPatchDetail(patch, acc.create());
|
||||
d.setLines(lines);
|
||||
return d;
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
private static void indexComments(
|
||||
final HashMap<Integer, List<PatchLineComment>>[] out,
|
||||
final ResultSet<PatchLineComment> comments) {
|
||||
for (final PatchLineComment c : comments) {
|
||||
if (0 <= c.getSide() && c.getSide() < out.length) {
|
||||
final HashMap<Integer, List<PatchLineComment>> m = out[c.getSide()];
|
||||
List<PatchLineComment> l = m.get(c.getLine());
|
||||
if (l == null) {
|
||||
l = new ArrayList<PatchLineComment>(4);
|
||||
m.put(c.getLine(), l);
|
||||
}
|
||||
l.add(c);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static void addComments(final AccountInfoCacheFactory accountInfo,
|
||||
final PatchLine pLine,
|
||||
final HashMap<Integer, List<PatchLineComment>>[] cache, final int side,
|
||||
final int line) {
|
||||
List<PatchLineComment> l = cache[side].get(line);
|
||||
if (l != null) {
|
||||
for (final PatchLineComment c : l) {
|
||||
pLine.addComment(c);
|
||||
accountInfo.want(c.getAuthor());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static String read(final ReviewDb db, final Patch patch)
|
||||
throws Failure, OrmException {
|
||||
final PatchContent.Key key = patch.getContent();
|
||||
if (key == null) {
|
||||
throw new Failure(new CorruptEntityException(patch.getKey()));
|
||||
}
|
||||
|
||||
final PatchContent pc = db.patchContents().get(key);
|
||||
if (pc == null || pc.getContent() == null) {
|
||||
throw new Failure(new CorruptEntityException(patch.getKey()));
|
||||
}
|
||||
|
||||
return pc.getContent();
|
||||
}
|
||||
|
||||
private static FileHeader parse(final Patch patch, final String content)
|
||||
throws Failure {
|
||||
final byte[] buf = Constants.encode(content);
|
||||
final org.spearce.jgit.patch.Patch p = new org.spearce.jgit.patch.Patch();
|
||||
p.parse(buf, 0, buf.length);
|
||||
for (final FormatError err : p.getErrors()) {
|
||||
if (err.getSeverity() == FormatError.Severity.ERROR) {
|
||||
throw new Failure(new CorruptEntityException(patch.getKey()));
|
||||
}
|
||||
}
|
||||
if (p.getFiles().size() != 1) {
|
||||
throw new Failure(new CorruptEntityException(patch.getKey()));
|
||||
}
|
||||
return p.getFiles().get(0);
|
||||
}
|
||||
}
|
||||
@@ -14,6 +14,8 @@
|
||||
|
||||
package com.google.gerrit.server;
|
||||
|
||||
import com.google.gerrit.server.patch.PatchDetailServiceImpl;
|
||||
|
||||
/** Publishes {@link PatchDetailServiceImpl} over JSON. */
|
||||
public class PatchDetailServiceSrv extends GerritJsonServlet {
|
||||
@Override
|
||||
|
||||
104
webapp/src/com/google/gerrit/server/patch/PatchDetailAction.java
Normal file
104
webapp/src/com/google/gerrit/server/patch/PatchDetailAction.java
Normal file
@@ -0,0 +1,104 @@
|
||||
// Copyright 2008 Google Inc.
|
||||
//
|
||||
// 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.server.patch;
|
||||
|
||||
import com.google.gerrit.client.data.AccountInfoCacheFactory;
|
||||
import com.google.gerrit.client.data.PatchLine;
|
||||
import com.google.gerrit.client.reviewdb.Patch;
|
||||
import com.google.gerrit.client.reviewdb.PatchContent;
|
||||
import com.google.gerrit.client.reviewdb.PatchLineComment;
|
||||
import com.google.gerrit.client.reviewdb.ReviewDb;
|
||||
import com.google.gerrit.client.rpc.CorruptEntityException;
|
||||
import com.google.gerrit.client.rpc.BaseServiceImplementation.Action;
|
||||
import com.google.gerrit.client.rpc.BaseServiceImplementation.Failure;
|
||||
import com.google.gwtorm.client.OrmException;
|
||||
import com.google.gwtorm.client.ResultSet;
|
||||
|
||||
import org.spearce.jgit.lib.Constants;
|
||||
import org.spearce.jgit.patch.FileHeader;
|
||||
import org.spearce.jgit.patch.FormatError;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
abstract class PatchDetailAction<T> implements Action<T> {
|
||||
protected final Patch.Id key;
|
||||
|
||||
PatchDetailAction(Patch.Id key) {
|
||||
this.key = key;
|
||||
}
|
||||
|
||||
protected static void indexComments(
|
||||
final HashMap<Integer, List<PatchLineComment>>[] out,
|
||||
final ResultSet<PatchLineComment> comments) {
|
||||
for (final PatchLineComment c : comments) {
|
||||
if (0 <= c.getSide() && c.getSide() < out.length) {
|
||||
final HashMap<Integer, List<PatchLineComment>> m = out[c.getSide()];
|
||||
List<PatchLineComment> l = m.get(c.getLine());
|
||||
if (l == null) {
|
||||
l = new ArrayList<PatchLineComment>(4);
|
||||
m.put(c.getLine(), l);
|
||||
}
|
||||
l.add(c);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected static void addComments(final AccountInfoCacheFactory accountInfo,
|
||||
final PatchLine pLine,
|
||||
final HashMap<Integer, List<PatchLineComment>>[] cache, final int side,
|
||||
final int line) {
|
||||
List<PatchLineComment> l = cache[side].get(line);
|
||||
if (l != null) {
|
||||
for (final PatchLineComment c : l) {
|
||||
pLine.addComment(c);
|
||||
accountInfo.want(c.getAuthor());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected static String read(final ReviewDb db, final Patch patch)
|
||||
throws Failure, OrmException {
|
||||
final PatchContent.Key key = patch.getContent();
|
||||
if (key == null) {
|
||||
throw new Failure(new CorruptEntityException(patch.getKey()));
|
||||
}
|
||||
|
||||
final PatchContent pc = db.patchContents().get(key);
|
||||
if (pc == null || pc.getContent() == null) {
|
||||
throw new Failure(new CorruptEntityException(patch.getKey()));
|
||||
}
|
||||
|
||||
return pc.getContent();
|
||||
}
|
||||
|
||||
protected static FileHeader parse(final Patch patch, final String content)
|
||||
throws Failure {
|
||||
final byte[] buf = Constants.encode(content);
|
||||
final org.spearce.jgit.patch.Patch p = new org.spearce.jgit.patch.Patch();
|
||||
p.parse(buf, 0, buf.length);
|
||||
for (final FormatError err : p.getErrors()) {
|
||||
if (err.getSeverity() == FormatError.Severity.ERROR) {
|
||||
throw new Failure(new CorruptEntityException(patch.getKey()));
|
||||
}
|
||||
}
|
||||
if (p.getFiles().size() != 1) {
|
||||
throw new Failure(new CorruptEntityException(patch.getKey()));
|
||||
}
|
||||
return p.getFiles().get(0);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
// Copyright 2008 Google Inc.
|
||||
//
|
||||
// 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.server.patch;
|
||||
|
||||
import com.google.gerrit.client.data.UnifiedPatchDetail;
|
||||
import com.google.gerrit.client.patches.PatchDetailService;
|
||||
import com.google.gerrit.client.reviewdb.Patch;
|
||||
import com.google.gerrit.client.reviewdb.ReviewDb;
|
||||
import com.google.gerrit.client.rpc.BaseServiceImplementation;
|
||||
import com.google.gwt.user.client.rpc.AsyncCallback;
|
||||
import com.google.gwtorm.client.SchemaFactory;
|
||||
|
||||
public class PatchDetailServiceImpl extends BaseServiceImplementation implements
|
||||
PatchDetailService {
|
||||
public PatchDetailServiceImpl(final SchemaFactory<ReviewDb> rdf) {
|
||||
super(rdf);
|
||||
}
|
||||
|
||||
public void unifiedPatchDetail(final Patch.Id key,
|
||||
final AsyncCallback<UnifiedPatchDetail> callback) {
|
||||
run(callback, new UnifiedPatchDetailAction(key));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,158 @@
|
||||
// Copyright 2008 Google Inc.
|
||||
//
|
||||
// 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.server.patch;
|
||||
|
||||
import static org.spearce.jgit.util.RawParseUtils.decode;
|
||||
import static org.spearce.jgit.util.RawParseUtils.nextLF;
|
||||
|
||||
import com.google.gerrit.client.data.AccountInfoCacheFactory;
|
||||
import com.google.gerrit.client.data.PatchLine;
|
||||
import com.google.gerrit.client.data.UnifiedPatchDetail;
|
||||
import com.google.gerrit.client.data.PatchLine.Type;
|
||||
import com.google.gerrit.client.reviewdb.Account;
|
||||
import com.google.gerrit.client.reviewdb.Patch;
|
||||
import com.google.gerrit.client.reviewdb.PatchLineComment;
|
||||
import com.google.gerrit.client.reviewdb.ReviewDb;
|
||||
import com.google.gerrit.client.rpc.NoSuchEntityException;
|
||||
import com.google.gerrit.client.rpc.RpcUtil;
|
||||
import com.google.gerrit.client.rpc.BaseServiceImplementation.Failure;
|
||||
import com.google.gwtorm.client.OrmException;
|
||||
|
||||
import org.spearce.jgit.lib.Constants;
|
||||
import org.spearce.jgit.patch.CombinedFileHeader;
|
||||
import org.spearce.jgit.patch.FileHeader;
|
||||
import org.spearce.jgit.patch.HunkHeader;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
class UnifiedPatchDetailAction extends PatchDetailAction<UnifiedPatchDetail> {
|
||||
UnifiedPatchDetailAction(final Patch.Id key) {
|
||||
super(key);
|
||||
}
|
||||
|
||||
public UnifiedPatchDetail run(final ReviewDb db) throws OrmException, Failure {
|
||||
final Patch patch = db.patches().get(key);
|
||||
if (patch == null) {
|
||||
throw new Failure(new NoSuchEntityException());
|
||||
}
|
||||
|
||||
final FileHeader fh = parse(patch, read(db, patch));
|
||||
final int fileCnt;
|
||||
if (fh instanceof CombinedFileHeader) {
|
||||
fileCnt = ((CombinedFileHeader) fh).getParentCount() + 1;
|
||||
} else {
|
||||
fileCnt = 2;
|
||||
}
|
||||
|
||||
final AccountInfoCacheFactory acc = new AccountInfoCacheFactory(db);
|
||||
final HashMap<Integer, List<PatchLineComment>> published[];
|
||||
published = new HashMap[fileCnt];
|
||||
for (int n = 0; n < fileCnt; n++) {
|
||||
published[n] = new HashMap<Integer, List<PatchLineComment>>();
|
||||
}
|
||||
indexComments(published, db.patchComments().published(key));
|
||||
|
||||
final Account.Id me = RpcUtil.getAccountId();
|
||||
final HashMap<Integer, List<PatchLineComment>> drafted[];
|
||||
if (me != null) {
|
||||
drafted = new HashMap[fileCnt];
|
||||
for (int n = 0; n < fileCnt; n++) {
|
||||
drafted[n] = new HashMap<Integer, List<PatchLineComment>>();
|
||||
}
|
||||
indexComments(drafted, db.patchComments().draft(key, me));
|
||||
} else {
|
||||
drafted = null;
|
||||
}
|
||||
|
||||
final byte[] buf = fh.getBuffer();
|
||||
int ptr = fh.getStartOffset();
|
||||
final int end = fh.getEndOffset();
|
||||
final int hdrEnd;
|
||||
final ArrayList<PatchLine> lines = new ArrayList<PatchLine>();
|
||||
|
||||
if (fh.getHunks().size() > 0) {
|
||||
hdrEnd = fh.getHunks().get(0).getStartOffset();
|
||||
} else if (fh.getForwardBinaryHunk() != null) {
|
||||
hdrEnd = fh.getForwardBinaryHunk().getStartOffset();
|
||||
} else if (fh.getReverseBinaryHunk() != null) {
|
||||
hdrEnd = fh.getReverseBinaryHunk().getStartOffset();
|
||||
} else {
|
||||
hdrEnd = end;
|
||||
}
|
||||
|
||||
int eol;
|
||||
for (; ptr < hdrEnd; ptr = eol) {
|
||||
eol = nextLF(buf, ptr);
|
||||
lines.add(new PatchLine(0, 0, Type.FILE_HEADER, decode(Constants.CHARSET,
|
||||
buf, ptr, eol)));
|
||||
}
|
||||
|
||||
for (final HunkHeader h : fh.getHunks()) {
|
||||
final int hunkEnd = h.getEndOffset();
|
||||
if (ptr < hunkEnd) {
|
||||
eol = nextLF(buf, ptr);
|
||||
lines.add(new PatchLine(h.getOldImage().getStartLine(), h
|
||||
.getNewStartLine(), Type.HUNK_HEADER, decode(Constants.CHARSET,
|
||||
buf, ptr, eol)));
|
||||
ptr = eol;
|
||||
}
|
||||
int oldLine = h.getOldImage().getStartLine();
|
||||
int newLine = h.getNewStartLine();
|
||||
SCAN: for (; ptr < hunkEnd; ptr = eol) {
|
||||
eol = nextLF(buf, ptr);
|
||||
final PatchLine.Type type;
|
||||
switch (buf[ptr]) {
|
||||
case ' ':
|
||||
case '\n':
|
||||
oldLine++;
|
||||
newLine++;
|
||||
type = Type.CONTEXT;
|
||||
break;
|
||||
case '-':
|
||||
oldLine++;
|
||||
type = Type.PRE_IMAGE;
|
||||
break;
|
||||
case '+':
|
||||
newLine++;
|
||||
type = Type.POST_IMAGE;
|
||||
break;
|
||||
case '\\':
|
||||
type = Type.CONTEXT;
|
||||
break;
|
||||
default:
|
||||
break SCAN;
|
||||
}
|
||||
|
||||
final PatchLine pLine =
|
||||
new PatchLine(oldLine, newLine, type, decode(Constants.CHARSET,
|
||||
buf, ptr, eol));
|
||||
addComments(acc, pLine, published, 0, oldLine);
|
||||
addComments(acc, pLine, published, 1, newLine);
|
||||
if (drafted != null) {
|
||||
addComments(acc, pLine, drafted, 0, oldLine);
|
||||
addComments(acc, pLine, drafted, 1, newLine);
|
||||
}
|
||||
lines.add(pLine);
|
||||
}
|
||||
}
|
||||
|
||||
final UnifiedPatchDetail d;
|
||||
d = new UnifiedPatchDetail(patch, acc.create());
|
||||
d.setLines(lines);
|
||||
return d;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user