This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 55600
Collapse All | Expand All

(-)cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/cvs.xml (-6 / +27 lines)
Lines 865-871 Link Here
865 
      </command>
 865 
      </command>
866 
      <command name="UPDATE_CMD" >
 866 
      <command name="UPDATE_CMD" >
867 
	<property name="exec">
 867 
	<property name="exec">
868 
          <value>${CDM_EXECUTE} ${USER_GLOBAL_PARAM} update ${PRUNE_EMPTY} ${CREATE_DIRS} ${GET_CLEAN_COPY} ${SEND_TO_STDOUT} $[? RESET_STICKY] [${RESET_STICKY}] [$[? TAG] [-r ${TAG}] [] $[? DATE] [-D ${QUOTE}${DATE}${QUOTE}] []] $[? MERGE_SELECTION] [$[? MERGE_SELECTION - 1] [-j ${MERGE_REV1} -j ${MERGE_REV2}] [-j ${MERGE_REV}]] [] ${FORCE_HEAD_MATCH} ${RCS_KFLAG}  ${RECURSIVE} $[? DIR] [${QPATHS}] [$[? FILE] [${QPATHS}] []] ${NUR}</value>
 868 
          <value>${CDM_EXECUTE} ${USER_GLOBAL_PARAM} update ${PRUNE_EMPTY} ${CREATE_DIRS} ${GET_CLEAN_COPY} ${SEND_TO_STDOUT} $[? RESET_STICKY] [${RESET_STICKY}] [$[? TAG] [-r ${TAG}] [$[? revision] [-r ${revision}] []] $[? DATE] [-D ${QUOTE}${DATE}${QUOTE}] []] $[? MERGE_SELECTION] [$[? MERGE_SELECTION - 1] [-j ${MERGE_REV1} -j ${MERGE_REV2}] [-j ${MERGE_REV}]] [] ${FORCE_HEAD_MATCH} ${RCS_KFLAG}  ${RECURSIVE} $[? DIR] [${QPATHS}] [$[? FILE] [${QPATHS}] []] ${NUR}</value>
869 
	</property>
 869 
	</property>
870 
	<property name="data.regex">
 870 
	<property name="data.regex">
871 
	  <value>^([UPARMC]) (.*$)|^(.*) (already contains the differences)(.*)$</value>
 871 
	  <value>^([UPARMC]) (.*$)|^(.*) (already contains the differences)(.*)$</value>
Lines 929-935 Link Here
929 
                 ASK_FOR_EXPERT(GET_CLEAN_COPY, ResourceMsg1(COMMAND_UPDATE_GetCleanCopy), "false", ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_UPDATE_GetCleanCopy);;MNEMONIC_ResourceMsg1(ACS_COMMAND_UPDATE_GetCleanCopy_mnc)), "-C", "")
 929 
                 ASK_FOR_EXPERT(GET_CLEAN_COPY, ResourceMsg1(COMMAND_UPDATE_GetCleanCopy), "false", ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_UPDATE_GetCleanCopy);;MNEMONIC_ResourceMsg1(ACS_COMMAND_UPDATE_GetCleanCopy_mnc)), "-C", "")
930 
                 ASK_FOR_EXPERT(FORCE_HEAD_MATCH, ResourceMsg1(COMMAND_Force_Head_Match), "false",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_Force_Head_Match);;MNEMONIC_ResourceMsg1(ACS_COMMAND_UPDATE_Force_Head_Match_mnc)), "-f", "")
 930 
                 ASK_FOR_EXPERT(FORCE_HEAD_MATCH, ResourceMsg1(COMMAND_Force_Head_Match), "false",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_Force_Head_Match);;MNEMONIC_ResourceMsg1(ACS_COMMAND_UPDATE_Force_Head_Match_mnc)), "-f", "")
931 
                 ASK_FOR_EXPERT(SEND_TO_STDOUT, ResourceMsg1(COMMAND_UPDATE_Send_To_Stdout), "false",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_UPDATE_Send_To_Stdout);;MNEMONIC_ResourceMsg1(ACS_COMMAND_UPDATE_Send_To_Stdout_mnc)),"-p", "")
 931 
                 ASK_FOR_EXPERT(SEND_TO_STDOUT, ResourceMsg1(COMMAND_UPDATE_Send_To_Stdout), "false",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_UPDATE_Send_To_Stdout);;MNEMONIC_ResourceMsg1(ACS_COMMAND_UPDATE_Send_To_Stdout_mnc)),"-p", "")
932 
                 PROMPT_FOR_EXPERT(TAG, ResourceMsg1(COMMAND_UPDATE_Tag), "",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_UPDATE_Tag);;MNEMONIC_ResourceMsg1(ACS_COMMAND_UPDATE_Tag_mnc)), IF_VAR_EMPTY"FILES_IS_FOLDER"_SELECTOR_CMD_SELECTOR_REVISIONS)
 932 
                 PROMPT_FOR_EXPERT(TAG, ResourceMsg1(COMMAND_UPDATE_Tag), "${revision}",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_UPDATE_Tag);;MNEMONIC_ResourceMsg1(ACS_COMMAND_UPDATE_Tag_mnc)), IF_VAR_EMPTY"FILES_IS_FOLDER"_SELECTOR_CMD_SELECTOR_REVISIONS)
933 
                 PROMPT_FOR_EXPERT(DATE, ResourceMsg1(COMMAND_UPDATE_Date), "",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_UPDATE_Date);;MNEMONIC_ResourceMsg1(ACS_COMMAND_UPDATE_Date_mnc)), SELECTOR_DATE_CVS)
 933 
                 PROMPT_FOR_EXPERT(DATE, ResourceMsg1(COMMAND_UPDATE_Date), "",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_UPDATE_Date);;MNEMONIC_ResourceMsg1(ACS_COMMAND_UPDATE_Date_mnc)), SELECTOR_DATE_CVS)
934 
                 SELECT_RADIO_EXPERT(MERGE_SELECTION, "", "",
 934 
                 SELECT_RADIO_EXPERT(MERGE_SELECTION, "", "",
935 
                  [ResourceMsg1(COMMAND_UPDATE_NoMerge), "", ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_UPDATE_NoMerge);;MNEMONIC_ResourceMsg1(ACS_COMMAND_UPDATE_NoMerge_mnc))]
 935 
                  [ResourceMsg1(COMMAND_UPDATE_NoMerge), "", ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_UPDATE_NoMerge);;MNEMONIC_ResourceMsg1(ACS_COMMAND_UPDATE_NoMerge_mnc))]
Lines 993-998 Link Here
993 
        <property name="generalCommandActionDisplayName">
 993 
        <property name="generalCommandActionDisplayName">
994 
          <value>ResourceMsg1(CVS_GENERAL_ACTION_UPDATE)</value>
 994 
          <value>ResourceMsg1(CVS_GENERAL_ACTION_UPDATE)</value>
995 
        </property>
 995 
        </property>
996 
        <property name="associatedCommandInterfaceName">
997 
          <value>org.netbeans.api.vcs.commands.UpdateCommand</value>
998 
        </property>
996 
          <property name="disabledOnStatus">
 999 
          <property name="disabledOnStatus">
997 
            <value>&local-statuses;, "Yet-Unknown"</value>
 1000 
            <value>&local-statuses;, "Yet-Unknown"</value>
998 
          </property>
 1001 
          </property>
Lines 1027-1033 Link Here
1027 
                 VARIABLE_DEFAULTS(FOLDER_CONTENTS USER, RUN_RECURSIVELY USER, DO_COMMIT USER)
 1030 
                 VARIABLE_DEFAULTS(FOLDER_CONTENTS USER, RUN_RECURSIVELY USER, DO_COMMIT USER)
1028 
                 SELECT_RADIO(FOLDER_CONTENTS, "", "", [ResourceMsg1(COMMAND_ADD_JustFolder), "",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_ADD_JustFolder);;MNEMONIC_ResourceMsg1(ACS_COMMAND_ADD_JustFolder_mnc))],
 1031 
                 SELECT_RADIO(FOLDER_CONTENTS, "", "", [ResourceMsg1(COMMAND_ADD_JustFolder), "",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_ADD_JustFolder);;MNEMONIC_ResourceMsg1(ACS_COMMAND_ADD_JustFolder_mnc))],
1029 
                                                       [ResourceMsg1(COMMAND_ADD_FolderContents), "true",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_ADD_FolderContents);;MNEMONIC_ResourceMsg1(ACS_COMMAND_ADD_FolderContents_mnc)),
 1032 
                                                       [ResourceMsg1(COMMAND_ADD_FolderContents), "true",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_ADD_FolderContents);;MNEMONIC_ResourceMsg1(ACS_COMMAND_ADD_FolderContents_mnc)),
1030 
                                                        PROMPT_FOR(DESCRIPTION, ResourceMsg1(COMMAND_ADD_Description), "",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_ADD_Description);;MNEMONIC_ResourceMsg1(ACS_COMMAND_ADD_Description_mnc)))
 1033 
                                                        PROMPT_FOR(DESCRIPTION, ResourceMsg1(COMMAND_ADD_Description), "${message}",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_ADD_Description);;MNEMONIC_ResourceMsg1(ACS_COMMAND_ADD_Description_mnc)))
1031 
                                                        IF_VAR_EMPTY"recursionBanned"_ASK_FOR(RUN_RECURSIVELY, ResourceMsg1(COMMAND_ADD_Recursively), "false",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_ADD_Recursively);;MNEMONIC_ResourceMsg1(ACS_COMMAND_ADD_Recursively_mnc)) ,"", "-l")
 1034 
                                                        IF_VAR_EMPTY"recursionBanned"_ASK_FOR(RUN_RECURSIVELY, ResourceMsg1(COMMAND_ADD_Recursively), "false",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_ADD_Recursively);;MNEMONIC_ResourceMsg1(ACS_COMMAND_ADD_Recursively_mnc)) ,"", "-l")
1032 
                                                        ASK_FOR(DO_COMMIT, ResourceMsg1(COMMAND_ADD_DoCommit),, ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACS_COMMAND_ADD_DoCommit);;MNEMONIC_ResourceMsg1(ACS_COMMAND_ADD_DoCommit_mnc)))])
 1035 
                                                        ASK_FOR(DO_COMMIT, ResourceMsg1(COMMAND_ADD_DoCommit),, ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACS_COMMAND_ADD_DoCommit);;MNEMONIC_ResourceMsg1(ACS_COMMAND_ADD_DoCommit_mnc)))])
1033 

          1036
          

        

  

    
      
            Lines 1072-1077
          
      
      
        Link Here
      
    
  

        

          1072
          
        <property name="generalCommandActionDisplayName">

          1075
          
        <property name="generalCommandActionDisplayName">

        

        

          1073
          
          <value>ResourceMsg1(CVS_GENERAL_ACTION_ADD)</value>

          1076
          
          <value>ResourceMsg1(CVS_GENERAL_ACTION_ADD)</value>

        

        

          1074
          
        </property>

          1077
          
        </property>

        

            

              
              
              1078
              
        <property name="associatedCommandInterfaceName">

            

            

              1079
              
          <value>org.netbeans.api.vcs.commands.AddFolderCommand</value>

            

            

              1080
              
        </property>

            

        

          1075
          
        <property name="preCommands">

          1081
          
        <property name="preCommands">

        

        

          1076
          
          <value>ADD_LOCAL_PARENTS</value>

          1082
          
          <value>ADD_LOCAL_PARENTS</value>

        

        

          1077
          
        </property>

          1083
          
        </property>

        

  

    
      
            Lines 1257-1263
          
      
      
        Link Here
      
    
  

        

          1257
          
      <command name="ADD_CMD">

          1263
          
      <command name="ADD_CMD">

        

        

          1258
          
	<property name="exec">

          1264
          
	<property name="exec">

        

        

          1259
          
        <!-- if user specified KFLAG use it otherwise use MIME based autodetection (that marks just binary files, leaving others on CVS)-->

          1265
          
        <!-- if user specified KFLAG use it otherwise use MIME based autodetection (that marks just binary files, leaving others on CVS)-->

        

          
            

              1260
              
	  <value>${CDW_EXECUTE} ${USER_GLOBAL_PARAM} add $[? KFLAG_TRIVIAL] [${KFLAG_TRIVIAL}] [$[? KFLAG_EXPERT] [${KFLAG_EXPERT}] [$[? PROCESSING_BINARY_FILES] [-kb] []]] $[? DESCRIPTION] [-m ${QUOTE}${DESCRIPTION}${QUOTE}] [] ${QFILES} ${NUR}</value>


              1266
              
	  <value>${CDW_EXECUTE} ${USER_GLOBAL_PARAM} add $[? KFLAG_TRIVIAL] [${KFLAG_TRIVIAL}] [$[? KFLAG_EXPERT] [${KFLAG_EXPERT}] [$[? PROCESSING_BINARY_FILES] [-kb] []]] $[? DESCRIPTION] [-m ${QUOTE}${DESCRIPTION}${QUOTE}] [$[? message] [-m ${QUOTE}${message}${QUOTE}] []] ${QFILES} ${NUR}</value>

            

        

          1261
          
	</property>

          1267
          
	</property>

        

        

          1262
          
        <property name="visualizer">

          1268
          
        <property name="visualizer">

        

        

          1263
          
          <value>org.netbeans.modules.vcs.profiles.cvsprofiles.visualizers.add.CvsAddVisualizer</value>

          1269
          
          <value>org.netbeans.modules.vcs.profiles.cvsprofiles.visualizers.add.CvsAddVisualizer</value>

        

  

    
      
            Lines 1418-1423
          
      
      
        Link Here
      
    
  

        

          1418
          
              <!-- "Yet-Unknown"a nd "Ignored" are defined by vcscore: -->

          1424
          
              <!-- "Yet-Unknown"a nd "Ignored" are defined by vcscore: -->

        

        

          1419
          
              <value>&local-statuses;, "Yet-Unknown"</value>

          1425
          
              <value>&local-statuses;, "Yet-Unknown"</value>

        

        

          1420
          
          </property>

          1426
          
          </property>

        

            

              
              
              1427
              
        <property name="associatedCommandInterfaceName">

            

            

              1428
              
          <value>org.netbeans.api.vcs.commands.RemoveCommand</value>

            

            

              1429
              
        </property>

            

        

          1421
          

          1430
          

        

        

          1422
          
      </command>

          1431
          
      </command>

        

        

          1423
          

          1432
          

        

  

    
      
            Lines 1528-1533
          
      
      
        Link Here
      
    
  

        

          1528
          
          <property name="disabledOnStatus">

          1537
          
          <property name="disabledOnStatus">

        

        

          1529
          
              <value>&local-statuses;</value>

          1538
          
              <value>&local-statuses;</value>

        

        

          1530
          
          </property>

          1539
          
          </property>

        

            

              
              
              1540
              
        <property name="associatedCommandInterfaceName">

            

            

              1541
              
          <value>org.netbeans.api.vcs.commands.PropertiesCommand</value>

            

            

              1542
              
        </property>

            

        

          1531
          
      </command>

          1543
          
      </command>

        

        

          1532
          
      <command name="STATUS_GET_TAGS">

          1544
          
      <command name="STATUS_GET_TAGS">

        

        

          1533
          
	<property name="exec">

          1545
          
	<property name="exec">

        

  

    
      
            Lines 1605-1610
          
      
      
        Link Here
      
    
  

        

          1605
          
        <property name="generalCommandActionDisplayName">

          1617
          
        <property name="generalCommandActionDisplayName">

        

        

          1606
          
          <value>ResourceMsg1(CVS_GENERAL_ACTION_HISTORY)</value>

          1618
          
          <value>ResourceMsg1(CVS_GENERAL_ACTION_HISTORY)</value>

        

        

          1607
          
        </property>

          1619
          
        </property>

        

            

              
              
              1620
              
        <property name="associatedCommandInterfaceName">

            

            

              1621
              
          <value>org.netbeans.api.vcs.commands.HistoryCommand</value>

            

            

              1622
              
        </property>

            

        

          1608
          
      </command>

          1623
          
      </command>

        

        

          1609
          
      <command name="HISTORY" displayName="ResourceMsg1(CVS_HISTORY)" unless="BUILT-IN" >

          1624
          
      <command name="HISTORY" displayName="ResourceMsg1(CVS_HISTORY)" unless="BUILT-IN" >

        

        

          1610
          
        <property name="labelMnemonic">

          1625
          
        <property name="labelMnemonic">

        

  

    
      
            Lines 1900-1905
          
      
      
        Link Here
      
    
  

        

          1900
          
          <property name="notificationFailMsg">

          1915
          
          <property name="notificationFailMsg">

        

        

          1901
          
            <value>$[? MULTIPLE_FILES] [ResourceMsg1(NOTIFICATION_EDITs_Fail, ${NUM_FILES})] [ResourceMsg1(NOTIFICATION_EDIT_Fail, ${FILE})]</value>

          1916
          
            <value>$[? MULTIPLE_FILES] [ResourceMsg1(NOTIFICATION_EDITs_Fail, ${NUM_FILES})] [ResourceMsg1(NOTIFICATION_EDIT_Fail, ${FILE})]</value>

        

        

          1902
          
          </property>

          1917
          
          </property>

        

            

              
              
              1918
              
        <property name="associatedCommandInterfaceName">

            

            

              1919
              
          <value>org.netbeans.api.vcs.commands.CheckOutCommand</value>

            

            

              1920
              
        </property>

            

        

          1903
          
	</command>

          1921
          
	</command>

        

        

          1904
          
	<command name="UNEDIT" displayName="ResourceMsg1(CVS_UNEDIT)">

          1922
          
	<command name="UNEDIT" displayName="ResourceMsg1(CVS_UNEDIT)">

        

        

          1905
          
          <property name="labelMnemonic">

          1923
          
          <property name="labelMnemonic">

        

  

    
      
            Lines 2430-2436
          
      
      
        Link Here
      
    
  

        

          2430
          
  	<property name="inputDescriptor">

          2448
          
  	<property name="inputDescriptor">

        

        

          2431
          
 	  <value>LABEL(ResourceMsg1(COMMAND_DIFF_Label),ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_DIFF_Label)))

          2449
          
 	  <value>LABEL(ResourceMsg1(COMMAND_DIFF_Label),ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_DIFF_Label)))

        

        

          2432
          
                VARIABLE_DEFAULTS(IGNORE_WHITE USER, IGNORE_SPACE USER, IGNORE_CASE USER, ADDITIONAL_OPTIONS EXPERT_USER)

          2450
          
                VARIABLE_DEFAULTS(IGNORE_WHITE USER, IGNORE_SPACE USER, IGNORE_CASE USER, ADDITIONAL_OPTIONS EXPERT_USER)

        

          
            

              2433
              
                 PROMPT_FOR_EXPERT(TAG1, ResourceMsg1(COMMAND_DIFF_Tag1), "",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_DIFF_Tag1);;MNEMONIC_ResourceMsg1(ACS_COMMAND_DIFF_Tag1_mnc)) ,IF_VAR_EMPTY"FILES_IS_FOLDER"_SELECTOR_CMD_SELECTOR_REVISIONS)


              2451
              
                 PROMPT_FOR_EXPERT(TAG1, ResourceMsg1(COMMAND_DIFF_Tag1), "${revision}",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_DIFF_Tag1);;MNEMONIC_ResourceMsg1(ACS_COMMAND_DIFF_Tag1_mnc)) ,IF_VAR_EMPTY"FILES_IS_FOLDER"_SELECTOR_CMD_SELECTOR_REVISIONS)

            

        

          2434
          
                 PROMPT_FOR_EXPERT(TAG2, ResourceMsg1(COMMAND_DIFF_Tag2), "",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_DIFF_Tag2);;MNEMONIC_ResourceMsg1(ACS_COMMAND_DIFF_Tag2_mnc)) ,IF_VAR_EMPTY"FILES_IS_FOLDER"_SELECTOR_CMD_SELECTOR_REVISIONS)

          2452
          
                 PROMPT_FOR_EXPERT(TAG2, ResourceMsg1(COMMAND_DIFF_Tag2), "",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_DIFF_Tag2);;MNEMONIC_ResourceMsg1(ACS_COMMAND_DIFF_Tag2_mnc)) ,IF_VAR_EMPTY"FILES_IS_FOLDER"_SELECTOR_CMD_SELECTOR_REVISIONS)

        

        

          2435
          
                 PROMPT_FOR_EXPERT(DATE1, ResourceMsg1(COMMAND_DIFF_Date1), "",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_DIFF_Date1);;MNEMONIC_ResourceMsg1(ACS_COMMAND_DIFF_Date1_mnc)), SELECTOR_DATE_CVS)

          2453
          
                 PROMPT_FOR_EXPERT(DATE1, ResourceMsg1(COMMAND_DIFF_Date1), "",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_DIFF_Date1);;MNEMONIC_ResourceMsg1(ACS_COMMAND_DIFF_Date1_mnc)), SELECTOR_DATE_CVS)

        

        

          2436
          
                 PROMPT_FOR_EXPERT(DATE2, ResourceMsg1(COMMAND_DIFF_Date2), "",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_DIFF_Date2);;MNEMONIC_ResourceMsg1(ACS_COMMAND_DIFF_Date2_mnc)), SELECTOR_DATE_CVS)

          2454
          
                 PROMPT_FOR_EXPERT(DATE2, ResourceMsg1(COMMAND_DIFF_Date2), "",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_DIFF_Date2);;MNEMONIC_ResourceMsg1(ACS_COMMAND_DIFF_Date2_mnc)), SELECTOR_DATE_CVS)

        

  

    
      
            Lines 2456-2461
          
      
      
        Link Here
      
    
  

        

          2456
          
          <property name="disabledOnStatus">

          2474
          
          <property name="disabledOnStatus">

        

        

          2457
          
            <value>&local-statuses;, "Yet-Unknown"</value>

          2475
          
            <value>&local-statuses;, "Yet-Unknown"</value>

        

        

          2458
          
          </property>

          2476
          
          </property>

        

            

              
              
              2477
              
        <property name="associatedCommandInterfaceName">

            

            

              2478
              
          <value>org.netbeans.api.vcs.commands.DiffCommand</value>

            

            

              2479
              
        </property>

            

        

          2459
          
      </command>

          2480
          
      </command>

        

        

          2460
          
      <command name="DIFF_TEXT" displayName="ResourceMsg1(CVS_DIFF_TEXTUAL)">

          2481
          
      <command name="DIFF_TEXT" displayName="ResourceMsg1(CVS_DIFF_TEXTUAL)">

        

        

          2461
          
        <property name="labelMnemonic">

          2482
          
        <property name="labelMnemonic">

        

  

    
      
            Lines 2696-2702
          
      
      
        Link Here
      
    
  

        

          2696
          
      </command>

          2717
          
      </command>

        

        

          2697
          
      <command name="DIFF_USR_CMD">

          2718
          
      <command name="DIFF_USR_CMD">

        

        

          2698
          
	<property name="exec">

          2719
          
	<property name="exec">

        

          
            

              2699
              
          <value>${CDW_EXECUTE} ${USER_GLOBAL_PARAM} diff $[? DATE1] [-D ${QUOTE}${DATE1}${QUOTE}] [] $[? DATE2] [-D ${QUOTE}${DATE2}${QUOTE}] [] $[? TAG1] [-r ${TAG1}] [] $[? TAG2] [-r ${TAG2}] [] ${RCS_KFLAG} ${IGNORE_WHITE} ${IGNORE_SPACE} ${IGNORE_CASE} ${ADDITIONAL_OPTIONS} ${QFILE} ${NUR}</value>


              2720
              
          <value>${CDW_EXECUTE} ${USER_GLOBAL_PARAM} diff $[? DATE1] [-D ${QUOTE}${DATE1}${QUOTE}] [] $[? DATE2] [-D ${QUOTE}${DATE2}${QUOTE}] [] $[? TAG1] [-r ${TAG1}] [$[? revision] [-r ${revision}] []] $[? TAG2] [-r ${TAG2}] [] ${RCS_KFLAG} ${IGNORE_WHITE} ${IGNORE_SPACE} ${IGNORE_CASE} ${ADDITIONAL_OPTIONS} ${QFILE} ${NUR}</value>

            

        

          2700
          
	</property>

          2721
          
	</property>

        

        

          2701
          
	<property name="data.regex">

          2722
          
	<property name="data.regex">

        

        

          2702
          
          <value>(^[0-9]+(,[0-9]+|)[d][0-9]+$)|(^[0-9]+(,[0-9]+|)[c][0-9]+(,[0-9]+|)$)|(^[0-9]+[a][0-9]+(,[0-9]+|)$)|(^&lt; .*$)|(^&gt; .*$)|(^---$)|(^retrieving revision.*)</value>

          2723
          
          <value>(^[0-9]+(,[0-9]+|)[d][0-9]+$)|(^[0-9]+(,[0-9]+|)[c][0-9]+(,[0-9]+|)$)|(^[0-9]+[a][0-9]+(,[0-9]+|)$)|(^&lt; .*$)|(^&gt; .*$)|(^---$)|(^retrieving revision.*)</value>

        



(-)pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/config/pvcs.xml
      (-5 / +21 lines)




  

    
      
            Lines 360-365
          
      
      
        Link Here
      
    
  

        

          360
          
        <property name="disabledOnStatus">

          360
          
        <property name="disabledOnStatus">

        

        

          361
          
          <value>&versioned-statuses;</value>

          361
          
          <value>&versioned-statuses;</value>

        

        

          362
          
        </property>

          362
          
        </property>

        

            

              
              
              363
              
        <property name="associatedCommandInterfaceName">

            

            

              364
              
          <value>org.netbeans.api.vcs.commands.AddFolderCommand</value>

            

            

              365
              
        </property>

            

        

          363
          
      </command>

          366
          
      </command>

        

        

          364
          
      <command name="CREATE_PROJECT_CMD">

          367
          
      <command name="CREATE_PROJECT_CMD">

        

        

          365
          
        <!-- The same as CREATE_PROJECT, but without the pre-command to avoid loop -->

          368
          
        <!-- The same as CREATE_PROJECT, but without the pre-command to avoid loop -->

        

  

    
      
            Lines 462-474
          
      
      
        Link Here
      
    
  

        

          462
          
	</property>

          465
          
	</property>

        

        

          463
          
        <run>

          466
          
        <run>

        

        

          464
          
          <executable value="${PCLI_CMD}"/>

          467
          
          <executable value="${PCLI_CMD}"/>

        

          
            

              465
              
          <arg value="Get ${PRIDPP} ${RECURSIVE} ${SHOULD_LOCK} ${WRITABLE} $[? REVISION] [-r${REVISION}] [] $[? VERSION] [-v${QUOTE}${VERSION}${QUOTE}] [] $[? DO_CHECKOUT_BY_DATE] [$[? CHECKOUT_BY_DATE] [$[? CHECKOUT_BY_DATE - DATE_OPERATION_IDENT] [${CHECKOUT_BY_DATE}] [-d${DATE_BEFORE}]] [-u${DATE_AFTER}]] [] ${SET_CURR_TIME} $[? FILE] [${QFILES}] [.]"/>


              468
              
          <arg value="Get ${PRIDPP} ${RECURSIVE} ${SHOULD_LOCK} ${WRITABLE} $[? REVISION] [-r${REVISION}] [$[? revision] [-r${revision}] []] $[? VERSION] [-v${QUOTE}${VERSION}${QUOTE}] [] $[? DO_CHECKOUT_BY_DATE] [$[? CHECKOUT_BY_DATE] [$[? CHECKOUT_BY_DATE - DATE_OPERATION_IDENT] [${CHECKOUT_BY_DATE}] [-d${DATE_BEFORE}]] [-u${DATE_AFTER}]] [] ${SET_CURR_TIME} $[? FILE] [${QFILES}] [.]"/>

            

        

          466
          
        </run>

          469
          
        </run>

        

        

          467
          
        <property name="inputDescriptor">

          470
          
        <property name="inputDescriptor">

        

        

          468
          
          <value>LABEL(ResourceMsg(PVCS_CHECKOUT),ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_PVCS_CHECKOUT)))

          471
          
          <value>LABEL(ResourceMsg(PVCS_CHECKOUT),ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_PVCS_CHECKOUT)))

        

        

          469
          
                 ASK_FOR(SHOULD_LOCK, ResourceMsg(COMMAND_PVCS_CHECKOUT_Lock), "false",ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_CHECKOUT_Lock);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_CHECKOUT_Lock_mnc)), "-l", "")

          472
          
                 ASK_FOR(SHOULD_LOCK, ResourceMsg(COMMAND_PVCS_CHECKOUT_Lock), "false",ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_CHECKOUT_Lock);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_CHECKOUT_Lock_mnc)), "-l", "")

        

        

          470
          
                 ASK_FOR(WRITABLE, ResourceMsg(COMMAND_PVCS_CHECKOUT_Writable), "false",ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_CHECKOUT_Writable);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_CHECKOUT_Writable_mnc)), "-w", "")

          473
          
                 ASK_FOR(WRITABLE, ResourceMsg(COMMAND_PVCS_CHECKOUT_Writable), "false",ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_CHECKOUT_Writable);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_CHECKOUT_Writable_mnc)), "-w", "")

        

          
            

              471
              
                 PROMPT_FOR_EXPERT(REVISION, ResourceMsg(COMMAND_PVCS_CHECKOUT_Revision), "",ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_CHECKOUT_Revision);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_CHECKOUT_Revision_mnc)))


              474
              
                 PROMPT_FOR_EXPERT(REVISION, ResourceMsg(COMMAND_PVCS_CHECKOUT_Revision), "${revision}",ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_CHECKOUT_Revision);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_CHECKOUT_Revision_mnc)))

            

        

          472
          
                 PROMPT_FOR_EXPERT(VERSION, ResourceMsg(COMMAND_PVCS_CHECKOUT_Version), "",ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_CHECKOUT_Version);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_CHECKOUT_Version_mnc)))

          475
          
                 PROMPT_FOR_EXPERT(VERSION, ResourceMsg(COMMAND_PVCS_CHECKOUT_Version), "",ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_CHECKOUT_Version);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_CHECKOUT_Version_mnc)))

        

        

          473
          
                 ASK_FOR_EXPERT(DO_CHECKOUT_BY_DATE, ResourceMsg(COMMAND_PVCS_CHECKOUT_ByDate), "false", ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_CHECKOUT_ByDate);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_CHECKOUT_ByDate_mnc)), ENABLE(CHECKOUT_BY_DATE))

          476
          
                 ASK_FOR_EXPERT(DO_CHECKOUT_BY_DATE, ResourceMsg(COMMAND_PVCS_CHECKOUT_ByDate), "false", ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_CHECKOUT_ByDate);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_CHECKOUT_ByDate_mnc)), ENABLE(CHECKOUT_BY_DATE))

        

        

          474
          
                 SELECT_RADIO_EXPERT(CHECKOUT_BY_DATE, "", "-u",

          477
          
                 SELECT_RADIO_EXPERT(CHECKOUT_BY_DATE, "", "-u",

        

  

    
      
            Lines 523-528
          
      
      
        Link Here
      
    
  

        

          523
          
        <property name="generalCommandActionDisplayName">

          526
          
        <property name="generalCommandActionDisplayName">

        

        

          524
          
          <value>ResourceMsg(PVCS_GENERAL_ACTION_UPDATE)</value>

          527
          
          <value>ResourceMsg(PVCS_GENERAL_ACTION_UPDATE)</value>

        

        

          525
          
        </property>

          528
          
        </property>

        

            

              
              
              529
              
        <property name="associatedCommandInterfaceName">

            

            

              530
              
          <value>org.netbeans.api.vcs.commands.CheckOutCommand</value>

            

            

              531
              
        </property>

            

        

          526
          
      </command>

          532
          
      </command>

        

        

          527
          
      <command name="INITIAL_CHECKOUT">

          533
          
      <command name="INITIAL_CHECKOUT">

        

        

          528
          
        <run>

          534
          
        <run>

        

  

    
      
            Lines 574-580
          
      
      
        Link Here
      
    
  

        

          574
          
        </run>

          580
          
        </run>

        

        

          575
          
        <property name="inputDescriptor">

          581
          
        <property name="inputDescriptor">

        

        

          576
          
          <value>LABEL(ResourceMsg(PVCS_ADD),ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_PVCS_ADD)))

          582
          
          <value>LABEL(ResourceMsg(PVCS_ADD),ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_PVCS_ADD)))

        

          
            

              577
              
                 PROMPT_FOR(WF_DESCRIPTION, ResourceMsg(COMMAND_PVCS_ADD_Reason),"",ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_ADD_Reason);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_ADD_Reason_mnc)), VALIDATOR_NON_EMPTY)


              583
              
                 PROMPT_FOR(WF_DESCRIPTION, ResourceMsg(COMMAND_PVCS_ADD_Reason),"${message}",ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_ADD_Reason);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_ADD_Reason_mnc)), VALIDATOR_NON_EMPTY)

            

        

          578
          
                 PROMPT_FOR_FILE(DESCRIPTION_FILE, ResourceMsg(COMMAND_PVCS_CHECKIN_Reason), "{FILE_OUTPUT_OF_CHECKIN_TEMPLATE_GETTER(0)}", ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_CHECKIN_Reason);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_CHECKIN_Reason_mnc)))

          584
          
                 PROMPT_FOR_FILE(DESCRIPTION_FILE, ResourceMsg(COMMAND_PVCS_CHECKIN_Reason), "{FILE_OUTPUT_OF_CHECKIN_TEMPLATE_GETTER(0)}", ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_CHECKIN_Reason);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_CHECKIN_Reason_mnc)))

        

        

          579
          
                 ASK_FOR(KEEP_LOCK, ResourceMsg(COMMAND_PVCS_ADD_KeepLocked), "false", ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_ADD_KeepLocked);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_ADD_KeepLocked_mnc)), "-l", "")

          585
          
                 ASK_FOR(KEEP_LOCK, ResourceMsg(COMMAND_PVCS_ADD_KeepLocked), "false", ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_ADD_KeepLocked);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_ADD_KeepLocked_mnc)), "-l", "")

        

        

          580
          
                 PROMPT_FOR_EXPERT(ASSIGN_VERSION, ResourceMsg(COMMAND_PVCS_CHECKIN_AssignVersion), "", ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_CHECKIN_AssignVersion);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_CHECKIN_AssignVersion_mnc)))

          586
          
                 PROMPT_FOR_EXPERT(ASSIGN_VERSION, ResourceMsg(COMMAND_PVCS_CHECKIN_AssignVersion), "", ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_CHECKIN_AssignVersion);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_CHECKIN_AssignVersion_mnc)))

        

  

    
      
            Lines 633-639
          
      
      
        Link Here
      
    
  

        

          633
          
        </property>

          639
          
        </property>

        

        

          634
          
        <property name="inputDescriptor">

          640
          
        <property name="inputDescriptor">

        

        

          635
          
          <value>LABEL(ResourceMsg(PVCS_ADD),ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_PVCS_ADD)))

          641
          
          <value>LABEL(ResourceMsg(PVCS_ADD),ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_PVCS_ADD)))

        

          
            

              636
              
                 PROMPT_FOR(WF_DESCRIPTION, ResourceMsg(COMMAND_PVCS_ADD_Reason),"",ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_ADD_Reason);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_ADD_Reason_mnc)), VALIDATOR_NON_EMPTY)


              642
              
                 PROMPT_FOR(WF_DESCRIPTION, ResourceMsg(COMMAND_PVCS_ADD_Reason),"${message}",ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_ADD_Reason);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_ADD_Reason_mnc)), VALIDATOR_NON_EMPTY)

            

        

          637
          
                 PROMPT_FOR_FILE(DESCRIPTION_FILE, ResourceMsg(COMMAND_PVCS_CHECKIN_Reason), "{FILE_OUTPUT_OF_CHECKIN_TEMPLATE_GETTER(0)}", ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_CHECKIN_Reason);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_CHECKIN_Reason_mnc)))

          643
          
                 PROMPT_FOR_FILE(DESCRIPTION_FILE, ResourceMsg(COMMAND_PVCS_CHECKIN_Reason), "{FILE_OUTPUT_OF_CHECKIN_TEMPLATE_GETTER(0)}", ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_CHECKIN_Reason);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_CHECKIN_Reason_mnc)))

        

        

          638
          
                 ASK_FOR(KEEP_LOCK, ResourceMsg(COMMAND_PVCS_ADD_KeepLocked), "false", ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_ADD_KeepLocked);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_ADD_KeepLocked_mnc)), "-l", "")

          644
          
                 ASK_FOR(KEEP_LOCK, ResourceMsg(COMMAND_PVCS_ADD_KeepLocked), "false", ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_ADD_KeepLocked);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_ADD_KeepLocked_mnc)), "-l", "")

        

        

          639
          
                 PROMPT_FOR_EXPERT(ASSIGN_VERSION, ResourceMsg(COMMAND_PVCS_CHECKIN_AssignVersion), "", ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_CHECKIN_AssignVersion);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_CHECKIN_AssignVersion_mnc)))

          645
          
                 PROMPT_FOR_EXPERT(ASSIGN_VERSION, ResourceMsg(COMMAND_PVCS_CHECKIN_AssignVersion), "", ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_COMMAND_PVCS_CHECKIN_AssignVersion);;MNEMONIC_ResourceMsg(ACS_COMMAND_PVCS_CHECKIN_AssignVersion_mnc)))

        

  

    
      
            Lines 885-890
          
      
      
        Link Here
      
    
  

        

          885
          
        <property name="generalCommandActionDisplayName">

          891
          
        <property name="generalCommandActionDisplayName">

        

        

          886
          
          <value>ResourceMsg(PVCS_GENERAL_ACTION_REMOVE)</value>

          892
          
          <value>ResourceMsg(PVCS_GENERAL_ACTION_REMOVE)</value>

        

        

          887
          
        </property>

          893
          
        </property>

        

            

              
              
              894
              
        <property name="associatedCommandInterfaceName">

            

            

              895
              
          <value>org.netbeans.api.vcs.commands.RemoveCommand</value>

            

            

              896
              
        </property>

            

        

          888
          
      </command>

          897
          
      </command>

        

        

          889
          
      <separator />

          898
          
      <separator />

        

        

          890
          
      <command name="EDIT">

          899
          
      <command name="EDIT">

        

  

    
      
            Lines 1102-1107
          
      
      
        Link Here
      
    
  

        

          1102
          
        <property name="disabledOnStatus">

          1111
          
        <property name="disabledOnStatus">

        

        

          1103
          
          <value>&local-statuses;</value>

          1112
          
          <value>&local-statuses;</value>

        

        

          1104
          
        </property>

          1113
          
        </property>

        

            

              
              
              1114
              
        <property name="associatedCommandInterfaceName">

            

            

              1115
              
          <value>org.netbeans.api.vcs.commands.HistoryCommand</value>

            

            

              1116
              
        </property>

            

        

          1105
          
      </command>

          1117
          
      </command>

        

        

          1106
          
      <separator />

          1118
          
      <separator />

        

        

          1107
          
      <command name="DIFF" displayName="ResourceMsg(PVCS_DIFF)">

          1119
          
      <command name="DIFF" displayName="ResourceMsg(PVCS_DIFF)">

        

  

    
      
            Lines 1119-1125
          
      
      
        Link Here
      
    
  

        

          1119
          
        -->

          1131
          
        -->

        

        

          1120
          
        <run dir="${WORKDIR}">

          1132
          
        <run dir="${WORKDIR}">

        

        

          1121
          
          <executable value="$[? GEN_DELTA] [vdiff] [org.netbeans.modules.vcs.profiles.commands.Diff.class]"/>

          1133
          
          <executable value="$[? GEN_DELTA] [vdiff] [org.netbeans.modules.vcs.profiles.commands.Diff.class]"/>

        

          
            

              1122
              
          <arg value="$[? GEN_DELTA] [-dl] []"/>


              1134
              
          <arg value="$[? GEN_DELTA] [-dl] [$[? revision] [${revision}] []]"/>

            

        

          1123
          
          <arg value="$[? REV_VER1] [$[? GEN_DELTA] [-r][]${REVISION1}] [$[? GEN_DELTA] [-v][$[? VERSION1] [${BACKSLASH}] []]${VERSION1}]"/>

          1135
          
          <arg value="$[? REV_VER1] [$[? GEN_DELTA] [-r][]${REVISION1}] [$[? GEN_DELTA] [-v][$[? VERSION1] [${BACKSLASH}] []]${VERSION1}]"/>

        

        

          1124
          
          <arg value="$[? REV_VER2] [$[? GEN_DELTA] [$[? REVISION2] [-r${REVISION2}] []] [${REVISION2}]] [$[? GEN_DELTA] [$[? VERSION2] [-v${VERSION2}] []] [$[? VERSION2] [${BACKSLASH}${VERSION2}] []]]"/>

          1136
          
          <arg value="$[? REV_VER2] [$[? GEN_DELTA] [$[? REVISION2] [-r${REVISION2}] []] [${REVISION2}]] [$[? GEN_DELTA] [$[? VERSION2] [-v${VERSION2}] []] [$[? VERSION2] [${BACKSLASH}${VERSION2}] []]]"/>

        

        

          1125
          
          <arg line="$[? GEN_DELTA] [${IGNORE_WHITE} -d] [3 CHECKOUT_CMD DIFF_CA_CMD]"/>

          1137
          
          <arg line="$[? GEN_DELTA] [${IGNORE_WHITE} -d] [3 CHECKOUT_CMD DIFF_CA_CMD]"/>

        

  

    
      
            Lines 1161-1166
          
      
      
        Link Here
      
    
  

        

          1161
          
        <property name="disabledOnStatus">

          1173
          
        <property name="disabledOnStatus">

        

        

          1162
          
          <value>&local-statuses;</value>

          1174
          
          <value>&local-statuses;</value>

        

        

          1163
          
        </property>

          1175
          
        </property>

        

            

              
              
              1176
              
        <property name="associatedCommandInterfaceName">

            

            

              1177
              
          <value>org.netbeans.api.vcs.commands.DiffCommand</value>

            

            

              1178
              
        </property>

            

        

          1164
          
      </command>

          1179
          
      </command>

        

        

          1165
          
      <command name="APPLY_DELTA" displayName="ResourceMsg(PVCS_APPLY_DELTA)">

          1180
          
      <command name="APPLY_DELTA" displayName="ResourceMsg(PVCS_APPLY_DELTA)">

        

        

          1166
          
        <property name="labelMnemonic">

          1181
          
        <property name="labelMnemonic">

        

  

    
      
            Lines 1338-1343
          
      
      
        Link Here
      
    
  

        

          1338
          
        <run dir="${WORKDIR}">

          1353
          
        <run dir="${WORKDIR}">

        

        

          1339
          
          <executable value="vdiff"/>

          1354
          
          <executable value="vdiff"/>

        

        

          1340
          
          <arg value="-dl"/>

          1355
          
          <arg value="-dl"/>

        

            

              
              
              1356
              
          <arg value="$[? revision] [-r${revision}] []"/>

            

        

          1341
          
          <arg value="$[? REV_VER1] [-r${REVISION1}] [$[? VERSION1] [-v${VERSION1}] [-r]]"/>

          1357
          
          <arg value="$[? REV_VER1] [-r${REVISION1}] [$[? VERSION1] [-v${VERSION1}] [-r]]"/>

        

        

          1342
          
          <arg value="$[? REV_VER2] [$[? REVISION2] [-r${REVISION2}] []] [$[? VERSION2] [-v${VERSION2}] []]"/>

          1358
          
          <arg value="$[? REV_VER2] [$[? REVISION2] [-r${REVISION2}] []] [$[? VERSION2] [-v${VERSION2}] []]"/>

        

        

          1343
          
          <arg value="${IGNORE_WHITE}"/>

          1359
          
          <arg value="${IGNORE_WHITE}"/>

        



(-)vss/src/org/netbeans/modules/vcs/profiles/vss/config/vss.xml
      (-1 / +19 lines)




  

    
      
            Lines 657-662
          
      
      
        Link Here
      
    
  

        

          657
          
          <property name="disabledOnStatus">

          657
          
          <property name="disabledOnStatus">

        

        

          658
          
            <value>&local-statuses;</value>

          658
          
            <value>&local-statuses;</value>

        

        

          659
          
          </property>

          659
          
          </property>

        

            

              
              
              660
              
        <property name="associatedCommandInterfaceName">

            

            

              661
              
          <value>org.netbeans.api.vcs.commands.UncheckOutCommand</value>

            

            

              662
              
        </property>

            

        

          660
          
      </command>

          663
          
      </command>

        

        

          661
          
      <command name="UNCHECKOUTR_CONFIRM">

          664
          
      <command name="UNCHECKOUTR_CONFIRM">

        

        

          662
          
        <property name="exec">

          665
          
        <property name="exec">

        

  

    
      
            Lines 1155-1160
          
      
      
        Link Here
      
    
  

        

          1155
          
          <property name="disabledOnStatus">

          1158
          
          <property name="disabledOnStatus">

        

        

          1156
          
            <value>&versioned-statuses;</value>

          1159
          
            <value>&versioned-statuses;</value>

        

        

          1157
          
          </property>

          1160
          
          </property>

        

            

              
              
              1161
              
        <property name="associatedCommandInterfaceName">

            

            

              1162
              
          <value>org.netbeans.api.vcs.commands.AddFolderCommand</value>

            

            

              1163
              
        </property>

            

        

          1158
          
      </command>

          1164
          
      </command>

        

        

          1159
          
      <command name="ADD_LOCAL_PARENTS">

          1165
          
      <command name="ADD_LOCAL_PARENTS">

        

        

          1160
          
	<property name="exec">

          1166
          
	<property name="exec">

        

  

    
      
            Lines 1247-1252
          
      
      
        Link Here
      
    
  

        

          1247
          
          <property name="disabledOnStatus">

          1253
          
          <property name="disabledOnStatus">

        

        

          1248
          
            <value>&local-statuses;</value>

          1254
          
            <value>&local-statuses;</value>

        

        

          1249
          
          </property>

          1255
          
          </property>

        

            

              
              
              1256
              
        <property name="associatedCommandInterfaceName">

            

            

              1257
              
          <value>org.netbeans.api.vcs.commands.RemoveCommand</value>

            

            

              1258
              
        </property>

            

        

          1250
          
      </command>

          1259
          
      </command>

        

        

          1251
          
      <command name="RECOVER" displayName="ResourceMsg(VSS_RECOVER)">

          1260
          
      <command name="RECOVER" displayName="ResourceMsg(VSS_RECOVER)">

        

        

          1252
          
        <property name="labelMnemonic">

          1261
          
        <property name="labelMnemonic">

        

  

    
      
            Lines 1350-1355
          
      
      
        Link Here
      
    
  

        

          1350
          
          <property name="disabledOnStatus">

          1359
          
          <property name="disabledOnStatus">

        

        

          1351
          
            <value>&local-statuses;</value>

          1360
          
            <value>&local-statuses;</value>

        

        

          1352
          
          </property>

          1361
          
          </property>

        

            

              
              
              1362
              
        <property name="associatedCommandInterfaceName">

            

            

              1363
              
          <value>org.netbeans.api.vcs.commands.HistoryCommand</value>

            

            

              1364
              
        </property>

            

        

          1353
          
      </command>

          1365
          
      </command>

        

        

          1354
          
      <command name="PROPERTIES" displayName="ResourceMsg(VSS_PROPERTIES)">

          1366
          
      <command name="PROPERTIES" displayName="ResourceMsg(VSS_PROPERTIES)">

        

        

          1355
          
        <property name="labelMnemonic">

          1367
          
        <property name="labelMnemonic">

        

  

    
      
            Lines 1391-1396
          
      
      
        Link Here
      
    
  

        

          1391
          
          <property name="disabledOnStatus">

          1403
          
          <property name="disabledOnStatus">

        

        

          1392
          
            <value>&local-statuses;</value>

          1404
          
            <value>&local-statuses;</value>

        

        

          1393
          
          </property>

          1405
          
          </property>

        

            

              
              
              1406
              
        <property name="associatedCommandInterfaceName">

            

            

              1407
              
          <value>org.netbeans.api.vcs.commands.PropertiesCommand</value>

            

            

              1408
              
        </property>

            

        

          1394
          
      </command>

          1409
          
      </command>

        

        

          1395
          
      <separator />

          1410
          
      <separator />

        

        

          1396
          
      <command name="DIFF" displayName="ResourceMsg(VSS_DIFF)">

          1411
          
      <command name="DIFF" displayName="ResourceMsg(VSS_DIFF)">

        

  

    
      
            Lines 1432-1437
          
      
      
        Link Here
      
    
  

        

          1432
          
          <property name="disabledOnStatus">

          1447
          
          <property name="disabledOnStatus">

        

        

          1433
          
            <value>&local-statuses;</value>

          1448
          
            <value>&local-statuses;</value>

        

        

          1434
          
          </property>

          1449
          
          </property>

        

            

              
              
              1450
              
        <property name="associatedCommandInterfaceName">

            

            

              1451
              
          <value>org.netbeans.api.vcs.commands.DiffCommand</value>

            

            

              1452
              
        </property>

            

        

          1435
          
      </command>

          1453
          
      </command>

        

        

          1436
          
      <command name="LIST_FILE_DIFF">

          1454
          
      <command name="LIST_FILE_DIFF">

        

        

          1437
          
	<property name="exec">

          1455
          
	<property name="exec">

        

  

    
      
            Lines 1512-1518
          
      
      
        Link Here
      
    
  

        

          1512
          
      </command>

          1530
          
      </command>

        

        

          1513
          
      <command name="DIFF_USR_CMD">

          1531
          
      <command name="DIFF_USR_CMD">

        

        

          1514
          
	<property name="exec">

          1532
          
	<property name="exec">

        

          
            

              1515
              
          <value>${RUN} diff -DU ${CMD_DIFF_OPTIONS} ${OPTIONS} ${QUOTE}${FILE}${QUOTE} ${NUR}</value>


              1533
              
          <value>${RUN} diff -DU ${CMD_DIFF_OPTIONS} $[? revision] [-V${revision}] [] ${OPTIONS} ${QUOTE}${FILE}${QUOTE} ${NUR}</value>

            

        

          1516
          
        </property>

          1534
          
        </property>

        

        

          1517
          
	<property name="data.regex">

          1535
          
	<property name="data.regex">

        

        

          1518
          
	  <value>(.*$)</value>

          1536
          
	  <value>(.*$)</value>

        






  

  Return to bug 55600