diff options
Diffstat (limited to 'src/com/gitblit/utils/PatchFormatter.java')
| -rw-r--r-- | src/com/gitblit/utils/PatchFormatter.java | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/src/com/gitblit/utils/PatchFormatter.java b/src/com/gitblit/utils/PatchFormatter.java index ea13ff7e..daa15aae 100644 --- a/src/com/gitblit/utils/PatchFormatter.java +++ b/src/com/gitblit/utils/PatchFormatter.java @@ -34,9 +34,9 @@ public class PatchFormatter extends DiffFormatter { private final OutputStream os;
- private PatchTouple currentTouple = null;
+ private Map<String, PatchTouple> changes = new HashMap<String, PatchTouple>();
- Map<String, PatchTouple> changes = new HashMap<String, PatchTouple>();
+ private PatchTouple currentTouple;
public PatchFormatter(OutputStream os) {
super(os);
@@ -50,7 +50,8 @@ public class PatchFormatter extends DiffFormatter { }
@Override
- protected void writeLine(final char prefix, final RawText text, final int cur) throws IOException {
+ protected void writeLine(final char prefix, final RawText text, final int cur)
+ throws IOException {
switch (prefix) {
case '+':
currentTouple.insertions++;
@@ -68,9 +69,11 @@ public class PatchFormatter extends DiffFormatter { // I have no idea why that is there. it seems to be a constant.
patch.append("From " + commit.getName() + " Mon Sep 17 00:00:00 2001" + "\n");
patch.append("From: " + JGitUtils.getDisplayName(commit.getAuthorIdent()) + "\n");
- patch.append("Date: " + (new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss Z").format(new Date(commit.getCommitTime() * 1000l))) + "\n");
+ patch.append("Date: "
+ + (new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss Z").format(new Date(commit
+ .getCommitTime() * 1000L))) + "\n");
patch.append("Subject: [PATCH] " + commit.getShortMessage() + "\n");
- patch.append("\n");
+ patch.append('\n');
patch.append("---");
int maxPathLen = 0;
int files = 0;
@@ -93,26 +96,30 @@ public class PatchFormatter extends DiffFormatter { }
for (String path : changes.keySet()) {
PatchTouple touple = changes.get(path);
- patch.append("\n " + StringUtils.rightPad(path, maxPathLen, ' ') + " | " + StringUtils.leftPad("" + touple.total(), 4, ' ') + " " + touple.relativeScale(unit));
+ patch.append("\n " + StringUtils.rightPad(path, maxPathLen, ' ') + " | "
+ + StringUtils.leftPad("" + touple.total(), 4, ' ') + " "
+ + touple.relativeScale(unit));
}
- patch.append(MessageFormat.format("\n {0} files changed, {1} insertions(+), {2} deletions(-)\n\n", files, insertions, deletions));
+ patch.append(MessageFormat.format(
+ "\n {0} files changed, {1} insertions(+), {2} deletions(-)\n\n", files, insertions,
+ deletions));
patch.append(os.toString());
patch.append("\n--\n");
- patch.append(Constants.getRunningVersion());
+ patch.append(Constants.getGitBlitVersion());
return patch.toString();
}
- private class PatchTouple {
- int insertions = 0;
- int deletions = 0;
+ private static class PatchTouple {
+ int insertions;
+ int deletions;
int total() {
return insertions + deletions;
}
String relativeScale(int unit) {
- int plus = (insertions / unit);
- int minus = (deletions / unit);
+ int plus = insertions / unit;
+ int minus = deletions / unit;
StringBuilder sb = new StringBuilder();
for (int i = 0; i < plus; i++) {
sb.append('+');
|