private FetchRecurseSubmodulesMode getRecurseMode(String path) { // Use the caller-specified mode, if set if (submoduleRecurseMode != null) { return submoduleRecurseMode; } // Fall back to submodule.name.fetchRecurseSubmodules, if set FetchRecurseSubmodulesMode mode = repo.getConfig().getEnum( FetchRecurseSubmodulesMode.values(), ConfigConstants.CONFIG_SUBMODULE_SECTION, path, ConfigConstants.CONFIG_KEY_FETCH_RECURSE_SUBMODULES, null); if (mode != null) { return mode; } // Fall back to fetch.recurseSubmodules, if set mode = repo.getConfig().getEnum(FetchRecurseSubmodulesMode.values(), ConfigConstants.CONFIG_FETCH_SECTION, null, ConfigConstants.CONFIG_KEY_RECURSE_SUBMODULES, null); if (mode != null) { return mode; } // Default to on-demand mode return FetchRecurseSubmodulesMode.ON_DEMAND; }
private FetchRecurseSubmodulesMode getRecurseMode(String path) { // Use the caller-specified mode, if set if (submoduleRecurseMode != null) { return submoduleRecurseMode; } // Fall back to submodule.name.fetchRecurseSubmodules, if set FetchRecurseSubmodulesMode mode = repo.getConfig().getEnum( FetchRecurseSubmodulesMode.values(), ConfigConstants.CONFIG_SUBMODULE_SECTION, path, ConfigConstants.CONFIG_KEY_FETCH_RECURSE_SUBMODULES, null); if (mode != null) { return mode; } // Fall back to fetch.recurseSubmodules, if set mode = repo.getConfig().getEnum(FetchRecurseSubmodulesMode.values(), ConfigConstants.CONFIG_FETCH_SECTION, null, ConfigConstants.CONFIG_KEY_RECURSE_SUBMODULES, null); if (mode != null) { return mode; } // Default to on-demand mode return FetchRecurseSubmodulesMode.ON_DEMAND; }
/** * @param local * @param inCore */ protected ResolveMerger(Repository local, boolean inCore) { super(local); SupportedAlgorithm diffAlg = local.getConfig().getEnum( ConfigConstants.CONFIG_DIFF_SECTION, null, ConfigConstants.CONFIG_KEY_ALGORITHM, SupportedAlgorithm.HISTOGRAM); mergeAlgorithm = new MergeAlgorithm(DiffAlgorithm.getAlgorithm(diffAlg)); commitNames = new String[] { "BASE", "OURS", "THEIRS" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ this.inCore = inCore; if (inCore) { implicitDirCache = false; dircache = DirCache.newInCore(); } else { implicitDirCache = true; } }
/** * Compares the RawText of two files and creates a formateted diff to return. * * @param oldText - RawText. * @param newText - RawText. * @return - Formatted diff in a byte[]. * @throws IOException -failed. */ public byte[] getFormatter(final RawText oldText, final RawText newText) throws IOException { if (!isUndefined()) { val diffAlgorithm = DiffAlgorithm.getAlgorithm( git.getRepository().getConfig().getEnum("diff", null, "algorithm", DiffAlgorithm.SupportedAlgorithm.HISTOGRAM)); val editList = diffAlgorithm.diff(RawTextComparator.DEFAULT, oldText, newText); val bytes = new ByteArrayOutputStream(); try (val df = new DiffFormatter(bytes)) { df.setRepository(git.getRepository()); df.format(editList, oldText, newText); df.flush(); return bytes.toByteArray(); } } return StringUtils.EMPTY.getBytes(StandardCharsets.UTF_8); }