Merge branch 'master' of git.labs.intellij.net:idea/community

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgGlobalSettings.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgGlobalSettings.java
index 10fdb708e21427b3a28d037179a9d668d70a5ed1..d57ead726565d407cbe63bed7fafb8edb522445b 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgGlobalSettings.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgGlobalSettings.java
@@ -25,8 +25,8 @@ import java.util.List;
 import java.util.Map;
 
 @State(
-  name = "hg4idea.settings",
-  storages = @Storage(id = "hg4idea.settings", file = "$OPTIONS$/hg4idea.xml")
+  name = "HgGlobalSettings",
+  storages = @Storage(id = "HgGlobalSettings", file = "$APP_CONFIG$/vcs.xml")
 )
 public class HgGlobalSettings implements PersistentStateComponent<HgGlobalSettings> {
 

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgErrorUtil.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgErrorUtil.java
index dca18dda0910e1aa731cdecb96969e88d91b735c..943b296f1ec75885add8d9730f3d57e59348bf31 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgErrorUtil.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgErrorUtil.java
@@ -13,6 +13,7 @@
 package org.zmlx.hg4idea.command;
 
 import org.apache.commons.lang.StringUtils;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -36,8 +37,12 @@ public final class HgErrorUtil {
     );
   }
 
+  @Nullable
   private static String getLastErrorLine(HgCommandResult result) {
-    List<String> errorLines = result.getErrorLines();
+    if (result == null) {
+      return null;
+    }
+    final List<String> errorLines = result.getErrorLines();
     if (errorLines.isEmpty()) {
       return null;
     }