public static String getNativeEOLMarker(ISVNOptions options) { if (nativeEOLMarker == null) { nativeEOLMarker = new String(options.getNativeEOL()); } return nativeEOLMarker; }
public static Map computeAutoProperties(ISVNOptions options, File file, Map properties) throws SVNException { properties = options.applyAutoProperties(file, properties); if (!properties.containsKey(SVNProperty.MIME_TYPE)) { String mimeType = SVNFileUtil.detectMimeType(file, options.getFileExtensionsToMimeTypes()); if (mimeType != null) { properties.put(SVNProperty.MIME_TYPE, mimeType); } } if (SVNProperty.isBinaryMimeType((String) properties.get(SVNProperty.MIME_TYPE))) { properties.remove(SVNProperty.EOL_STYLE); properties.remove(SVNProperty.CHARSET); } if (!properties.containsKey(SVNProperty.EXECUTABLE)) { if (SVNFileUtil.isExecutable(file)) { properties.put(SVNProperty.EXECUTABLE, ""); } } return properties; }
public static Collection<String> getGlobalIgnores(ISVNOptions options) { Collection<String> allPatterns = new HashSet<String>(); String[] ignores = options.getIgnorePatterns(); for (int i = 0; ignores != null && i < ignores.length; i++) { allPatterns.add(ignores[i]); } return allPatterns; }
public void changeFileProperty(String commitPath, String name, String value) throws SVNException { myCurrentFile.propertyChanged(name, value); if (myWCAccess.getOptions().isUseCommitTimes() && SVNProperty.COMMITTED_DATE.equals(name)) { myCurrentFile.CommitTime = value; } }
private ISvnMerger createCustomMerger() { if (getOptions() != null && getOptions().getMergerFactory() != null) { ISVNMerger merger = getOptions().getMergerFactory().createMerger(CONFLICT_START, CONFLICT_END, CONFLICT_SEPARATOR); if (merger instanceof ISvnMerger) { return (ISvnMerger) merger; } } return null; }
String[] preservedExts = getOperation().getOptions().getPreservedConflictFileExtensions(); boolean useCommitTimes = getOperation().getOptions().isUseCommitTimes(); Map<String, SVNProperties> iprops = repository.getInheritedProperties("", revnum, null); if (iprops != null && !iprops.isEmpty()) {
String[] preservedExts = getOperation().getOptions().getPreservedConflictFileExtensions(); boolean useCommitTimes = getOperation().getOptions().isUseCommitTimes(); String target; false, serverSupportsDepth, false, dirFetcher, externalsStore, preservedExts, getOperation().getOptions().getConflictResolver());
/** * Returns the encoding used for diff output. * * @return charset name */ public String getEncoding() { if (hasEncoding()) { return myEncoding; } return getOptions().getNativeCharset(); }
String[] preservedExts = getOptions().getPreservedConflictFileExtensions(); SVNRepository repos = createRepository(url, anchorArea.getRoot(), wcAccess, true); boolean serverSupportsDepth = repos.hasCapability(SVNCapability.DEPTH);
myReposUuid = reposUuid; myExternalsStore = externalsStore; myIsUseCommitTimes = myWCContext.getOptions().isUseCommitTimes(); if (myTargetBasename != null) { myTargetAbspath = SVNFileUtil.createFilePath(myTargetAbspath, myTargetBasename); initExcludedDirectoryEntries(dirFetcher); myConflictHandler = myWCContext.getOptions().getConflictResolver(); myInheritableProperties = inheritableProperties;
public static Map computeAutoProperties(ISVNOptions options, File file) { Map properties = options.applyAutoProperties(file, null); if (!properties.containsKey(SVNProperty.MIME_TYPE)) { String mimeType = SVNFileUtil.detectMimeType(file); if (mimeType != null) { properties.put(SVNProperty.MIME_TYPE, mimeType); } } if (SVNProperty.isBinaryMimeType((String) properties.get(SVNProperty.MIME_TYPE))) { properties.remove(SVNProperty.EOL_STYLE); } if (!properties.containsKey(SVNProperty.EXECUTABLE)) { if (SVNFileUtil.isExecutable(file)) { properties.put(SVNProperty.EXECUTABLE, SVNProperty.getValueOfBooleanProperty(SVNProperty.EXECUTABLE)); } } return properties; }
public static String formatHumanDate(Date date, ISVNOptions options) { DateFormat df = HUMAN_FORMAT; if (options != null && options.getKeywordDateFormat() != null) { df = options.getKeywordDateFormat(); } synchronized (df) { return df.format(date != null ? date : NULL); } }
if (getOptions().isAllowAllForwardMergesFromSelf()) { if (targetMergeInfo != null) { targetRangeList = (SVNMergeRangeList) targetMergeInfo.get(mergeInfoPath);
String mimeType = SVNFileUtil.detectMimeType(localAbsPath1, context.getOptions().getFileExtensionsToMimeTypes()); String mimeType = SVNFileUtil.detectMimeType(localAbsPath2, context.getOptions().getFileExtensionsToMimeTypes());
private void changeFileProperty(String name, SVNPropertyValue value, SVNFileInfo fileInfo) { if (!fileInfo.isSkipped) { fileInfo.propertyChanged(name, value); if (myWCAccess.getOptions().isUseCommitTimes() && SVNProperty.COMMITTED_DATE.equals(name)) { fileInfo.commitTime = value.getString(); if (fileInfo.commitTime != null) { fileInfo.commitTime = fileInfo.commitTime.trim(); } } } }
public SVNStatusType mergeProperties(String name, SVNProperties serverBaseProps, SVNProperties baseProps, SVNProperties workingProps, SVNProperties propDiff, String localLabel, String latestLabel, boolean baseMerge, boolean dryRun, SVNLog log) throws SVNException { localLabel = localLabel == null ? "(modified)" : localLabel; latestLabel = latestLabel == null ? "(latest)" : latestLabel; byte[] conflictStart = ("<<<<<<< " + localLabel).getBytes(); byte[] conflictEnd = (">>>>>>> " + latestLabel).getBytes(); byte[] separator = ("=======").getBytes(); ISVNMergerFactory factory = myWCAccess.getOptions().getMergerFactory(); ISVNMerger merger = factory.createMerger(conflictStart, separator, conflictEnd); propDiff = propDiff == null ? new SVNProperties() : propDiff; SVNMergeResult result = merger.mergeProperties(name, workingProps, baseProps, serverBaseProps, propDiff, this, log, baseMerge, dryRun); return result.getMergeStatus(); }
String[] preservedExts = getOperation().getOptions().getPreservedConflictFileExtensions(); boolean useCommitTimes = getOperation().getOptions().isUseCommitTimes();
/** * Returns the encoding used for diff output. * * @return charset name */ public String getEncoding() { if (hasEncoding()) { return myEncoding; } return getOptions().getNativeCharset(); }
String[] preservedExts = getOptions().getPreservedConflictFileExtensions();
Map autoProperties = new HashMap(); if (fileType != SVNFileType.SYMLINK) { autoProperties = getOptions().applyAutoProperties(file, autoProperties); if (!autoProperties.containsKey(SVNProperty.MIME_TYPE)) { mimeType = SVNFileUtil.detectMimeType(file);