Package com.gitblit.utils.DiffUtils

Examples of com.gitblit.utils.DiffUtils.DiffStat

775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
      if (ticket != null) {
        if (ticket.hasPatchsets()) {
          Repository r = repositoryManager.getRepository(repository.name);
          try {
            Patchset patchset = ticket.getCurrentPatchset();
            DiffStat diffStat = DiffUtils.getDiffStat(r, patchset.base, patchset.tip);
            // diffstat could be null if we have ticket data without the
            // commit objects.  e.g. ticket replication without repo
            // mirroring
            if (diffStat != null) {
              ticket.insertions = diffStat.getInsertions();
              ticket.deletions = diffStat.getDeletions();
            }
          } finally {
            r.close();
          }
        }
View Full Code Here
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
    StringBuilder sb = new StringBuilder();
    boolean newTicket = lastChange.isStatusChange() && Status.New == lastChange.getStatus();
    boolean isFastForward = true;
    List<RevCommit> commits = null;
    DiffStat diffstat = null;

    String pattern;
    if (lastChange.hasPatchset()) {
      // patchset uploaded
      Patchset patchset = lastChange.patchset;
      String base = "";
      // determine the changed paths
      Repository repo = null;
      try {
        repo = repositoryManager.getRepository(ticket.repository);
        if (patchset.isFF() && (patchset.rev > 1)) {
          // fast-forward update, just show the new data
          isFastForward = true;
          Patchset prev = ticket.getPatchset(patchset.number, patchset.rev - 1);
          base = prev.tip;
        } else {
          // proposal OR non-fast-forward update
          isFastForward = false;
          base = patchset.base;
        }

        diffstat = DiffUtils.getDiffStat(repo, base, patchset.tip);
        commits = JGitUtils.getRevLog(repo, base, patchset.tip);
      } catch (Exception e) {
        Logger.getLogger(getClass()).error("failed to get changed paths", e);
      } finally {
        if (repo != null) {
          repo.close();
        }
      }

      String compareUrl = ticketService.getCompareUrl(ticket, base, patchset.tip);

      if (newTicket) {
        // new proposal
        pattern = "**{0}** is proposing a change.";
        sb.append(MessageFormat.format(pattern, user.getDisplayName()));
        fieldExclusions.add(Field.status);
        fieldExclusions.add(Field.title);
        fieldExclusions.add(Field.body);
      } else {
        // describe the patchset
        if (patchset.isFF()) {
          pattern = "**{0}** added {1} {2} to patchset {3}.";
          sb.append(MessageFormat.format(pattern, user.getDisplayName(), patchset.added, patchset.added == 1 ? "commit" : "commits", patchset.number));
        } else {
          pattern = "**{0}** uploaded patchset {1}. *({2})*";
          sb.append(MessageFormat.format(pattern, user.getDisplayName(), patchset.number, patchset.type.toString().toUpperCase()));
        }
      }
      sb.append(HARD_BRK);

      sb.append(MessageFormat.format("{0} {1}, {2} {3}, <span style=\"color:darkgreen;\">+{4} insertions</span>, <span style=\"color:darkred;\">-{5} deletions</span> from {6}. [compare]({7})",
          commits.size(), commits.size() == 1 ? "commit" : "commits",
          diffstat.paths.size(),
          diffstat.paths.size() == 1 ? "file" : "files",
          diffstat.getInsertions(),
          diffstat.getDeletions(),
          isFastForward ? "previous revision" : "merge base",
          compareUrl));

      // note commit additions on a rebase,if any
      switch (lastChange.patchset.type) {
View Full Code Here
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
      newPatchset.number = 1;
      newPatchset.rev = 1;
      newPatchset.type = PatchsetType.Proposal;

      // diffstat from merge base
      DiffStat diffStat = DiffUtils.getDiffStat(getRepository(), mergeBase, tip);
      newPatchset.insertions = diffStat.getInsertions();
      newPatchset.deletions = diffStat.getDeletions();
    } else {
      /*
       * PATCHSET UPDATE
       */
      int added = totalCommits - currPatchset.commits;
      boolean ff = JGitUtils.isMergedInto(getRepository(), currPatchset.tip, tip);
      boolean squash = added < 0;
      boolean rebase = !currPatchset.base.equals(mergeBase);

      // determine type, number and rev of the patchset
      if (ff) {
        /*
         * FAST-FORWARD
         * patchset number preserved, rev incremented
         */

        boolean merged = JGitUtils.isMergedInto(getRepository(), currPatchset.tip, ticket.mergeTo);
        if (merged) {
          // current patchset was already merged
          // new patchset, mark as rebase
          newPatchset.type = PatchsetType.Rebase;
          newPatchset.number = currPatchset.number + 1;
          newPatchset.rev = 1;

          // diffstat from parent
          DiffStat diffStat = DiffUtils.getDiffStat(getRepository(), mergeBase, tip);
          newPatchset.insertions = diffStat.getInsertions();
          newPatchset.deletions = diffStat.getDeletions();
        } else {
          // FF update to patchset
          newPatchset.type = PatchsetType.FastForward;
          newPatchset.number = currPatchset.number;
          newPatchset.rev = currPatchset.rev + 1;
          newPatchset.parent = currPatchset.tip;

          // diffstat from parent
          DiffStat diffStat = DiffUtils.getDiffStat(getRepository(), currPatchset.tip, tip);
          newPatchset.insertions = diffStat.getInsertions();
          newPatchset.deletions = diffStat.getDeletions();
        }
      } else {
        /*
         * NON-FAST-FORWARD
         * new patchset, rev 1
         */
        if (rebase && squash) {
          newPatchset.type = PatchsetType.Rebase_Squash;
          newPatchset.number = currPatchset.number + 1;
          newPatchset.rev = 1;
        } else if (squash) {
          newPatchset.type = PatchsetType.Squash;
          newPatchset.number = currPatchset.number + 1;
          newPatchset.rev = 1;
        } else if (rebase) {
          newPatchset.type = PatchsetType.Rebase;
          newPatchset.number = currPatchset.number + 1;
          newPatchset.rev = 1;
        } else {
          newPatchset.type = PatchsetType.Amend;
          newPatchset.number = currPatchset.number + 1;
          newPatchset.rev = 1;
        }

        // diffstat from merge base
        DiffStat diffStat = DiffUtils.getDiffStat(getRepository(), mergeBase, tip);
        newPatchset.insertions = diffStat.getInsertions();
        newPatchset.deletions = diffStat.getDeletions();
      }

      if (added > 0) {
        // ignore squash (negative add)
        newPatchset.added = added;
View Full Code Here
37
38
39
40
41
42
43
  private PathChangeModel path;

  public DiffStatFormatter(String commitId) {
    super(NullOutputStream.INSTANCE);
    diffStat = new DiffStat(commitId);
  }
View Full Code Here
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
      newPatchset.number = 1;
      newPatchset.rev = 1;
      newPatchset.type = PatchsetType.Proposal;

      // diffstat from merge base
      DiffStat diffStat = DiffUtils.getDiffStat(getRepository(), mergeBase, tip);
      newPatchset.insertions = diffStat.getInsertions();
      newPatchset.deletions = diffStat.getDeletions();
    } else {
      /*
       * PATCHSET UPDATE
       */
      int added = totalCommits - currPatchset.commits;
      boolean ff = JGitUtils.isMergedInto(getRepository(), currPatchset.tip, tip);
      boolean squash = added < 0;
      boolean rebase = !currPatchset.base.equals(mergeBase);

      // determine type, number and rev of the patchset
      if (ff) {
        /*
         * FAST-FORWARD
         * patchset number preserved, rev incremented
         */

        boolean merged = JGitUtils.isMergedInto(getRepository(), currPatchset.tip, ticket.mergeTo);
        if (merged) {
          // current patchset was already merged
          // new patchset, mark as rebase
          newPatchset.type = PatchsetType.Rebase;
          newPatchset.number = currPatchset.number + 1;
          newPatchset.rev = 1;

          // diffstat from parent
          DiffStat diffStat = DiffUtils.getDiffStat(getRepository(), mergeBase, tip);
          newPatchset.insertions = diffStat.getInsertions();
          newPatchset.deletions = diffStat.getDeletions();
        } else {
          // FF update to patchset
          newPatchset.type = PatchsetType.FastForward;
          newPatchset.number = currPatchset.number;
          newPatchset.rev = currPatchset.rev + 1;
          newPatchset.parent = currPatchset.tip;

          // diffstat from parent
          DiffStat diffStat = DiffUtils.getDiffStat(getRepository(), currPatchset.tip, tip);
          newPatchset.insertions = diffStat.getInsertions();
          newPatchset.deletions = diffStat.getDeletions();
        }
      } else {
        /*
         * NON-FAST-FORWARD
         * new patchset, rev 1
         */
        if (rebase && squash) {
          newPatchset.type = PatchsetType.Rebase_Squash;
          newPatchset.number = currPatchset.number + 1;
          newPatchset.rev = 1;
        } else if (squash) {
          newPatchset.type = PatchsetType.Squash;
          newPatchset.number = currPatchset.number + 1;
          newPatchset.rev = 1;
        } else if (rebase) {
          newPatchset.type = PatchsetType.Rebase;
          newPatchset.number = currPatchset.number + 1;
          newPatchset.rev = 1;
        } else {
          newPatchset.type = PatchsetType.Amend;
          newPatchset.number = currPatchset.number + 1;
          newPatchset.rev = 1;
        }

        // diffstat from merge base
        DiffStat diffStat = DiffUtils.getDiffStat(getRepository(), mergeBase, tip);
        newPatchset.insertions = diffStat.getInsertions();
        newPatchset.deletions = diffStat.getDeletions();
      }

      if (added > 0) {
        // ignore squash (negative add)
        newPatchset.added = added;
View Full Code Here
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
    StringBuilder sb = new StringBuilder();
    boolean newTicket = lastChange.isStatusChange() && Status.New == lastChange.getStatus();
    boolean isFastForward = true;
    List<RevCommit> commits = null;
    DiffStat diffstat = null;

    String pattern;
    if (lastChange.hasPatchset()) {
      // patchset uploaded
      Patchset patchset = lastChange.patchset;
      String base = "";
      // determine the changed paths
      Repository repo = null;
      try {
        repo = repositoryManager.getRepository(ticket.repository);
        if (patchset.isFF() && (patchset.rev > 1)) {
          // fast-forward update, just show the new data
          isFastForward = true;
          Patchset prev = ticket.getPatchset(patchset.number, patchset.rev - 1);
          base = prev.tip;
        } else {
          // proposal OR non-fast-forward update
          isFastForward = false;
          base = patchset.base;
        }

        diffstat = DiffUtils.getDiffStat(repo, base, patchset.tip);
        commits = JGitUtils.getRevLog(repo, base, patchset.tip);
      } catch (Exception e) {
        Logger.getLogger(getClass()).error("failed to get changed paths", e);
      } finally {
        if (repo != null) {
          repo.close();
        }
      }

      String compareUrl = ticketService.getCompareUrl(ticket, base, patchset.tip);

      if (newTicket) {
        // new proposal
        pattern = "**{0}** is proposing a change.";
        sb.append(MessageFormat.format(pattern, user.getDisplayName()));
        fieldExclusions.add(Field.status);
        fieldExclusions.add(Field.title);
        fieldExclusions.add(Field.body);
      } else {
        // describe the patchset
        if (patchset.isFF()) {
          pattern = "**{0}** added {1} {2} to patchset {3}.";
          sb.append(MessageFormat.format(pattern, user.getDisplayName(), patchset.added, patchset.added == 1 ? "commit" : "commits", patchset.number));
        } else {
          pattern = "**{0}** uploaded patchset {1}. *({2})*";
          sb.append(MessageFormat.format(pattern, user.getDisplayName(), patchset.number, patchset.type.toString().toUpperCase()));
        }
      }
      sb.append(HARD_BRK);

      sb.append(MessageFormat.format("{0} {1}, {2} {3}, <span style=\"color:darkgreen;\">+{4} insertions</span>, <span style=\"color:darkred;\">-{5} deletions</span> from {6}. [compare]({7})",
          commits.size(), commits.size() == 1 ? "commit" : "commits",
          diffstat.paths.size(),
          diffstat.paths.size() == 1 ? "file" : "files",
          diffstat.getInsertions(),
          diffstat.getDeletions(),
          isFastForward ? "previous revision" : "merge base",
          compareUrl));

      // note commit additions on a rebase,if any
      switch (lastChange.patchset.type) {
View Full Code Here
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
      if (ticket != null) {
        if (ticket.hasPatchsets() && updateDiffstats) {
          Repository r = repositoryManager.getRepository(repository.name);
          try {
            Patchset patchset = ticket.getCurrentPatchset();
            DiffStat diffStat = DiffUtils.getDiffStat(r, patchset.base, patchset.tip);
            // diffstat could be null if we have ticket data without the
            // commit objects.  e.g. ticket replication without repo
            // mirroring
            if (diffStat != null) {
              ticket.insertions = diffStat.getInsertions();
              ticket.deletions = diffStat.getDeletions();
            }
          } finally {
            r.close();
          }
        }
View Full Code Here
49
50
51
52
53
54
55
  private int left, right;

  public GitBlitDiffFormatter(OutputStream os, String commitId) {
    super(os);
    this.os = os;
    this.diffStat = new DiffStat(commitId);
  }
View Full Code Here
TOP

Related Classes of com.gitblit.utils.DiffUtils.DiffStat

  • com.gitblit.git.PatchsetReceivePack
  • com.gitblit.tickets.ITicketService
  • com.gitblit.tickets.TicketNotifier
  • com.gitblit.utils.DiffStatFormatter
  • com.gitblit.utils.GitBlitDiffFormatter
    • Copyright © 2018 www.massapicom. All rights reserved.
    All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.