From 3dc021ead30ef96df163ea690539cec7cfd9cfdb Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Fri, 15 Jul 2016 12:36:35 +0300
Subject: [PATCH] patch: inline only field usage

---
 .../com/intellij/openapi/diff/impl/patch/PatchReader.java   | 4 ++--
 .../intellij/openapi/diff/impl/patch/TextPatchBuilder.java  | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/platform/vcs-api/src/com/intellij/openapi/diff/impl/patch/PatchReader.java b/platform/vcs-api/src/com/intellij/openapi/diff/impl/patch/PatchReader.java
index d62c74f14ef6..8b1239108594 100644
--- a/platform/vcs-api/src/com/intellij/openapi/diff/impl/patch/PatchReader.java
+++ b/platform/vcs-api/src/com/intellij/openapi/diff/impl/patch/PatchReader.java
@@ -53,7 +53,7 @@ public class PatchReader {
   @NonNls private static final Pattern ourUnifiedHunkStartPattern = Pattern.compile("@@ -(\\d+)(,(\\d+))? \\+(\\d+)(,(\\d+))? @@.*");
   @NonNls private static final Pattern ourContextBeforeHunkStartPattern = Pattern.compile("\\*\\*\\* (\\d+),(\\d+) \\*\\*\\*\\*");
   @NonNls private static final Pattern ourContextAfterHunkStartPattern = Pattern.compile("--- (\\d+),(\\d+) ----");
-  @NonNls private static final Pattern EMPTY_REVISION_INFO_PATTERN = Pattern.compile(TextPatchBuilder.getEmptyRevisionPattern());
+  @NonNls private static final Pattern ourEmptyRevisionInfoPattern = Pattern.compile("\\(\\s*revision\\s*\\)");
 
   public PatchReader(CharSequence patchContent) {
     this(patchContent, true);
@@ -570,7 +570,7 @@ public class PatchReader {
       if (pos >= 0) {
         String versionId = fileName.substring(pos).trim();
         fileName = fileName.substring(0, pos);
-        if (versionId.length() > 0 && !EMPTY_REVISION_INFO_PATTERN.matcher(versionId).matches()) {
+        if (versionId.length() > 0 && !ourEmptyRevisionInfoPattern.matcher(versionId).matches()) {
           if (before) {
             patch.setBeforeVersionId(versionId);
           }
diff --git a/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/diff/impl/patch/TextPatchBuilder.java b/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/diff/impl/patch/TextPatchBuilder.java
index 9f58a058079d..dfc51571de5d 100644
--- a/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/diff/impl/patch/TextPatchBuilder.java
+++ b/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/diff/impl/patch/TextPatchBuilder.java
@@ -43,7 +43,6 @@ public class TextPatchBuilder {
   private static final int CONTEXT_LINES = 3;
   @NonNls private static final String REVISION_NAME_TEMPLATE = "(revision {0})";
   @NonNls private static final String DATE_NAME_TEMPLATE = "(date {0})";
-  @NonNls private static final String EMPTY_REVISION_INFO = "\\(\\s*revision\\s*\\)";
 
   @NotNull private final String myBasePath;
   private final boolean myIsReversePath;
@@ -65,11 +64,6 @@ public class TextPatchBuilder {
     }
   }
 
-  @NotNull
-  public static String getEmptyRevisionPattern() {
-    return EMPTY_REVISION_INFO;
-  }
-
   public static List<FilePatch> buildPatch(final Collection<BeforeAfter<AirContentRevision>> changes, @NotNull final String basePath,
                                            final boolean reversePatch,
                                            final boolean isCaseSensitive,