Line data    Source code

       1             : // Copyright (C) 2016 The Android Open Source Project
       2             : //
       3             : // Licensed under the Apache License, Version 2.0 (the "License");
       4             : // you may not use this file except in compliance with the License.
       5             : // You may obtain a copy of the License at
       6             : //
       7             : // http://www.apache.org/licenses/LICENSE-2.0
       8             : //
       9             : // Unless required by applicable law or agreed to in writing, software
      10             : // distributed under the License is distributed on an "AS IS" BASIS,
      11             : // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      12             : // See the License for the specific language governing permissions and
      13             : // limitations under the License.
      14             : 
      15             : package com.google.gerrit.extensions.common;
      16             : 
      17           3 : public class MergeInput {
      18             :   /**
      19             :    * {@code source} can be any Git object reference expression.
      20             :    *
      21             :    * @see <a
      22             :    *     href="https://www.kernel.org/pub/software/scm/git/docs/gitrevisions.html">gitrevisions(7)</a>
      23             :    */
      24             :   public String source;
      25             : 
      26             :   /**
      27             :    * If specified, visibility of the {@code source} commit will only be checked against {@code
      28             :    * source_branch}, rather than all visible branches.
      29             :    */
      30             :   public String sourceBranch;
      31             : 
      32             :   /**
      33             :    * {@code strategy} name of the merge strategy.
      34             :    *
      35             :    * @see org.eclipse.jgit.merge.MergeStrategy
      36             :    */
      37             :   public String strategy;
      38             : 
      39             :   /**
      40             :    * Whether the creation of the merge should succeed if there are conflicts.
      41             :    *
      42             :    * <p>If there are conflicts the file contents of the created change contain git conflict markers
      43             :    * to indicate the conflicts.
      44             :    */
      45             :   public boolean allowConflicts;
      46             : }