diff options
| author | Brad Larson <bklarson@gmail.com> | 2011-10-26 21:31:47 -0500 |
|---|---|---|
| committer | Brad Larson <bklarson@gmail.com> | 2011-10-26 22:54:10 -0500 |
| commit | 2af3e9752ceaf836940404e298577654ec99e10e (patch) | |
| tree | 3bf8a7c8867759cb836cd90a8c063ddea1bcdb6f /gerrit-prettify | |
| parent | 86a76eb6c22e8b0237a7c7f48b9521f3f85cdf49 (diff) | |
Fix diffs skipping one line
Don't show '... skipping 1 common line ...'. The text to show this
takes up just as much space as showing the line which was skipped.
Issue: 981
Change-Id: If86eb27dd6734a6826a9ceb379920c7c1d5e4692
Diffstat (limited to 'gerrit-prettify')
| -rw-r--r-- | gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/EditList.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/EditList.java b/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/EditList.java index d41865a8eb..1d23009895 100644 --- a/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/EditList.java +++ b/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/EditList.java @@ -72,13 +72,15 @@ public class EditList { private boolean combineA(final int i) { final Edit s = edits.get(i); final Edit e = edits.get(i - 1); - return s.getBeginA() - e.getEndA() <= 2 * context; + // + 1 to prevent '... skipping 1 common line ...' messages. + return s.getBeginA() - e.getEndA() <= 2 * context + 1; } private boolean combineB(final int i) { final int s = edits.get(i).getBeginB(); final int e = edits.get(i - 1).getEndB(); - return s - e <= 2 * context; + // + 1 to prevent '... skipping 1 common line ...' messages. + return s - e <= 2 * context + 1; } public class Hunk { |