Package org.eclipse.team.core.diff

Examples of org.eclipse.team.core.diff.IDiff

126
127
128
129
130
131
132
133
134
135
136
    iProject.refreshLocal(IResource.DEPTH_INFINITE,
        new NullProgressMonitor());

    IMergeContext mergeContext = prepareContext(workspaceFile, HEAD, HEAD);
    IDiff node = mergeContext.getDiffTree().getDiff(workspaceFile);
    assertNotNull(node);
    // First of all, "markAsMerged" is not supposed to have any effect on a
    // folder.
    // Second, it should only be used on IDiff obtained from the context,
    // not created for the occasion.
View Full Code Here
172
173
174
175
176
177
178
179
180
181
182
        new NullProgressMonitor());
    // end setup

    IMergeContext mergeContext = prepareContext(workspaceFile, MASTER,
        BRANCH);
    IDiff node = mergeContext.getDiffTree().getDiff(workspaceFile);
    assertNotNull(node);

    IStatus mergeStatus = mergeContext.merge(node, false,
        new NullProgressMonitor());
    assertEquals(IStatus.OK, mergeStatus.getSeverity());
View Full Code Here
228
229
230
231
232
233
234
235
236
237
238
    iProject.refreshLocal(IResource.DEPTH_INFINITE,
        new NullProgressMonitor());
    // end setup

    IMergeContext mergeContext = prepareModelContext(iFile1, MASTER, BRANCH);
    IDiff node = mergeContext.getDiffTree().getDiff(iFile1);
    assertNotNull(node);
    node = mergeContext.getDiffTree().getDiff(iFile2);
    assertNotNull(node);

    IResourceMappingMerger merger = new SampleModelMerger(
View Full Code Here
282
283
284
285
286
287
288
289
290
291
292
        new NullProgressMonitor());
    // end setup

    IMergeContext mergeContext = prepareContext(workspaceFile, MASTER,
        BRANCH);
    IDiff node = mergeContext.getDiffTree().getDiff(workspaceFile);
    assertNotNull(node);

    IStatus mergeStatus = mergeContext.merge(node, false,
        new NullProgressMonitor());
    assertEquals(IStatus.ERROR, mergeStatus.getSeverity());
View Full Code Here
333
334
335
336
337
338
339
340
341
342
343
    iProject.refreshLocal(IResource.DEPTH_INFINITE,
        new NullProgressMonitor());
    // end setup

    IMergeContext mergeContext = prepareModelContext(iFile1, MASTER, BRANCH);
    IDiff node = mergeContext.getDiffTree().getDiff(iFile1);
    assertNotNull(node);
    node = mergeContext.getDiffTree().getDiff(iFile2);
    assertNotNull(node);

    IResourceMappingMerger merger = new SampleModelMerger(
View Full Code Here
405
406
407
408
409
410
411
412
413
414
415
    iProject.refreshLocal(IResource.DEPTH_INFINITE,
        new NullProgressMonitor());
    // end setup

    IMergeContext mergeContext = prepareModelContext(iFile1, MASTER, BRANCH);
    IDiff node = mergeContext.getDiffTree().getDiff(iFile1);
    assertNotNull(node);
    node = mergeContext.getDiffTree().getDiff(iFile2);
    assertNotNull(node);

    IResourceMappingMerger merger = new SampleModelMerger(
View Full Code Here
351
352
353
354
355
356
357
358
359
360
361
    GitSynchronizeDataSet gsds = new GitSynchronizeDataSet(gsd);
    GitResourceVariantTreeSubscriber subscriber = new GitResourceVariantTreeSubscriber(
        gsds);
    subscriber.init(new NullProgressMonitor());

    IDiff diff = subscriber.getDiff(iFile2);
    assertTrue(diff instanceof IThreeWayDiff);

    IFileRevision sourceRevision = getSource(diff);
    IFileRevision destinationRevision = getDestination(diff);
    IFileRevision baseRevision = getBase(diff);
View Full Code Here
388
389
390
391
392
393
394
395
396
397
398
    if (diff instanceof IResourceDiff)
      return ((IResourceDiff) diff).getBeforeState();

    if (diff instanceof IThreeWayDiff) {
      final IThreeWayDiff twd = (IThreeWayDiff) diff;
      final IDiff localChange = twd.getLocalChange();
      if (localChange instanceof IResourceDiff)
        return ((IResourceDiff) localChange).getAfterState();
    }

    return null;
View Full Code Here
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
    if (diff instanceof IResourceDiff)
      return ((IResourceDiff) diff).getAfterState();

    if (diff instanceof IThreeWayDiff) {
      final IThreeWayDiff twd = (IThreeWayDiff) diff;
      final IDiff remoteChange = twd.getRemoteChange();
      if (remoteChange instanceof IResourceDiff)
        return ((IResourceDiff) remoteChange).getAfterState();

      final IDiff localChange = twd.getLocalChange();
      if (localChange instanceof IResourceDiff)
        return ((IResourceDiff) localChange).getBeforeState();
    }

    return null;
View Full Code Here
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
  }

  private static IFileRevision getBase(IDiff diff) {
    if (diff instanceof IThreeWayDiff) {
      final IThreeWayDiff twd = (IThreeWayDiff) diff;
      final IDiff remoteChange = twd.getRemoteChange();
      if (remoteChange instanceof IResourceDiff)
        return ((IResourceDiff) remoteChange).getBeforeState();

      final IDiff localChange = twd.getLocalChange();
      if (localChange instanceof IResourceDiff)
        return ((IResourceDiff) localChange).getBeforeState();
    }

    return null;
View Full Code Here
TOP

Related Classes of org.eclipse.team.core.diff.IDiff

  • org.eclipse.egit.core.synchronize.GitSubscriberMergeContextTest
  • org.eclipse.egit.core.test.HistoryTest
    • 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.