[JIRA] Commented: (CC-850) Change to Allow PVCS Plugin to Detect Changes to Branched Code

    [ http://jira.public.thoughtworks.org/browse/CC-850?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_19219 ] 

Dan Rollo commented on CC-850:
------------------------------

If you can supply a patch built from the trunk (and agree to test it once applied), I'd be happy to apply the patch to the trunk. I don't have pvcs, so I'd need some help to validate things.
Do you know the answer to jtf's question above:  should I get one revision or two, and should the revision number be 1.6 or 1.5.1.0?

Dan

> Change to Allow PVCS Plugin to Detect Changes to Branched Code
> --------------------------------------------------------------
>
>                 Key: CC-850
>                 URL: http://jira.public.thoughtworks.org/browse/CC-850
>             Project: CruiseControl
>          Issue Type: Improvement
>          Components: Core Application
>    Affects Versions: 2.7.2
>         Environment: Windows 2000 Server, PVCS source Control
>            Reporter: Jeremy Jones
>         Assigned To: Jeffrey Fredrick
>
> The PVCS plugin works as it was originally intended to detect changes on the trunk code but it does not appear that there was any interest in detect changes to branched code. We would like to be able to detect changes checked in on branches as well as the trunk to allow parallel development. 
> When PCLI command is run to query PVCS check in history it returns the following file.  Note the branched code Rev 1.5.1.0 is nested and has white space before it.  
> PCLI Output File
> ---------------------------------------------------------------------------------------------------------------------------------
> Archive:          \\pvcs\pvcs\arc\nbsefil\workspace\DMSPrintWorkspace\DMSPrint\JavaSource\com\nm\dtefiles\dmsprint\application\DMSPrintApplication.java-arc
> Workfile:         DMSPrintApplication.java
> Archive created:  Nov 15 2006 07:10:20
> Split mode:       Unsplit 
> Owner:            kos4811
> Last trunk rev:   1.6
> Locks:            
> Groups:           
> Rev count:        8
> Attributes:
>    NOWRITEPROTECT
>    CHECKLOCK
>    NOEXCLUSIVELOCK
>    EXPANDKEYWORDS
>    TRANSLATE
>    NOCOMPRESSDELTA
>    NOCOMPRESSWORKIMAGE
>    GENERATEDELTA
>    COMMENTPREFIX = " * "
>    NEWLINE = "\r\n"
> Version labels:
>    "GL6BASE_STAGE" = 1.4
>    "GL7BASE_STAGE" = 1.4
>    "GL8BASE_STAGE" = 1.4
>    "GL9BASE_STAGE" = 1.4
>    "GL6BASE_PROD" = 1.4
>    "GL7BASE_PROD" = 1.4
>    "GL8BASE_PROD" = 1.4
>    "GL9BASE_PROD" = 1.4
>    "PORTFOLIO_BASE" = 1.4
>    "PORTFOLIO_TIP" = 1.4
>    "PST_DEVELOPMENT" = 1.5
>    "PROD_20080222" = 1.4
>    "CC_TIP" = 1.*
>    "NAIP_BASE" = 1.5
>    "NAIP_TIP" = 1.5.1.*
> Description:
> Initial version
> -----------------------------------
> Rev 1.6
> Checked in:     Sep 11 2008 09:13:14
> Last modified:  Dec 05 2007 06:37:52
> Author id: jon4813     lines deleted/added/moved: 0/0/0
> Testing CC trigger
> -----------------------------------
>     Rev 1.5.1.0
>     Checked in:     Sep 11 2008 09:09:44
>     Last modified:  Dec 05 2007 06:37:52
>     Author id: jon4813     lines deleted/added/moved: 0/0/0
>     Testing cc Trigger
> ===================================
> If you look at PVCS.java the method consumeLine consists of an if else block to process the PCLI output.  Each if statement uses the function line.startsWith.  Therefore it will discard the lines for the branched revision 1.5.1.0.  In order to detect this modification I added a trim function to the beginning of the consumeLine method in PVCS.java
>         public void consumeLine(String line) {
>             string.append(line + ls);
>             line = line.trim();
>             if (line.startsWith("Archive:")) { 
>                 .
>                 .
>                 .
> This cased the PVCSTest.java unit test to fail in the testPvcsStreamConsumer() function because one line had a space after it that was now being trimmed.  I removed the single space character in "Add code for " and the unit test then passed.  
> Changed
>         assertEquals("Add code for " + System.getProperty("line.separator") + "Sections", mod2.comment);
> to
>         assertEquals("Add code for" + System.getProperty("line.separator") + "Sections", mod2.comment);
> Please note that in order to have two different CC projects, one building on the tip and one building on a branch, I have created a floating label for the trunk and for the branch and I specify this label in my modificationset task.  If this is not done both the branch and the trunk builds will trigger on a check-in to one or the other.
>         <modificationset quietperiod="60">
>           <pvcs pvcsproject="\\pvcs\arc\nbsefil\pdbconfig"
>                 pvcssubproject="/workspace/DMSPrintWorkSpace" 
>                 pvcsversionlabel="NAIP_TIP"/>  
>         </modificationset>

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://jira.public.thoughtworks.org/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

------------------------------------------------------------------------------
Using storage to extend the benefits of virtualization and iSCSI
Virtualization increases hardware utilization and delivers a new level of
agility. Learn what those decisions are and how to modernize your storage 
and backup environments for virtualization.
http://www.accelacomm.com/jaw/sfnl/114/51434361/