Subversion Repositories DevTools

Rev

Rev 1281 | Rev 1370 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1281 Rev 1339
Line 496... Line 496...
496 
'---------------------------------------------------------------
 496 
'---------------------------------------------------------------
497 
' Returns the VCS tag for the specified package version
 497 
' Returns the VCS tag for the specified package version
498 
Function Get_Pkg_Vcs_Tag(apv_id)
 498 
Function Get_Pkg_Vcs_Tag(apv_id)
499 
   OraDatabase.Parameters.Add "PV_ID", apv_id, ORAPARM_INPUT, ORATYPE_NUMBER
 499 
   OraDatabase.Parameters.Add "PV_ID", apv_id, ORAPARM_INPUT, ORATYPE_NUMBER
500 
   OraDatabase.Parameters.Add "RETURN_CODE","", ORAPARM_OUTPUT, ORATYPE_VARCHAR2
 500 
   OraDatabase.Parameters.Add "RETURN_CODE","", ORAPARM_OUTPUT, ORATYPE_VARCHAR2
- 
 
 501 
   On Error Resume Next
501 
   OraDatabase.ExecuteSQL ("BEGIN   :RETURN_CODE := PK_RMAPI.RETURN_VCS_TAG( :PV_ID );   END;")
 502 
        OraDatabase.ExecuteSQL ("BEGIN   :RETURN_CODE := PK_RMAPI.RETURN_VCS_TAG( :PV_ID );   END;")
502 
   Get_Pkg_Vcs_Tag = OraDatabase.Parameters("RETURN_CODE").Value
 503 
        Get_Pkg_Vcs_Tag = OraDatabase.Parameters("RETURN_CODE").Value
- 
 
 504 
   On Error Goto 0
503 
   OraDatabase.Parameters.Remove "PV_ID"
 505 
   OraDatabase.Parameters.Remove "PV_ID"
504 
   OraDatabase.Parameters.Remove "RETURN_CODE"
 506 
   OraDatabase.Parameters.Remove "RETURN_CODE"
505 
End Function
 507 
End Function
506 
 
 508 
 
507 
'----------------------------------------------------------------------------------------------------------------------------------------
 509 
'----------------------------------------------------------------------------------------------------------------------------------------
Line 694... Line 696...
694 
            <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Version Control System:</b></td>
 696 
            <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Version Control System:</b></td>
695 
            <td bgcolor=#f5f5f5 class="sublbox_txt">
 697 
            <td bgcolor=#f5f5f5 class="sublbox_txt">
696 
               <%=NewLine_To_BR ( To_HTML( vcsInfoCollector.Item("vcs_name") ) )%>
 698 
               <%=NewLine_To_BR ( To_HTML( vcsInfoCollector.Item("vcs_name") ) )%>
697 
            </td>
 699 
            </td>
698 
         </tr>
 700 
         </tr>
699
701 
 
700 
         <tr>
 702 
         <tr>
701 
            <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Label:</b></td>
 703 
            <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Source Path:</b> </td>
702 
            <td bgcolor=#f5f5f5 class="sublbox_txt">
 704 
            <td bgcolor=#f5f5f5 class="sublbox_txt">
703 
               <%If IsNull( rsQry("pkg_label") ) Then%>
 705 
               <%If IsNull( rsQry("src_path") ) Then%>
704 
                  <span class='err_alert'>Required!</span><%Else%><%=NewLine_To_BR ( To_HTML( rsQry("pkg_label") ) )%>
 706 
                  <span class='err_alert'>Required!</span><%Else%><%=NewLine_To_BR ( To_HTML( rsQry("src_path") ) )%>
705 
               <%End If%>
 707 
               <%End If%>
706 
            </td>
 708 
            </td>
707 
         </tr>
 709 
         </tr>
- 
 
 710 
 
708 
         <tr>
 711 
         <tr>
709 
            <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Source Path:</b> </td>
 712 
            <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Label:</b></td>
710 
            <td bgcolor=#f5f5f5 class="sublbox_txt">
 713 
            <td bgcolor=#f5f5f5 class="sublbox_txt">
711 
               <%If IsNull( rsQry("src_path") ) Then%>
 714 
               <%If IsNull( rsQry("pkg_label") ) Then%>
712 
                  <span class='err_alert'>Required!</span><%Else%><%=NewLine_To_BR ( To_HTML( rsQry("src_path") ) )%>
 715 
                  <span class='err_alert'>Required!</span><%Else%><%=NewLine_To_BR ( To_HTML( rsQry("pkg_label") ) )%>
713 
               <%End If%>
 716 
               <%End If%>
714 
            </td>
 717 
            </td>
715 
         </tr>
 718 
         </tr>
716 
      <%ElseIf vcsInfoCollector.Item("vcs_tag") = enum_VCS_SUBVERSION_TAG Then%>
 719 
      <%ElseIf vcsInfoCollector.Item("vcs_tag") = enum_VCS_SUBVERSION_TAG Then%>
717 
         <tr>
 720 
         <tr>
718 
            <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Version Control System:</b></td>
 721 
            <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Version Control System:</b></td>
719 
            <td bgcolor=#f5f5f5 class="sublbox_txt">
 722 
            <td bgcolor=#f5f5f5 class="sublbox_txt">
720 
               <%=NewLine_To_BR ( To_HTML( vcsInfoCollector.Item("vcs_name") ) )%>
 723 
               <%=NewLine_To_BR ( To_HTML( vcsInfoCollector.Item("vcs_name") ) )%>
721 
            </td>
 724 
            </td>
722 
         </tr>
 725 
         </tr>
- 
 
 726 
 
723 
         <tr>
 727 
         <tr>
724 
            <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>SubVersion Tag:</b> </td>
 728 
            <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Source Path:</b> </td>
725 
            <td bgcolor=#f5f5f5 class="sublbox_txt">
 729 
            <td bgcolor=#f5f5f5 class="sublbox_txt">
726 
               <%If IsNull( rsQry("src_path") ) Then%>
 730 
               <%If IsNull( rsQry("src_path") ) Then%>
727 
                  <span class='err_alert'>Required!</span><%Else%><%=NewLine_To_BR ( To_HTML( rsQry("src_path") ) )%>
 731 
                  <span class='err_alert'>Required!</span><%Else%><%=NewLine_To_BR ( To_HTML( rsQry("src_path") ) )%>
728 
               <%End If%>
 732 
               <%End If%>
729 
            </td>
 733 
            </td>
730 
         </tr>
 734 
         </tr>
731 
         <%If PackageExists(parRtag_id,parPv_id,"work_in_progress") Then%>
 - 
 
- 
 
 735 
 
732 
         <tr>
 736 
         <tr>
733 
            <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>WIP Tag:</b> </td>
 737 
            <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Tag:</b></td>
734 
            <td bgcolor=#f5f5f5 class="sublbox_txt">
 738 
            <td bgcolor=#f5f5f5 class="sublbox_txt">
735 
               <%If IsNull( rsQry("pkg_label") ) Then%>
 739 
               <%If IsNull( rsQry("pkg_label") ) Then%>
736 
                  <span class='err_alert'>Required!</span><%Else%><%=NewLine_To_BR ( To_HTML( rsQry("pkg_label") ) )%>
 740 
                  <span class='err_alert'>Required!</span><%Else%><%=NewLine_To_BR ( To_HTML( rsQry("pkg_label") ) )%>
737 
               <%End If%>
 741 
               <%End If%>
738 
            </td>
 742 
            </td>
739 
         </tr>
 743 
         </tr>
740 
         <%End If%>
 - 
 
- 
 
 744 
 
741 
      <%ElseIf vcsInfoCollector.Item("vcs_tag") = enum_VCS_UNCONTROLLED_TAG Then%>
 745 
      <%ElseIf vcsInfoCollector.Item("vcs_tag") = enum_VCS_UNCONTROLLED_TAG Then%>
742 
         <tr>
 746 
         <tr>
743 
            <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Version Control System:</b></td>
 747 
            <td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Version Control System:</b></td>
744 
            <td bgcolor=#f5f5f5 class="sublbox_txt">
 748 
            <td bgcolor=#f5f5f5 class="sublbox_txt">
745 
               <%=NewLine_To_BR ( To_HTML( vcsInfoCollector.Item("vcs_name") ) )%>
 749 
               <%=NewLine_To_BR ( To_HTML( vcsInfoCollector.Item("vcs_name") ) )%>
Line 932... Line 936...
932 
           <%=NewLine_To_BR ( To_HTML(sjats_cmd_test) )%>
 936 
           <%=NewLine_To_BR ( To_HTML(sjats_cmd_test) )%>
933 
         </td>
 937 
         </td>
934 
      </tr>
 938 
      </tr>
935 
 
 939 
 
936 
      <%
 940 
      <%
937 
      ' Codestriker and Beyond Compare differencing commands
 941 
      ' Beyond Compare difference command
938 
      Dim oldLabel
 - 
 
939 
      Dim old_vcs_tag
 942 
      Dim prevVcsTag
940 
      Dim sCsCmd
 943 
      Dim curVcsTag
941 
      Dim sBcCmd
 944 
      Dim sBcCmd
- 
 
 945 
 
- 
 
 946 
      prevVcsTag = Get_Pkg_Vcs_Tag(iLastSignificantPVID)
942 
      sCsCmd = ""
 947 
      curVcsTag = Get_Pkg_Vcs_Tag(parPv_id)
943 
      sBcCmd = ""
 948 
      sBcCmd = ""
- 
 
 949 
 
- 
 
 950 
      If (IsNull(prevVcsTag) OR prevVcsTag = "" ) Then
- 
 
 951 
            sBcCmd = "No prior label to compare against"
- 
 
 952 
      ElseIf (IsNull(curVcsTag) OR curVcsTag = "" ) Then
- 
 
 953 
            sBcCmd = "Current VCS tag not yet specified"
- 
 
 954 
      Else
- 
 
 955 
            sBcCmd = "jats vcsdiff -old=" & prevVcsTag & " -new=" & curVcsTag
- 
 
 956 
 
- 
 
 957 
      End If
- 
 
 958 
      sBcCmd = NewLine_To_BR( To_HTML (sBcCmd) )
- 
 
 959 
 
- 
 
 960 
      ' Codestriker commands - Only for ClearCase
- 
 
 961 
      Dim sCsCmd
- 
 
 962 
      sCsCmd = ""
- 
 
 963 
 
944 
      If vcsInfoCollector.Item("vcs_tag") = enum_VCS_CLEARCASE_TAG Then
 964 
      If vcsInfoCollector.Item("vcs_tag") = enum_VCS_CLEARCASE_TAG Then
- 
 
 965 
         Dim oldLabel
- 
 
 966 
         Dim old_vcs_tag
945 
         If (pv_id_exists(iLastSignificantPVID) = TRUE) Then
 967 
         If (pv_id_exists(iLastSignificantPVID) = TRUE) Then
946 
            old_vcs_tag = get_vcs_tag(iLastSignificantPVID)
 968 
            old_vcs_tag = get_vcs_tag(iLastSignificantPVID)
947 
            If (old_vcs_tag = enum_VCS_CLEARCASE_TAG) Then
 969 
            If (old_vcs_tag = enum_VCS_CLEARCASE_TAG) Then
948 
               oldLabel = get_Pkg_Label(iLastSignificantPVID)
 970 
               oldLabel = get_Pkg_Label(iLastSignificantPVID)
949 
               sCsCmd = NewLine_To_BR ( To_HTML( Codestriker_Command   (oldLabel, pkgInfoHash.Item("pkg_label")) ) )
 971 
               sCsCmd = NewLine_To_BR ( To_HTML( Codestriker_Command (oldLabel, pkgInfoHash.Item("pkg_label")) ) )
950 
               sBcCmd = NewLine_To_BR ( To_HTML( BeyondCompare_Command (oldLabel, pkgInfoHash.Item("pkg_label")) ) )
 - 
 
951 
           End If
 972 
           End If
952 
         End If
 973 
         End If
953 
      End If%>
 974 
      End If%>
954
975
955 
      <tr>
 976 
      <tr>
Line 1560... Line 1581...
1560 
                                 </td>
 1581 
                                 </td>
1561 
                              <%Else%>
 1582 
                              <%Else%>
1562 
                                 <td align="center" nowrap bgcolor=#e4e9ec></td>
 1583 
                                 <td align="center" nowrap bgcolor=#e4e9ec></td>
1563 
                              <%End If%>
 1584 
                              <%End If%>
1564 
                              <td bgcolor=#f5f5f5 nowrap class="form_item">
 1585 
                              <td bgcolor=#f5f5f5 nowrap class="form_item">
1565 
                                 <a href="http://auperajir02:8080/browse/<%=rsCQ("iss_num")%>" target="_blank" class="txt_linked">
 1586 
                                 <a href="<%=JIRA_URL%>/browse/<%=rsCQ("iss_num")%>" target="_blank" class="txt_linked">
1566 
                                    <%=rsCQ("iss_num")%>
 1587 
                                    <%=rsCQ("iss_num")%>
1567 
                                 </a>
 1588 
                                 </a>
1568 
                              </td>
 1589 
                              </td>
1569 
                              <td bgcolor=#f5f5f5 class="form_item">JIRA</td>
 1590 
                              <td bgcolor=#f5f5f5 class="form_item">JIRA</td>
1570 
                              <td bgcolor=#f5f5f5 class="form_item"><%=NewLine_To_BR ( To_HTML ( rsCQ("summary") ) )%></td>
 1591 
                              <td bgcolor=#f5f5f5 class="form_item"><%=NewLine_To_BR ( To_HTML ( rsCQ("summary") ) )%></td>