Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven-scm
# By Kristian Rosenvold # Via Kristian Rosenvold * 'master' of https://git-wip-us.apache.org/repos/asf/maven-scm: Added .gitattributes to enforce proper line endings, remaining incorrect files fixed. Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/f7c5c4c7 Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/f7c5c4c7 Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/f7c5c4c7 Branch: refs/heads/master Commit: f7c5c4c75958e872c1834e2205539197a7384fe4 Parents: 4f4897a 8ad9801 Author: Michael Osipov <micha...@apache.org> Authored: Sat Nov 23 14:14:20 2013 +0100 Committer: Michael Osipov <micha...@apache.org> Committed: Sat Nov 23 14:14:20 2013 +0100 ---------------------------------------------------------------------- .gitattributes | 8 + .../maven/scm/provider/hg/HgUtilsTest.java | 130 +- .../scm/provider/integrity/APISession.java | 570 +++--- .../provider/integrity/ExceptionHandler.java | 250 +-- .../integrity/IntegrityScmProvider.java | 824 ++++----- .../maven/scm/provider/integrity/Member.java | 528 +++--- .../maven/scm/provider/integrity/Project.java | 826 ++++----- .../maven/scm/provider/integrity/Sandbox.java | 1700 +++++++++--------- .../command/add/IntegrityAddCommand.java | 142 +- .../command/blame/IntegrityBlameCommand.java | 184 +- .../command/blame/IntegrityBlameConsumer.java | 194 +- .../command/branch/IntegrityBranchCommand.java | 178 +- .../changelog/IntegrityChangeLogCommand.java | 186 +- .../checkin/IntegrityCheckInCommand.java | 138 +- .../checkout/IntegrityCheckOutCommand.java | 240 +-- .../command/diff/IntegrityDiffCommand.java | 206 +-- .../command/diff/IntegrityDiffConsumer.java | 106 +- .../command/edit/IntegrityEditCommand.java | 148 +- .../command/export/IntegrityExportCommand.java | 240 +-- .../fileinfo/IntegrityFileInfoCommand.java | 218 +-- .../fileinfo/IntegrityFileInfoConsumer.java | 110 +- .../command/list/IntegrityListCommand.java | 174 +- .../command/lock/IntegrityLockCommand.java | 190 +- .../command/login/IntegrityLoginCommand.java | 176 +- .../command/mkdir/IntegrityMkdirCommand.java | 202 +-- .../command/remove/IntegrityRemoveCommand.java | 146 +- .../command/status/IntegrityStatusCommand.java | 232 +-- .../command/tag/IntegrityTagCommand.java | 266 +-- .../command/unedit/IntegrityUnEditCommand.java | 146 +- .../command/unlock/IntegrityUnlockCommand.java | 218 +-- .../command/update/IntegrityUpdateCommand.java | 236 +-- .../IntegrityScmProviderRepository.java | 266 +-- .../integrity/command/IntegrityCommandTest.java | 194 +- .../command/add/IntegrityAddCommandTest.java | 124 +- .../branch/IntegrityBranchCommandTest.java | 122 +- .../IntegrityChangeLogCommandTest.java | 130 +- .../checkin/IntegrityCheckInCommandTest.java | 150 +- .../checkout/IntegrityCheckOutCommandTest.java | 110 +- .../export/IntegrityExportCommandTest.java | 116 +- .../command/list/IntegrityListCommandTest.java | 126 +- .../command/lock/IntegrityLockCommandTest.java | 118 +- .../status/IntegrityStatusCommandTest.java | 112 +- .../command/tag/IntegrityTagCommandTest.java | 120 +- .../unedit/IntegrityUnEditCommandTest.java | 112 +- .../update/IntegrityUpdateCommandTest.java | 130 +- .../IntegrityScmProviderRepositoryTest.java | 370 ++-- .../command/status/JazzStatusConsumerTest.java | 120 +- .../command/edit/PerforceEditCommandTest.java | 196 +- .../src/test/resources/checkoutdir/CVS/Entries | 2 +- .../resources/checkoutdir/CVS/Entries.Extra | 18 +- .../resources/checkoutdir/CVS/Entries.Extra.Old | 18 +- .../test/resources/checkoutdir/CVS/Entries.Old | 18 +- .../test/resources/checkoutdir/CVS/Repository | 2 +- .../src/test/resources/checkoutdir/CVS/Root | 2 +- .../src/test/repository/CVSROOT/.cvsignore | 4 +- .../src/test/repository/CVSROOT/checkoutlist | 26 +- .../src/test/repository/CVSROOT/checkoutlist,v | 72 +- .../src/test/repository/CVSROOT/commitinfo | 48 +- .../src/test/repository/CVSROOT/commitinfo,v | 94 +- .../src/test/repository/CVSROOT/config | 74 +- .../src/test/repository/CVSROOT/config,v | 120 +- .../src/test/repository/CVSROOT/cvswrappers | 38 +- .../src/test/repository/CVSROOT/cvswrappers,v | 84 +- .../src/test/repository/CVSROOT/loginfo | 62 +- .../src/test/repository/CVSROOT/loginfo,v | 108 +- .../src/test/repository/CVSROOT/modules | 52 +- .../src/test/repository/CVSROOT/modules,v | 98 +- .../src/test/repository/CVSROOT/notify | 34 +- .../src/test/repository/CVSROOT/notify,v | 80 +- .../src/test/repository/CVSROOT/rcsinfo | 26 +- .../src/test/repository/CVSROOT/rcsinfo,v | 72 +- .../src/test/repository/CVSROOT/taginfo | 80 +- .../src/test/repository/CVSROOT/taginfo,v | 126 +- .../src/test/repository/CVSROOT/val-tags | 2 +- .../src/test/repository/CVSROOT/verifymsg | 58 +- .../src/test/repository/CVSROOT/verifymsg,v | 104 +- .../repository/test-repo/checkout/Foo.java,v | 52 +- .../repository/test-repo/checkout/Readme.txt,v | 48 +- .../src/test/tck-repository/CVSROOT/.cvsignore | 4 +- .../src/test/repository/CVSROOT/.cvsignore | 4 +- .../src/test/repository/CVSROOT/checkoutlist | 26 +- .../src/test/repository/CVSROOT/checkoutlist,v | 72 +- .../src/test/repository/CVSROOT/commitinfo | 48 +- .../src/test/repository/CVSROOT/commitinfo,v | 94 +- .../src/test/repository/CVSROOT/config | 60 +- .../src/test/repository/CVSROOT/config,v | 120 +- .../src/test/repository/CVSROOT/cvswrappers | 38 +- .../src/test/repository/CVSROOT/cvswrappers,v | 84 +- .../src/test/repository/CVSROOT/loginfo | 62 +- .../src/test/repository/CVSROOT/loginfo,v | 108 +- .../src/test/repository/CVSROOT/modules | 52 +- .../src/test/repository/CVSROOT/modules,v | 98 +- .../src/test/repository/CVSROOT/notify | 34 +- .../src/test/repository/CVSROOT/notify,v | 80 +- .../src/test/repository/CVSROOT/rcsinfo | 26 +- .../src/test/repository/CVSROOT/rcsinfo,v | 72 +- .../src/test/repository/CVSROOT/taginfo | 80 +- .../src/test/repository/CVSROOT/taginfo,v | 126 +- .../src/test/repository/CVSROOT/val-tags | 2 +- .../src/test/repository/CVSROOT/verifymsg | 58 +- .../src/test/repository/CVSROOT/verifymsg,v | 104 +- .../repository/test-repo/checkout/Foo.java,v | 52 +- .../repository/test-repo/checkout/Readme.txt,v | 48 +- .../src/test/tck-repository/CVSROOT/.cvsignore | 4 +- .../resources/repository/CVSROOT/.cvsignore | 4 +- .../resources/repository/CVSROOT/checkoutlist | 26 +- .../resources/repository/CVSROOT/checkoutlist,v | 72 +- .../resources/repository/CVSROOT/commitinfo | 48 +- .../resources/repository/CVSROOT/commitinfo,v | 94 +- .../main/resources/repository/CVSROOT/config | 74 +- .../main/resources/repository/CVSROOT/config,v | 120 +- .../resources/repository/CVSROOT/cvswrappers | 38 +- .../resources/repository/CVSROOT/cvswrappers,v | 84 +- .../main/resources/repository/CVSROOT/loginfo | 62 +- .../main/resources/repository/CVSROOT/loginfo,v | 108 +- .../main/resources/repository/CVSROOT/modules | 52 +- .../main/resources/repository/CVSROOT/modules,v | 98 +- .../main/resources/repository/CVSROOT/notify | 34 +- .../main/resources/repository/CVSROOT/notify,v | 80 +- .../main/resources/repository/CVSROOT/rcsinfo | 26 +- .../main/resources/repository/CVSROOT/rcsinfo,v | 72 +- .../main/resources/repository/CVSROOT/taginfo | 80 +- .../main/resources/repository/CVSROOT/taginfo,v | 126 +- .../main/resources/repository/CVSROOT/val-tags | 2 +- .../main/resources/repository/CVSROOT/verifymsg | 58 +- .../resources/repository/CVSROOT/verifymsg,v | 104 +- .../repository/test-repo/checkout/Foo.java,v | 52 +- .../repository/test-repo/checkout/Readme.txt,v | 48 +- .../resources/tck-repository/CVSROOT/.cvsignore | 4 +- .../src/test/resources/git/diff/git-diff1.log | 12 +- .../src/test/resources/git/diff/git-diff2.log | 32 +- .../GitCommandLineUtilsAddTargetTest.java | 158 +- .../src/test/resources/repository/HEAD | 2 +- .../src/test/resources/repository/config | 8 +- .../src/test/resources/repository/description | 2 +- .../src/test/resources/repository/info/exclude | 12 +- .../test/resources/repository/refs/heads/master | 2 +- .../src/test/resources/repository/HEAD | 2 +- .../src/test/resources/repository/config | 8 +- .../src/test/resources/repository/description | 2 +- .../repository/hooks/applypatch-msg.sample | 30 +- .../repository/hooks/commit-msg.sample | 48 +- .../repository/hooks/post-commit.sample | 16 +- .../repository/hooks/post-receive.sample | 30 +- .../repository/hooks/post-update.sample | 16 +- .../repository/hooks/pre-applypatch.sample | 28 +- .../repository/hooks/pre-commit.sample | 36 +- .../repository/hooks/pre-rebase.sample | 338 ++-- .../repository/hooks/prepare-commit-msg.sample | 72 +- .../resources/repository/hooks/update.sample | 214 +-- .../src/test/resources/repository/info/exclude | 12 +- .../test/resources/repository/refs/heads/master | 2 +- .../checkout/SvnCheckOutConsumerTest.java | 88 +- .../command/export/SvnExportCommandTest.java | 126 +- .../svnexe/command/info/SvnInfoCommandTest.java | 106 +- 155 files changed, 8941 insertions(+), 8933 deletions(-) ----------------------------------------------------------------------