Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml
	platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java

Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f

1 files changed, 10 insertions, 3 deletions

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgErrorUtil.java b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgErrorUtil.java
index 1810370588b7..7592f5830ee5 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgErrorUtil.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgErrorUtil.java
@@ -43,7 +43,7 @@ public final class HgErrorUtil {
     }
     final List<String> errorLines = result.getErrorLines();
     for (String line : errorLines) {
-      if (!StringUtil.isEmptyOrSpaces(line) && line.trim().startsWith("abort:")) {
+      if (isAbortLine(line)) {
         return true;
       }
     }
@@ -55,8 +55,7 @@ public final class HgErrorUtil {
       return false;
     }
     String line = getLastErrorLine(result);
-    return !StringUtil.isEmptyOrSpaces(line) && (line.contains("authorization required") || line.contains("authorization failed")
-    );
+    return isAuthorizationError(line);
   }
 
   @Nullable
@@ -119,4 +118,12 @@ public final class HgErrorUtil {
     Matcher matcher = UNCOMMITTED_PATTERN.matcher(result.getRawError());
     return matcher.matches();
   }
+
+  public static boolean isAuthorizationError(String line) {
+    return !StringUtil.isEmptyOrSpaces(line) && (line.contains("authorization required") || line.contains("authorization failed"));
+  }
+
+  public static boolean isAbortLine(String line) {
+    return !StringUtil.isEmptyOrSpaces(line) && line.trim().startsWith("abort:");
+  }
 }