Attachment #55473 for bug #125786

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 125786
Collapse All | Expand All

Lines 78-83 Link Here

(-)versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/diff/Bundle.properties (+2 lines)
78		78
79	LBL_ImportDiff_Progress=Importing Patches	79	LBL_ImportDiff_Progress=Importing Patches
80		80
		81	BK3005=Replace existing {0} file?
		82
81	ACSD_ImportBrowseFolder = Lets you browse for mercurial import file.	83	ACSD_ImportBrowseFolder = Lets you browse for mercurial import file.
82	ImportBrowse_title=Browse for the Import File	84	ImportBrowse_title=Browse for the Import File
83	#~	85	#~




        }
        final String revStr = ed.getSelectionRevision();
        final String outputFileName = ed.getOutputFileName();
        File destinationFile = new File(outputFileName);
        if (destinationFile.exists()) {
            NotifyDescriptor nd = new NotifyDescriptor.Confirmation(NbBundle.getMessage(ExportDiffAction.class, "BK3005", destinationFile.getAbsolutePath()));
            nd.setOptionType(NotifyDescriptor.YES_NO_OPTION);
            DialogDisplayer.getDefault().notify(nd);
            if (nd.getValue().equals(NotifyDescriptor.OK_OPTION) == false) {
                return;
            }
        }

        HgModuleConfig.getDefault().setExportFolder(destinationFile.getParent());
        RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(root.getAbsolutePath());
        HgProgressSupport support = new HgProgressSupport() {
            public void perform() {

Return to bug 125786

Lines 103-110 Link Here

(-)versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/diff/ExportDiffAction.java (-2 / +11 lines)
103	}	103	}
104	final String revStr = ed.getSelectionRevision();	104	final String revStr = ed.getSelectionRevision();
105	final String outputFileName = ed.getOutputFileName();	105	final String outputFileName = ed.getOutputFileName();
106	File outputFile = new File(outputFileName);	106	File destinationFile = new File(outputFileName);
107	HgModuleConfig.getDefault().setExportFolder(outputFile.getParent());	107	if (destinationFile.exists()) {
		108	NotifyDescriptor nd = new NotifyDescriptor.Confirmation(NbBundle.getMessage(ExportDiffAction.class, "BK3005", destinationFile.getAbsolutePath()));
		109	nd.setOptionType(NotifyDescriptor.YES_NO_OPTION);
		110	DialogDisplayer.getDefault().notify(nd);
		111	if (nd.getValue().equals(NotifyDescriptor.OK_OPTION) == false) {
		112	return;
		113	}
		114	}
		115
		116	HgModuleConfig.getDefault().setExportFolder(destinationFile.getParent());
108	RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(root.getAbsolutePath());	117	RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(root.getAbsolutePath());
109	HgProgressSupport support = new HgProgressSupport() {	118	HgProgressSupport support = new HgProgressSupport() {
110	public void perform() {	119	public void perform() {