# This patch file was generated by NetBeans IDE # This patch can be applied using context Tools: Apply Diff Patch action on respective folder. # It uses platform neutral UTF-8 encoding. # Above lines and this line are ignored by the patching process. Index: versioncontrol/mercurial/src/org/netbeans/modules/mercurial/MercurialAnnotator.java --- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/MercurialAnnotator.java Base (1.19) +++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/MercurialAnnotator.java Locally Modified (Based On 1.19) @@ -159,11 +159,7 @@ public void refresh() { String string = HgModuleConfig.getDefault().getAnnotationFormat(); //System.getProperty("netbeans.experimental.svn.ui.statusLabelFormat"); // NOI18N if (string != null && !string.trim().equals("")) { // NOI18N - if (string.indexOf("{revision}") != -1 ) { // NOI18N - needRevisionForFormat = true; - } else { - needRevisionForFormat = false; - } + needRevisionForFormat = isRevisionInAnnotationFormat(string); string = string.replaceAll("\\{revision\\}", "\\{0\\}"); // NOI18N string = string.replaceAll("\\{status\\}", "\\{1\\}"); // NOI18N string = string.replaceAll("\\{folder\\}", "\\{2\\}"); // NOI18N @@ -172,6 +168,14 @@ } } + public static boolean isRevisionInAnnotationFormat(String str){ + if (str.indexOf("{revision}") != -1) { // NOI18N + return true; + } else { + return false; + } + } + private void initDefaultColor(String name) { String color = System.getProperty("hg.color." + name); // NOI18N if (color == null) return; Index: versioncontrol/mercurial/src/org/netbeans/modules/mercurial/options/Bundle.properties --- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/options/Bundle.properties Base (1.8) +++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/options/Bundle.properties Locally Modified (Based On 1.8) @@ -77,6 +77,9 @@ MercurialPanel.label.status = stays for Status MercurialPanel.label.folder = stays for Branch or Tag Name +MSG_STATUS_LABEL_WITH_REVSION_TITLE = Revision Label Performance +MSG_STATUS_LABEL_WITH_REVSION_MSG = Revision labels {revision} have been added.\n\nThis can seriously effect performance when viewing Mercurial controlled Projects.\nUsing Show Annotations or Show History on selected files is a more efficient way to get revision information. + //AnnotationSettings.edit.title = Edit the URL Pattern Regular Expresion //AnnotationSettings.new.title = Add a new URL Pattern Regular Expresion Index: versioncontrol/mercurial/src/org/netbeans/modules/mercurial/options/MercurialPanel.java --- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/options/MercurialPanel.java Base (1.8) +++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/options/MercurialPanel.java Locally Modified (Based On 1.8) @@ -45,6 +45,8 @@ import javax.swing.event.DocumentListener; import javax.swing.event.DocumentEvent; +import org.netbeans.modules.mercurial.MercurialAnnotator; +import org.netbeans.modules.mercurial.util.HgUtils; final class MercurialPanel extends javax.swing.JPanel { @@ -255,7 +257,11 @@ HgModuleConfig.getDefault().setExportFilename(exportFilenameTextField.getText()); HgModuleConfig.getDefault().setAnnotationFormat(annotationTextField.getText()); HgModuleConfig.getDefault().setBackupOnRevertModifications(backupOnRevertModifications.isSelected()); + if (MercurialAnnotator.isRevisionInAnnotationFormat(annotationTextField.getText())){ + HgUtils.warningDialog(MercurialPanel.class, + "MSG_STATUS_LABEL_WITH_REVSION_TITLE", "MSG_STATUS_LABEL_WITH_REVSION_MSG");// NOI18N } + } boolean valid() { // TODO check whether form is consistent and complete