# 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/HgModuleConfig.java
--- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/HgModuleConfig.java Base (1.16)
+++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/HgModuleConfig.java Locally Modified (Based On 1.16)
@@ -68,6 +68,8 @@
     public static final String PROP_RUN_VERSION             = "runVersion";                                 // NOI18N
     public static final String KEY_EXECUTABLE_BINARY        = "hgExecBinary";                              // NOI18N
     public static final String KEY_EXPORT_FILENAME          = "hgExportFilename";                          // NOI18N
+    public static final String KEY_EXPORT_FOLDER            = "hgExportFolder";                          // NOI18N
+    public static final String KEY_IMPORT_FOLDER            = "hgImportFolder";                          // NOI18N
     public static final String KEY_ANNOTATION_FORMAT        = "annotationFormat";                           // NOI18N
     public static final String SAVE_PASSWORD                = "savePassword";                               // NOI18N
     public static final String KEY_BACKUP_ON_REVERTMODS = "backupOnRevert";                               // NOI18N
@@ -83,7 +85,7 @@
     
     public static final String TEXT_ANNOTATIONS_FORMAT_DEFAULT = "{DEFAULT}";                               // NOI18N           
 
-    private static final String DEFAULT_EXPORT_FILENAME = "/tmp/%b_%r_%h";                                  // NOI18N
+    private static final String DEFAULT_EXPORT_FILENAME = "%b_%r_%h";                                  // NOI18N
     private static final HgModuleConfig INSTANCE = new HgModuleConfig();    
     
     private static String userName;
@@ -151,6 +153,22 @@
         getPreferences().put(KEY_EXECUTABLE_BINARY, path);
     }
 
+    public String getExportFolder() {
+        return (String) getPreferences().get(KEY_EXPORT_FOLDER, System.getProperty("user.home")); // NOI18N
+    }
+    
+    public void setExportFolder(String path) {
+        getPreferences().put(KEY_EXPORT_FOLDER, path);
+    }
+
+    public String getImportFolder() {
+        return (String) getPreferences().get(KEY_IMPORT_FOLDER, System.getProperty("user.home")); // NOI18N
+    }
+    
+    public void setImportFolder(String path) {
+        getPreferences().put(KEY_IMPORT_FOLDER, path);
+    }
+
     public String getExportFilename() {
         String str = (String) getPreferences().get(KEY_EXPORT_FILENAME, ""); // NOI18N
         if (str.trim().length() == 0) str = DEFAULT_EXPORT_FILENAME;
Index: versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/diff/ExportDiffAction.java
--- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/diff/ExportDiffAction.java Base (1.10)
+++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/diff/ExportDiffAction.java Locally Modified (Based On 1.10)
@@ -50,6 +50,7 @@
 import org.netbeans.modules.mercurial.HgException;
 import org.netbeans.modules.mercurial.HgProgressSupport;
 import org.netbeans.modules.mercurial.Mercurial;
+import org.netbeans.modules.mercurial.HgModuleConfig;
 import org.netbeans.modules.mercurial.util.HgUtils;
 import org.netbeans.modules.mercurial.util.HgRepositoryContextCache;
 import org.netbeans.modules.mercurial.util.HgCommand;
@@ -102,6 +103,8 @@
         }
         final String revStr = ed.getSelectionRevision();
         final String outputFileName = ed.getOutputFileName();
+        File outputFile = new File(outputFileName);
+        HgModuleConfig.getDefault().setExportFolder(outputFile.getParent());
         RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(root.getAbsolutePath());
         HgProgressSupport support = new HgProgressSupport() {
             public void perform() {
Index: versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/diff/ExportDiffPanel.java
--- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/diff/ExportDiffPanel.java Base (1.6)
+++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/diff/ExportDiffPanel.java Locally Modified (Based On 1.6)
@@ -174,7 +174,10 @@
     }
 
     private void getDefaultOutputFile() {
-        outputFileTextField.setText(HgModuleConfig.getDefault().getExportFilename());
+        String folderName = HgModuleConfig.getDefault().getExportFolder();
+        String fileName = HgModuleConfig.getDefault().getExportFilename();
+        File file = new File(folderName, fileName);
+        outputFileTextField.setText(file.getAbsolutePath());
     }
 
     private void refreshRevisions() {
@@ -219,6 +222,7 @@
             fileChooser.removeChoosableFileFilter(fileFilter);
 
         }
+        fileChooser.setCurrentDirectory(new File(HgModuleConfig.getDefault().getExportFolder()));
         fileChooser.showDialog(this, NbBundle.getMessage(ExportDiffPanel.class, "OK_Button"));                                            // NO I18N
         File f = fileChooser.getSelectedFile();
         if (f != null) {
Index: versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/diff/ImportDiffAction.java
--- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/diff/ImportDiffAction.java Base (1.12)
+++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/diff/ImportDiffAction.java Locally Modified (Based On 1.12)
@@ -50,6 +50,7 @@
 import org.netbeans.modules.mercurial.HgException;
 import org.netbeans.modules.mercurial.HgProgressSupport;
 import org.netbeans.modules.mercurial.Mercurial;
+import org.netbeans.modules.mercurial.HgModuleConfig;
 import org.netbeans.modules.mercurial.util.HgUtils;
 import org.netbeans.modules.mercurial.util.HgRepositoryContextCache;
 import org.netbeans.modules.mercurial.util.HgCommand;
@@ -108,9 +109,12 @@
             fileChooser.removeChoosableFileFilter(fileFilter);
 
         }
+       fileChooser.setCurrentDirectory(new File(HgModuleConfig.getDefault().getImportFolder()));
+
         if (fileChooser.showDialog(null, NbBundle.getMessage(ImportDiffAction.class, "OK_Button")) == JFileChooser.APPROVE_OPTION) { // NO I18N
             final File patchFile = fileChooser.getSelectedFile();
 
+            HgModuleConfig.getDefault().setImportFolder(patchFile.getParent());
             if (patchFile != null) {
                 RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(root.getAbsolutePath());
                 HgProgressSupport support = new HgProgressSupport() {