JGit - Core

Comparing source compatibility of /home/jenkins/agent/workspace/stable/jgit-publish-site/repo/org.eclipse.jgit/target/org.eclipse.jgit-6.2.0.202206071550-r.jar against /home/jenkins/agent/workspace/stable/jgit-publish-site/.repository/org/eclipse/jgit/org.eclipse.jgit/6.1.0.202203080745-r/org.eclipse.jgit-6.1.0.202203080745-r.jar

Old:	/home/jenkins/agent/workspace/stable/jgit-publish-site/.repository/org/eclipse/jgit/org.eclipse.jgit/6.1.0.202203080745-r/org.eclipse.jgit-6.1.0.202203080745-r.jar
New:	/home/jenkins/agent/workspace/stable/jgit-publish-site/repo/org.eclipse.jgit/target/org.eclipse.jgit-6.2.0.202206071550-r.jar
Created:	2022-06-12T20:15:03.460+0000
Access modifier filter:	PUBLIC
Only modifications:	true
Only binary incompatible modifications:	false
Ignore missing classes:	true
Includes:	org.eclipse.jgit.;org.eclipse.jgit.
Excludes:	n.a.
Semantic Versioning:	1.0.0

WARNING: You are using the option '--ignore-missing-classes', i.e. superclasses and interfaces that could not be found on the classpath are ignored. Hence changes caused by these superclasses and interfaces are not reflected in the output.

Classes

Classes:

Status	Fully Qualified Name
MODIFIED	org.eclipse.jgit.diff.ContentSource
MODIFIED	org.eclipse.jgit.diff.ContentSource$Pair
MODIFIED	org.eclipse.jgit.hooks.PrePushHook
NEW	org.eclipse.jgit.internal.diffmergetool.CommandExecutor
NEW	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool
MODIFIED (!)	org.eclipse.jgit.internal.diffmergetool.DiffTools
MODIFIED (*)	org.eclipse.jgit.internal.diffmergetool.ExternalDiffTool
NEW	org.eclipse.jgit.internal.diffmergetool.ExternalMergeTool
NEW	org.eclipse.jgit.internal.diffmergetool.ExternalToolUtils
NEW	org.eclipse.jgit.internal.diffmergetool.FileElement
NEW	org.eclipse.jgit.internal.diffmergetool.FileElement$Type
NEW	org.eclipse.jgit.internal.diffmergetool.InformNoToolHandler
NEW	org.eclipse.jgit.internal.diffmergetool.MergeToolConfig
NEW	org.eclipse.jgit.internal.diffmergetool.MergeTools
NEW (*)	org.eclipse.jgit.internal.diffmergetool.PreDefinedMergeTool
NEW	org.eclipse.jgit.internal.diffmergetool.PromptContinueHandler
NEW	org.eclipse.jgit.internal.diffmergetool.ToolException
MODIFIED	org.eclipse.jgit.internal.diffmergetool.UserDefinedDiffTool
NEW (*)	org.eclipse.jgit.internal.diffmergetool.UserDefinedMergeTool
MODIFIED	org.eclipse.jgit.internal.JGitText
MODIFIED	org.eclipse.jgit.lib.CommitConfig
MODIFIED	org.eclipse.jgit.lib.ConfigConstants
MODIFIED	org.eclipse.jgit.transport.RefSpec
NEW	org.eclipse.jgit.transport.UrlConfig
NEW	org.eclipse.jgit.util.Equality
MODIFIED	org.eclipse.jgit.util.FileUtils
NEW	org.eclipse.jgit.util.FileUtils$IOFunction

Binary incompatible changes are marked with (!) while source incompatible changes are marked with (*).

MODIFIED public abstract class org.eclipse.jgit.diff.ContentSourcetop

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

public

void

close()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	102

NEW

public

boolean

isWorkingTreeSource()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	114

MODIFIED final static public class org.eclipse.jgit.diff.ContentSource$Pairtop

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

public

void

close()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	314

NEW

public

boolean

isWorkingTreeSource(org.eclipse.jgit.diff.DiffEntry$Side)

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	329

MODIFIED public class org.eclipse.jgit.hooks.PrePushHooktop

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

public

void

setDryRun(boolean)

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	157

NEW public class org.eclipse.jgit.internal.diffmergetool.CommandExecutortop

Constructors:

Status

Modifier

Constructor

Exceptions

Compatibility Changes:

Line Number

NEW

public

CommandExecutor(org.eclipse.jgit.util.FS, boolean)

n.a.

Old file	New file
n.a.	50

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

public

boolean

checkExecutable(java.lang.String, java.io.File, java.util.Map)

Status:	Name:
NEW	org.eclipse.jgit.internal.diffmergetool.ToolException
NEW	java.io.IOException
NEW	java.lang.InterruptedException

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	115

NEW

public

org.eclipse.jgit.util.FS$ExecutionResult

run(java.lang.String, java.io.File, java.util.Map)

Status:	Name:
NEW	org.eclipse.jgit.internal.diffmergetool.ToolException
NEW	java.io.IOException
NEW	java.lang.InterruptedException

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	70

NEW (Serializable compatible) final public enum org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTooltop

Compatibility Changes:

Change
INTERFACE_ADDED

Superclass:

Status	Superclass	Compatibility Changes:
NEW	java.lang.Enum	n.a.

Interfaces:

Status	Interface	Compatibility Changes:
NEW	java.io.Serializable	n.a.
NEW	java.lang.Comparable	n.a.

	Serializable	default serialVersionUID	serialVersionUID in class
Old	false	n.a.	n.a.
New	true	7481416747559779898	n.a.

Fields:

Status	Modifier	Type	Field	Compatibility Changes:
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	araxis
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	bc
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	bc3
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	codecompare
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	deltawalker
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	diffmerge
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	diffuse
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	ecmerge
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	emerge
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	examdiff
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	guiffy
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	gvimdiff
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	gvimdiff2
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	gvimdiff3
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	kdiff3
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	meld
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	opendiff
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	p4merge
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	tkdiff
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	tortoisegitmerge
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	tortoisemerge
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	vimdiff
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	vimdiff2
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	vimdiff3
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	winmerge
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool	n.a.	xxdiff

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

public

boolean

canMergeWithoutBasePresent()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	324

NEW

public

java.lang.String

getParameters(boolean)

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	307

NEW

public

java.lang.String

getPath()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	298

NEW

public

boolean

isExitCodeTrustable()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	317

NEW

static public

org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool

valueOf(java.lang.String)

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	1

NEW

static public

org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool[]

values()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	1

MODIFIED (!) public class org.eclipse.jgit.internal.diffmergetool.DiffToolstop

Constructors:

Status

Modifier

Constructor

Exceptions

Compatibility Changes:

Line Number

NEW

public

DiffTools(org.eclipse.jgit.lib.StoredConfig)

n.a.

Old file	New file
n.a.	69

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

REMOVED (!)

public

int

compare(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, org.eclipse.jgit.lib.internal.BooleanTriState, org.eclipse.jgit.lib.internal.BooleanTriState, org.eclipse.jgit.lib.internal.BooleanTriState)

n.a.

Change
METHOD_REMOVED

Old file	New file
68	n.a.

NEW

public

java.util.Optional

compare(org.eclipse.jgit.internal.diffmergetool.FileElement, org.eclipse.jgit.internal.diffmergetool.FileElement, java.util.Optional, org.eclipse.jgit.lib.internal.BooleanTriState, boolean, org.eclipse.jgit.lib.internal.BooleanTriState, org.eclipse.jgit.internal.diffmergetool.PromptContinueHandler, org.eclipse.jgit.internal.diffmergetool.InformNoToolHandler)

Status:	Name:
NEW	org.eclipse.jgit.internal.diffmergetool.ToolException

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	118

NEW

public

org.eclipse.jgit.util.FS$ExecutionResult

compare(org.eclipse.jgit.internal.diffmergetool.FileElement, org.eclipse.jgit.internal.diffmergetool.FileElement, org.eclipse.jgit.internal.diffmergetool.ExternalDiffTool, boolean)

Status:	Name:
NEW	org.eclipse.jgit.internal.diffmergetool.ToolException

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	180

NEW

public

java.util.Set

getAllToolNames()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	226

REMOVED (!)

public

java.util.Map

getAvailableTools()

n.a.

Change
METHOD_REMOVED

Old file	New file
89	n.a.

REMOVED (!)

public

java.lang.String

getDefaultToolName(org.eclipse.jgit.lib.internal.BooleanTriState)

n.a.

Change
METHOD_REMOVED

Old file	New file
105	n.a.

NEW

public

java.lang.String

getDefaultToolName(boolean)

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	326

NEW

public

java.util.Optional

getExternalToolFromAttributes(java.lang.String)

Status:	Name:
NEW	org.eclipse.jgit.internal.diffmergetool.ToolException

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	250

NEW

public

java.lang.String

getFirstAvailableTool()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	308

REMOVED (!)

public

java.util.Map

getNotAvailableTools()

n.a.

Change
METHOD_REMOVED

Old file	New file
96	n.a.

NEW

public

java.util.Set

getPredefinedAvailableTools()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	260

NEW

public

java.util.Set

getPredefinedToolNames()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	216

NEW

public

java.util.Map

getPredefinedTools(boolean)

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	292

REMOVED (!)

public

java.util.Set

getToolNames()

n.a.

Change
METHOD_REMOVED

Old file	New file
75	n.a.

NEW

public

java.util.Set

getUserDefinedToolNames()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	207

MODIFIED (*) public abstract interface org.eclipse.jgit.internal.diffmergetool.ExternalDiffTooltop

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW (*)

public abstract

boolean

isAvailable()

n.a.

Change
METHOD_ADDED_TO_INTERFACE

Old file	New file
n.a.	n.a.

NEW public abstract interface org.eclipse.jgit.internal.diffmergetool.ExternalMergeTooltop

Compatibility Changes:

Change
INTERFACE_ADDED

Interfaces:

Status	Interface	Compatibility Changes:
NEW	org.eclipse.jgit.internal.diffmergetool.ExternalDiffTool	n.a.

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

public abstract

java.lang.String

getCommand(boolean)

n.a.

Old file	New file
n.a.	n.a.

NEW

public abstract

org.eclipse.jgit.lib.internal.BooleanTriState

getTrustExitCode()

n.a.

Old file	New file
n.a.	n.a.

NEW public class org.eclipse.jgit.internal.diffmergetool.ExternalToolUtilstop

Fields:

Status	Modifier	Type	Field	Compatibility Changes:
NEW	public static final	java.lang.String	n.a.	KEY_DIFF_TOOL
NEW	public static final	java.lang.String	n.a.	KEY_MERGE_TOOL

Constructors:

Status

Modifier

Constructor

Exceptions

Compatibility Changes:

Line Number

NEW

public

ExternalToolUtils()

n.a.

Old file	New file
n.a.	33

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

static public

java.util.Set

createSortedToolSet(java.lang.String, java.util.Set, java.util.Set)

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	175

NEW

static public

java.util.Optional

getExternalToolFromAttributes(org.eclipse.jgit.lib.Repository, java.lang.String, java.lang.String)

Status:	Name:
NEW	org.eclipse.jgit.internal.diffmergetool.ToolException

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	217

NEW

static public

boolean

isToolAvailable(org.eclipse.jgit.util.FS, java.io.File, java.io.File, java.lang.String)

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	151

NEW

static public

java.lang.String

prepareCommand(java.lang.String, org.eclipse.jgit.internal.diffmergetool.FileElement, org.eclipse.jgit.internal.diffmergetool.FileElement, org.eclipse.jgit.internal.diffmergetool.FileElement, org.eclipse.jgit.internal.diffmergetool.FileElement)

Status:	Name:
NEW	java.io.IOException

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	64

NEW

static public

java.util.Map

prepareEnvironment(java.io.File, org.eclipse.jgit.internal.diffmergetool.FileElement, org.eclipse.jgit.internal.diffmergetool.FileElement, org.eclipse.jgit.internal.diffmergetool.FileElement, org.eclipse.jgit.internal.diffmergetool.FileElement)

Status:	Name:
NEW	java.io.IOException

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	98

NEW

static public

java.lang.String

quotePath(java.lang.String)

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	125

NEW public class org.eclipse.jgit.internal.diffmergetool.FileElementtop

Constructors:

Status

Modifier

Constructor

Exceptions

Compatibility Changes:

Line Number

NEW

public

FileElement(java.lang.String, org.eclipse.jgit.internal.diffmergetool.FileElement$Type)

n.a.

Old file	New file
n.a.	75

NEW

public

FileElement(java.lang.String, org.eclipse.jgit.internal.diffmergetool.FileElement$Type, java.io.File, java.io.InputStream)

n.a.

Old file	New file
n.a.	105

NEW

public

FileElement(java.lang.String, org.eclipse.jgit.internal.diffmergetool.FileElement$Type, java.io.File)

n.a.

Old file	New file
n.a.	90

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

public

void

addToEnv(java.util.Map)

Status:	Name:
NEW	java.io.IOException

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	220

NEW

public

void

cleanTemporaries()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	194

NEW

public

java.io.File

createTempFile(java.io.File)

Status:	Name:
NEW	java.io.IOException

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	184

NEW

public

java.io.File

getFile()

Status:	Name:
NEW	java.io.IOException

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	145

NEW

public

java.lang.String

getPath()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	117

NEW

public

org.eclipse.jgit.internal.diffmergetool.FileElement$Type

getType()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	124

NEW

public

boolean

isNullPath()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	171

NEW

public

java.lang.String

replaceVariable(java.lang.String)

Status:	Name:
NEW	java.io.IOException

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	209

NEW (Serializable compatible) final static public enum org.eclipse.jgit.internal.diffmergetool.FileElement$Typetop

Compatibility Changes:

Change
INTERFACE_ADDED

Superclass:

Status	Superclass	Compatibility Changes:
NEW	java.lang.Enum	n.a.

Interfaces:

Status	Interface	Compatibility Changes:
NEW	java.io.Serializable	n.a.
NEW	java.lang.Comparable	n.a.

	Serializable	default serialVersionUID	serialVersionUID in class
Old	false	n.a.	n.a.
New	true	-5972100542794714805	n.a.

Fields:

Status	Modifier	Type	Field	Compatibility Changes:
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.FileElement$Type	n.a.	BACKUP
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.FileElement$Type	n.a.	BASE
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.FileElement$Type	n.a.	LOCAL
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.FileElement$Type	n.a.	MERGED
NEW	public static final	org.eclipse.jgit.internal.diffmergetool.FileElement$Type	n.a.	REMOTE

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

static public

org.eclipse.jgit.internal.diffmergetool.FileElement$Type

valueOf(java.lang.String)

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	1

NEW

static public

org.eclipse.jgit.internal.diffmergetool.FileElement$Type[]

values()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	1

NEW public abstract interface org.eclipse.jgit.internal.diffmergetool.InformNoToolHandlertop

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

public abstract

void

inform(java.util.List)

n.a.

Old file	New file
n.a.	n.a.

NEW public class org.eclipse.jgit.internal.diffmergetool.MergeToolConfigtop

Fields:

Status	Modifier	Type	Field	Compatibility Changes:
NEW	public static final	org.eclipse.jgit.lib.Config$SectionParser	n.a.	KEY

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

public

java.lang.String

getDefaultGuiToolName()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	102

NEW

public

java.lang.String

getDefaultToolName()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	95

NEW

public

java.util.Set

getToolNames()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	144

NEW

public

java.util.Map

getTools()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	137

NEW

public

boolean

isKeepBackup()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	116

NEW

public

boolean

isKeepTemporaries()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	123

NEW

public

boolean

isPrompt()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	109

NEW

public

boolean

isWriteToTemp()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	130

NEW public class org.eclipse.jgit.internal.diffmergetool.MergeToolstop

Constructors:

Status

Modifier

Constructor

Exceptions

Compatibility Changes:

Line Number

NEW

public

MergeTools(org.eclipse.jgit.lib.StoredConfig)

n.a.

Old file	New file
n.a.	74

NEW

public

MergeTools(org.eclipse.jgit.lib.Repository)

n.a.

Old file	New file
n.a.	64

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

public

java.io.File

createTempDirectory()

Status:	Name:
NEW	java.io.IOException

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	259

NEW

public

java.util.Set

getAllToolNames()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	287

NEW

public

java.lang.String

getDefaultToolName(boolean)

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	395

NEW

public

java.util.Optional

getExternalToolFromAttributes(java.lang.String)

Status:	Name:
NEW	org.eclipse.jgit.internal.diffmergetool.ToolException

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	311

NEW

public

java.lang.String

getFirstAvailableTool()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	367

NEW

public

java.util.Set

getPredefinedAvailableTools()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	321

NEW

public

java.util.Set

getPredefinedToolNames()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	277

NEW

public

java.util.Map

getPredefinedTools(boolean)

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	351

NEW

public

java.util.Set

getUserDefinedToolNames()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	270

NEW

public

java.util.Map

getUserDefinedTools()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	335

NEW

public

boolean

isInteractive()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	384

NEW

public

java.util.Optional

merge(org.eclipse.jgit.internal.diffmergetool.FileElement, org.eclipse.jgit.internal.diffmergetool.FileElement, org.eclipse.jgit.internal.diffmergetool.FileElement, org.eclipse.jgit.internal.diffmergetool.FileElement, java.io.File, java.util.Optional, org.eclipse.jgit.lib.internal.BooleanTriState, boolean, org.eclipse.jgit.internal.diffmergetool.PromptContinueHandler, org.eclipse.jgit.internal.diffmergetool.InformNoToolHandler)

Status:	Name:
NEW	org.eclipse.jgit.internal.diffmergetool.ToolException

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	127

NEW

public

org.eclipse.jgit.util.FS$ExecutionResult

Status:	Name:
NEW	org.eclipse.jgit.internal.diffmergetool.ToolException

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	191

NEW (*) public class org.eclipse.jgit.internal.diffmergetool.PreDefinedMergeTooltop

Compatibility Changes:

Change
INTERFACE_ADDED
METHOD_ABSTRACT_ADDED_IN_IMPLEMENTED_INTERFACE

Superclass:

Status	Superclass	Compatibility Changes:
NEW	org.eclipse.jgit.internal.diffmergetool.UserDefinedMergeTool	n.a.

Interfaces:

Status	Interface	Compatibility Changes:
NEW	org.eclipse.jgit.internal.diffmergetool.ExternalDiffTool	n.a.
NEW	org.eclipse.jgit.internal.diffmergetool.ExternalMergeTool	n.a.

Constructors:

Status

Modifier

Constructor

Exceptions

Compatibility Changes:

Line Number

NEW

public

PreDefinedMergeTool(java.lang.String, java.lang.String, java.lang.String, java.lang.String, org.eclipse.jgit.lib.internal.BooleanTriState)

n.a.

Old file	New file
n.a.	44

NEW

public

PreDefinedMergeTool(org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool)

n.a.

Old file	New file
n.a.	56

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

public

java.lang.String

getCommand()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	76

NEW

public

java.lang.String

getCommand(boolean)

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	87

NEW

public

void

setTrustExitCode(org.eclipse.jgit.lib.internal.BooleanTriState)

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	68

NEW public abstract interface org.eclipse.jgit.internal.diffmergetool.PromptContinueHandlertop

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

public abstract

boolean

prompt(java.lang.String)

n.a.

Old file	New file
n.a.	n.a.

NEW (Serializable compatible) public class org.eclipse.jgit.internal.diffmergetool.ToolExceptiontop

Compatibility Changes:

Change
INTERFACE_ADDED

Superclass:

Status	Superclass	Compatibility Changes:
NEW	java.lang.Exception	n.a.

Interfaces:

Status	Interface	Compatibility Changes:
NEW	java.io.Serializable	n.a.

	Serializable	default serialVersionUID	serialVersionUID in class
Old	false	n.a.	n.a.
New	true	-1353666318895322523	1

Constructors:

Status

Modifier

Constructor

Exceptions

Compatibility Changes:

Line Number

NEW

public

ToolException()

n.a.

Old file	New file
n.a.	40

NEW

public

ToolException(java.lang.String)

n.a.

Old file	New file
n.a.	48

NEW

public

ToolException(java.lang.String, java.lang.Throwable)

n.a.

Old file	New file
n.a.	73

NEW

public

ToolException(java.lang.String, org.eclipse.jgit.util.FS$ExecutionResult, boolean)

n.a.

Old file	New file
n.a.	61

NEW

public

ToolException(java.lang.Throwable)

n.a.

Old file	New file
n.a.	83

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

public

org.eclipse.jgit.util.FS$ExecutionResult

getResult()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	99

NEW

public

java.lang.String

getResultStderr()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	113

NEW

public

java.lang.String

getResultStdout()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	128

NEW

public

boolean

isCommandExecutionError()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	106

NEW

public

boolean

isResult()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	92

MODIFIED public class org.eclipse.jgit.internal.diffmergetool.UserDefinedDiffTooltop

Interfaces:

Status	Interface	Compatibility Changes:
UNCHANGED (*)	org.eclipse.jgit.internal.diffmergetool.ExternalDiffTool	n.a.

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

public

boolean

isAvailable()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	109

NEW

public

void

setAvailable(boolean)

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	117

NEW (*) public class org.eclipse.jgit.internal.diffmergetool.UserDefinedMergeTooltop

Compatibility Changes:

Change
INTERFACE_ADDED
METHOD_ABSTRACT_ADDED_IN_IMPLEMENTED_INTERFACE

Superclass:

Status	Superclass	Compatibility Changes:
NEW	org.eclipse.jgit.internal.diffmergetool.UserDefinedDiffTool	n.a.

Interfaces:

Status	Interface	Compatibility Changes:
NEW	org.eclipse.jgit.internal.diffmergetool.ExternalDiffTool	n.a.
NEW	org.eclipse.jgit.internal.diffmergetool.ExternalMergeTool	n.a.

Constructors:

Status

Modifier

Constructor

Exceptions

Compatibility Changes:

Line Number

NEW

public

UserDefinedMergeTool(java.lang.String, java.lang.String, java.lang.String, org.eclipse.jgit.lib.internal.BooleanTriState)

n.a.

Old file	New file
n.a.	40

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

public

java.lang.String

getCommand(boolean)

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	67

NEW

public

org.eclipse.jgit.lib.internal.BooleanTriState

getTrustExitCode()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	48

MODIFIED public class org.eclipse.jgit.internal.JGitTexttop

Fields:

Status	Modifier	Type	Field	Compatibility Changes:
NEW	public	java.lang.String	n.a.	diffToolNotGivenError
NEW	public	java.lang.String	n.a.	diffToolNotSpecifiedInGitAttributesError
NEW	public	java.lang.String	n.a.	diffToolNullError
NEW	public	java.lang.String	n.a.	invalidNegativeAndForce
NEW	public	java.lang.String	n.a.	mergeToolNotGivenError
NEW	public	java.lang.String	n.a.	mergeToolNullError

MODIFIED public class org.eclipse.jgit.lib.CommitConfigtop

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

static public

char

determineCommentChar(java.lang.String)

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	397

NEW

public

char

getCommentChar()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	161

NEW

public

char

getCommentChar(java.lang.String)

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	177

NEW

public

boolean

isAutoCommentChar()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	195

MODIFIED final public class org.eclipse.jgit.lib.ConfigConstantstop

Fields:

Status	Modifier	Type	Field	Compatibility Changes:
NEW	public static final	java.lang.String	n.a.	CONFIG_KEY_COMMENT_CHAR
NEW	public static final	java.lang.String	n.a.	CONFIG_KEY_KEEP_BACKUP
NEW	public static final	java.lang.String	n.a.	CONFIG_KEY_KEEP_TEMPORARIES
NEW	public static final	java.lang.String	n.a.	CONFIG_KEY_WRITE_TO_TEMP
NEW	public static final	java.lang.String	n.a.	CONFIG_MERGETOOL_SECTION

MODIFIED (Serializable compatible) public class org.eclipse.jgit.transport.RefSpectop

	Serializable	default serialVersionUID	serialVersionUID in class
Old	true	1375842098669190139	1
New	true	-7591349562956017859	1

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

public

boolean

isNegative()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	326

NEW public class org.eclipse.jgit.transport.UrlConfigtop

Constructors:

Status

Modifier

Constructor

Exceptions

Compatibility Changes:

Line Number

NEW

public

UrlConfig(org.eclipse.jgit.lib.Config)

n.a.

Old file	New file
n.a.	44

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

public

boolean

hasPushReplacements()

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	71

NEW

public

java.lang.String

replace(java.lang.String)

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	58

NEW

public

java.lang.String

replacePush(java.lang.String)

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	87

NEW public class org.eclipse.jgit.util.Equalitytop

Constructors:

Status

Modifier

Constructor

Exceptions

Compatibility Changes:

Line Number

NEW

public

Equality()

n.a.

Old file	New file
n.a.	18

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

static public

boolean

isSameInstance(java.lang.Object, java.lang.Object)

n.a.

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	34

MODIFIED public class org.eclipse.jgit.util.FileUtilstop

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

static public

java.lang.Object

readWithRetries(java.io.File, org.eclipse.jgit.util.FileUtils$IOFunction)

Status:	Name:
NEW	java.lang.Exception

Change
METHOD_ADDED_TO_PUBLIC_CLASS

Old file	New file
n.a.	716

NEW static public abstract interface org.eclipse.jgit.util.FileUtils$IOFunctiontop

Methods:

Status

Modifier

Type

Method

Exceptions

Compatibility Changes:

Line Number

NEW

public abstract

java.lang.Object

apply(java.lang.Object)

Status:	Name:
NEW	java.lang.Exception

n.a.

Old file	New file
n.a.	n.a.

Annotations:

Status:	Fully Qualified Name:	Elements:
NEW	java.lang.FunctionalInterface	n.a.

Parent Project

Project Documentation