Index: cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/cvs.xml =================================================================== RCS file: /cvs/vcsgeneric/profiles/cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/cvs.xml,v --- cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/cvs.xml 2 Mar 2005 12:09:34 -0000 1.152 +++ cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/cvs.xml 2 Mar 2005 14:26:22 -0000 @@ -865,7 +865,7 @@ - ${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} + ${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} ^([UPARMC]) (.*$)|^(.*) (already contains the differences)(.*)$ @@ -929,7 +929,7 @@ 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", "") 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", "") 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", "") - 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) + 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) 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) SELECT_RADIO_EXPERT(MERGE_SELECTION, "", "", [ResourceMsg1(COMMAND_UPDATE_NoMerge), "", ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_UPDATE_NoMerge);;MNEMONIC_ResourceMsg1(ACS_COMMAND_UPDATE_NoMerge_mnc))] @@ -993,6 +993,9 @@ ResourceMsg1(CVS_GENERAL_ACTION_UPDATE) + + org.netbeans.api.vcs.commands.UpdateCommand + &local-statuses;, "Yet-Unknown" @@ -1027,7 +1030,7 @@ VARIABLE_DEFAULTS(FOLDER_CONTENTS USER, RUN_RECURSIVELY USER, DO_COMMIT USER) SELECT_RADIO(FOLDER_CONTENTS, "", "", [ResourceMsg1(COMMAND_ADD_JustFolder), "",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_ADD_JustFolder);;MNEMONIC_ResourceMsg1(ACS_COMMAND_ADD_JustFolder_mnc))], [ResourceMsg1(COMMAND_ADD_FolderContents), "true",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_ADD_FolderContents);;MNEMONIC_ResourceMsg1(ACS_COMMAND_ADD_FolderContents_mnc)), - PROMPT_FOR(DESCRIPTION, ResourceMsg1(COMMAND_ADD_Description), "",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_ADD_Description);;MNEMONIC_ResourceMsg1(ACS_COMMAND_ADD_Description_mnc))) + PROMPT_FOR(DESCRIPTION, ResourceMsg1(COMMAND_ADD_Description), "${message}",ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_ADD_Description);;MNEMONIC_ResourceMsg1(ACS_COMMAND_ADD_Description_mnc))) 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") ASK_FOR(DO_COMMIT, ResourceMsg1(COMMAND_ADD_DoCommit),, ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACS_COMMAND_ADD_DoCommit);;MNEMONIC_ResourceMsg1(ACS_COMMAND_ADD_DoCommit_mnc)))]) @@ -1072,6 +1075,9 @@ ResourceMsg1(CVS_GENERAL_ACTION_ADD) + + org.netbeans.api.vcs.commands.AddFolderCommand + ADD_LOCAL_PARENTS @@ -1257,7 +1263,7 @@ - ${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} + ${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} org.netbeans.modules.vcs.profiles.cvsprofiles.visualizers.add.CvsAddVisualizer @@ -1418,6 +1424,9 @@ &local-statuses;, "Yet-Unknown" + + org.netbeans.api.vcs.commands.RemoveCommand + @@ -1528,6 +1537,9 @@ &local-statuses; + + org.netbeans.api.vcs.commands.PropertiesCommand + @@ -1605,6 +1617,9 @@ ResourceMsg1(CVS_GENERAL_ACTION_HISTORY) + + org.netbeans.api.vcs.commands.HistoryCommand + @@ -1900,6 +1915,9 @@ $[? MULTIPLE_FILES] [ResourceMsg1(NOTIFICATION_EDITs_Fail, ${NUM_FILES})] [ResourceMsg1(NOTIFICATION_EDIT_Fail, ${FILE})] + + org.netbeans.api.vcs.commands.CheckOutCommand + @@ -2430,7 +2448,7 @@ LABEL(ResourceMsg1(COMMAND_DIFF_Label),ACCESSIBILITY(DESCRIPTION_ResourceMsg1(ACSD_COMMAND_DIFF_Label))) VARIABLE_DEFAULTS(IGNORE_WHITE USER, IGNORE_SPACE USER, IGNORE_CASE USER, ADDITIONAL_OPTIONS EXPERT_USER) - 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) + 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) 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) 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) 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) @@ -2456,6 +2474,9 @@ &local-statuses;, "Yet-Unknown" + + org.netbeans.api.vcs.commands.DiffCommand + @@ -2696,7 +2717,7 @@ - ${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} + ${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} (^[0-9]+(,[0-9]+|)[d][0-9]+$)|(^[0-9]+(,[0-9]+|)[c][0-9]+(,[0-9]+|)$)|(^[0-9]+[a][0-9]+(,[0-9]+|)$)|(^< .*$)|(^> .*$)|(^---$)|(^retrieving revision.*) Index: pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/config/pvcs.xml =================================================================== RCS file: /cvs/vcsgeneric/profiles/pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/config/pvcs.xml,v --- pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/config/pvcs.xml 9 Feb 2005 17:38:03 -0000 1.46 +++ pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/config/pvcs.xml 2 Mar 2005 14:26:30 -0000 @@ -360,6 +360,9 @@ &versioned-statuses; + + org.netbeans.api.vcs.commands.AddFolderCommand + @@ -462,13 +465,13 @@ - + LABEL(ResourceMsg(PVCS_CHECKOUT),ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_PVCS_CHECKOUT))) 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", "") 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", "") - 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))) + 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))) 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))) 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)) SELECT_RADIO_EXPERT(CHECKOUT_BY_DATE, "", "-u", @@ -523,6 +526,9 @@ ResourceMsg(PVCS_GENERAL_ACTION_UPDATE) + + org.netbeans.api.vcs.commands.CheckOutCommand + @@ -574,7 +580,7 @@ LABEL(ResourceMsg(PVCS_ADD),ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_PVCS_ADD))) - 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) + 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) 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))) 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", "") 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))) @@ -633,7 +639,7 @@ LABEL(ResourceMsg(PVCS_ADD),ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_PVCS_ADD))) - 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) + 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) 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))) 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", "") 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))) @@ -885,6 +891,9 @@ ResourceMsg(PVCS_GENERAL_ACTION_REMOVE) + + org.netbeans.api.vcs.commands.RemoveCommand + @@ -1102,6 +1111,9 @@ &local-statuses; + + org.netbeans.api.vcs.commands.HistoryCommand + @@ -1119,7 +1131,7 @@ --> - + @@ -1161,6 +1173,9 @@ &local-statuses; + + org.netbeans.api.vcs.commands.DiffCommand + @@ -1338,6 +1353,7 @@ + Index: vss/src/org/netbeans/modules/vcs/profiles/vss/config/vss.xml =================================================================== RCS file: /cvs/vcsgeneric/profiles/vss/src/org/netbeans/modules/vcs/profiles/vss/config/vss.xml,v --- vss/src/org/netbeans/modules/vcs/profiles/vss/config/vss.xml 10 Feb 2005 15:19:50 -0000 1.48 +++ vss/src/org/netbeans/modules/vcs/profiles/vss/config/vss.xml 2 Mar 2005 14:26:37 -0000 @@ -657,6 +657,9 @@ &local-statuses; + + org.netbeans.api.vcs.commands.UncheckOutCommand + @@ -1155,6 +1158,9 @@ &versioned-statuses; + + org.netbeans.api.vcs.commands.AddFolderCommand + @@ -1247,6 +1253,9 @@ &local-statuses; + + org.netbeans.api.vcs.commands.RemoveCommand + @@ -1350,6 +1359,9 @@ &local-statuses; + + org.netbeans.api.vcs.commands.HistoryCommand + @@ -1391,6 +1403,9 @@ &local-statuses; + + org.netbeans.api.vcs.commands.PropertiesCommand + @@ -1432,6 +1447,9 @@ &local-statuses; + + org.netbeans.api.vcs.commands.DiffCommand + @@ -1512,7 +1530,7 @@ - ${RUN} diff -DU ${CMD_DIFF_OPTIONS} ${OPTIONS} ${QUOTE}${FILE}${QUOTE} ${NUR} + ${RUN} diff -DU ${CMD_DIFF_OPTIONS} $[? revision] [-V${revision}] [] ${OPTIONS} ${QUOTE}${FILE}${QUOTE} ${NUR} (.*$)