Modifier and Type	Class and Description
private static class	MergeConfig.MergeConfigSectionParser

Modifier and Type	Field and Description
private final boolean	commit
private final MergeCommand.FastForwardMode	fastForwardMode
private final boolean	squash

Access	Constructor and Description
private	MergeConfig(String branch, Config config)
private	MergeConfig()

Method Summary

Modifier and Type	Method and Description
public static MergeConfig	Returns: merge configuration for the current branch of the repository getConfigForCurrentBranch(Repository a `org.eclipse.jgit.lib.Repository` object. repo) Get merge configuration for the current branch of the repository
public MergeCommand.FastForwardMode	Returns: the fast forward mode configured for this branch getFastForwardMode() Get the fast forward mode configured for this branch
private static MergeCommand.FastForwardMode	getFastForwardMode(Config config, String[] mergeOptions)
private static String[]	getMergeOptions(String branch, Config config)
public static final Config.SectionParser<MergeConfig>	Returns: a parser for use with `org.eclipse.jgit.lib.Config#get(SectionParser)` getParser(final String short branch name to get the configuration for, as returned e.g. by `org.eclipse.jgit.lib.Repository#getBranch()` branch) Get a parser for use with `org.eclipse.jgit.lib.Config#get(SectionParser)`
public boolean	Returns: `false` if --no-commit is configured for this branch, `true` otherwise (even if --squash is configured) isCommit() Whether `--no-commit` option is not set.
private static boolean	isMergeConfigOptionSet(String optionToLookFor, String[] mergeOptions)
public boolean	Returns: true if merges into this branch are configured to be squash merges, false otherwise isSquash() Whether merges into this branch are configured to be squash merges, false otherwise

Inherited from java.lang.Object:: clone equals finalize getClass hashCode notify notifyAll toString wait wait wait

Field Detail

commit	back to summary
private final boolean commit

fastForwardMode	back to summary
private final MergeCommand.FastForwardMode fastForwardMode

squash	back to summary
private final boolean squash

Constructor Detail

MergeConfig	back to summary
private MergeConfig(String branch, Config config)

MergeConfig	back to summary
private MergeConfig()

Method Detail

getConfigForCurrentBranch back to summary

getConfigForCurrentBranch	back to summary
public static MergeConfig getConfigForCurrentBranch(Repository repo) Get merge configuration for the current branch of the repository Parameters repo:Repository a `org.eclipse.jgit.lib.Repository` object. Returns:MergeConfig merge configuration for the current branch of the repository

public static MergeConfig getConfigForCurrentBranch(Repository repo)

Get merge configuration for the current branch of the repository

Parameters

repo:Repository: a org.eclipse.jgit.lib.Repository object.

Returns:MergeConfig

merge configuration for the current branch of the repository

getFastForwardMode	back to summary
public MergeCommand.FastForwardMode getFastForwardMode() Get the fast forward mode configured for this branch Returns:MergeCommand.FastForwardMode the fast forward mode configured for this branch

getFastForwardMode

back to summary

public MergeCommand.FastForwardMode getFastForwardMode()

Get the fast forward mode configured for this branch

Returns:MergeCommand.FastForwardMode: the fast forward mode configured for this branch

getFastForwardMode	back to summary
private static MergeCommand.FastForwardMode getFastForwardMode(Config config, String[] mergeOptions)

getMergeOptions	back to summary
private static String[] getMergeOptions(String branch, Config config)

getParser back to summary

getParser	back to summary
public static final Config.SectionParser<MergeConfig> getParser(final String branch) Get a parser for use with `org.eclipse.jgit.lib.Config#get(SectionParser)` Parameters branch:String short branch name to get the configuration for, as returned e.g. by `org.eclipse.jgit.lib.Repository#getBranch()` Returns:Config.SectionParser<MergeConfig> a parser for use with `org.eclipse.jgit.lib.Config#get(SectionParser)`

public static final Config.SectionParser<MergeConfig> getParser(final String branch)

Get a parser for use with org.eclipse.jgit.lib.Config#get(SectionParser)

Parameters

branch:String: short branch name to get the configuration for, as returned e.g. by org.eclipse.jgit.lib.Repository#getBranch()

Returns:Config.SectionParser<MergeConfig>

a parser for use with org.eclipse.jgit.lib.Config#get(SectionParser)

isCommit back to summary

isCommit	back to summary
public boolean isCommit() Whether `--no-commit` option is not set. Returns:boolean `false` if --no-commit is configured for this branch, `true` otherwise (even if --squash is configured)

public boolean isCommit()

Whether --no-commit option is not set.

Returns:boolean: false if --no-commit is configured for this branch, true otherwise (even if --squash is configured)

isMergeConfigOptionSet	back to summary
private static boolean isMergeConfigOptionSet(String optionToLookFor, String[] mergeOptions)

isSquash	back to summary
public boolean isSquash() Whether merges into this branch are configured to be squash merges, false otherwise Returns:boolean true if merges into this branch are configured to be squash merges, false otherwise

isSquash

back to summary

public boolean isSquash()

Whether merges into this branch are configured to be squash merges, false otherwise

Returns:boolean: true if merges into this branch are configured to be squash merges, false otherwise

org.eclipse.jgit.merge back to summary

private Class MergeConfig.MergeConfigSectionParser

Class Inheritance

extends Object
implements Config.SectionParser<MergeConfig>

java.lang.Object
org.eclipse.jgit.merge.MergeConfig.MergeConfigSectionParser

All Implemented Interfaces

org.eclipse.jgit.lib.Config.SectionParser

Field Summary

Modifier and Type	Field and Description
private final String	branch

Constructor Summary

Access	Constructor and Description
public	MergeConfigSectionParser(String branch)

Method Summary

Modifier and Type	Method and Description
public boolean	equals(Object the reference object with which to compare. obj) Overrides java.lang.Object.equals. Indicates whether some other object is "equal to" this one.
public int	hashCode() Overrides java.lang.Object.hashCode. Returns a hash code value for this object.
public MergeConfig	parse(Config the configuration to read values from. cfg) Implements org.eclipse.jgit.lib.Config.SectionParser.parse. Create a model object from a configuration.

Inherited from java.lang.Object:: clone finalize getClass notify notifyAll toString wait wait wait

Field Detail

branch	back to summary
private final String branch

Constructor Detail

MergeConfigSectionParser	back to summary
public MergeConfigSectionParser(String branch)

Method Detail

equals back to summary

equals	back to summary
public boolean equals(Object obj) Overrides java.lang.Object.equals. Doc from java.lang.Object.equals. Indicates whether some other object is "equal to" this one. The `equals` method implements an equivalence relation on non-null object references: It is reflexive: for any non-null reference value `x`, `x.equals(x)` should return `true`. It is symmetric: for any non-null reference values `x` and `y`, `x.equals(y)` should return `true` if and only if `y.equals(x)` returns `true`. It is transitive: for any non-null reference values `x`, `y`, and `z`, if `x.equals(y)` returns `true` and `y.equals(z)` returns `true`, then `x.equals(z)` should return `true`. It is consistent: for any non-null reference values `x` and `y`, multiple invocations of `x.equals(y)` consistently return `true` or consistently return `false`, provided no information used in `equals` comparisons on the objects is modified. For any non-null reference value `x`, `x.equals(null)` should return `false`. An equivalence relation partitions the elements it operates on into equivalence classes; all the members of an equivalence class are equal to each other. Members of an equivalence class are substitutable for each other, at least for some purposes. Parameters obj:Object the reference object with which to compare. Returns:boolean `true` if this object is the same as the obj argument; `false` otherwise. Annotations @Override

public boolean equals(Object obj)

Overrides java.lang.Object.equals.

Doc from java.lang.Object.equals.

Indicates whether some other object is "equal to" this one.

The equals method implements an equivalence relation on non-null object references:

It is reflexive: for any non-null reference value x, x.equals(x) should return true.
It is symmetric: for any non-null reference values x and y, x.equals(y) should return true if and only if y.equals(x) returns true.
It is transitive: for any non-null reference values x, y, and z, if x.equals(y) returns true and y.equals(z) returns true, then x.equals(z) should return true.
It is consistent: for any non-null reference values x and y, multiple invocations of x.equals(y) consistently return true or consistently return false, provided no information used in equals comparisons on the objects is modified.
For any non-null reference value x, x.equals(null) should return false.

An equivalence relation partitions the elements it operates on into equivalence classes; all the members of an equivalence class are equal to each other. Members of an equivalence class are substitutable for each other, at least for some purposes.

Parameters

obj:Object: the reference object with which to compare.

Returns:boolean

true if this object is the same as the obj argument; false otherwise.

Annotations

@Override

hashCode back to summary

hashCode	back to summary
public int hashCode() Overrides java.lang.Object.hashCode. Doc from java.lang.Object.hashCode. Returns a hash code value for this object. This method is supported for the benefit of hash tables such as those provided by `java.util.HashMap`. The general contract of `hashCode` is: Whenever it is invoked on the same object more than once during an execution of a Java application, the `hashCode` method must consistently return the same integer, provided no information used in `equals` comparisons on the object is modified. This integer need not remain consistent from one execution of an application to another execution of the same application. If two objects are equal according to the `equals` method, then calling the `hashCode` method on each of the two objects must produce the same integer result. It is not required that if two objects are unequal according to the `equals` method, then calling the `hashCode` method on each of the two objects must produce distinct integer results. However, the programmer should be aware that producing distinct integer results for unequal objects may improve the performance of hash tables. Returns:int a hash code value for this object Annotations @Override

public int hashCode()

Overrides java.lang.Object.hashCode.

Doc from java.lang.Object.hashCode.

Returns a hash code value for this object. This method is supported for the benefit of hash tables such as those provided by java.util.HashMap.

The general contract of hashCode is:

Whenever it is invoked on the same object more than once during an execution of a Java application, the hashCode method must consistently return the same integer, provided no information used in equals comparisons on the object is modified. This integer need not remain consistent from one execution of an application to another execution of the same application.
If two objects are equal according to the equals method, then calling the hashCode method on each of the two objects must produce the same integer result.
It is not required that if two objects are unequal according to the equals method, then calling the hashCode method on each of the two objects must produce distinct integer results. However, the programmer should be aware that producing distinct integer results for unequal objects may improve the performance of hash tables.

Returns:int

a hash code value for this object

Annotations

@Override

parse	back to summary
public MergeConfig parse(Config cfg) Implements org.eclipse.jgit.lib.Config.SectionParser.parse. Doc from org.eclipse.jgit.lib.Config.SectionParser.parse. Create a model object from a configuration. Parameters cfg:Config the configuration to read values from. Returns:MergeConfig the application model instance. Annotations @Override

parse

back to summary

public MergeConfig parse(Config cfg)

Implements org.eclipse.jgit.lib.Config.SectionParser.parse.

Doc from org.eclipse.jgit.lib.Config.SectionParser.parse.

Create a model object from a configuration.

Parameters