Examples of PullResult

Examples of org.eclipse.jgit.api.PullResult

136
137
138
139
140
141
142
143
144
145
146
147
148
149
            repository.incrementOpen();

            Git git = Git.wrap(repository);

            // Pull remote repository
            PullResult pullResult = git.pull().call();

            // Check result
            if (pullResult.getMergeResult().getMergeStatus() == MergeStatus.CONFLICTING || pullResult.getMergeResult().getMergeStatus() == MergeStatus.FAILED) {

                // TODO: How to report failure
                throw new RuntimeException(String.format("Failed to merge changes from %s", gitUri));
            }
View Full Code Here

Examples of org.eclipse.jgit.api.PullResult

140
141
142
143
144
145
146
147
      PullCommand pull = git.pull();
      if (timeout >= 0)
         pull.setTimeout(timeout);
      pull.setProgressMonitor(new TextProgressMonitor());

      PullResult result = pull.call();
      return result;
   }
View Full Code Here

Examples of org.eclipse.jgit.api.PullResult

102
103
104
105
106
107
108
109
      PullCommand pull = git.pull();
      if (timeout >= 0)
         pull.setTimeout(timeout);
      pull.setProgressMonitor(new TextProgressMonitor());

      PullResult result = pull.call();
      return result;
   }
View Full Code Here

Examples of org.eclipse.jgit.api.PullResult

139
140
141
142
143
144
145
146
      PullCommand pull = git.pull();
      if (timeout >= 0)
         pull.setTimeout(timeout);
      pull.setProgressMonitor(new TextProgressMonitor());

      PullResult result = pull.call();
      return result;
   }
View Full Code Here

Examples of org.eclipse.jgit.api.PullResult

140
141
142
143
144
145
146
147
      PullCommand pull = git.pull();
      if (timeout >= 0)
         pull.setTimeout(timeout);
      pull.setProgressMonitor(new TextProgressMonitor());

      PullResult result = pull.call();
      return result;
   }
View Full Code Here

Examples of org.eclipse.jgit.api.PullResult

144
145
146
147
148
149
150
151
      PullCommand pull = git.pull();
      if (timeout >= 0)
         pull.setTimeout(timeout);
      pull.setProgressMonitor(new TextProgressMonitor());

      PullResult result = pull.call();
      return result;
   }
View Full Code Here

Examples of org.eclipse.jgit.api.PullResult

164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
      assertEquals(true, pushStatus.isOK());

      // TODO: replace with RESTful API for git pull when available
      // try to pull - up to date status is expected
      Git git = new Git(getRepositoryForContentLocation(cloneContentLocation));
      PullResult pullResults = git.pull().call();
      assertEquals(Constants.DEFAULT_REMOTE_NAME, pullResults.getFetchedFrom());
      assertEquals(MergeStatus.ALREADY_UP_TO_DATE, pullResults.getMergeResult().getMergeStatus());
      assertNull(pullResults.getRebaseResult());

      // checkout branch which was created a moment ago
      response = checkoutBranch(cloneLocation, BRANCH_NAME);
      assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());

      // TODO: replace with RESTful API for git pull when available
      // try to pull again - now fast forward update is expected
      pullResults = git.pull().call();
      assertEquals(Constants.DEFAULT_REMOTE_NAME, pullResults.getFetchedFrom());
      assertEquals(MergeStatus.FAST_FORWARD, pullResults.getMergeResult().getMergeStatus());
      assertNull(pullResults.getRebaseResult());
    }
  }
View Full Code Here

Examples of org.eclipse.jgit.api.PullResult

84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
            map.put(GitConstants.KEY_COOKIE, cookie.getName() + "=" + cookie.getValue());
            ((TransportHttp) t).setAdditionalHeaders(map);
          }
        }
      });
      PullResult pullResult = pc.call();

      if (monitor.isCanceled()) {
        return new Status(IStatus.CANCEL, GitActivator.PI_GIT, "Cancelled");
      }

      // handle result
      if (pullResult.isSuccessful()) {
        return Status.OK_STATUS;
      }
      FetchResult fetchResult = pullResult.getFetchResult();

      IStatus fetchStatus = FetchJob.handleFetchResult(fetchResult);
      if (!fetchStatus.isOK()) {
        return fetchStatus;
      }

      MergeStatus mergeStatus = pullResult.getMergeResult().getMergeStatus();
      if (!mergeStatus.isSuccessful())
        return new Status(IStatus.ERROR, GitActivator.PI_GIT, mergeStatus.name());
    } finally {
      if (db != null) {
        db.close();
View Full Code Here

Examples of org.eclipse.jgit.api.PullResult

715
716
717
718
719
720
721
722
723
    cfg.setBoolean(ConfigConstants.CONFIG_BRANCH_SECTION, Constants.MASTER, ConfigConstants.CONFIG_KEY_REBASE, false);
    cfg.save();

    // TODO: replace with RESTful API when ready, see bug 339114
    Git git = new Git(r);
    PullResult pullResult = git.pull().call();
    assertEquals(pullResult.getMergeResult().getMergeStatus(), MergeStatus.ALREADY_UP_TO_DATE);
    assertEquals(RepositoryState.SAFE, git.getRepository().getRepositoryState());
  }
View Full Code Here

Examples of org.eclipse.jgit.api.PullResult

530
531
532
533
534
535
536
537
538
539
540
541
    // clone2: pull
    // TODO: replace with REST API for git pull once bug 339114 is fixed
    Repository db2 = getRepositoryForContentLocation(contentLocation2);
    git = new Git(db2);
    PullResult pullResult = git.pull().call();
    assertEquals(pullResult.getMergeResult().getMergeStatus(), MergeStatus.CONFLICTING);

    // this is how EGit checks for conflicts
    cache = db2.readDirCache();
    entry = cache.getEntry("test.txt");
    assertTrue(entry.getStage() > 0);
View Full Code Here
TOP
Copyright © 2018 www.massapi.com. 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.