Package org.eclipse.jgit.errors

Examples of org.eclipse.jgit.errors.UnmergedPathException

395
396
397
398
399
400
401
402
403
404
405
406
407
          if (stage > DirCacheEntry.STAGE_0) {
            if (checkoutStage != null) {
              if (stage == checkoutStage.number)
                checkoutPath(ent, r);
            } else {
              UnmergedPathException e = new UnmergedPathException(
                  ent);
              throw new JGitInternalException(e.getMessage(), e);
            }
          } else {
            checkoutPath(ent, r);
          }
        }
View Full Code Here
352
353
354
355
356
357
358
359
360
361
362
    int size = 0;

    while (entryIdx < endIdx) {
      final DirCacheEntry e = cache[entryIdx];
      if (e.getStage() != 0)
        throw new UnmergedPathException(e);

      final byte[] ep = e.path;
      if (childIdx < childCnt) {
        final DirCacheTree st = children[childIdx];
        if (st.contains(ep, pathOffset, ep.length)) {
View Full Code Here
272
273
274
275
276
277
278
279
280
281
282
          WorkingTreeIterator wtIter = treeWalk.getTree(2,
              WorkingTreeIterator.class);
          if (indexIter != null
              && !indexIter.getDirCacheEntry().isMerged())
            throw new UnmergedPathsException(
                new UnmergedPathException(
                    indexIter.getDirCacheEntry()));
          if (wtIter != null) {
            if (indexIter == null && headIter == null
                && !includeUntracked)
              continue;
View Full Code Here
352
353
354
355
356
357
358
359
360
361
362
    int size = 0;

    while (entryIdx < endIdx) {
      final DirCacheEntry e = cache[entryIdx];
      if (e.getStage() != 0)
        throw new UnmergedPathException(e);

      final byte[] ep = e.path;
      if (childIdx < childCnt) {
        final DirCacheTree st = children[childIdx];
        if (st.contains(ep, pathOffset, ep.length)) {
View Full Code Here
420
421
422
423
424
425
426
427
428
429
430
431
432
          if (stage > DirCacheEntry.STAGE_0) {
            if (checkoutStage != null) {
              if (stage == checkoutStage.number)
                checkoutPath(ent, r);
            } else {
              UnmergedPathException e = new UnmergedPathException(
                  ent);
              throw new JGitInternalException(e.getMessage(), e);
            }
          } else {
            checkoutPath(ent, r);
          }
        }
View Full Code Here
360
361
362
363
364
365
366
367
368
369
370
    int size = 0;

    while (entryIdx < endIdx) {
      final DirCacheEntry e = cache[entryIdx];
      if (e.getStage() != 0)
        throw new UnmergedPathException(e);

      final byte[] ep = e.path;
      if (childIdx < childCnt) {
        final DirCacheTree st = children[childIdx];
        if (st.contains(ep, pathOffset, ep.length)) {
View Full Code Here
249
250
251
252
253
254
255
256
257
258
259
          WorkingTreeIterator wtIter = treeWalk.getTree(2,
              WorkingTreeIterator.class);
          if (headIter != null && indexIter != null && wtIter != null) {
            if (!indexIter.getDirCacheEntry().isMerged())
              throw new UnmergedPathsException(
                  new UnmergedPathException(
                      indexIter.getDirCacheEntry()));
            if (wtIter.idEqual(indexIter)
                || wtIter.idEqual(headIter))
              continue;
            treeWalk.getObjectId(id, 0);
View Full Code Here
250
251
252
253
254
255
256
257
258
259
260
          WorkingTreeIterator wtIter = treeWalk.getTree(2,
              WorkingTreeIterator.class);
          if (indexIter != null
              && !indexIter.getDirCacheEntry().isMerged())
            throw new UnmergedPathsException(
                new UnmergedPathException(
                    indexIter.getDirCacheEntry()));
          if (wtIter != null) {
            if (indexIter == null && headIter == null)
              continue;
            hasChanges = true;
View Full Code Here
395
396
397
398
399
400
401
402
403
404
405
406
407
          if (stage > DirCacheEntry.STAGE_0) {
            if (checkoutStage != null) {
              if (stage == checkoutStage.number)
                checkoutPath(ent, r);
            } else {
              UnmergedPathException e = new UnmergedPathException(
                  ent);
              throw new JGitInternalException(e.getMessage(), e);
            }
          } else {
            checkoutPath(ent, r);
          }
        }
View Full Code Here
TOP

Related Classes of org.eclipse.jgit.errors.UnmergedPathException

  • org.eclipse.jgit.api.CheckoutCommand
  • org.eclipse.jgit.api.StashCreateCommand
  • org.eclipse.jgit.dircache.DirCacheTree
    • 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.