@SuppressWarnings("unchecked") private void logDirty(Status status) { Set<String> dirties = dirties(status.getAdded(), status.getChanged(), status.getRemoved(), status.getMissing(), status.getModified(), status.getConflicting(), status.getUntracked()); this.logger.warn(format("Dirty files found: %s", dirties)); }
public static void main(String[] args) throws IOException, GitAPIException { try (Repository repository = CookbookHelper.openJGitCookbookRepository()) { try (Git git = new Git(repository)) { Status status = git.status().call(); System.out.println("Added: " + status.getAdded()); System.out.println("Changed: " + status.getChanged()); System.out.println("Conflicting: " + status.getConflicting()); System.out.println("ConflictingStageState: " + status.getConflictingStageState()); System.out.println("IgnoredNotInIndex: " + status.getIgnoredNotInIndex()); System.out.println("Missing: " + status.getMissing()); System.out.println("Modified: " + status.getModified()); System.out.println("Removed: " + status.getRemoved()); System.out.println("Untracked: " + status.getUntracked()); System.out.println("UntrackedFolders: " + status.getUntrackedFolders()); } } } }
public static ArrayMemory valueOf(Status value) { ArrayMemory memory = new ArrayMemory(); memory.refOfIndex("added").assign(ArrayMemory.ofStringCollection(value.getAdded())); memory.refOfIndex("changed").assign(ArrayMemory.ofStringCollection(value.getChanged())); memory.refOfIndex("conflicting").assign(ArrayMemory.ofStringCollection(value.getConflicting())); memory.refOfIndex("ignoredNotInIndex").assign(ArrayMemory.ofStringCollection(value.getIgnoredNotInIndex())); memory.refOfIndex("missing").assign(ArrayMemory.ofStringCollection(value.getMissing())); memory.refOfIndex("modified").assign(ArrayMemory.ofStringCollection(value.getModified())); memory.refOfIndex("removed").assign(ArrayMemory.ofStringCollection(value.getRemoved())); memory.refOfIndex("uncommittedChanges").assign(ArrayMemory.ofStringCollection(value.getUncommittedChanges())); memory.refOfIndex("untracked").assign(ArrayMemory.ofStringCollection(value.getUntracked())); memory.refOfIndex("untrackedFolders").assign(ArrayMemory.ofStringCollection(value.getUntrackedFolders())); return memory; }
public static void main(String[] args) throws IOException, GitAPIException { try (Repository repository = CookbookHelper.openJGitCookbookRepository()) { try (Git git = new Git(repository)) { Status status = git.status().call(); System.out.println("Added: " + status.getAdded()); System.out.println("Changed: " + status.getChanged()); System.out.println("Conflicting: " + status.getConflicting()); System.out.println("ConflictingStageState: " + status.getConflictingStageState()); System.out.println("IgnoredNotInIndex: " + status.getIgnoredNotInIndex()); System.out.println("Missing: " + status.getMissing()); System.out.println("Modified: " + status.getModified()); System.out.println("Removed: " + status.getRemoved()); System.out.println("Untracked: " + status.getUntracked()); System.out.println("UntrackedFolders: " + status.getUntrackedFolders()); } } } }
public static boolean isRepositoryInDirtyState(Repository repo) throws GitAPIException { Git git = Git.wrap(repo); Status status = git.status().call(); // Git describe doesn't mind about untracked files when checking if // repo is dirty. JGit does this, so we cannot use the isClean method // to get the same behaviour. Instead check dirty state without // status.getUntracked().isEmpty() boolean isDirty = !(status.getAdded().isEmpty() && status.getChanged().isEmpty() && status.getRemoved().isEmpty() && status.getMissing().isEmpty() && status.getModified().isEmpty() && status.getConflicting().isEmpty()); return isDirty; } }
try (Git git = new Git(repository)) { Status status = git.status().call(); Set<String> conflicting = status.getConflicting(); for(String conflict : conflicting) { System.out.println("Conflicting: " + conflict);
public boolean isDirty() throws IOException { Status status = git.status().call(); return !(status.getAdded().isEmpty() && status.getRemoved().isEmpty() && status.getChanged().isEmpty() && status.getMissing().isEmpty() && status.getModified().isEmpty() && status.getConflicting().isEmpty()); }
try (Git git = new Git(repository)) { Status status = git.status().call(); Set<String> conflicting = status.getConflicting(); for(String conflict : conflicting) { System.out.println("Conflicting: " + conflict);
private boolean localRepoIsDirty(Git git) throws GitAPIException { Status status = git.status().call(); List potentialIssues = new ArrayList(); potentialIssues.addAll(status.getConflicting()); potentialIssues.addAll(status.getIgnoredNotInIndex()); potentialIssues.addAll(status.getAdded()); potentialIssues.addAll(status.getChanged()); potentialIssues.addAll(status.getMissing()); potentialIssues.addAll(status.getModified()); potentialIssues.addAll(status.getRemoved()); potentialIssues.addAll(status.getUncommittedChanges()); potentialIssues.addAll(status.getUntracked()); potentialIssues.addAll(status.getUntrackedFolders()); return !potentialIssues.isEmpty(); }
sbInfo.append("Added: ").append(status.getAdded()).append("\n"); sbInfo.append("Changed: ").append(status.getChanged()).append("\n"); sbInfo.append("Conflicting: ").append(status.getConflicting()).append("\n"); sbInfo.append("ConflictingStageState: ").append(status.getConflictingStageState()).append("\n"); sbInfo.append("IgnoredNotInIndex: ").append(status.getIgnoredNotInIndex()).append("\n");
@Override public Set<String> getConflicting() throws RepositoryException { return wrap(() -> git.status().call().getConflicting()); }
public static boolean isRepositoryInDirtyState(Repository repo) throws GitAPIException { Git git = Git.wrap(repo); Status status = git.status().call(); // Git describe doesn't mind about untracked files when checking if // repo is dirty. JGit does this, so we cannot use the isClean method // to get the same behaviour. Instead check dirty state without // status.getUntracked().isEmpty() boolean isDirty = !(status.getAdded().isEmpty() && status.getChanged().isEmpty() && status.getRemoved().isEmpty() && status.getMissing().isEmpty() && status.getModified().isEmpty() && status.getConflicting().isEmpty()); return isDirty; } }
private static void handleMergeConflict(Git git, Context context) { Status status = null; try { status = git.status().call(); ContentResolver resolver = context.getContentResolver(); for (String file : status.getConflicting()) { OrgFile f = new OrgFile(file, resolver); ContentValues values = new ContentValues(); values.put("comment", "conflict"); f.updateFileInDB(resolver, values); } } catch (GitAPIException e1) { e1.printStackTrace(); return; } catch (OrgFileNotFoundException e) { e.printStackTrace(); } }
@SuppressWarnings("unchecked") private void logDirty(Status status) { Set<String> dirties = dirties(status.getAdded(), status.getChanged(), status.getRemoved(), status.getMissing(), status.getModified(), status.getConflicting(), status.getUntracked()); this.logger.warn(String.format("Dirty files found: %s", dirties)); }
private Collection<String> applyStashIfNeeded() throws GitAPIException { if (!git.stashList().call().isEmpty()) { try { git.stashApply().call(); } catch (final Exception e) { val conflicts = git.status().call().getConflicting(); git.close(); return conflicts; } } return new HashSet<>(); }
private void resetLocalRepoToProperState(Git git) throws GitAPIException { log.warn("conflicts in local repo - trying to fix them one by one..."); Status status = git.status().call(); log.info("cleaning up directory.."); Set<String> removedFiles = gitWrapper.cleanDirectories(git); for (String removedFile : removedFiles) { log.info("\t removed {}", removedFile); } ResetCommand reset = gitWrapper.resetRepo(git); reset.setRef(Constants.HEAD); log.info("trying to remove conflicted files from workspace.."); for (String conflictedFile : status.getConflicting()) { log.info("\t resetting {}", conflictedFile); reset.addPath(conflictedFile); } log.info("trying to remove uncommitted files from workspace.."); for (String addedFile : status.getAdded()) { log.info("\t resetting {}", addedFile); reset.addPath(addedFile); } reset.call(); log.info("reverting modified files to latest known state.."); CheckoutCommand checkout = gitWrapper.checkOut(git); for (String modifiedFile : status.getModified()) { log.info("\t reverting {}", modifiedFile); checkout.addPath(modifiedFile); } checkout.call(); }
private List<ScmFile> getFileStati( Status status ) { List<ScmFile> all = new ArrayList<ScmFile>(); addAsScmFiles( all, status.getAdded(), ScmFileStatus.ADDED ); addAsScmFiles( all, status.getChanged(), ScmFileStatus.UPDATED ); addAsScmFiles( all, status.getConflicting(), ScmFileStatus.CONFLICT ); addAsScmFiles( all, status.getModified(), ScmFileStatus.MODIFIED ); addAsScmFiles( all, status.getRemoved(), ScmFileStatus.DELETED ); return all; }
private List<ScmFile> getFileStati( Status status ) { List<ScmFile> all = new ArrayList<ScmFile>(); addAsScmFiles( all, status.getAdded(), ScmFileStatus.ADDED ); addAsScmFiles( all, status.getChanged(), ScmFileStatus.UPDATED ); addAsScmFiles( all, status.getConflicting(), ScmFileStatus.CONFLICT ); addAsScmFiles( all, status.getModified(), ScmFileStatus.MODIFIED ); addAsScmFiles( all, status.getRemoved(), ScmFileStatus.DELETED ); return all; }
private void convertStatus(org.eclipse.jgit.api.Status status) { if (!status.hasUncommittedChanges() && status.isClean()) { mResult.append("Nothing to commit, working directory clean"); return; } // TODO if working dir not clean convertStatusSet("Added files:", status.getAdded()); convertStatusSet("Changed files:", status.getChanged()); convertStatusSet("Removed files:", status.getRemoved()); convertStatusSet("Missing files:", status.getMissing()); convertStatusSet("Modified files:", status.getModified()); convertStatusSet("Conflicting files:", status.getConflicting()); convertStatusSet("Untracked files:", status.getUntracked()); }
private void convertStatus(org.eclipse.jgit.api.Status status) { if (!status.hasUncommittedChanges() && status.isClean()) { mResult.append("Nothing to commit, working directory clean"); return; } // TODO if working dir not clean convertStatusSet("Added files:", status.getAdded()); convertStatusSet("Changed files:", status.getChanged()); convertStatusSet("Removed files:", status.getRemoved()); convertStatusSet("Missing files:", status.getMissing()); convertStatusSet("Modified files:", status.getModified()); convertStatusSet("Conflicting files:", status.getConflicting()); convertStatusSet("Untracked files:", status.getUntracked()); }