[FIXED HUDSON-1816] in 1.331. Applied a patch from ybubnov, and made him a committer.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@23071 71c3de6d-444a-0410-be80-ed276b4c234a

core/src/main/java/hudson/model/UpdateCenter.java

@@ -693,7 +693,7 @@ public class UpdateCenter extends AbstractModelObject {
         public String getPluginRepositoryBaseUrl() {
             return "http://hudson-ci.org/";
         }
-        
+
         
         private void testConnection(URL url) throws IOException {
             try {

core/src/main/java/hudson/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java

@@ -437,9 +437,10 @@ public class ChangeLogTask extends AbstractCvsTask {
                 log("Filtering out "+cvsEntry+" because it's too late compare to "+m_stop,Project.MSG_VERBOSE);
                 continue;
             }
-            if (!cvsEntry.containsBranch(branch)) {
+            //if tag was specified, it takes care of branches or HEAD, because it does not go out of one. Otherwise HEAD or specified Brach should be filtered
+            if (null == getTag() && !cvsEntry.containsBranch(branch)) {
                 // didn't match the branch
-                log("Filtering out "+cvsEntry+" because it didn't match the branch",Project.MSG_VERBOSE);
+                log("Filtering out "+cvsEntry+" because it didn't match the branch '"+branch+"'",Project.MSG_VERBOSE);
                 continue;
             }
             results.addElement(cvsEntry);

core/src/main/java/hudson/scm/CVSSCM.java

@@ -868,6 +868,11 @@ public class CVSSCM extends SCM implements Serializable {
                     task.setFailOnError(true);
                     BufferedOutputStream bufferedOutput = new BufferedOutputStream(out);
                     task.setDeststream(bufferedOutput);
+                    // It's to enforce ChangeLogParser find a "branch". If tag was specified, branch does not matter (see documentation for 'cvs log -r:tag').
+                    if (!isTag()){
+                        task.setBranch(branch);
+                    }
+                    // It's to enforce ChangeLogTask use "baranch" in CVS command (cvs log -r...).
                     task.setTag(isTag() ? ":" + branch : branch);
                     task.setStart(startTime);
                     task.setEnd(endTime);