org.eclipse.jgit.diff.Sequence Java Examples

The following examples show how to use org.eclipse.jgit.diff.Sequence. You can vote up the ones you like or vote down the ones you don't like, and go to the original project or source file by following the links above each example. You may check out the related API usage on the sidebar.
Example #1
Source File: MergeConflict.java    From ParallelGit with Apache License 2.0 5 votes vote down vote up 
@Nonnull
public static Map<String, MergeConflict> readConflicts(ResolveMerger merger) {
  Map<String, MergeConflict> ret = new HashMap<>();
  for(Map.Entry<String, MergeResult<? extends Sequence>> conflict : merger.getMergeResults().entrySet())
    ret.put(toAbsolutePath(conflict.getKey()), new MergeConflict(conflict.getValue(), merger.getCommitNames()));
  return unmodifiableMap(ret);
}
Example #2
Source File: MergeConflict.java    From ParallelGit with Apache License 2.0 5 votes vote down vote up 
@Nonnull
public static Map<String, MergeConflict> readConflicts(ResolveMerger merger) {
  Map<String, MergeConflict> ret = new HashMap<>();
  for(Map.Entry<String, MergeResult<? extends Sequence>> conflict : merger.getMergeResults().entrySet())
    ret.put(toAbsolutePath(conflict.getKey()), new MergeConflict(conflict.getValue(), merger.getCommitNames()));
  return unmodifiableMap(ret);
}
Example #3
Source File: MergeConflict.java    From ParallelGit with Apache License 2.0 4 votes vote down vote up 
private MergeConflict(MergeResult<? extends Sequence> result, String[] names) {
  this.result = result;
  this.names = names;
}
Example #4
Source File: MergeConflict.java    From ParallelGit with Apache License 2.0 4 votes vote down vote up 
private MergeConflict(MergeResult<? extends Sequence> result, String[] names) {
  this.result = result;
  this.names = names;
}
Example #5
Source File: ResolveMerger.java    From onedev with MIT License 2 votes vote down vote up 
/**
 * Get the mergeResults
 *
 * @return the mergeResults
 */
public Map<String, MergeResult<? extends Sequence>> getMergeResults() {
	return mergeResults;
}