Package org.eclipse.jgit.diff

Examples of org.eclipse.jgit.diff.DiffEntry

608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
    }

    if (n.sourceCommit == null)
      return result(n);

    DiffEntry r = findRename(parent, n.sourceCommit, n.sourcePath);
    if (r == null)
      return result(n);

    if (0 == r.getOldId().prefixCompare(n.sourceBlob)) {
      // A 100% rename without any content change can also
      // skip directly to the parent.
      n.sourceCommit = parent;
      n.sourcePath = PathFilter.create(r.getOldPath());
      push(n);
      return false;
    }

    Candidate next = n.create(parent, PathFilter.create(r.getOldPath()));
    next.sourceBlob = r.getOldId().toObjectId();
    next.renameScore = r.getScore();
    next.loadText(reader);
    return split(next, n);
  }
View Full Code Here
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
      for (int pIdx = 0; pIdx < pCnt; pIdx++) {
        RevCommit parent = n.getParent(pIdx);
        if (ids != null && ids[pIdx] != null)
          continue;

        DiffEntry r = findRename(parent, n.sourceCommit, n.sourcePath);
        if (r == null)
          continue;

        if (n instanceof ReverseCandidate) {
          if (ids == null)
            ids = new ObjectId[pCnt];
          ids[pCnt] = r.getOldId().toObjectId();
        } else if (0 == r.getOldId().prefixCompare(n.sourceBlob)) {
          // A 100% rename without any content change can also
          // skip directly to the parent. Note this bypasses an
          // earlier parent that had the path (above) but did not
          // have an exact content match. For performance reasons
          // we choose to follow the one parent over trying to do
          // possibly both parents.
          n.sourcePath = PathFilter.create(r.getOldPath());
          return blameEntireRegionOnParent(n, parent);
        }

        renames[pIdx] = r;
      }
View Full Code Here
216
217
218
219
220
221
222
223
224
225
226
227
    walk.addTree(commit.getTree());
    walk.addTree(submoduleCommit.getTree());
    walk.setFilter(TreeFilter.ANY_DIFF);
    List<DiffEntry> diffs = DiffEntry.scan(walk);
    assertEquals(1, diffs.size());
    DiffEntry subDiff = diffs.get(0);
    assertEquals(FileMode.MISSING, subDiff.getOldMode());
    assertEquals(FileMode.GITLINK, subDiff.getNewMode());
    assertEquals(ObjectId.zeroId(), subDiff.getOldId().toObjectId());
    assertEquals(commit, subDiff.getNewId().toObjectId());
    assertEquals(path, subDiff.getNewPath());
  }
View Full Code Here
272
273
274
275
276
277
278
279
280
281
282
283
284
    walk.addTree(submoduleAddCommit.getTree());
    walk.addTree(submoduleEditCommit.getTree());
    walk.setFilter(TreeFilter.ANY_DIFF);
    List<DiffEntry> diffs = DiffEntry.scan(walk);
    assertEquals(1, diffs.size());
    DiffEntry subDiff = diffs.get(0);
    assertEquals(FileMode.GITLINK, subDiff.getOldMode());
    assertEquals(FileMode.GITLINK, subDiff.getNewMode());
    assertEquals(commit2, subDiff.getOldId().toObjectId());
    assertEquals(commit, subDiff.getNewId().toObjectId());
    assertEquals(path, subDiff.getNewPath());
    assertEquals(path, subDiff.getOldPath());
  }
View Full Code Here
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
    Assert.assertEquals("Unexpected number of renames. Expected: " +
        expectedRenames.length + ", actual: " + diffCollector.diffs.size(),
        expectedRenames.length, diffCollector.diffs.size());

    for (int i = 0; i < expectedRenames.length; i++) {
      DiffEntry diff = diffCollector.diffs.get(i);
      Assert.assertNotNull(diff);
      String[] split = expectedRenames[i].split("->");

      Assert.assertNotNull(split);
      Assert.assertEquals(2, split.length);
      String src = split[0];
      String target = split[1];

      Assert.assertEquals(src, diff.getOldPath());
      Assert.assertEquals(target, diff.getNewPath());
    }
  }
View Full Code Here
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
    int pageSize = request.getParameter("pageSize") != null ? new Integer(request.getParameter("pageSize")).intValue() : Integer.MAX_VALUE; //$NON-NLS-1$ //$NON-NLS-2$
    int start = pageSize * (page - 1);
    int end = Math.min(pageSize + start, l.size());
    int i = start;
    for (i = start; i < end; i++) {
      DiffEntry entr = l.get(i);
      JSONObject diff = new JSONObject();
      diff.put(ProtocolConstants.KEY_TYPE, org.eclipse.orion.server.git.objects.Diff.TYPE);
      diff.put(GitConstants.KEY_COMMIT_DIFF_NEWPATH, entr.getNewPath());
      diff.put(GitConstants.KEY_COMMIT_DIFF_OLDPATH, entr.getOldPath());
      diff.put(GitConstants.KEY_COMMIT_DIFF_CHANGETYPE, entr.getChangeType().toString());

      // add diff location for the commit
      String path = entr.getChangeType() != ChangeType.DELETE ? entr.getNewPath() : entr.getOldPath();
      diff.put(GitConstants.KEY_DIFF, createDiffLocation(diffLocation, path));
      diff.put(ProtocolConstants.KEY_CONTENT_LOCATION, createContentLocation(cloneLocation, entr, path));

      diffs.put(diff);
    }
View Full Code Here
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
      int page = 1;
      int start = pageSize * (page - 1);
      int end = Math.min(pageSize + start, l.size());
      int i = start;
      for (i = start; i < end; i++) {
        DiffEntry entr = l.get(i);
        JSONObject diff = new JSONObject();
        diff.put(ProtocolConstants.KEY_TYPE, org.eclipse.orion.server.git.objects.Diff.TYPE);
        diff.put(GitConstants.KEY_COMMIT_DIFF_NEWPATH, entr.getNewPath());
        diff.put(GitConstants.KEY_COMMIT_DIFF_OLDPATH, entr.getOldPath());
        diff.put(GitConstants.KEY_COMMIT_DIFF_CHANGETYPE, entr.getChangeType().toString());

        // add diff location for the commit
        String path = entr.getChangeType() != ChangeType.DELETE ? entr.getNewPath() : entr.getOldPath();
        diff.put(GitConstants.KEY_DIFF, createDiffLocation(revCommit.getName(), fromName, path));
        diff.put(ProtocolConstants.KEY_CONTENT_LOCATION, createContentLocation(entr, path));
        diff.put(GitConstants.KEY_TREE, createTreeLocation(path));

        diffs.put(diff);
View Full Code Here
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
    }

    if (n.sourceCommit == null)
      return result(n);

    DiffEntry r = findRename(parent, n.sourceCommit, n.sourcePath);
    if (r == null)
      return result(n);

    if (0 == r.getOldId().prefixCompare(n.sourceBlob)) {
      // A 100% rename without any content change can also
      // skip directly to the parent.
      n.sourceCommit = parent;
      n.sourcePath = PathFilter.create(r.getOldPath());
      push(n);
      return false;
    }

    Candidate next = n.create(parent, PathFilter.create(r.getOldPath()));
    next.sourceBlob = r.getOldId().toObjectId();
    next.renameScore = r.getScore();
    next.loadText(reader);
    return split(next, n);
  }
View Full Code Here
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
        if (parent.has(SEEN))
          continue;
        if (ids != null && ids[pIdx] != null)
          continue;

        DiffEntry r = findRename(parent, n.sourceCommit, n.sourcePath);
        if (r == null)
          continue;

        if (n instanceof ReverseCandidate) {
          if (ids == null)
            ids = new ObjectId[pCnt];
          ids[pCnt] = r.getOldId().toObjectId();
        } else if (0 == r.getOldId().prefixCompare(n.sourceBlob)) {
          // A 100% rename without any content change can also
          // skip directly to the parent. Note this bypasses an
          // earlier parent that had the path (above) but did not
          // have an exact content match. For performance reasons
          // we choose to follow the one parent over trying to do
          // possibly both parents.
          n.sourceCommit = parent;
          n.sourcePath = PathFilter.create(r.getOldPath());
          push(n);
          return false;
        }

        renames[pIdx] = r;
View Full Code Here
455
456
457
458
459
460
461
462
463
464
465
466
  }

  protected String getPreviousPath(Repository repository,
      ObjectReader reader, RevCommit headCommit,
      RevCommit previousCommit, String path) throws IOException {
    DiffEntry diffEntry = CompareCoreUtils.getChangeDiffEntry(repository, path,
        headCommit, previousCommit, reader);
    if (diffEntry != null)
      return diffEntry.getOldPath();
    else
      return path;
  }
View Full Code Here
TOP

Related Classes of org.eclipse.jgit.diff.DiffEntry

  • Main$InsertThread
  • org.dstadler.jgit.porcelain.DiffRenamedFile
  • org.eclipse.egit.ui.internal.actions.RepositoryActionHandler
  • org.eclipse.egit.ui.internal.blame.BlameRevision
  • org.eclipse.egit.ui.internal.history.FileDiff
  • org.eclipse.jgit.api.CommitCommandTest
  • org.eclipse.jgit.api.DiffCommandTest
  • org.eclipse.jgit.blame.BlameGenerator
  • org.eclipse.jgit.lib.MutableObjectId
  • org.eclipse.jgit.revwalk.RevWalkFollowFilterTest
    • 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.