Package org.eclipse.jgit.errors

Examples of org.eclipse.jgit.errors.CheckoutConflictException

396
397
398
399
400
401
402
403
404
405
406
      else
        prescanOneTree();

      if (!conflicts.isEmpty()) {
        if (failOnConflict)
          throw new CheckoutConflictException(conflicts.toArray(new String[conflicts.size()]));
        else
          cleanUpConflicts();
      }

      // update our index
View Full Code Here
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
  private void cleanUpConflicts() throws CheckoutConflictException {
    // TODO: couldn't we delete unsaved worktree content here?
    for (String c : conflicts) {
      File conflict = new File(repo.getWorkTree(), c);
      if (!conflict.delete())
        throw new CheckoutConflictException(MessageFormat.format(
            JGitText.get().cannotDeleteFile, c));
      removeEmptyParents(conflict);
    }
    for (String r : removed) {
      File file = new File(repo.getWorkTree(), r);
      if (!file.delete())
        throw new CheckoutConflictException(
            MessageFormat.format(JGitText.get().cannotDeleteFile,
                file.getAbsolutePath()));
      removeEmptyParents(file);
    }
  }
View Full Code Here
382
383
384
385
386
387
388
389
390
391
392
      prescanOneTree();

    if (!conflicts.isEmpty()) {
      if (failOnConflict) {
        dc.unlock();
        throw new CheckoutConflictException(conflicts.toArray(new String[conflicts.size()]));
      } else
        cleanUpConflicts();
    }

    // update our index
View Full Code Here
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
  private void cleanUpConflicts() throws CheckoutConflictException {
    // TODO: couldn't we delete unsaved worktree content here?
    for (String c : conflicts) {
      File conflict = new File(repo.getWorkTree(), c);
      if (!conflict.delete())
        throw new CheckoutConflictException(MessageFormat.format(
            JGitText.get().cannotDeleteFile, c));
      removeEmptyParents(conflict);
    }
    for (String r : removed) {
      File file = new File(repo.getWorkTree(), r);
      if (!file.delete())
        throw new CheckoutConflictException(
            MessageFormat.format(JGitText.get().cannotDeleteFile,
                file.getAbsolutePath()));
      removeEmptyParents(file);
    }
  }
View Full Code Here
387
388
389
390
391
392
393
394
395
396
397
      prescanOneTree();

    if (!conflicts.isEmpty()) {
      if (failOnConflict) {
        dc.unlock();
        throw new CheckoutConflictException(conflicts.toArray(new String[conflicts.size()]));
      } else
        cleanUpConflicts();
    }

    // update our index
View Full Code Here
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
  private void cleanUpConflicts() throws CheckoutConflictException {
    // TODO: couldn't we delete unsaved worktree content here?
    for (String c : conflicts) {
      File conflict = new File(repo.getWorkTree(), c);
      if (!conflict.delete())
        throw new CheckoutConflictException(MessageFormat.format(
            JGitText.get().cannotDeleteFile, c));
      removeEmptyParents(conflict);
    }
    for (String r : removed) {
      File file = new File(repo.getWorkTree(), r);
      if (!file.delete())
        throw new CheckoutConflictException(
            MessageFormat.format(JGitText.get().cannotDeleteFile,
                file.getAbsolutePath()));
      removeEmptyParents(file);
    }
  }
View Full Code Here
132
133
134
135
136
137
138
139
140
141
142
      prescanOneTree();
    else prescanTwoTrees();
    if (!conflicts.isEmpty()) {
      if (failOnConflict) {
        String[] entries = conflicts.toArray(new String[0]);
        throw new CheckoutConflictException(entries);
      }
    }

    cleanUpConflicts();
    if (head == null)
View Full Code Here
192
193
194
195
196
197
198
199
200
201
202
  private void cleanUpConflicts() throws CheckoutConflictException {
    for (String c : conflicts) {
      File conflict = new File(root, c);
      if (!conflict.delete())
        throw new CheckoutConflictException(MessageFormat.format(JGitText.get().cannotDeleteFile, c));
      removeEmptyParents(conflict);
    }
    for (String r : removed) {
      File file = new File(root, r);
      file.delete();
View Full Code Here
382
383
384
385
386
387
388
389
390
391
392
      prescanOneTree();

    if (!conflicts.isEmpty()) {
      if (failOnConflict) {
        dc.unlock();
        throw new CheckoutConflictException(conflicts.toArray(new String[conflicts.size()]));
      } else
        cleanUpConflicts();
    }

    // update our index
View Full Code Here
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
  private void cleanUpConflicts() throws CheckoutConflictException {
    // TODO: couldn't we delete unsaved worktree content here?
    for (String c : conflicts) {
      File conflict = new File(repo.getWorkTree(), c);
      if (!conflict.delete())
        throw new CheckoutConflictException(MessageFormat.format(
            JGitText.get().cannotDeleteFile, c));
      removeEmptyParents(conflict);
    }
    for (String r : removed) {
      File file = new File(repo.getWorkTree(), r);
      if (!file.delete())
        throw new CheckoutConflictException(
            MessageFormat.format(JGitText.get().cannotDeleteFile,
                file.getAbsolutePath()));
      removeEmptyParents(file);
    }
  }
View Full Code Here
TOP

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

  • org.eclipse.jgit.api.StashApplyCommand
  • org.eclipse.jgit.dircache.DirCacheCheckout
  • org.eclipse.jgit.lib.WorkDirCheckout
  • org.eclipse.orion.server.git.jobs.StashApplyCommand
    • 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.