return commandName;
}
protected DefaultSVNOptions createClientOptions() throws SVNException {
File configDir = myConfigDir != null ? new File(myConfigDir) : SVNWCUtil.getDefaultConfigurationDirectory();
DefaultSVNOptions options = SVNWCUtil.createDefaultOptions(configDir, true);
options.setAuthStorageEnabled(!myIsNoAuthCache);
if (myIsAutoProps) {
options.setUseAutoProperties(true);
}
if (myIsNoAutoProps) {
options.setUseAutoProperties(false);
}
if (myIsNoUnlock) {
options.setKeepLocks(true);
}
if ((myResolveAccept == SVNConflictAcceptPolicy.UNSPECIFIED && (!options.isInteractiveConflictResolution() || myIsNonInteractive))
|| myResolveAccept == SVNConflictAcceptPolicy.POSTPONE) {
options.setConflictHandler(null);
} else {
if (myIsNonInteractive) {
if (myResolveAccept == SVNConflictAcceptPolicy.EDIT) {
SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.CL_ARG_PARSING_ERROR,
"--accept={0} incompatible with --non-interactive", SVNConflictAcceptPolicy.EDIT);
SVNErrorManager.error(err, SVNLogType.CLIENT);
}
if (myResolveAccept == SVNConflictAcceptPolicy.LAUNCH) {
SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.CL_ARG_PARSING_ERROR,
"--accept={0} incompatible with --non-interactive", SVNConflictAcceptPolicy.LAUNCH);
SVNErrorManager.error(err, SVNLogType.CLIENT);
}
}
options.setConflictHandler(new SVNCommandLineConflictHandler(myResolveAccept, this));
}
return options;
}