Update dialog reworked. Radio buttons are used for merge selection.
Associated issue: 25139.
1.1 --- a/vcs.profiles.cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle.properties Tue Dec 09 17:15:22 2003 +0000
1.2 +++ b/vcs.profiles.cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle.properties Tue Dec 09 17:54:34 2003 +0000
1.3 @@ -243,8 +243,11 @@
1.4 COMMAND_UPDATE_Date=Date:
1.5 COMMAND_UPDATE_RemoveSticky=Reset Sticky Tags/Dates
1.6 COMMAND_UPDATE_GetCleanCopy=Get Clean Repository Copy
1.7 -COMMAND_UPDATE_MergeRev1=Merge With Revision:
1.8 -COMMAND_UPDATE_MergeRev2=Merge With Diff. Between Above and This:
1.9 +COMMAND_UPDATE_NoMerge=No Merge
1.10 +COMMAND_UPDATE_MergeRevCurr=Merge With Revision:
1.11 +COMMAND_UPDATE_Merge2Rev=Merge With Differences Between Two Revisions
1.12 +COMMAND_UPDATE_MergeRev1=Revision 1:
1.13 +COMMAND_UPDATE_MergeRev2=Revision 2:
1.14 COMMAND_UPDATE_Send_To_Stdout=Send Updates to Standard Output
1.15 COMMAND_UPDATE_Recursive=Process Directories Recursively
1.16
1.17 @@ -509,10 +512,16 @@
1.18 ACS_COMMAND_UPDATE_RemoveSticky_mnc=m
1.19 ACSD_COMMAND_UPDATE_GetCleanCopy=Discard local modifications and get the clean copy.
1.20 ACS_COMMAND_UPDATE_GetCleanCopy_mnc=c
1.21 -ACSD_COMMAND_UPDATE_MergeRev1=Merge with a revision
1.22 -ACS_COMMAND_UPDATE_MergeRev1_mnc=w
1.23 -ACSD_COMMAND_UPDATE_MergeRev2=Merge with the difference between the above revision and this revision
1.24 -ACS_COMMAND_UPDATE_MergeRev2_mnc=f
1.25 +ACSD_COMMAND_UPDATE_NoMerge=Do not perform any merge
1.26 +ACS_COMMAND_UPDATE_NoMerge_mnc=o
1.27 +ACSD_COMMAND_UPDATE_MergeRevCurr=Merge with changes between current revision and filled revision
1.28 +ACS_COMMAND_UPDATE_MergeRevCurr_mnc=w
1.29 +ACSD_COMMAND_UPDATE_Merge2Rev=Merge with the difference between the two revisions
1.30 +ACS_COMMAND_UPDATE_Merge2Rev_mnc=f
1.31 +ACSD_COMMAND_UPDATE_MergeRev1=The first revision
1.32 +ACS_COMMAND_UPDATE_MergeRev1_mnc=1
1.33 +ACSD_COMMAND_UPDATE_MergeRev2=The second revision
1.34 +ACS_COMMAND_UPDATE_MergeRev2_mnc=2
1.35
1.36 ACSD_COMMAND_Force_Head_Match=Checkbox to sign if Force a Head Revision Match in case Tag/Date not found
1.37 ACS_COMMAND_Force_Head_Match_mnc=O
2.1 --- a/vcs.profiles.cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/cvs.xml Tue Dec 09 17:15:22 2003 +0000
2.2 +++ b/vcs.profiles.cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/cvs.xml Tue Dec 09 17:54:34 2003 +0000
2.3 @@ -211,6 +211,9 @@
2.4 <variable name="REVISION_OPERATION_IDENT" basic="false">
2.5 <value>R</value>
2.6 </variable>
2.7 + <variable name="1" basic="false">
2.8 + <value>1</value>
2.9 + </variable>
2.10 <variable name="GLOBAL_INPUT_DESCRIPTOR" basic="false">
2.11 <value>LABEL(getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(CVS_OPTIONS_GLOBAL_Label),
2.12 ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_CVS_OPTIONS_GLOBAL_Label)))
2.13 @@ -674,7 +677,7 @@
2.14 </command>
2.15 <command name="UPDATE_CMD" >
2.16 <property name="exec">
2.17 - <value>${CDM_EXECUTE} ${USER_GLOBAL_PARAM} update ${PRUNE_EMPTY} ${CREATE_DIRS} ${RESET_STICKY} ${GET_CLEAN_COPY} ${SEND_TO_STDOUT} $[? TAG] [-r ${TAG}] [] $[? DATE] [-D ${QUOTE}${DATE}${QUOTE}] [] $[? MERGE_REV1] [-j ${MERGE_REV1}] [] $[? MERGE_REV2] [-j ${MERGE_REV2}] [] ${FORCE_HEAD_MATCH} ${RCS_KFLAG} ${RECURSIVE} $[? DIR] [${QPATHS}] [$[? FILE] [${QPATHS}] []] ${NUR}</value>
2.18 + <value>${CDM_EXECUTE} ${USER_GLOBAL_PARAM} update ${PRUNE_EMPTY} ${CREATE_DIRS} ${RESET_STICKY} ${GET_CLEAN_COPY} ${SEND_TO_STDOUT} $[? 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>
2.19 </property>
2.20 <property name="data.regex">
2.21 <value>^([UPARMC]) (.*$)|^(.*) (already contains the differences)(.*)$</value>
2.22 @@ -710,14 +713,19 @@
2.23 ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_COMMAND_UPDATE_Label)))
2.24 ASK_FOR_EXPERT(PRUNE_EMPTY, getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_UPDATE_PruneEmpty), "true",ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_COMMAND_UPDATE_PruneEmpty);;MNEMONIC_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACS_COMMAND_UPDATE_PruneEmpty_mnc)),"-P", "")
2.25 ASK_FOR_EXPERT(CREATE_DIRS, getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_UPDATE_CreateDirs), "true",ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_COMMAND_UPDATE_CreateDirs);;MNEMONIC_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACS_COMMAND_UPDATE_CreateDirs_mnc)), "-d", "")
2.26 + ASK_FOR_EXPERT(RESET_STICKY, getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_UPDATE_RemoveSticky), "false", ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_COMMAND_UPDATE_RemoveSticky);;MNEMONIC_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACS_COMMAND_UPDATE_RemoveSticky_mnc)), "-A", "")
2.27 + ASK_FOR_EXPERT(GET_CLEAN_COPY, getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_UPDATE_GetCleanCopy), "false", ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_COMMAND_UPDATE_GetCleanCopy);;MNEMONIC_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACS_COMMAND_UPDATE_GetCleanCopy_mnc)), "-C", "")
2.28 + ASK_FOR_EXPERT(FORCE_HEAD_MATCH, getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_Force_Head_Match), "false",ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_COMMAND_Force_Head_Match);;MNEMONIC_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACS_COMMAND_Force_Head_Match_mnc)), "-f", "")
2.29 + ASK_FOR_EXPERT(SEND_TO_STDOUT, getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_UPDATE_Send_To_Stdout), "false",ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_COMMAND_UPDATE_Send_To_Stdout);;MNEMONIC_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACS_COMMAND_UPDATE_Send_To_Stdout_mnc)),"-p", "")
2.30 PROMPT_FOR_EXPERT(TAG, getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_UPDATE_Tag), "",ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_COMMAND_UPDATE_Tag);;MNEMONIC_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACS_COMMAND_UPDATE_Tag_mnc)) ,IF_VAR_EMPTY"FILES_IS_FOLDER"_SELECTOR_CMD_SELECTOR_REVISIONS)
2.31 PROMPT_FOR_EXPERT(DATE, getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_UPDATE_Date), "",ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_COMMAND_UPDATE_Date);;MNEMONIC_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACS_COMMAND_UPDATE_Date_mnc)),SELECTOR_DATE_CVS)
2.32 - ASK_FOR_EXPERT(RESET_STICKY, getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_UPDATE_RemoveSticky), "false", ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_COMMAND_UPDATE_RemoveSticky);;MNEMONIC_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACS_COMMAND_UPDATE_RemoveSticky_mnc)), "-A", "")
2.33 - ASK_FOR_EXPERT(GET_CLEAN_COPY, getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_UPDATE_GetCleanCopy), "false", ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_COMMAND_UPDATE_GetCleanCopy);;MNEMONIC_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACS_COMMAND_UPDATE_GetCleanCopy_mnc)), "-C", "")
2.34 - PROMPT_FOR_EXPERT(MERGE_REV1, getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_UPDATE_MergeRev1), "", ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_COMMAND_UPDATE_MergeRev1);;MNEMONIC_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACS_COMMAND_UPDATE_MergeRev1_mnc)))
2.35 - PROMPT_FOR_EXPERT(MERGE_REV2, getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_UPDATE_MergeRev2), "", ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_COMMAND_UPDATE_MergeRev2);;MNEMONIC_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACS_COMMAND_UPDATE_MergeRev2_mnc)))
2.36 - ASK_FOR_EXPERT(FORCE_HEAD_MATCH, getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_Force_Head_Match), "false",ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_COMMAND_Force_Head_Match);;MNEMONIC_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACS_COMMAND_Force_Head_Match_mnc)), "-f", "")
2.37 - ASK_FOR_EXPERT(SEND_TO_STDOUT, getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_UPDATE_Send_To_Stdout), "false",ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_COMMAND_UPDATE_Send_To_Stdout);;MNEMONIC_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACS_COMMAND_UPDATE_Send_To_Stdout_mnc)),"-p", "")
2.38 + SELECT_RADIO_EXPERT(MERGE_SELECTION, "", "",
2.39 + [getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_UPDATE_NoMerge), "", ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_COMMAND_UPDATE_NoMerge);;MNEMONIC_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACS_COMMAND_UPDATE_NoMerge_mnc))]
2.40 + [getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_UPDATE_MergeRevCurr), "1", ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_COMMAND_UPDATE_MergeRevCurr);;MNEMONIC_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACS_COMMAND_UPDATE_MergeRevCurr_mnc)),
2.41 + PROMPT_FOR_EXPERT(MERGE_REV, "")],
2.42 + [getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_UPDATE_Merge2Rev), "2", ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_COMMAND_UPDATE_Merge2Rev);;MNEMONIC_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACS_COMMAND_UPDATE_Merge2Rev_mnc)),
2.43 + PROMPT_FOR_EXPERT(MERGE_REV1, getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_UPDATE_MergeRev1), "", ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_COMMAND_UPDATE_MergeRev1);;MNEMONIC_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACS_COMMAND_UPDATE_MergeRev1_mnc)))
2.44 + PROMPT_FOR_EXPERT(MERGE_REV2, getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_UPDATE_MergeRev2), "", ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_COMMAND_UPDATE_MergeRev2);;MNEMONIC_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACS_COMMAND_UPDATE_MergeRev2_mnc)))])
2.45 SELECT_COMBO_EXPERT(RCS_KFLAG, getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_Keyword_Substitution), "",ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_COMMAND_Keyword_Substitution);;MNEMONIC_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACS_COMMAND_Keyword_Substitution_mnc)),["getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_Keyword_Substitution_None)", ""], ["getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_Keyword_Substitution_Binary)", "-kb"], ["getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_Keyword_Substitution_KeywordValue)", "-kkv"], ["getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_Keyword_Substitution_KeywordValueLocker)", "-kkvl"], ["getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_Keyword_Substitution_KeywordOnly)", "-kk"], ["getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_Keyword_Substitution_ValueOnly)", "-kv"], ["getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_Keyword_Substitution_ReuseOld)", "-ko"])
2.46 IF_VAR_NON_EMPTY"FILES_IS_FOLDER"_ASK_FOR_EXPERT(RECURSIVE, getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(COMMAND_Recursive), "true",ACCESSIBILITY(DESCRIPTION_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACSD_COMMAND_Recursive);;MNEMONIC_getBundle(org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle).getString(ACS_COMMAND_Recursive_mnc)),"-R", "-l")
2.47 </value>