/** * @param pathFilter if specified, only changes that match the filter will be returned * @return an iterator for all of the differences between the work tree and the index based on * the path filter. */ @Override public AutoCloseableIterator<DiffEntry> getUnstaged(final @Nullable String pathFilter) { AutoCloseableIterator<DiffEntry> unstaged = context.command(DiffWorkTree.class) .setFilter(pathFilter).setReportTrees(true).call(); return unstaged; }
/** * @param pathFilter if specified, only changes that match the filter will be returned * @return an iterator for all of the differences between the work tree and the index based on * the path filter. */ @Override public AutoCloseableIterator<DiffEntry> getUnstaged(final @Nullable String pathFilter) { AutoCloseableIterator<DiffEntry> unstaged = context.command(DiffWorkTree.class) .setFilter(pathFilter).setReportTrees(true).call(); return unstaged; }
/** * @see java.util.concurrent.Callable#call() */ protected WorkingTree _call() { if (path != null) { // check that is a valid path NodeRef.checkValidPath(path); Optional<NodeRef> ref = command(FindTreeChild.class).setParent(workingTree().getTree()) .setChildPath(path).call(); Preconditions.checkArgument(ref.isPresent(), "pathspec '%s' did not match any tree", path); Preconditions.checkArgument(ref.get().getType() == TYPE.TREE, "pathspec '%s' did not resolve to a tree", path); } try (final AutoCloseableIterator<DiffEntry> unstaged = command(DiffWorkTree.class) .setFilter(path).call()) { final Iterator<DiffEntry> added = filter(unstaged, new Predicate<DiffEntry>() { @Override public boolean apply(@Nullable DiffEntry input) { return input.changeType().equals(ChangeType.ADDED); } }); workingTree().delete(transform(added, (de) -> de.newPath()), getProgressListener()); } return workingTree(); }
.setFilter(path).call()) { final Iterator<DiffEntry> added = filter(unstaged, new Predicate<DiffEntry>() {
@Override public void write(ResponseWriter writer) throws Exception { writer.start(); if (!currHead.isPresent()) { writer.writeErrors("Repository has no HEAD."); } else { if (currHead.get() instanceof SymRef) { final SymRef headRef = (SymRef) currHead.get(); writer.writeHeaderElements("branch", Ref.localName(headRef.getTarget())); } } writer.writeStaged(geogig.command(DiffIndex.class).addFilter(pathFilter), offset, limit); writer.writeUnstaged(geogig.command(DiffWorkTree.class).setFilter(pathFilter), offset, limit); writer.writeUnmerged(geogig.command(ConflictsQueryOp.class).call(), offset, limit); writer.finish(); } });
} else if (newRefSpec == null) { DiffWorkTree workTreeIndexDiff = command(DiffWorkTree.class).setFilter(pathFilter) .setReportTrees(reportTrees).setPreserveIterationOrder(preserveIterationOrder); if (oldRefSpec != null) {
try { try (AutoCloseableIterator<DiffEntry> unstaged = geogig.command(DiffWorkTree.class) .setFilter(null).call()) { cli.getConsole().println("Unstaged changes after reset:"); while (unstaged.hasNext()) {
try { try (AutoCloseableIterator<DiffEntry> unstaged = geogig.command(DiffWorkTree.class) .setFilter(null).call()) { cli.getConsole().println("Unstaged changes after reset:"); while (unstaged.hasNext()) {
try { try (AutoCloseableIterator<DiffEntry> unstaged = geogig.command(DiffWorkTree.class) .setFilter(null).call()) { cli.getConsole().println("Unstaged changes after reset:"); while (unstaged.hasNext()) {
} else if (newRefSpec == null) { DiffWorkTree workTreeIndexDiff = command(DiffWorkTree.class).setFilter(pathFilter) .setReportTrees(reportTrees).setPreserveIterationOrder(preserveIterationOrder); if (oldRefSpec != null) {
.setFilter(pathFilter).call()) { while (unstaged.hasNext()) { DiffEntry entry = unstaged.next();
.setFilter(pathFilter).call()) { while (unstaged.hasNext()) { DiffEntry entry = unstaged.next();
.setFilter(pathFilter).call()) { while (unstaged.hasNext()) { DiffEntry entry = unstaged.next();