public PullOp setRemote(final Remote remote) { checkNotNull(remote); return setRemote(Suppliers.ofInstance(Optional.of(remote))); }
/** * @param remoteName the name or URL of a remote repository to fetch from * @return {@code this} */ public PullOp setRemote(final String remoteName) { checkNotNull(remoteName); return setRemote(command(RemoteResolve.class).setName(remoteName)); }
/** * @param remoteName the name or URL of a remote repository to fetch from * @return {@code this} */ public PullOp setRemote(final String remoteName) { Preconditions.checkNotNull(remoteName); return setRemote(command(RemoteResolve.class).setName(remoteName)); }
@Test public void testPullMerge() throws Exception { // Add a commit to the remote insertAndAdd(remoteGeogig.geogig, lines3); RevCommit commit = remoteGeogig.geogig.command(CommitOp.class).call(); expectedMaster.addFirst(commit); // Pull the commit PullOp pull = pullOp(); pull.setRemote("origin").call(); Iterator<RevCommit> logs = localGeogig.geogig.command(LogOp.class).call(); List<RevCommit> logged = new ArrayList<RevCommit>(); for (; logs.hasNext();) { logged.add(logs.next()); } assertEquals(expectedMaster, logged); }
@Test public void testPullMerge() throws Exception { // Add a commit to the remote insertAndAdd(remoteGeogig.geogig, lines3); RevCommit commit = commit(remoteGeogig.repo, "lines3"); expectedMaster.addFirst(commit); // Pull the commit PullOp pull = pullOp(); pull.setRemote("origin").call(); List<RevCommit> logged = log(localGeogig.repo); assertEquals(expectedMaster, logged); }
private PullResult pull(final GeogigTransaction context, final Remote remote) throws MergeConflictsException { String fetchSpec = remote.getFetchSpec(); PullResult pullResult = context.command(PullOp.class)// .setAll(false)// .setIncludeIndexes(true)// .setRemote(remote)// .addRefSpec(fetchSpec)// .setNoFastForward(true)// .setMessage(message)// .setProgressListener(getProgressListener())// .call(); return pullResult; }
protected PullResult _call() { if (remote == null) { setRemote("origin");
@Test public void testPullMergeNothingToFetch() throws Exception { // Add a commit to the remote insertAndAdd(remoteGeogig.geogig, lines3); RevCommit commit = commit(remoteGeogig.repo, "lines3"); expectedMaster.addFirst(commit); // call fetch first so the missing objects are already in the local repo fetchOp().call(); // Then Pull should update the target ref even if there's nothing to fetch PullOp pull = pullOp(); pull.setRemote("origin").call(); List<RevCommit> logged = log(localGeogig.repo); assertEquals(expectedMaster, logged); }
.setAuthor(authorName.orNull(), authorEmail.orNull()).setRemote(remoteName) .setAll(fetchAll).addRefSpec(refSpec); try {
/** * Pull from a remote that's not being saved as named remote in the repository */ public @Test void testPullMergeNonPersistedRemote() throws Exception { // Add a commit to the remote insertAndAdd(remoteGeogig.geogig, lines3); RevCommit commit = remoteGeogig.geogig.command(CommitOp.class).call(); expectedMaster.addFirst(commit); Remote removedOrigin = localGeogig.geogig.command(RemoteRemoveOp.class).setName("origin") .call(); assertFalse(localGeogig.geogig.command(RemoteResolve.class).setName("origin").call() .isPresent()); // Pull the commit PullOp pull = pullOp(); pull.setRemote(removedOrigin).call(); List<RevCommit> logged = log(localGeogig.repo); assertEquals(expectedMaster, logged); }
@Test public void testPullMultipleRefspecsNonPersistedRemote() throws Exception { // Add a commit to the remote insertAndAdd(remoteGeogig.geogig, lines3); RevCommit commit = remoteGeogig.geogig.command(CommitOp.class).call(); expectedMaster.addFirst(commit); // remove the remote Remote removedOrigin = localGeogig.geogig.command(RemoteRemoveOp.class).setName("origin") .call(); assertFalse(localGeogig.geogig.command(RemoteResolve.class).setName("origin").call() .isPresent()); // Pull the commit PullOp pull = pullOp(); pull.setRemote(removedOrigin);// client supplied remote pull.addRefSpec("master:newbranch"); pull.addRefSpec("Branch1:newbranch2"); pull.call(); assertTrue(getRef(localGeogig.repo, "refs/remotes/origin/newbranch").isPresent()); assertTrue(getRef(localGeogig.repo, "refs/remotes/origin/newbranch2").isPresent()); assertEquals(7, log(localGeogig.repo).size()); }
pull.setRemote(args.get(0));
pull.setRemote(args.get(0));
pull.setRemote(args.get(0));