Skip to content
Permalink
Browse files

Merge pull request #5 from mc1arke/master

Overhaul of the cvs plugin

Changes:
* Allowing checking out modules from different branch/tags in a single repository (JENKINS-768, JENKINS-6812)
* Allowing multiple repositories in a single job i.e. multiple CVS roots (JENKINS-2638)
* Using a Java CVS Library rather than depend on a system library (JENKINS-49, JENKINS-3848, JENKINS-3756, JENKINS-1676)
* Use 'rlog' for polling and change-log generation and 'rtag' for tagging (JENKINS-6312, JENKINS-10981, JENKINS-11787, JENKINS-1847, JENKINS-1359, JENKINS-76, JENKINS-9809, JENKINS-2710, JENKINS-5744, JENKINS-4604)
* Restrict CVS to only check-out configured modules and not other CVS items in the workspace (JENKINS-7449, JENKINS-2345, JENKINS-4489, JENKINS-1638, JENKINS-528)
* Add check-box to allow disabling change-log generation per project (JENKINS-3979)
* Leave CVS/Entries contents in their original encoding (JENKINS-4241, JENKINS-2614)
* Making CVS Prune (-p parameter) optional through job configuration (JENKINS-1013)
* Improving warnings and validation (JENKINS-9670, JENKINS-9045, JENKINS-7407, JENKINS-3133)
* Fixing cyclic dependency with subversion plugin in POM (JENKINS-10370)
* Fixing 'after-the-fact' tagging of builds (JENKINS-8128)
* Improved date format on CVS commands (JENKINS-6119, JENKINS-7833)
* Allowing macro/parameter expansion on input fields (JENKINS-2318, JENKINS-3821)
* Fixing missing CVS change log entries when 'use head if not found' is used (JENKINS-12104)

Potentially also fixes:
JENKINS-1737: Alternative Quiet Period Implementation (untested - updated polling should fix this)
JENKINS-10843: CVS Update (defect is unclear)
JENKINS-427: Cannot check out alias modules from CVS (untested - using rlog should fix this)

It's probably worth updating the version number in the POM to 2.0 given the number/scale of these changes, although this hasn't been included as part of this request.
  • Loading branch information
mc1arke committed Jan 27, 2012
2 parents 7b57474 + bfbac19 commit 1c6ddef1e5c1c3fe9f1a236fe4cc3aa336b8ca21
Showing with 4,620 additions and 4,267 deletions.
  1. +24 −0 pom.xml
  2. +0 −862 src/main/java/hudson/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
  3. +0 −87 src/main/java/hudson/org/apache/tools/ant/taskdefs/cvslib/CVSEntry.java
  4. +0 −380 src/main/java/hudson/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java
  5. +0 −501 src/main/java/hudson/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
  6. +0 −104 src/main/java/hudson/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java
  7. +0 −93 src/main/java/hudson/org/apache/tools/ant/taskdefs/cvslib/CvsUser.java
  8. +0 −77 src/main/java/hudson/org/apache/tools/ant/taskdefs/cvslib/RCSFile.java
  9. +0 −51 src/main/java/hudson/org/apache/tools/ant/taskdefs/cvslib/RedirectingOutputStream.java
  10. +0 −68 src/main/java/hudson/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java
  11. +9 −4 src/main/java/hudson/scm/CVSChangeLogParser.java
  12. +367 −100 src/main/java/hudson/scm/CVSChangeLogSet.java
  13. +15 −14 src/main/java/hudson/scm/CVSRepositoryBrowser.java
  14. +801 −1,413 src/main/java/hudson/scm/CVSSCM.java
  15. +271 −0 src/main/java/hudson/scm/CvsChangeLogHelper.java
  16. +92 −0 src/main/java/hudson/scm/CvsChangeSet.java
  17. +107 −0 src/main/java/hudson/scm/CvsFile.java
  18. +189 −0 src/main/java/hudson/scm/CvsModule.java
  19. +195 −0 src/main/java/hudson/scm/CvsModuleLocation.java
  20. +59 −0 src/main/java/hudson/scm/CvsModuleLocationType.java
  21. +204 −0 src/main/java/hudson/scm/CvsRepository.java
  22. +54 −0 src/main/java/hudson/scm/CvsRevisionState.java
  23. +106 −0 src/main/java/hudson/scm/ExcludedRegion.java
  24. +186 −0 src/main/java/hudson/scm/LegacyConvertor.java
  25. +29 −19 src/main/java/hudson/scm/MailAddressResolverImpl.java
  26. +188 −0 src/main/java/hudson/scm/cvstagging/CvsTagAction.java
  27. +16 −0 src/main/java/hudson/scm/cvstagging/CvsTagActionDescriptor.java
  28. +71 −0 src/main/java/hudson/scm/cvstagging/CvsTagActionWorker.java
  29. +420 −0 src/main/java/hudson/scm/cvstagging/LegacyTagAction.java
  30. +16 −28 src/main/resources/hudson/scm/CVSSCM/config.jelly
  31. +1 −1 src/main/resources/hudson/scm/CVSSCM/config.properties
  32. +15 −22 src/main/resources/hudson/scm/CVSSCM/global.jelly
  33. +0 −7 src/main/resources/hudson/scm/CVSSCM/help-allModules.html
  34. +0 −8 src/main/resources/hudson/scm/CVSSCM/help-allModules_de.html
  35. +0 −10 src/main/resources/hudson/scm/CVSSCM/help-allModules_fr.html
  36. +0 −7 src/main/resources/hudson/scm/CVSSCM/help-allModules_ja.html
  37. +0 −8 src/main/resources/hudson/scm/CVSSCM/help-allModules_nl.html
  38. +0 −7 src/main/resources/hudson/scm/CVSSCM/help-allModules_pt_BR.html
  39. +0 −7 src/main/resources/hudson/scm/CVSSCM/help-allModules_ru.html
  40. +0 −8 src/main/resources/hudson/scm/CVSSCM/help-allModules_tr.html
  41. +0 −11 src/main/resources/hudson/scm/CVSSCM/help-branch_de.html
  42. +0 −14 src/main/resources/hudson/scm/CVSSCM/help-branch_fr.html
  43. +0 −10 src/main/resources/hudson/scm/CVSSCM/help-branch_ja.html
  44. +0 −6 src/main/resources/hudson/scm/CVSSCM/help-branch_nl.html
  45. +0 −10 src/main/resources/hudson/scm/CVSSCM/help-branch_pt_BR.html
  46. +0 −11 src/main/resources/hudson/scm/CVSSCM/help-branch_ru.html
  47. +0 −10 src/main/resources/hudson/scm/CVSSCM/help-branch_tr.html
  48. +0 −5 src/main/resources/hudson/scm/CVSSCM/help-cvsExe.html
  49. +0 −7 src/main/resources/hudson/scm/CVSSCM/help-cvsExe_de.html
  50. +0 −7 src/main/resources/hudson/scm/CVSSCM/help-cvsExe_fr.html
  51. +0 −5 src/main/resources/hudson/scm/CVSSCM/help-cvsExe_ja.html
  52. +0 −5 src/main/resources/hudson/scm/CVSSCM/help-cvsExe_nl.html
  53. +0 −5 src/main/resources/hudson/scm/CVSSCM/help-cvsExe_pt_BR.html
  54. +0 −5 src/main/resources/hudson/scm/CVSSCM/help-cvsExe_ru.html
  55. +0 −5 src/main/resources/hudson/scm/CVSSCM/help-cvsExe_tr.html
  56. +0 −4 src/main/resources/hudson/scm/CVSSCM/help-cvsExe_zh_CN.html
  57. +0 −5 src/main/resources/hudson/scm/CVSSCM/help-cvsRsh.html
  58. +0 −5 src/main/resources/hudson/scm/CVSSCM/help-cvsRsh_de.html
  59. +0 −8 src/main/resources/hudson/scm/CVSSCM/help-cvsRsh_fr.html
  60. +0 −4 src/main/resources/hudson/scm/CVSSCM/help-cvsRsh_ja.html
  61. +0 −3 src/main/resources/hudson/scm/CVSSCM/help-cvsRsh_nl.html
  62. +0 −5 src/main/resources/hudson/scm/CVSSCM/help-cvsRsh_pt_BR.html
  63. +0 −6 src/main/resources/hudson/scm/CVSSCM/help-cvsRsh_ru.html
  64. +0 −5 src/main/resources/hudson/scm/CVSSCM/help-cvsRsh_tr.html
  65. +0 −27 src/main/resources/hudson/scm/CVSSCM/help-cvspassFile.html
  66. +0 −30 src/main/resources/hudson/scm/CVSSCM/help-cvspassFile_de.html
  67. +0 −27 src/main/resources/hudson/scm/CVSSCM/help-cvspassFile_fr.html
  68. +0 −26 src/main/resources/hudson/scm/CVSSCM/help-cvspassFile_ja.html
  69. +0 −21 src/main/resources/hudson/scm/CVSSCM/help-cvspassFile_zh_CN.html
  70. +3 −0 src/main/resources/hudson/scm/CVSSCM/help-disableCvsQuiet.html
  71. +3 −0 src/main/resources/hudson/scm/CVSSCM/help-pruneEmptyDirectories.html
  72. +3 −0 src/main/resources/hudson/scm/CVSSCM/help-skipChangeLog.html
  73. +46 −0 src/main/resources/hudson/scm/CvsModule/config.jelly
  74. +24 −0 src/main/resources/hudson/scm/CvsModule/config.properties
  75. +30 −0 src/main/resources/hudson/scm/CvsModule/config_de.properties
  76. +31 −0 src/main/resources/hudson/scm/CvsModule/config_es.properties
  77. +29 −0 src/main/resources/hudson/scm/CvsModule/config_fr.properties
  78. +29 −0 src/main/resources/hudson/scm/CvsModule/config_ja.properties
  79. +27 −0 src/main/resources/hudson/scm/CvsModule/config_nl.properties
  80. +27 −0 src/main/resources/hudson/scm/CvsModule/config_pt_BR.properties
  81. +28 −0 src/main/resources/hudson/scm/CvsModule/config_ru.properties
  82. +29 −0 src/main/resources/hudson/scm/CvsModule/config_tr.properties
  83. +0 −1 src/main/resources/hudson/scm/{CVSSCM/help-branch.html → CvsModule/help-branchName.html}
  84. +4 −0 src/main/resources/hudson/scm/CvsModule/help-localName.html
  85. +3 −0 src/main/resources/hudson/scm/CvsModule/help-remoteName.html
  86. +9 −0 src/main/resources/hudson/scm/CvsModule/help-tagName.html
  87. +1 −1 src/main/resources/hudson/scm/{CVSSCM → CvsModule}/help-useHeadIfNotFound.html
  88. 0 src/main/resources/hudson/scm/{CVSSCM → CvsModule}/help-useHeadIfNotFound_de.html
  89. +9 −27 ...{CVSSCM/DescriptorImpl/enterPassword.jelly → CvsModuleLocation/BranchModuleLocation/config.jelly}
  90. +4 −5 ...efs/cvslib/package.html → resources/hudson/scm/CvsModuleLocation/HeadModuleLocation/config.jelly}
  91. +9 −15 ...CVSSCM/DescriptorImpl/versionCheckError.jelly → CvsModuleLocation/TagModuleLocation/config.jelly}
  92. +56 −0 src/main/resources/hudson/scm/CvsRepository/config.jelly
  93. +24 −0 src/main/resources/hudson/scm/CvsRepository/config.properties
  94. +30 −0 src/main/resources/hudson/scm/CvsRepository/config_de.properties
  95. +31 −0 src/main/resources/hudson/scm/CvsRepository/config_es.properties
  96. +29 −0 src/main/resources/hudson/scm/CvsRepository/config_fr.properties
  97. +29 −0 src/main/resources/hudson/scm/CvsRepository/config_ja.properties
  98. +27 −0 src/main/resources/hudson/scm/CvsRepository/config_nl.properties
  99. +27 −0 src/main/resources/hudson/scm/CvsRepository/config_pt_BR.properties
  100. +28 −0 src/main/resources/hudson/scm/CvsRepository/config_ru.properties
  101. +29 −0 src/main/resources/hudson/scm/CvsRepository/config_tr.properties
  102. 0 src/main/resources/hudson/scm/{CVSSCM → CvsRepository}/help-cvsRoot.html
  103. 0 src/main/resources/hudson/scm/{CVSSCM → CvsRepository}/help-cvsRoot_de.html
  104. 0 src/main/resources/hudson/scm/{CVSSCM → CvsRepository}/help-cvsRoot_fr.html
  105. 0 src/main/resources/hudson/scm/{CVSSCM → CvsRepository}/help-cvsRoot_ja.html
  106. 0 src/main/resources/hudson/scm/{CVSSCM → CvsRepository}/help-cvsRoot_nl.html
  107. 0 src/main/resources/hudson/scm/{CVSSCM → CvsRepository}/help-cvsRoot_pt_BR.html
  108. 0 src/main/resources/hudson/scm/{CVSSCM → CvsRepository}/help-cvsRoot_ru.html
  109. 0 src/main/resources/hudson/scm/{CVSSCM → CvsRepository}/help-cvsRoot_tr.html
  110. 0 src/main/resources/hudson/scm/{CVSSCM → CvsRepository}/help-excludedRegions.html
  111. 0 src/main/resources/hudson/scm/{CVSSCM → CvsRepository}/help-excludedRegions_de.html
  112. 0 src/main/resources/hudson/scm/{CVSSCM → CvsRepository}/help-excludedRegions_fr.html
  113. 0 src/main/resources/hudson/scm/{CVSSCM → CvsRepository}/help-excludedRegions_ja.html
  114. +34 −0 src/main/resources/hudson/scm/ExcludedRegion/config.jelly
  115. +6 −5 src/main/resources/hudson/scm/cvs/Messages.properties
  116. +0 −1 src/main/resources/hudson/scm/cvs/Messages_de.properties
  117. +0 −2 src/main/resources/hudson/scm/cvs/Messages_es.properties
  118. +1 −1 src/main/resources/hudson/scm/cvs/Messages_fr.properties
  119. +0 −1 src/main/resources/hudson/scm/cvs/Messages_ja.properties
  120. +0 −1 src/main/resources/hudson/scm/cvs/Messages_nl.properties
  121. 0 src/main/resources/hudson/scm/{CVSSCM/TagAction → cvstagging/CvsTagAction}/help-tagAll.html
  122. 0 src/main/resources/hudson/scm/{CVSSCM/TagAction → cvstagging/CvsTagAction}/help-tagAll_de.html
  123. 0 src/main/resources/hudson/scm/{CVSSCM/TagAction → cvstagging/CvsTagAction}/help-tagAll_fr.html
  124. 0 src/main/resources/hudson/scm/{CVSSCM/TagAction → cvstagging/CvsTagAction}/help-tagAll_ja.html
  125. 0 src/main/resources/hudson/scm/{CVSSCM/TagAction → cvstagging/CvsTagAction}/help-tagAll_nl.html
  126. 0 src/main/resources/hudson/scm/{CVSSCM/TagAction → cvstagging/CvsTagAction}/help-tagAll_pt_BR.html
  127. 0 src/main/resources/hudson/scm/{CVSSCM/TagAction → cvstagging/CvsTagAction}/help-tagAll_ru.html
  128. 0 src/main/resources/hudson/scm/{CVSSCM/TagAction → cvstagging/CvsTagAction}/help-tagAll_tr.html
  129. +120 −0 src/main/resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly
  130. 0 src/main/resources/hudson/scm/{CVSSCM/TagAction → cvstagging/CvsTagAction}/tagForm_de.properties
  131. 0 src/main/resources/hudson/scm/{CVSSCM/TagAction → cvstagging/CvsTagAction}/tagForm_es.properties
  132. 0 src/main/resources/hudson/scm/{CVSSCM/TagAction → cvstagging/CvsTagAction}/tagForm_fr.properties
  133. 0 src/main/resources/hudson/scm/{CVSSCM/TagAction → cvstagging/CvsTagAction}/tagForm_ja.properties
  134. 0 src/main/resources/hudson/scm/{CVSSCM/TagAction → cvstagging/CvsTagAction}/tagForm_nl.properties
  135. 0 src/main/resources/hudson/scm/{CVSSCM/TagAction → cvstagging/CvsTagAction}/tagForm_pt_BR.properties
  136. 0 src/main/resources/hudson/scm/{CVSSCM/TagAction → cvstagging/CvsTagAction}/tagForm_ru.properties
  137. 0 src/main/resources/hudson/scm/{CVSSCM/TagAction → cvstagging/CvsTagAction}/tagForm_tr.properties
  138. +5 −0 src/main/resources/hudson/scm/cvstagging/LegacyTagAction/help-tagAll.html
  139. +6 −0 src/main/resources/hudson/scm/cvstagging/LegacyTagAction/help-tagAll_de.html
  140. +6 −0 src/main/resources/hudson/scm/cvstagging/LegacyTagAction/help-tagAll_fr.html
  141. +4 −0 src/main/resources/hudson/scm/cvstagging/LegacyTagAction/help-tagAll_ja.html
  142. +4 −0 src/main/resources/hudson/scm/cvstagging/LegacyTagAction/help-tagAll_nl.html
  143. +5 −0 src/main/resources/hudson/scm/cvstagging/LegacyTagAction/help-tagAll_pt_BR.html
  144. +5 −0 src/main/resources/hudson/scm/cvstagging/LegacyTagAction/help-tagAll_ru.html
  145. +5 −0 src/main/resources/hudson/scm/cvstagging/LegacyTagAction/help-tagAll_tr.html
  146. 0 src/main/resources/hudson/scm/{CVSSCM/TagAction → cvstagging/LegacyTagAction}/tagForm.jelly
  147. +28 −0 src/main/resources/hudson/scm/cvstagging/LegacyTagAction/tagForm_de.properties
  148. +28 −0 src/main/resources/hudson/scm/cvstagging/LegacyTagAction/tagForm_es.properties
  149. +28 −0 src/main/resources/hudson/scm/cvstagging/LegacyTagAction/tagForm_fr.properties
  150. +28 −0 src/main/resources/hudson/scm/cvstagging/LegacyTagAction/tagForm_ja.properties
  151. +28 −0 src/main/resources/hudson/scm/cvstagging/LegacyTagAction/tagForm_nl.properties
  152. +28 −0 src/main/resources/hudson/scm/cvstagging/LegacyTagAction/tagForm_pt_BR.properties
  153. +28 −0 src/main/resources/hudson/scm/cvstagging/LegacyTagAction/tagForm_ru.properties
  154. +28 −0 src/main/resources/hudson/scm/cvstagging/LegacyTagAction/tagForm_tr.properties
  155. +61 −29 src/test/java/hudson/scm/CVSSCMTest.java
  156. +41 −0 src/test/java/hudson/scm/CvsChangeLogHelperTest.java
24 pom.xml
@@ -20,13 +20,37 @@
<id>kohsuke</id>
<name>Kohsuke Kawaguchi</name>
</developer>
<developer>
<id>mc1arke</id>
<name>Michael Clarke</name>
</developer>
</developers>

<scm>
<connection>scm:git:git://github.com/jenkinsci/cvs-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/cvs-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/cvs-plugin</url>
</scm>

<dependencies>
<dependency>
<groupId>org.jenkins-ci.lib</groupId>
<artifactId>cvsclient</artifactId>
<version>71-jenkins-3</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>jenkins-test-harness</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>subversion</artifactId>
<groupId>org.jvnet.hudson.plugins</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

0 comments on commit 1c6ddef

Please sign in to comment.
You can’t perform that action at this time.