Merge branch 'Indore-10.0.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Fri, 17 Mar 2017 11:15:26 +0000 (12:15 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Fri, 17 Mar 2017 11:15:26 +0000 (12:15 +0100)
1  2 
git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/PluginConfigImpl.java
git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/ServerPluginConfig.java
git-tests/src/jetbrains/buildServer/buildTriggers/vcs/git/tests/PluginConfigBuilder.java

index df568f7608c747dd1cd31333328f9b614f726a5b,2862bde9d4ec20431bf05bada5f63d668ee08e5f..a3a0f02e9898ba489f49e8dbe3970c0665ffff2f
@@@ -75,7 -75,7 +75,8 @@@ public class PluginConfigImpl implement
    private static final String HTTP_CONNECTION_SSL_PROTOCOL = "teamcity.git.httpConnectionSslProtocol";
    private static final String MONITORING_FILE_THRESHOLD_SECONDS = "teamcity.git.monitoringFileThresholdSeconds";
    public static final String CREATE_NEW_CONNECTION_FOR_PRUNE = "teamcity.git.newConnectionForPrune";
+   public static final String IGNORE_MISSING_REMOTE_REF = "teamcity.git.ignoreMissingRemoteRef";
 +  private static final String ACCESS_TIME_UPDATE_RATE_MINUTES = "teamcity.git.accessTimeUpdateRateMinutes";
    private static final String GET_REPOSITORY_STATE_TIMEOUT_SECONDS = "teamcity.git.repositoryStateTimeoutSeconds";
    private final static Logger LOG = Logger.getInstance(PluginConfigImpl.class.getName());
    private final static int GB = 1024 * 1024 * 1024;//bytes
    }
  
    @Override
 +  public long getAccessTimeUpdateRateMinutes() {
 +    return TeamCityProperties.getLong(ACCESS_TIME_UPDATE_RATE_MINUTES, 5);
 +  }
++
+   public boolean ignoreMissingRemoteRef() {
+     return TeamCityProperties.getBoolean(IGNORE_MISSING_REMOTE_REF);
+   }
  }
index c34a7b9cea7962298a85e3153275d8a910c27593,58c84b3be9b8fc89fe362fa55a46f922caeff0ea..ceb9d6a155ce845343384a18c177e8a56dd53b6f
@@@ -147,5 -147,5 +147,7 @@@ public interface ServerPluginConfig ext
  
    boolean createNewConnectionForPrune();
  
 +  long getAccessTimeUpdateRateMinutes();
++
+   boolean ignoreMissingRemoteRef();
  }
index 72c843f762592d0694c67abb5f610c549adf25ba,3ac14c58d1adb3612fa4fa57cf915b4dcfbb5a2f..303ade096a9fcc216d52b3094321e6b6af82154c
@@@ -321,9 -322,11 +322,15 @@@ public class PluginConfigBuilder 
        }
  
        @Override
 +      public long getAccessTimeUpdateRateMinutes() {
 +        return myDelegate.getAccessTimeUpdateRateMinutes();
 +      }
++
+       public boolean ignoreMissingRemoteRef() {
+         if (myIgnoreMissingRemoteRef != null)
+           return myIgnoreMissingRemoteRef;
+         return myDelegate.ignoreMissingRemoteRef();
+       }
      };
    }