Package org.eclipse.jgit.api.errors

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

253
254
255
256
257
258
259
260
261
262
263
        }
      }
    } 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
356
357
358
359
360
361
362
363
364
365
366
          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
317
318
319
320
321
322
323
324
325
326
327
        }
      }
    } 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
239
240
241
242
243
244
245
246
247
248
249
        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
406
407
408
409
410
411
412
413
414
415
416
        }
      }
    } 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
393
394
395
396
397
398
399
400
401
402
403
          commitTree);
      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
260
261
262
263
264
265
266
267
268
269
270
        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
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
          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
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
    FileEntry 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(2, exception.getConflictingPaths().size());
    assertEquals("a", exception.getConflictingPaths().get(0));
    assertEquals("a/c", exception.getConflictingPaths().get(1));
  }
View Full Code Here
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
    FileEntry entry = new FileTreeIterator.FileEntry(new File(
        db.getWorkTree(), "a"), db.getFS());
    assertEquals(FileMode.REGULAR_FILE, 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
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.