Package org.eclipse.jgit.api.errors

Examples of org.eclipse.jgit.api.errors.CheckoutConflictException

469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
    entry = new FileTreeIterator.FileEntry(new File(db.getWorkTree(), "a"),
        db.getFS());
    assertEquals(FileMode.TREE, entry.getMode());

    CheckoutConflictException exception = null;
    try {
      git.checkout().setName(branch_1.getName()).call();
    } catch (CheckoutConflictException e) {
      exception = e;
    }
    assertNotNull(exception);
    assertEquals(1, exception.getConflictingPaths().size());
    assertEquals("a", exception.getConflictingPaths().get(0));
  }
View Full Code Here
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
    entry = new FileTreeIterator.FileEntry(new File(db.getWorkTree(), "a"),
        db.getFS());
    assertEquals(FileMode.TREE, entry.getMode());

    CheckoutConflictException exception = null;
    try {
      git.checkout().setName(branch_1.getName()).call();
    } catch (CheckoutConflictException e) {
      exception = e;
    }
    assertNotNull(exception);
    assertEquals(1, exception.getConflictingPaths().size());
    assertEquals("a", exception.getConflictingPaths().get(0));

    // TODO: ideally we'd like to get two paths from this exception
    // assertEquals(2, exception.getConflictingPaths().size());
    // assertEquals("a", exception.getConflictingPaths().get(0));
    // assertEquals("a/c", exception.getConflictingPaths().get(1));
View Full Code Here
174
175
176
177
178
179
180
181
182
183
184
        try {
          dco.checkout();
        } catch (org.eclipse.jgit.errors.CheckoutConflictException e) {
          status = new CheckoutResult(Status.CONFLICTS,
              dco.getConflicts());
          throw new CheckoutConflictException(dco.getConflicts(), e);
        }
      } finally {
        dc.unlock();
      }
      Ref ref = repo.getRef(name);
View Full Code Here
254
255
256
257
258
259
260
261
262
263
264
        }
      }
    } catch (org.eclipse.jgit.errors.CheckoutConflictException e) {
      List<String> conflicts = (dco == null) ? Collections
          .<String> emptyList() : dco.getConflicts();
      throw new CheckoutConflictException(conflicts, e);
    } catch (IOException e) {
      throw new JGitInternalException(
          MessageFormat.format(
              JGitText.get().exceptionCaughtDuringExecutionOfMergeCommand,
              e), e);
View Full Code Here
376
377
378
379
380
381
382
383
384
385
386
          commit.getTree());
      checkout.setFailOnConflict(false);
      try {
        checkout.checkout();
      } catch (org.eclipse.jgit.errors.CheckoutConflictException cce) {
        throw new CheckoutConflictException(checkout.getConflicts(),
            cce);
      }
    } finally {
      dc.unlock();
    }
View Full Code Here
172
173
174
175
176
177
178
179
180
181
182
        try {
          dco.checkout();
        } catch (org.eclipse.jgit.errors.CheckoutConflictException e) {
          status = new CheckoutResult(Status.CONFLICTS,
              dco.getConflicts());
          throw new CheckoutConflictException(dco.getConflicts(), e);
        }
      } finally {
        dc.unlock();
      }
      Ref ref = repo.getRef(name);
View Full Code Here
291
292
293
294
295
296
297
298
299
300
301
        }
      }
    } catch (org.eclipse.jgit.errors.CheckoutConflictException e) {
      List<String> conflicts = (dco == null) ? Collections
          .<String> emptyList() : dco.getConflicts();
      throw new CheckoutConflictException(conflicts, e);
    } catch (IOException e) {
      throw new JGitInternalException(
          MessageFormat.format(
              JGitText.get().exceptionCaughtDuringExecutionOfMergeCommand,
              e), e);
View Full Code Here
378
379
380
381
382
383
384
385
386
387
388
          commit.getTree());
      checkout.setFailOnConflict(false);
      try {
        checkout.checkout();
      } catch (org.eclipse.jgit.errors.CheckoutConflictException cce) {
        throw new CheckoutConflictException(checkout.getConflicts(),
            cce);
      }
    } finally {
      dc.unlock();
    }
View Full Code Here
890
891
892
893
894
895
896
897
898
899
900
          repo.lockDirCache(), commit.getTree());
      dco.setFailOnConflict(true);
      try {
        dco.checkout();
      } catch (org.eclipse.jgit.errors.CheckoutConflictException cce) {
        throw new CheckoutConflictException(dco.getConflicts(), cce);
      }
      // update the HEAD
      RefUpdate refUpdate = repo.updateRef(Constants.HEAD, true);
      refUpdate.setExpectedOldObjectId(head);
      refUpdate.setNewObjectId(commit);
View Full Code Here
389
390
391
392
393
394
395
396
397
398
399
        }
      }
    } catch (org.eclipse.jgit.errors.CheckoutConflictException e) {
      List<String> conflicts = (dco == null) ? Collections
          .<String> emptyList() : dco.getConflicts();
      throw new CheckoutConflictException(conflicts, e);
    } catch (IOException e) {
      throw new JGitInternalException(
          MessageFormat.format(
              JGitText.get().exceptionCaughtDuringExecutionOfMergeCommand,
              e), e);
View Full Code Here
TOP

Related Classes of org.eclipse.jgit.api.errors.CheckoutConflictException

  • org.eclipse.jgit.api.CheckoutCommand
  • org.eclipse.jgit.api.MergeCommand
  • org.eclipse.jgit.api.RebaseCommand
  • org.eclipse.jgit.api.ResetCommand
  • org.eclipse.jgit.pgm.CheckoutTest
    • 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.