This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository svnkit.
commit ad4d6f892ae134a8762682da7ee2e37a099f4772 Merge: 0e33a15 0c0b958 Author: Markus Koschany <[email protected]> Date: Sun Mar 16 13:17:42 2014 +0100 Merge tag 'upstream/1.8.4+dfsg' Imported Upstream version 1.8.4 CHANGES.txt | 81 +- LICENSE.txt | 2 +- README.txt | 5 +- build.gradle | 27 +- gradle/wrapper/gradle-wrapper.properties | 6 + svnkit-cli/build.gradle | 4 + svnkit-cli/src/main/conf/logging.properties | 6 +- .../svn/cli/AbstractSVNCommandEnvironment.java | 2 +- .../java/org/tmatesoft/svn/cli/SVNCommandUtil.java | 22 +- .../svn/cli/SVNConsoleAuthenticationProvider.java | 55 +- .../java/org/tmatesoft/svn/cli/SvnCliTest.java | 46 + .../svn/DefaultSVNCommandLineDiffGenerator.java | 11 +- .../main/java/org/tmatesoft/svn/cli/svn/SVN.java | 7 +- .../org/tmatesoft/svn/cli/svn/SVNAddCommand.java | 7 +- .../org/tmatesoft/svn/cli/svn/SVNBlameCommand.java | 2 +- .../java/org/tmatesoft/svn/cli/svn/SVNCommand.java | 1 + .../svn/cli/svn/SVNCommandEnvironment.java | 69 +- .../svn/cli/svn/SVNCommandLineConflictHandler.java | 129 +- .../tmatesoft/svn/cli/svn/SVNCommitCommand.java | 5 + .../org/tmatesoft/svn/cli/svn/SVNDiffCommand.java | 31 +- .../tmatesoft/svn/cli/svn/SVNImportCommand.java | 2 +- .../org/tmatesoft/svn/cli/svn/SVNInfoCommand.java | 43 + .../org/tmatesoft/svn/cli/svn/SVNListCommand.java | 62 +- .../org/tmatesoft/svn/cli/svn/SVNLogCommand.java | 5 +- .../tmatesoft/svn/cli/svn/SVNMergeInfoCommand.java | 85 +- .../org/tmatesoft/svn/cli/svn/SVNMoveCommand.java | 2 +- .../tmatesoft/svn/cli/svn/SVNNotifyPrinter.java | 130 +- .../java/org/tmatesoft/svn/cli/svn/SVNOption.java | 5 + .../tmatesoft/svn/cli/svn/SVNPropGetCommand.java | 101 +- .../tmatesoft/svn/cli/svn/SVNPropListCommand.java | 127 +- .../tmatesoft/svn/cli/svn/SVNPropSetCommand.java | 38 +- .../svn/cli/svn/SVNPropertiesCommand.java | 4 +- .../tmatesoft/svn/cli/svn/SVNStatusCommand.java | 2 +- .../tmatesoft/svn/cli/svn/SVNStatusPrinter.java | 29 +- .../org/tmatesoft/svn/cli/svn/SVNXMLCommand.java | 19 +- .../org/tmatesoft/svn/cli/svnlook/SVNLook.java | 1 + .../svn/cli/svnlook/SVNLookFileSizeCommand.java | 52 + .../core/internal/server/dav/DAVResourceURI.java | 4 +- svnkit-distribution/build.gradle | 11 +- .../src/main/licenses/LICENSE-JSCH.txt | 30 + .../main/update-site/features/jna-osgi/feature.xml | 4 +- .../update-site/features/svnkit-osgi/feature.xml | 4 +- .../subversion/javahl/JavaHLObjectFactory.java | 10 + .../org/apache/subversion/javahl/SVNClient.java | 116 + .../org/apache/subversion/javahl/SVNRepos.java | 23 + .../javahl/types/JavaHLTypesObjectFactory.java | 14 + .../subversion/javahl/JavaHLObjectFactory.java | 2 +- .../org/tigris/subversion/javahl/SVNClient.java | 16 +- .../tmatesoft/svn/core/javahl/SVNClientImpl.java | 30 +- .../tmatesoft/svn/core/javahl17/SVNClientImpl.java | 535 +- .../tmatesoft/svn/core/javahl17/SVNReposImpl.java | 11 +- svnkit-osgi/build.gradle | 8 +- svnkit-test/build.gradle | 6 +- .../daemon/{matcher.pl => matcher.pl.template} | 0 svnkit-test/configurations/shared/daemon/snapshot | 2 +- svnkit-test/configurations/shared/daemon/template | 29 +- .../configurations/svn16/default.properties | 5 - svnkit-test/configurations/svn17/all.properties | 1 + svnkit-test/configurations/svn17/basic.properties | 9 +- .../{fsfs.properties => check.wc.db.properties} | 9 +- .../configurations/svn17/cmdline/svntest/main.py | 1791 ------- .../configurations/svn17/default.properties | 11 - svnkit-test/configurations/svn17/fsfs.properties | 1 + svnkit-test/nailgun/Makefile | 26 + svnkit-test/nailgun/README.txt | 10 + svnkit-test/nailgun/src/c/ng.c | 638 +++ .../prod/com/martiansoftware/nailgun/Alias.java | 113 + .../com/martiansoftware/nailgun/AliasManager.java | 132 + .../com/martiansoftware/nailgun/LongUtils.java | 61 + .../com/martiansoftware/nailgun/NGConstants.java | 108 + .../com/martiansoftware/nailgun/NGContext.java | 261 + .../martiansoftware/nailgun/NGExitException.java | 47 + .../com/martiansoftware/nailgun/NGInputStream.java | 123 + .../martiansoftware/nailgun/NGOutputStream.java | 76 + .../martiansoftware/nailgun/NGSecurityManager.java | 74 + .../prod/com/martiansoftware/nailgun/NGServer.java | 506 ++ .../com/martiansoftware/nailgun/NGSession.java | 344 ++ .../com/martiansoftware/nailgun/NGSessionPool.java | 122 + .../com/martiansoftware/nailgun/NailStats.java | 130 + .../nailgun/ThreadLocalInputStream.java | 144 + .../nailgun/ThreadLocalPrintStream.java | 261 + .../nailgun/builtins/DefaultNail.java | 37 + .../martiansoftware/nailgun/builtins/NGAlias.java | 82 + .../nailgun/builtins/NGClasspath.java | 77 + .../nailgun/builtins/NGServerStats.java | 54 + .../martiansoftware/nailgun/builtins/NGStop.java | 36 + .../nailgun/builtins/NGVersion.java | 16 + .../nailgun/builtins/builtins.properties | 14 + .../martiansoftware/nailgun/examples/DumpAll.java | 54 + .../com/martiansoftware/nailgun/examples/Echo.java | 36 + .../com/martiansoftware/nailgun/examples/Exit.java | 33 + .../com/martiansoftware/nailgun/examples/Hash.java | 110 + .../nailgun/examples/HelloWorld.java | 31 + .../martiansoftware/nailgun/examples/Prompt.java | 40 + .../martiansoftware/nailgun/examples/Stack.java | 81 + .../nailgun/examples/ThreadTest.java | 54 + .../nailgun/nailgun-version.properties | 3 + .../prod/org/apache/tools/ant/ExitException.java | 97 + .../com/martiansoftware/nailgun/TestAlias.java | 40 + .../martiansoftware/nailgun/TestAliasManager.java | 45 + .../com/martiansoftware/nailgun/TestLongUtils.java | 45 + .../com/martiansoftware/nailgun/TestNGContext.java | 119 + .../martiansoftware/nailgun/TestNGInputStream.java | 70 + .../com/martiansoftware/nailgun/TestNailStats.java | 49 + .../org/tmatesoft/svn/core/test/GitObjectId.java | 18 + .../svn/core/test/GitRepositoryAccess.java | 245 + .../tmatesoft/svn/core/test/NailgunProcessor.java | 1 + .../org/tmatesoft/svn/core/test/PythonTests.java | 689 ++- .../svn/core/test/PythonTestsGitCommitInfo.java | 190 + .../org/tmatesoft/svn/core/test/TestResult.java | 2 +- svnkit/build.gradle | 1 + .../tmatesoft/svn/core/SVNAnnotationGenerator.java | 10 +- .../svn/core/SVNAuthenticationException.java | 4 +- .../org/tmatesoft/svn/core/SVNCancelException.java | 6 +- .../java/org/tmatesoft/svn/core/SVNDirEntry.java | 20 +- .../java/org/tmatesoft/svn/core/SVNErrorCode.java | 6 + .../org/tmatesoft/svn/core/SVNErrorMessage.java | 6 + .../java/org/tmatesoft/svn/core/SVNException.java | 10 +- .../java/org/tmatesoft/svn/core/SVNNodeKind.java | 14 + .../java/org/tmatesoft/svn/core/SVNProperties.java | 6 +- .../java/org/tmatesoft/svn/core/SVNProperty.java | 33 +- .../org/tmatesoft/svn/core/SVNPropertyValue.java | 12 + .../main/java/org/tmatesoft/svn/core/SVNURL.java | 34 +- .../core/auth/ISVNAuthenticationManagerExt.java | 2 +- .../svn/core/auth/SVNSSHAuthentication.java | 22 +- .../svn/core/internal/db/SVNSqlJetDb.java | 25 +- .../core/internal/db/SVNSqlJetSelectStatement.java | 32 +- .../svn/core/internal/db/SVNSqlJetStatement.java | 61 +- .../svn/core/internal/io/dav/DAVCommitEditor.java | 8 +- .../svn/core/internal/io/dav/DAVConnection.java | 14 +- .../svn/core/internal/io/dav/DAVElement.java | 3 + .../svn/core/internal/io/dav/DAVRepository.java | 114 +- .../svn/core/internal/io/dav/DAVResource.java | 4 + .../svn/core/internal/io/dav/DAVUtil.java | 2 + .../internal/io/dav/handlers/DAVEditorHandler.java | 59 +- .../handlers/DAVInheritedPropertiesHandler.java | 91 + .../internal/io/dav/handlers/DAVReplayHandler.java | 2 +- .../http/DefaultHTTPNegotiateAuthentication.java | 26 +- .../internal/io/dav/http/HTTPAuthentication.java | 42 +- .../core/internal/io/dav/http/HTTPConnection.java | 217 +- .../svn/core/internal/io/dav/http/HTTPHeader.java | 18 +- .../io/dav/http/HTTPNTLMAuthentication.java | 30 +- .../io/dav/http/HTTPNativeNTLMAuthentication.java | 8 + .../svn/core/internal/io/dav/http/HTTPParser.java | 8 +- .../svn/core/internal/io/dav/http/HTTPRequest.java | 39 +- .../internal/io/dav/http/HTTPSSLKeyManager.java | 34 +- .../svn/core/internal/io/dav/http/SpoolFile.java | 8 +- .../svn/core/internal/io/fs/FSCommitter.java | 86 +- .../tmatesoft/svn/core/internal/io/fs/FSFS.java | 282 +- .../tmatesoft/svn/core/internal/io/fs/FSFile.java | 107 +- .../svn/core/internal/io/fs/FSOutputStream.java | 26 +- .../svn/core/internal/io/fs/FSPacker.java | 129 +- .../svn/core/internal/io/fs/FSRepository.java | 45 +- .../svn/core/internal/io/fs/FSRepositoryUtil.java | 9 + .../tmatesoft/svn/core/internal/io/fs/FSRoot.java | 5 + .../svn/core/internal/io/fs/FSTransactionRoot.java | 10 +- .../svn/core/internal/io/fs/FSUpdateContext.java | 7 + .../fs/repcache/FSRepresentationCacheManager.java | 6 +- .../io/fs/revprop/SVNFSFSPackedRevProps.java | 472 ++ .../fs/revprop/SVNFSFSPackedRevPropsManifest.java | 130 + .../svn/core/internal/io/svn/SVNConnection.java | 4 +- .../svn/core/internal/io/svn/SVNReader.java | 2 +- .../core/internal/io/svn/SVNRepositoryImpl.java | 47 +- .../svn/core/internal/io/svn/SVNSSHConnector.java | 31 +- .../core/internal/io/svn/SVNSSHPrivateKeyUtil.java | 25 + .../svn/core/internal/io/svn/ssh/SshHost.java | 41 +- .../core/internal/io/svn/ssh/SshSessionPool.java | 33 +- .../core/internal/util/SVNCharsetInputStream.java | 18 +- .../svn/core/internal/util/SVNEncodingUtil.java | 12 +- .../svn/core/internal/util/SVNPathUtil.java | 18 +- .../svn/core/internal/util/SVNSSLUtil.java | 8 + .../tmatesoft/svn/core/internal/util/SVNSkel.java | 120 +- .../svn/core/internal/util/SVNSocketFactory.java | 172 +- .../internal/util/jna/DebugProxyISVNCLibrary.java | 92 + .../internal/util/jna/DebugProxyISVNGLibrary.java | 47 + .../jna/DebugProxyISVNGnomeKeyringLibrary.java | 91 + .../util/jna/DebugProxyISVNKernel32Library.java | 62 + .../util/jna/DebugProxyISVNMacOsCFLibrary.java | 23 + .../jna/DebugProxyISVNMacOsSecurityLibrary.java | 62 + .../util/jna/DebugProxyISVNSecurityLibrary.java | 68 + .../util/jna/DebugProxyISVNWin32Library.java | 29 + .../util/jna/DebugProxyISVNWinCryptLibrary.java | 34 + .../svn/core/internal/util/jna/ISVNGLibrary.java | 7 + .../internal/util/jna/ISVNGnomeKeyringLibrary.java | 7 + .../internal/util/jna/ISVNKernel32Library.java | 11 + .../internal/util/jna/ISVNSecurityLibrary.java | 24 + .../internal/util/jna/ISVNWinCryptLibrary.java | 10 +- .../core/internal/util/jna/JNALibraryLoader.java | 25 +- .../core/internal/util/jna/SVNGnomeKeyring.java | 284 +- .../svn/core/internal/util/jna/SVNJNAUtil.java | 11 +- .../svn/core/internal/util/jna/SVNLinuxUtil.java | 76 +- .../svn/core/internal/util/jna/SVNOS2Util.java | 2 +- .../svn/core/internal/util/jna/SVNWin32Util.java | 30 +- .../svn/core/internal/util/jna/SVNWinCrypt.java | 12 +- .../svn/core/internal/util/jna/SVNWinSecurity.java | 15 +- .../wc/DefaultSVNAuthenticationManager.java | 10 +- .../svn/core/internal/wc/DefaultSVNOptions.java | 2 +- ...DefaultSVNPersistentAuthenticationProvider.java | 38 +- .../internal/wc/DefaultSVNSSLTrustManager.java | 22 +- .../svn/core/internal/wc/ISVNMergeStrategy.java | 1 + .../svn/core/internal/wc/SVNConfigFile.java | 12 + .../svn/core/internal/wc/SVNErrorManager.java | 2 +- .../svn/core/internal/wc/SVNExternal.java | 18 + .../svn/core/internal/wc/SVNFileListUtil.java | 115 +- .../svn/core/internal/wc/SVNFileUtil.java | 173 +- .../svn/core/internal/wc/SVNMergeDriver.java | 200 +- .../svn/core/internal/wc/SVNPropertiesManager.java | 28 +- .../svn/core/internal/wc/SVNRemoteDiffEditor.java | 4 +- .../core/internal/wc/SVNRemoteStatusEditor.java | 14 +- .../svn/core/internal/wc/SVNStatusUtil.java | 7 + .../svn/core/internal/wc/SVNTreeConflictUtil.java | 39 +- .../svn/core/internal/wc/SVNUpdateEditor15.java | 1 - .../svn/core/internal/wc/SVNWCManager.java | 7 +- .../svn/core/internal/wc/admin/SVNAdminArea.java | 72 +- .../svn/core/internal/wc/admin/SVNAdminArea14.java | 53 +- .../internal/wc/admin/SVNChecksumInputStream.java | 2 +- .../svn/core/internal/wc/admin/SVNLogRunner.java | 26 +- .../svn/core/internal/wc/admin/SVNTranslator.java | 38 +- .../core/internal/wc/admin/SVNXMLAdminArea.java | 66 +- .../svn/core/internal/wc16/SVNCommitClient16.java | 300 +- .../svn/core/internal/wc16/SVNCopyClient16.java | 3 + .../svn/core/internal/wc16/SVNLogClient16.java | 2 +- .../svn/core/internal/wc16/SVNUpdateClient16.java | 72 +- .../svn/core/internal/wc16/SVNWCClient16.java | 4 +- .../svn/core/internal/wc17/DefaultSvnMerger.java | 106 +- .../svn/core/internal/wc17/ISVNEditor2.java | 34 + .../internal/wc17/SVNRemoteStatusEditor17.java | 22 +- .../svn/core/internal/wc17/SVNReporter17.java | 49 +- .../svn/core/internal/wc17/SVNStatusEditor17.java | 226 +- .../core/internal/wc17/SVNStatusReporter17.java | 3 + .../core/internal/wc17/SVNTreeConflictEditor.java | 654 +++ .../svn/core/internal/wc17/SVNUpdateEditor17.java | 1058 ++-- .../svn/core/internal/wc17/SVNWCContext.java | 2540 ++++++++-- .../svn/core/internal/wc17/SVNWCUtils.java | 2 +- .../svn/core/internal/wc17/SvnConflictReport.java | 29 + .../wc17/SvnSingleRangeConflictReport.java | 23 + .../svn/core/internal/wc17/db/ISVNWCDb.java | 150 +- .../svn/core/internal/wc17/db/SVNWCDb.java | 5126 ++++++++++++++++---- .../svn/core/internal/wc17/db/SVNWCDbDir.java | 5 +- .../svn/core/internal/wc17/db/SVNWCDbRoot.java | 38 +- .../svn/core/internal/wc17/db/StructureFields.java | 33 +- .../wc17/db/SvnChangelistActualNodesTrigger.java | 1 - .../internal/wc17/db/SvnExternalUpdateEditor.java | 65 +- .../wc17/db/SvnRevertActualNodesTrigger.java | 31 +- .../core/internal/wc17/db/SvnWcDbChangelist.java | 104 +- .../core/internal/wc17/db/SvnWcDbConflicts.java | 943 ++++ .../svn/core/internal/wc17/db/SvnWcDbCopy.java | 257 +- .../core/internal/wc17/db/SvnWcDbExternals.java | 69 +- .../core/internal/wc17/db/SvnWcDbPristines.java | 130 +- .../core/internal/wc17/db/SvnWcDbProperties.java | 314 +- .../svn/core/internal/wc17/db/SvnWcDbReader.java | 55 +- .../svn/core/internal/wc17/db/SvnWcDbRelocate.java | 72 +- .../svn/core/internal/wc17/db/SvnWcDbRevert.java | 428 +- .../svn/core/internal/wc17/db/SvnWcDbShared.java | 393 +- .../internal/wc17/db/SvnWcDbStatementUtil.java | 21 + ...bClearActualNodeLeavingChangelistRecursive.java | 5 +- .../statement/SVNWCDbClearMovedHereRecursive.java | 47 + .../statement/SVNWCDbClearMovedToDescendants.java | 49 + .../db/statement/SVNWCDbClearMovedToRelPath.java | 26 + .../wc17/db/statement/SVNWCDbCopyMoveNode.java | 122 + .../wc17/db/statement/SVNWCDbCreateSchema.java | 37 +- .../db/statement/SVNWCDbDeleteActualEmpties.java | 24 +- .../db/statement/SVNWCDbDeleteActualEmpty.java | 13 +- .../SVNWCDbDeleteActualForBaseRecursive.java | 86 + .../db/statement/SVNWCDbDeleteBaseRecursive.java | 40 + .../SVNWCDbDeleteExternalRegistrations.java | 33 + .../SVNWCDbDeleteFileExternalRegistrations.java | 41 + .../db/statement/SVNWCDbDeleteFileExternals.java | 41 + .../db/statement/SVNWCDbDeleteLockRecursively.java | 39 + .../wc17/db/statement/SVNWCDbDeleteMovedBack.java | 41 + .../db/statement/SVNWCDbDeleteNoLowerLayer.java | 58 + .../SVNWCDbDeleteNodesAboveDepthRecursive.java | 40 + .../statement/SVNWCDbDeleteWorkingBaseDelete.java | 58 + .../db/statement/SVNWCDbDeleteWorkingOpDepth.java | 40 + .../SVNWCDbDeleteWorkingOpDepthAbove.java | 39 + .../statement/SVNWCDbDeleteWorkingRecursive.java | 51 + .../wc17/db/statement/SVNWCDbFindWCLock.java | 30 +- .../wc17/db/statement/SVNWCDbHasLayerBetween.java | 33 + .../SVNWCDbHasServerExcludedDescendants.java | 63 + .../db/statement/SVNWCDbInsertActualEmpties.java | 1 + .../wc17/db/statement/SVNWCDbInsertActualNode.java | 16 +- .../SVNWCDbInsertDeleteFromNodeRecursive.java | 6 +- .../wc17/db/statement/SVNWCDbInsertExternal.java | 104 +- .../db/statement/SVNWCDbInsertExternalUpgrade.java | 172 +- .../wc17/db/statement/SVNWCDbInsertNode.java | 7 +- ...CDbInsertTargetDepthInfinityWithChangelist.java | 12 +- .../db/statement/SVNWCDbInsertUpdateMoveList.java | 36 + .../SVNWCDbInstallWorkingNodeForDelete.java | 21 +- .../db/statement/SVNWCDbNodesStrictOpDepth.java | 27 + .../statement/SVNWCDbReplaceWithBaseDeleted.java | 100 + .../internal/wc17/db/statement/SVNWCDbSchema.java | 15 +- ...va => SVNWCDbSelectActualChildrenConflict.java} | 8 +- .../statement/SVNWCDbSelectActualChildrenInfo.java | 22 +- .../wc17/db/statement/SVNWCDbSelectActualNode.java | 6 +- .../wc17/db/statement/SVNWCDbSelectAllFiles.java | 90 +- .../statement/SVNWCDbSelectBaseChildrenInfo.java | 34 + .../statement/SVNWCDbSelectBaseNodeChildren.java | 11 +- .../SVNWCDbSelectBaseNodeLockTokensRecursive.java | 84 + .../db/statement/SVNWCDbSelectBasePresent.java | 75 + .../db/statement/SVNWCDbSelectChildrenOpDepth.java | 60 + .../SVNWCDbSelectCommittableExternalsBelow.java | 18 + ...SelectCommittableExternalsImmediatelyBelow.java | 190 + .../db/statement/SVNWCDbSelectConflictVictims.java | 36 + .../db/statement/SVNWCDbSelectCopyPristines.java | 149 + .../db/statement/SVNWCDbSelectDeletionInfo.java | 91 +- .../statement/SVNWCDbSelectDeletionInfoScan.java | 69 + .../wc17/db/statement/SVNWCDbSelectDepthNode.java | 39 + .../statement/SVNWCDbSelectHasGrandChildren.java | 45 + .../statement/SVNWCDbSelectHasNonFileChildren.java | 36 + .../statement/SVNWCDbSelectHighestWorkingNode.java | 50 + .../wc17/db/statement/SVNWCDbSelectIPropsNode.java | 75 + .../SVNWCDbSelectLocalRelPathOpDepth.java | 46 + .../statement/SVNWCDbSelectLowestWorkingNode.java | 32 +- .../db/statement/SVNWCDbSelectMinMaxRevisions.java | 106 + .../wc17/db/statement/SVNWCDbSelectMovedBack.java | 153 + .../db/statement/SVNWCDbSelectMovedForDelete.java | 71 + .../statement/SVNWCDbSelectMovedFromRelPath.java | 29 + .../statement/SVNWCDbSelectMovedHereChildren.java | 51 + .../db/statement/SVNWCDbSelectMovedOutside.java | 50 + .../wc17/db/statement/SVNWCDbSelectMovedPair3.java | 50 + .../wc17/db/statement/SVNWCDbSelectMovedTo.java | 23 + .../db/statement/SVNWCDbSelectOpDepthChildren.java | 24 +- .../statement/SVNWCDbSelectOpDepthMovedPair.java | 58 + .../statement/SVNWCDbSelectReposPathRevision.java | 49 + .../db/statement/SVNWCDbSelectUpdateMoveList.java | 29 + .../db/statement/SVNWCDbSelectWCRootNodes.java | 81 + .../wc17/db/statement/SVNWCDbStatements.java | 66 +- .../db/statement/SVNWCDbUpdateActualConflict.java | 33 + .../statement/SVNWCDbUpdateBaseNodeDavCache.java | 88 +- .../wc17/db/statement/SVNWCDbUpdateIProps.java | 30 + .../statement/SVNWCDbUpdateMovedToDescendants.java | 67 + .../db/statement/SVNWCDbUpdateMovedToRelPath.java | 32 + .../db/statement/SVNWCDbUpdateNodeProperties.java | 88 +- .../statement/SVNWCDbUpdateOpDepthRecursive.java | 49 + .../SVNWCDbInsertActualConflictData17.java | 38 + .../SVNWCDbSelectActualChildrenConflict17.java | 36 + .../SVNWCDbSelectActualChildrenInfo17.java | 32 + .../SVNWCDbSelectActualConflictVictims17.java | 29 + .../SVNWCDbSelectConflictVictims17.java | 32 + .../SVNWCDbSelectMovedFromRelPath17.java | 24 + .../SVNWCDbUpdateActualConflictData17.java | 40 + .../svn/core/internal/wc2/ISvnCommitRunner.java | 4 +- .../svn/core/internal/wc2/SvnRepositoryAccess.java | 56 +- .../wc2/admin/SvnRepositoryGetFileSizeImpl.java | 22 + .../svn/core/internal/wc2/compat/SvnCodec.java | 171 +- .../core/internal/wc2/ng/ISvnDiffCallback2.java | 84 + .../wc2/ng/SvnCopyAsChangedDiffCallback.java | 88 + .../svn/core/internal/wc2/ng/SvnDiffCallback.java | 39 +- .../internal/wc2/ng/SvnDiffCallbackResult.java | 5 +- .../internal/wc2/ng/SvnDiffCallbackWrapper.java | 101 + .../svn/core/internal/wc2/ng/SvnDiffEditor.java | 1149 ++--- .../svn/core/internal/wc2/ng/SvnDiffGenerator.java | 135 +- .../svn/core/internal/wc2/ng/SvnDiffSource.java | 29 + .../internal/wc2/ng/SvnDiffStatusReceiver.java | 8 +- .../internal/wc2/ng/SvnDiffSummarizeCallback.java | 109 + .../internal/wc2/ng/SvnFilterDiffCallback.java | 101 + .../core/internal/wc2/ng/SvnNgAbstractUpdate.java | 203 +- .../svn/core/internal/wc2/ng/SvnNgAdd.java | 456 +- .../svn/core/internal/wc2/ng/SvnNgCat.java | 20 +- .../svn/core/internal/wc2/ng/SvnNgCheckout.java | 4 +- .../svn/core/internal/wc2/ng/SvnNgCommit.java | 263 +- .../svn/core/internal/wc2/ng/SvnNgCommitUtil.java | 368 +- .../svn/core/internal/wc2/ng/SvnNgDiff.java | 308 +- .../core/internal/wc2/ng/SvnNgDiffSummarize.java | 383 ++ .../svn/core/internal/wc2/ng/SvnNgDiffUtil.java | 1057 ++++ .../svn/core/internal/wc2/ng/SvnNgDowngrade.java | 174 + .../svn/core/internal/wc2/ng/SvnNgExport.java | 31 +- .../svn/core/internal/wc2/ng/SvnNgGetInfo.java | 8 +- .../core/internal/wc2/ng/SvnNgGetProperties.java | 103 +- .../svn/core/internal/wc2/ng/SvnNgGetStatus.java | 79 +- .../wc2/ng/SvnNgInheritableProperties.java | 93 + .../svn/core/internal/wc2/ng/SvnNgLockUtil.java | 9 +- .../core/internal/wc2/ng/SvnNgLogMergeInfo.java | 99 +- .../core/internal/wc2/ng/SvnNgMarkReplaced.java | 6 +- .../svn/core/internal/wc2/ng/SvnNgMerge.java | 45 +- .../core/internal/wc2/ng/SvnNgMergeCallback.java | 26 +- .../core/internal/wc2/ng/SvnNgMergeCallback2.java | 1533 ++++++ .../svn/core/internal/wc2/ng/SvnNgMergeDriver.java | 1562 +++--- .../svn/core/internal/wc2/ng/SvnNgMergePegged.java | 26 +- .../internal/wc2/ng/SvnNgMergeReintegrate.java | 30 +- .../core/internal/wc2/ng/SvnNgMergeinfoUtil.java | 7 +- .../internal/wc2/ng/SvnNgPropertiesManager.java | 200 +- .../internal/wc2/ng/SvnNgRemoteDiffEditor.java | 6 +- .../internal/wc2/ng/SvnNgRemoteDiffEditor2.java | 504 ++ .../internal/wc2/ng/SvnNgRemoteMergeEditor.java | 492 ++ .../svn/core/internal/wc2/ng/SvnNgRemove.java | 22 +- .../core/internal/wc2/ng/SvnNgReposToWcCopy.java | 482 +- .../svn/core/internal/wc2/ng/SvnNgResolve.java | 21 +- .../svn/core/internal/wc2/ng/SvnNgRevert.java | 187 +- .../svn/core/internal/wc2/ng/SvnNgSetLock.java | 20 +- .../svn/core/internal/wc2/ng/SvnNgUpgrade.java | 210 +- .../svn/core/internal/wc2/ng/SvnNgUpgradeSDb.java | 1787 +++---- .../core/internal/wc2/ng/SvnNgWcToReposCopy.java | 2 +- .../svn/core/internal/wc2/ng/SvnNgWcToWcCopy.java | 544 ++- .../core/internal/wc2/ng/SvnOldDiffGenerator.java | 21 +- .../wc2/ng/SvnReverseOrderDiffCallback.java | 105 + .../svn/core/internal/wc2/old/SvnOldCommit.java | 14 +- .../svn/core/internal/wc2/old/SvnOldImport.java | 6 +- .../core/internal/wc2/old/SvnOldRemoteCopy.java | 1 - .../svn/core/internal/wc2/old/SvnOldUpgrade.java | 67 +- .../internal/wc2/old/SvnOldUpgradeEntries.java | 1466 +++--- .../internal/wc2/remote/SvnRemoteAnnotate.java | 26 +- .../svn/core/internal/wc2/remote/SvnRemoteCat.java | 2 +- .../wc2/remote/SvnRemoteDiffSummarize.java | 193 - .../core/internal/wc2/remote/SvnRemoteGetInfo.java | 13 +- .../wc2/remote/SvnRemoteGetProperties.java | 75 +- .../core/internal/wc2/remote/SvnRemoteList.java | 90 +- .../core/io/ISVNInheritedPropertiesHandler.java | 10 + .../core/io/ISVNWorkingCopyContentMediator.java | 9 + .../org/tmatesoft/svn/core/io/SVNCapability.java | 8 + .../org/tmatesoft/svn/core/io/SVNRepository.java | 59 + .../svn/core/io/SVNRepositoryFactory.java | 2 +- .../svn/core/replicator/SVNReplicationEditor.java | 31 +- .../svn/core/wc/DefaultSVNRepositoryPool.java | 30 +- .../org/tmatesoft/svn/core/wc/SVNCommitClient.java | 212 +- .../org/tmatesoft/svn/core/wc/SVNCommitPacket.java | 32 +- .../tmatesoft/svn/core/wc/SVNConflictReason.java | 17 + .../tmatesoft/svn/core/wc/SVNConflictStats.java | 93 + .../org/tmatesoft/svn/core/wc/SVNCopyClient.java | 96 + .../org/tmatesoft/svn/core/wc/SVNDiffOptions.java | 15 + .../org/tmatesoft/svn/core/wc/SVNEventAction.java | 189 +- .../java/org/tmatesoft/svn/core/wc/SVNInfo.java | 18 + .../org/tmatesoft/svn/core/wc/SVNLogClient.java | 2 + .../java/org/tmatesoft/svn/core/wc/SVNStatus.java | 91 +- .../org/tmatesoft/svn/core/wc/SVNStatusType.java | 37 +- .../org/tmatesoft/svn/core/wc/SVNWCClient.java | 82 +- .../java/org/tmatesoft/svn/core/wc/SVNWCUtil.java | 62 +- .../svn/core/wc/admin/SVNAdminClient.java | 4 +- .../tmatesoft/svn/core/wc/admin/SVNLookClient.java | 70 + .../svn/core/wc2/ISvnCommitParameters.java | 2 - .../org/tmatesoft/svn/core/wc2/ISvnMerger.java | 42 +- .../org/tmatesoft/svn/core/wc2/SvnCheckout.java | 10 + .../org/tmatesoft/svn/core/wc2/SvnChecksum.java | 16 + .../java/org/tmatesoft/svn/core/wc2/SvnCommit.java | 54 + .../org/tmatesoft/svn/core/wc2/SvnCommitItem.java | 15 +- .../tmatesoft/svn/core/wc2/SvnCommitPacket.java | 141 +- .../java/org/tmatesoft/svn/core/wc2/SvnCopy.java | 28 + .../org/tmatesoft/svn/core/wc2/SvnGetInfo.java | 9 +- .../tmatesoft/svn/core/wc2/SvnGetProperties.java | 11 + .../java/org/tmatesoft/svn/core/wc2/SvnImport.java | 10 + .../svn/core/wc2/SvnInheritedProperties.java | 26 + .../java/org/tmatesoft/svn/core/wc2/SvnList.java | 10 + .../tmatesoft/svn/core/wc2/SvnLogMergeInfo.java | 14 + .../java/org/tmatesoft/svn/core/wc2/SvnMerge.java | 11 +- .../org/tmatesoft/svn/core/wc2/SvnMergeResult.java | 20 +- .../org/tmatesoft/svn/core/wc2/SvnOperation.java | 11 + .../svn/core/wc2/SvnOperationFactory.java | 142 +- .../java/org/tmatesoft/svn/core/wc2/SvnRevert.java | 10 + .../tmatesoft/svn/core/wc2/SvnSetWCDbVersion.java | 83 + .../java/org/tmatesoft/svn/core/wc2/SvnStatus.java | 38 + .../tmatesoft/svn/core/wc2/SvnWorkingCopyInfo.java | 18 + .../core/wc2/admin/SvnRepositoryGetFileSize.java | 29 + .../svn/core/wc2/hooks/ISvnFileFilter.java | 10 + .../java/org/tmatesoft/svn/util/SVNLogType.java | 1 + .../main/java/org/tmatesoft/svn/util/Version.java | 8 +- .../org/tmatesoft/svn/test/AutoPropertiesTest.java | 102 + .../org/tmatesoft/svn/test/AutoUnlockTest.java | 58 +- .../org/tmatesoft/svn/test/BatchCommitTest.java | 202 + .../java/org/tmatesoft/svn/test/CheckoutTest.java | 57 + .../java/org/tmatesoft/svn/test/CommitBuilder.java | 169 +- .../java/org/tmatesoft/svn/test/CommitTest.java | 255 +- .../java/org/tmatesoft/svn/test/ConfigTest.java | 50 + .../test/java/org/tmatesoft/svn/test/CopyTest.java | 483 +- .../org/tmatesoft/svn/test/CorruptionTest.java | 255 +- .../org/tmatesoft/svn/test/CredentialsTest.java | 105 + .../org/tmatesoft/svn/test/DavOutOfDateTest.java | 116 + .../java/org/tmatesoft/svn/test/DavSwitchTest.java | 35 +- .../java/org/tmatesoft/svn/test/DeleteTest.java | 134 +- .../test/java/org/tmatesoft/svn/test/DiffTest.java | 76 + .../java/org/tmatesoft/svn/test/DowngradeTest.java | 77 + .../java/org/tmatesoft/svn/test/EncodingTest.java | 16 + .../java/org/tmatesoft/svn/test/EventTest.java | 70 + .../tmatesoft/svn/test/ExceptionsHandlingTest.java | 58 + .../java/org/tmatesoft/svn/test/ExternalsTest.java | 397 ++ .../java/org/tmatesoft/svn/test/FSFileTest.java | 86 + .../java/org/tmatesoft/svn/test/FileUtilTest.java | 66 + .../test/java/org/tmatesoft/svn/test/HookTest.java | 52 + .../test/java/org/tmatesoft/svn/test/InfoTest.java | 181 +- .../test/java/org/tmatesoft/svn/test/LogTest.java | 62 + .../java/org/tmatesoft/svn/test/MergeTest.java | 352 +- .../tmatesoft/svn/test/MiscWorkingCopyTest.java | 57 + .../test/java/org/tmatesoft/svn/test/MoveTest.java | 404 ++ .../org/tmatesoft/svn/test/PackedRevPropsTest.java | 128 + .../java/org/tmatesoft/svn/test/ReplicateTest.java | 92 + .../java/org/tmatesoft/svn/test/ResolveTest.java | 106 + .../java/org/tmatesoft/svn/test/RevertTest.java | 496 ++ .../test/SVNFSFSPackedRevPropsManifestTest.java | 47 + .../svn/test/SVNFSFSPackedRevPropsTest.java | 174 + .../test/java/org/tmatesoft/svn/test/Sandbox.java | 19 +- .../java/org/tmatesoft/svn/test/SqlJetTest.java | 89 + .../java/org/tmatesoft/svn/test/StatusTest.java | 222 +- .../org/tmatesoft/svn/test/SvnKeywordsTest.java | 59 +- .../java/org/tmatesoft/svn/test/SvnLockTest.java | 102 +- .../java/org/tmatesoft/svn/test/SvnLookTest.java | 95 + .../java/org/tmatesoft/svn/test/SvnUrlTest.java | 121 + .../org/tmatesoft/svn/test/SvnserveProcess.java | 5 + .../test/java/org/tmatesoft/svn/test/SyncTest.java | 113 + .../tmatesoft/svn/test/TestRepositoryRestore.java | 592 +++ .../test/java/org/tmatesoft/svn/test/TestUtil.java | 26 + .../java/org/tmatesoft/svn/test/UpdateTest.java | 1313 ++++- .../java/org/tmatesoft/svn/test/UpgradeTest.java | 329 ++ .../java/org/tmatesoft/svn/test/WorkingCopy.java | 2 +- 502 files changed, 46451 insertions(+), 11100 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/svnkit.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
