public class org.eclipse.jgit.merge.ResolveMerger extends org.eclipse.jgit.merge.ThreeWayMerger
minor version: 0
major version: 59
flags: flags: (0x0021) ACC_PUBLIC, ACC_SUPER
this_class: org.eclipse.jgit.merge.ResolveMerger
super_class: org.eclipse.jgit.merge.ThreeWayMerger
{
protected org.eclipse.jgit.treewalk.NameConflictTreeWalk tw;
descriptor: Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
flags: (0x0004) ACC_PROTECTED
protected java.lang.String[] commitNames;
descriptor: [Ljava/lang/String;
flags: (0x0004) ACC_PROTECTED
protected static final int T_BASE;
descriptor: I
flags: (0x001c) ACC_PROTECTED, ACC_STATIC, ACC_FINAL
ConstantValue: 0
protected static final int T_OURS;
descriptor: I
flags: (0x001c) ACC_PROTECTED, ACC_STATIC, ACC_FINAL
ConstantValue: 1
protected static final int T_THEIRS;
descriptor: I
flags: (0x001c) ACC_PROTECTED, ACC_STATIC, ACC_FINAL
ConstantValue: 2
protected static final int T_INDEX;
descriptor: I
flags: (0x001c) ACC_PROTECTED, ACC_STATIC, ACC_FINAL
ConstantValue: 3
protected static final int T_FILE;
descriptor: I
flags: (0x001c) ACC_PROTECTED, ACC_STATIC, ACC_FINAL
ConstantValue: 4
protected org.eclipse.jgit.dircache.DirCacheBuilder builder;
descriptor: Lorg/eclipse/jgit/dircache/DirCacheBuilder;
flags: (0x0004) ACC_PROTECTED
protected org.eclipse.jgit.lib.ObjectId resultTree;
descriptor: Lorg/eclipse/jgit/lib/ObjectId;
flags: (0x0004) ACC_PROTECTED
protected java.util.List<java.lang.String> unmergedPaths;
descriptor: Ljava/util/List;
flags: (0x0004) ACC_PROTECTED
Signature: Ljava/util/List<Ljava/lang/String;>;
protected java.util.List<java.lang.String> modifiedFiles;
descriptor: Ljava/util/List;
flags: (0x0004) ACC_PROTECTED
Signature: Ljava/util/List<Ljava/lang/String;>;
protected java.util.Map<java.lang.String, org.eclipse.jgit.dircache.DirCacheEntry> toBeCheckedOut;
descriptor: Ljava/util/Map;
flags: (0x0004) ACC_PROTECTED
Signature: Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/jgit/dircache/DirCacheEntry;>;
protected java.util.List<java.lang.String> toBeDeleted;
descriptor: Ljava/util/List;
flags: (0x0004) ACC_PROTECTED
Signature: Ljava/util/List<Ljava/lang/String;>;
protected java.util.Map<java.lang.String, org.eclipse.jgit.merge.MergeResult<? extends org.eclipse.jgit.diff.Sequence>> mergeResults;
descriptor: Ljava/util/Map;
flags: (0x0004) ACC_PROTECTED
Signature: Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/jgit/merge/MergeResult<+Lorg/eclipse/jgit/diff/Sequence;>;>;
protected java.util.Map<java.lang.String, org.eclipse.jgit.merge.ResolveMerger$MergeFailureReason> failingPaths;
descriptor: Ljava/util/Map;
flags: (0x0004) ACC_PROTECTED
Signature: Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/jgit/merge/ResolveMerger$MergeFailureReason;>;
protected boolean enterSubtree;
descriptor: Z
flags: (0x0004) ACC_PROTECTED
protected boolean inCore;
descriptor: Z
flags: (0x0004) ACC_PROTECTED
protected boolean implicitDirCache;
descriptor: Z
flags: (0x0004) ACC_PROTECTED
protected org.eclipse.jgit.dircache.DirCache dircache;
descriptor: Lorg/eclipse/jgit/dircache/DirCache;
flags: (0x0004) ACC_PROTECTED
protected org.eclipse.jgit.treewalk.WorkingTreeIterator workingTreeIterator;
descriptor: Lorg/eclipse/jgit/treewalk/WorkingTreeIterator;
flags: (0x0004) ACC_PROTECTED
protected org.eclipse.jgit.merge.MergeAlgorithm mergeAlgorithm;
descriptor: Lorg/eclipse/jgit/merge/MergeAlgorithm;
flags: (0x0004) ACC_PROTECTED
protected org.eclipse.jgit.treewalk.WorkingTreeOptions workingTreeOptions;
descriptor: Lorg/eclipse/jgit/treewalk/WorkingTreeOptions;
flags: (0x0004) ACC_PROTECTED
private int inCoreLimit;
descriptor: I
flags: (0x0002) ACC_PRIVATE
private java.util.Map<java.lang.String, org.eclipse.jgit.dircache.DirCacheCheckout$CheckoutMetadata> checkoutMetadata;
descriptor: Ljava/util/Map;
flags: (0x0002) ACC_PRIVATE
Signature: Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/jgit/dircache/DirCacheCheckout$CheckoutMetadata;>;
private static final org.eclipse.jgit.attributes.Attributes NO_ATTRIBUTES;
descriptor: Lorg/eclipse/jgit/attributes/Attributes;
flags: (0x001a) ACC_PRIVATE, ACC_STATIC, ACC_FINAL
static void <clinit>();
descriptor: ()V
flags: (0x0008) ACC_STATIC
Code:
stack=3, locals=0, args_size=0
0: new org.eclipse.jgit.attributes.Attributes
dup
iconst_0
anewarray org.eclipse.jgit.attributes.Attribute
invokespecial org.eclipse.jgit.attributes.Attributes.<init>:([Lorg/eclipse/jgit/attributes/Attribute;)V
putstatic org.eclipse.jgit.merge.ResolveMerger.NO_ATTRIBUTES:Lorg/eclipse/jgit/attributes/Attributes;
return
LocalVariableTable:
Start End Slot Name Signature
private static org.eclipse.jgit.merge.MergeAlgorithm getMergeAlgorithm(org.eclipse.jgit.lib.Config);
descriptor: (Lorg/eclipse/jgit/lib/Config;)Lorg/eclipse/jgit/merge/MergeAlgorithm;
flags: (0x000a) ACC_PRIVATE, ACC_STATIC
Code:
stack=5, locals=2, args_size=1
start local 0 0: aload 0
1: ldc "diff"
aconst_null
ldc "algorithm"
2: getstatic org.eclipse.jgit.diff.DiffAlgorithm$SupportedAlgorithm.HISTOGRAM:Lorg/eclipse/jgit/diff/DiffAlgorithm$SupportedAlgorithm;
3: invokevirtual org.eclipse.jgit.lib.Config.getEnum:(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Enum;)Ljava/lang/Enum;
checkcast org.eclipse.jgit.diff.DiffAlgorithm$SupportedAlgorithm
astore 1
start local 1 4: new org.eclipse.jgit.merge.MergeAlgorithm
dup
aload 1
invokestatic org.eclipse.jgit.diff.DiffAlgorithm.getAlgorithm:(Lorg/eclipse/jgit/diff/DiffAlgorithm$SupportedAlgorithm;)Lorg/eclipse/jgit/diff/DiffAlgorithm;
invokespecial org.eclipse.jgit.merge.MergeAlgorithm.<init>:(Lorg/eclipse/jgit/diff/DiffAlgorithm;)V
areturn
end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 5 0 config Lorg/eclipse/jgit/lib/Config;
4 5 1 diffAlg Lorg/eclipse/jgit/diff/DiffAlgorithm$SupportedAlgorithm;
MethodParameters:
Name Flags
config
private static int getInCoreLimit(org.eclipse.jgit.lib.Config);
descriptor: (Lorg/eclipse/jgit/lib/Config;)I
flags: (0x000a) ACC_PRIVATE, ACC_STATIC
Code:
stack=4, locals=1, args_size=1
start local 0 0: aload 0
1: ldc "merge"
ldc "inCoreLimit"
ldc 10485760
2: invokevirtual org.eclipse.jgit.lib.Config.getInt:(Ljava/lang/String;Ljava/lang/String;I)I
ireturn
end local 0 LocalVariableTable:
Start End Slot Name Signature
0 3 0 config Lorg/eclipse/jgit/lib/Config;
MethodParameters:
Name Flags
config
private static java.lang.String[] defaultCommitNames();
descriptor: ()[Ljava/lang/String;
flags: (0x000a) ACC_PRIVATE, ACC_STATIC
Code:
stack=4, locals=0, args_size=0
0: iconst_3
anewarray java.lang.String
dup
iconst_0
ldc "BASE"
aastore
dup
iconst_1
ldc "OURS"
aastore
dup
iconst_2
ldc "THEIRS"
aastore
areturn
LocalVariableTable:
Start End Slot Name Signature
protected void <init>(org.eclipse.jgit.lib.Repository, boolean);
descriptor: (Lorg/eclipse/jgit/lib/Repository;Z)V
flags: (0x0004) ACC_PROTECTED
Code:
stack=3, locals=4, args_size=3
start local 0 start local 1 start local 2 0: aload 0
aload 1
invokespecial org.eclipse.jgit.merge.ThreeWayMerger.<init>:(Lorg/eclipse/jgit/lib/Repository;)V
1: aload 0
new java.util.ArrayList
dup
invokespecial java.util.ArrayList.<init>:()V
putfield org.eclipse.jgit.merge.ResolveMerger.unmergedPaths:Ljava/util/List;
2: aload 0
new java.util.LinkedList
dup
invokespecial java.util.LinkedList.<init>:()V
putfield org.eclipse.jgit.merge.ResolveMerger.modifiedFiles:Ljava/util/List;
3: aload 0
new java.util.HashMap
dup
invokespecial java.util.HashMap.<init>:()V
putfield org.eclipse.jgit.merge.ResolveMerger.toBeCheckedOut:Ljava/util/Map;
4: aload 0
new java.util.ArrayList
dup
invokespecial java.util.ArrayList.<init>:()V
putfield org.eclipse.jgit.merge.ResolveMerger.toBeDeleted:Ljava/util/List;
5: aload 0
new java.util.HashMap
dup
invokespecial java.util.HashMap.<init>:()V
putfield org.eclipse.jgit.merge.ResolveMerger.mergeResults:Ljava/util/Map;
6: aload 0
new java.util.HashMap
dup
invokespecial java.util.HashMap.<init>:()V
putfield org.eclipse.jgit.merge.ResolveMerger.failingPaths:Ljava/util/Map;
7: aload 1
invokevirtual org.eclipse.jgit.lib.Repository.getConfig:()Lorg/eclipse/jgit/lib/StoredConfig;
astore 3
start local 3 8: aload 0
aload 3
invokestatic org.eclipse.jgit.merge.ResolveMerger.getMergeAlgorithm:(Lorg/eclipse/jgit/lib/Config;)Lorg/eclipse/jgit/merge/MergeAlgorithm;
putfield org.eclipse.jgit.merge.ResolveMerger.mergeAlgorithm:Lorg/eclipse/jgit/merge/MergeAlgorithm;
9: aload 0
aload 3
invokestatic org.eclipse.jgit.merge.ResolveMerger.getInCoreLimit:(Lorg/eclipse/jgit/lib/Config;)I
putfield org.eclipse.jgit.merge.ResolveMerger.inCoreLimit:I
10: aload 0
invokestatic org.eclipse.jgit.merge.ResolveMerger.defaultCommitNames:()[Ljava/lang/String;
putfield org.eclipse.jgit.merge.ResolveMerger.commitNames:[Ljava/lang/String;
11: aload 0
iload 2
putfield org.eclipse.jgit.merge.ResolveMerger.inCore:Z
12: iload 2
ifeq 16
13: aload 0
iconst_0
putfield org.eclipse.jgit.merge.ResolveMerger.implicitDirCache:Z
14: aload 0
invokestatic org.eclipse.jgit.dircache.DirCache.newInCore:()Lorg/eclipse/jgit/dircache/DirCache;
putfield org.eclipse.jgit.merge.ResolveMerger.dircache:Lorg/eclipse/jgit/dircache/DirCache;
15: goto 18
16: StackMap locals: org.eclipse.jgit.merge.ResolveMerger org.eclipse.jgit.lib.Repository int org.eclipse.jgit.lib.Config
StackMap stack:
aload 0
iconst_1
putfield org.eclipse.jgit.merge.ResolveMerger.implicitDirCache:Z
17: aload 0
aload 1
invokevirtual org.eclipse.jgit.lib.Repository.getConfig:()Lorg/eclipse/jgit/lib/StoredConfig;
getstatic org.eclipse.jgit.treewalk.WorkingTreeOptions.KEY:Lorg/eclipse/jgit/lib/Config$SectionParser;
invokevirtual org.eclipse.jgit.lib.StoredConfig.get:(Lorg/eclipse/jgit/lib/Config$SectionParser;)Ljava/lang/Object;
checkcast org.eclipse.jgit.treewalk.WorkingTreeOptions
putfield org.eclipse.jgit.merge.ResolveMerger.workingTreeOptions:Lorg/eclipse/jgit/treewalk/WorkingTreeOptions;
18: StackMap locals:
StackMap stack:
return
end local 3 end local 2 end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 19 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
0 19 1 local Lorg/eclipse/jgit/lib/Repository;
0 19 2 inCore Z
8 19 3 config Lorg/eclipse/jgit/lib/Config;
MethodParameters:
Name Flags
local
inCore
protected void <init>(org.eclipse.jgit.lib.Repository);
descriptor: (Lorg/eclipse/jgit/lib/Repository;)V
flags: (0x0004) ACC_PROTECTED
Code:
stack=3, locals=2, args_size=2
start local 0 start local 1 0: aload 0
aload 1
iconst_0
invokespecial org.eclipse.jgit.merge.ResolveMerger.<init>:(Lorg/eclipse/jgit/lib/Repository;Z)V
1: return
end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 2 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
0 2 1 local Lorg/eclipse/jgit/lib/Repository;
MethodParameters:
Name Flags
local
protected void <init>(org.eclipse.jgit.lib.ObjectInserter, org.eclipse.jgit.lib.Config);
descriptor: (Lorg/eclipse/jgit/lib/ObjectInserter;Lorg/eclipse/jgit/lib/Config;)V
flags: (0x0004) ACC_PROTECTED
Code:
stack=3, locals=3, args_size=3
start local 0 start local 1 start local 2 0: aload 0
aload 1
invokespecial org.eclipse.jgit.merge.ThreeWayMerger.<init>:(Lorg/eclipse/jgit/lib/ObjectInserter;)V
1: aload 0
new java.util.ArrayList
dup
invokespecial java.util.ArrayList.<init>:()V
putfield org.eclipse.jgit.merge.ResolveMerger.unmergedPaths:Ljava/util/List;
2: aload 0
new java.util.LinkedList
dup
invokespecial java.util.LinkedList.<init>:()V
putfield org.eclipse.jgit.merge.ResolveMerger.modifiedFiles:Ljava/util/List;
3: aload 0
new java.util.HashMap
dup
invokespecial java.util.HashMap.<init>:()V
putfield org.eclipse.jgit.merge.ResolveMerger.toBeCheckedOut:Ljava/util/Map;
4: aload 0
new java.util.ArrayList
dup
invokespecial java.util.ArrayList.<init>:()V
putfield org.eclipse.jgit.merge.ResolveMerger.toBeDeleted:Ljava/util/List;
5: aload 0
new java.util.HashMap
dup
invokespecial java.util.HashMap.<init>:()V
putfield org.eclipse.jgit.merge.ResolveMerger.mergeResults:Ljava/util/Map;
6: aload 0
new java.util.HashMap
dup
invokespecial java.util.HashMap.<init>:()V
putfield org.eclipse.jgit.merge.ResolveMerger.failingPaths:Ljava/util/Map;
7: aload 0
aload 2
invokestatic org.eclipse.jgit.merge.ResolveMerger.getMergeAlgorithm:(Lorg/eclipse/jgit/lib/Config;)Lorg/eclipse/jgit/merge/MergeAlgorithm;
putfield org.eclipse.jgit.merge.ResolveMerger.mergeAlgorithm:Lorg/eclipse/jgit/merge/MergeAlgorithm;
8: aload 0
invokestatic org.eclipse.jgit.merge.ResolveMerger.defaultCommitNames:()[Ljava/lang/String;
putfield org.eclipse.jgit.merge.ResolveMerger.commitNames:[Ljava/lang/String;
9: aload 0
iconst_1
putfield org.eclipse.jgit.merge.ResolveMerger.inCore:Z
10: aload 0
iconst_0
putfield org.eclipse.jgit.merge.ResolveMerger.implicitDirCache:Z
11: aload 0
invokestatic org.eclipse.jgit.dircache.DirCache.newInCore:()Lorg/eclipse/jgit/dircache/DirCache;
putfield org.eclipse.jgit.merge.ResolveMerger.dircache:Lorg/eclipse/jgit/dircache/DirCache;
12: return
end local 2 end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 13 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
0 13 1 inserter Lorg/eclipse/jgit/lib/ObjectInserter;
0 13 2 config Lorg/eclipse/jgit/lib/Config;
MethodParameters:
Name Flags
inserter
config
protected boolean mergeImpl();
descriptor: ()Z
flags: (0x0004) ACC_PROTECTED
Code:
stack=5, locals=3, args_size=1
start local 0 0: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.implicitDirCache:Z
ifeq 2
1: aload 0
aload 0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.nonNullRepo:()Lorg/eclipse/jgit/lib/Repository;
invokevirtual org.eclipse.jgit.lib.Repository.lockDirCache:()Lorg/eclipse/jgit/dircache/DirCache;
putfield org.eclipse.jgit.merge.ResolveMerger.dircache:Lorg/eclipse/jgit/dircache/DirCache;
2: StackMap locals:
StackMap stack:
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.inCore:Z
ifne 4
3: aload 0
new java.util.HashMap
dup
invokespecial java.util.HashMap.<init>:()V
putfield org.eclipse.jgit.merge.ResolveMerger.checkoutMetadata:Ljava/util/Map;
4: StackMap locals:
StackMap stack:
aload 0
aload 0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.mergeBase:()Lorg/eclipse/jgit/treewalk/AbstractTreeIterator;
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.sourceTrees:[Lorg/eclipse/jgit/revwalk/RevTree;
iconst_0
aaload
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.sourceTrees:[Lorg/eclipse/jgit/revwalk/RevTree;
iconst_1
aaload
5: iconst_0
6: invokevirtual org.eclipse.jgit.merge.ResolveMerger.mergeTrees:(Lorg/eclipse/jgit/treewalk/AbstractTreeIterator;Lorg/eclipse/jgit/revwalk/RevTree;Lorg/eclipse/jgit/revwalk/RevTree;Z)Z
istore 2
7: aload 0
aconst_null
putfield org.eclipse.jgit.merge.ResolveMerger.checkoutMetadata:Ljava/util/Map;
8: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.implicitDirCache:Z
ifeq 10
9: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.dircache:Lorg/eclipse/jgit/dircache/DirCache;
invokevirtual org.eclipse.jgit.dircache.DirCache.unlock:()V
10: StackMap locals: org.eclipse.jgit.merge.ResolveMerger top int
StackMap stack:
iload 2
ireturn
11: StackMap locals: org.eclipse.jgit.merge.ResolveMerger
StackMap stack: java.lang.Throwable
astore 1
12: aload 0
aconst_null
putfield org.eclipse.jgit.merge.ResolveMerger.checkoutMetadata:Ljava/util/Map;
13: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.implicitDirCache:Z
ifeq 15
14: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.dircache:Lorg/eclipse/jgit/dircache/DirCache;
invokevirtual org.eclipse.jgit.dircache.DirCache.unlock:()V
15: StackMap locals: java.lang.Throwable
StackMap stack:
aload 1
athrow
end local 0 LocalVariableTable:
Start End Slot Name Signature
0 16 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
Exception table:
from to target type
4 7 11 any
Exceptions:
throws java.io.IOException
private void checkout();
descriptor: ()V
flags: (0x0002) ACC_PRIVATE
Code:
stack=6, locals=4, args_size=1
start local 0 0: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.toBeDeleted:Ljava/util/List;
invokeinterface java.util.List.size:()I
iconst_1
isub
istore 1
start local 1 1: goto 11
2: StackMap locals: int
StackMap stack:
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.toBeDeleted:Ljava/util/List;
iload 1
invokeinterface java.util.List.get:(I)Ljava/lang/Object;
checkcast java.lang.String
astore 2
start local 2 3: new java.io.File
dup
aload 0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.nonNullRepo:()Lorg/eclipse/jgit/lib/Repository;
invokevirtual org.eclipse.jgit.lib.Repository.getWorkTree:()Ljava/io/File;
aload 2
invokespecial java.io.File.<init>:(Ljava/io/File;Ljava/lang/String;)V
astore 3
start local 3 4: aload 3
invokevirtual java.io.File.delete:()Z
ifne 9
5: aload 3
invokevirtual java.io.File.isDirectory:()Z
ifne 9
6: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.failingPaths:Ljava/util/Map;
aload 2
7: getstatic org.eclipse.jgit.merge.ResolveMerger$MergeFailureReason.COULD_NOT_DELETE:Lorg/eclipse/jgit/merge/ResolveMerger$MergeFailureReason;
8: invokeinterface java.util.Map.put:(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
pop
9: StackMap locals: java.lang.String java.io.File
StackMap stack:
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.modifiedFiles:Ljava/util/List;
aload 2
invokeinterface java.util.List.add:(Ljava/lang/Object;)Z
pop
end local 3 end local 2 10: iinc 1 -1
StackMap locals:
StackMap stack:
11: iload 1
ifge 2
end local 1 12: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.toBeCheckedOut:Ljava/util/Map;
13: invokeinterface java.util.Map.entrySet:()Ljava/util/Set;
invokeinterface java.util.Set.iterator:()Ljava/util/Iterator;
astore 2
goto 23
StackMap locals: org.eclipse.jgit.merge.ResolveMerger top java.util.Iterator
StackMap stack:
14: aload 2
invokeinterface java.util.Iterator.next:()Ljava/lang/Object;
checkcast java.util.Map$Entry
astore 1
start local 1 15: aload 1
invokeinterface java.util.Map$Entry.getValue:()Ljava/lang/Object;
checkcast org.eclipse.jgit.dircache.DirCacheEntry
astore 3
start local 3 16: aload 3
invokevirtual org.eclipse.jgit.dircache.DirCacheEntry.getFileMode:()Lorg/eclipse/jgit/lib/FileMode;
getstatic org.eclipse.jgit.lib.FileMode.GITLINK:Lorg/eclipse/jgit/lib/FileMode;
if_acmpne 19
17: new java.io.File
dup
aload 0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.nonNullRepo:()Lorg/eclipse/jgit/lib/Repository;
invokevirtual org.eclipse.jgit.lib.Repository.getWorkTree:()Ljava/io/File;
aload 1
invokeinterface java.util.Map$Entry.getKey:()Ljava/lang/Object;
checkcast java.lang.String
invokespecial java.io.File.<init>:(Ljava/io/File;Ljava/lang/String;)V
invokevirtual java.io.File.mkdirs:()Z
pop
18: goto 23
19: StackMap locals: org.eclipse.jgit.merge.ResolveMerger java.util.Map$Entry java.util.Iterator org.eclipse.jgit.dircache.DirCacheEntry
StackMap stack:
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.db:Lorg/eclipse/jgit/lib/Repository;
aload 3
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.reader:Lorg/eclipse/jgit/lib/ObjectReader;
iconst_0
20: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.checkoutMetadata:Ljava/util/Map;
aload 1
invokeinterface java.util.Map$Entry.getKey:()Ljava/lang/Object;
invokeinterface java.util.Map.get:(Ljava/lang/Object;)Ljava/lang/Object;
checkcast org.eclipse.jgit.dircache.DirCacheCheckout$CheckoutMetadata
21: invokestatic org.eclipse.jgit.dircache.DirCacheCheckout.checkoutEntry:(Lorg/eclipse/jgit/lib/Repository;Lorg/eclipse/jgit/dircache/DirCacheEntry;Lorg/eclipse/jgit/lib/ObjectReader;ZLorg/eclipse/jgit/dircache/DirCacheCheckout$CheckoutMetadata;)V
22: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.modifiedFiles:Ljava/util/List;
aload 1
invokeinterface java.util.Map$Entry.getKey:()Ljava/lang/Object;
checkcast java.lang.String
invokeinterface java.util.List.add:(Ljava/lang/Object;)Z
pop
end local 3 end local 1 23: StackMap locals: org.eclipse.jgit.merge.ResolveMerger top java.util.Iterator
StackMap stack:
aload 2
invokeinterface java.util.Iterator.hasNext:()Z
ifne 14
24: return
end local 0 LocalVariableTable:
Start End Slot Name Signature
0 25 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
1 12 1 i I
3 10 2 fileName Ljava/lang/String;
4 10 3 f Ljava/io/File;
15 23 1 entry Ljava/util/Map$Entry<Ljava/lang/String;Lorg/eclipse/jgit/dircache/DirCacheEntry;>;
16 23 3 cacheEntry Lorg/eclipse/jgit/dircache/DirCacheEntry;
Exceptions:
throws org.eclipse.jgit.errors.NoWorkTreeException, java.io.IOException
protected void cleanUp();
descriptor: ()V
flags: (0x0004) ACC_PROTECTED
Code:
stack=6, locals=5, args_size=1
start local 0 0: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.inCore:Z
ifeq 3
1: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.modifiedFiles:Ljava/util/List;
invokeinterface java.util.List.clear:()V
2: return
3: StackMap locals:
StackMap stack:
aload 0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.nonNullRepo:()Lorg/eclipse/jgit/lib/Repository;
invokevirtual org.eclipse.jgit.lib.Repository.readDirCache:()Lorg/eclipse/jgit/dircache/DirCache;
astore 1
start local 1 4: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.modifiedFiles:Ljava/util/List;
invokeinterface java.util.List.iterator:()Ljava/util/Iterator;
astore 2
start local 2 5: goto 13
6: StackMap locals: org.eclipse.jgit.dircache.DirCache java.util.Iterator
StackMap stack:
aload 2
invokeinterface java.util.Iterator.next:()Ljava/lang/Object;
checkcast java.lang.String
astore 3
start local 3 7: aload 1
aload 3
invokevirtual org.eclipse.jgit.dircache.DirCache.getEntry:(Ljava/lang/String;)Lorg/eclipse/jgit/dircache/DirCacheEntry;
astore 4
start local 4 8: aload 4
ifnull 12
9: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.db:Lorg/eclipse/jgit/lib/Repository;
aload 4
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.reader:Lorg/eclipse/jgit/lib/ObjectReader;
iconst_0
10: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.checkoutMetadata:Ljava/util/Map;
aload 3
invokeinterface java.util.Map.get:(Ljava/lang/Object;)Ljava/lang/Object;
checkcast org.eclipse.jgit.dircache.DirCacheCheckout$CheckoutMetadata
11: invokestatic org.eclipse.jgit.dircache.DirCacheCheckout.checkoutEntry:(Lorg/eclipse/jgit/lib/Repository;Lorg/eclipse/jgit/dircache/DirCacheEntry;Lorg/eclipse/jgit/lib/ObjectReader;ZLorg/eclipse/jgit/dircache/DirCacheCheckout$CheckoutMetadata;)V
12: StackMap locals: java.lang.String org.eclipse.jgit.dircache.DirCacheEntry
StackMap stack:
aload 2
invokeinterface java.util.Iterator.remove:()V
end local 4 end local 3 13: StackMap locals:
StackMap stack:
aload 2
invokeinterface java.util.Iterator.hasNext:()Z
ifne 6
14: return
end local 2 end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 15 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
4 15 1 dc Lorg/eclipse/jgit/dircache/DirCache;
5 15 2 mpathsIt Ljava/util/Iterator<Ljava/lang/String;>;
7 13 3 mpath Ljava/lang/String;
8 13 4 entry Lorg/eclipse/jgit/dircache/DirCacheEntry;
Exceptions:
throws org.eclipse.jgit.errors.NoWorkTreeException, org.eclipse.jgit.errors.CorruptObjectException, java.io.IOException
private org.eclipse.jgit.dircache.DirCacheEntry add(byte[], org.eclipse.jgit.treewalk.CanonicalTreeParser, int, java.time.Instant, long);
descriptor: ([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
flags: (0x0002) ACC_PRIVATE
Code:
stack=4, locals=8, args_size=6
start local 0 start local 1 start local 2 start local 3 start local 4 start local 5 0: aload 2
ifnull 8
aload 2
invokevirtual org.eclipse.jgit.treewalk.CanonicalTreeParser.getEntryFileMode:()Lorg/eclipse/jgit/lib/FileMode;
getstatic org.eclipse.jgit.lib.FileMode.TREE:Lorg/eclipse/jgit/lib/FileMode;
invokevirtual java.lang.Object.equals:(Ljava/lang/Object;)Z
ifne 8
1: new org.eclipse.jgit.dircache.DirCacheEntry
dup
aload 1
iload 3
invokespecial org.eclipse.jgit.dircache.DirCacheEntry.<init>:([BI)V
astore 7
start local 7 2: aload 7
aload 2
invokevirtual org.eclipse.jgit.treewalk.CanonicalTreeParser.getEntryFileMode:()Lorg/eclipse/jgit/lib/FileMode;
invokevirtual org.eclipse.jgit.dircache.DirCacheEntry.setFileMode:(Lorg/eclipse/jgit/lib/FileMode;)V
3: aload 7
aload 2
invokevirtual org.eclipse.jgit.treewalk.CanonicalTreeParser.getEntryObjectId:()Lorg/eclipse/jgit/lib/ObjectId;
invokevirtual org.eclipse.jgit.dircache.DirCacheEntry.setObjectId:(Lorg/eclipse/jgit/lib/AnyObjectId;)V
4: aload 7
aload 4
invokevirtual org.eclipse.jgit.dircache.DirCacheEntry.setLastModified:(Ljava/time/Instant;)V
5: aload 7
lload 5
invokevirtual org.eclipse.jgit.dircache.DirCacheEntry.setLength:(J)V
6: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.builder:Lorg/eclipse/jgit/dircache/DirCacheBuilder;
aload 7
invokevirtual org.eclipse.jgit.dircache.DirCacheBuilder.add:(Lorg/eclipse/jgit/dircache/DirCacheEntry;)V
7: aload 7
areturn
end local 7 8: StackMap locals:
StackMap stack:
aconst_null
areturn
end local 5 end local 4 end local 3 end local 2 end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 9 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
0 9 1 path [B
0 9 2 p Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;
0 9 3 stage I
0 9 4 lastMod Ljava/time/Instant;
0 9 5 len J
2 8 7 e Lorg/eclipse/jgit/dircache/DirCacheEntry;
MethodParameters:
Name Flags
path
p
stage
lastMod
len
private org.eclipse.jgit.dircache.DirCacheEntry keep(org.eclipse.jgit.dircache.DirCacheEntry);
descriptor: (Lorg/eclipse/jgit/dircache/DirCacheEntry;)Lorg/eclipse/jgit/dircache/DirCacheEntry;
flags: (0x0002) ACC_PRIVATE
Code:
stack=4, locals=3, args_size=2
start local 0 start local 1 0: new org.eclipse.jgit.dircache.DirCacheEntry
dup
aload 1
invokevirtual org.eclipse.jgit.dircache.DirCacheEntry.getRawPath:()[B
1: aload 1
invokevirtual org.eclipse.jgit.dircache.DirCacheEntry.getStage:()I
2: invokespecial org.eclipse.jgit.dircache.DirCacheEntry.<init>:([BI)V
astore 2
start local 2 3: aload 2
aload 1
invokevirtual org.eclipse.jgit.dircache.DirCacheEntry.getFileMode:()Lorg/eclipse/jgit/lib/FileMode;
invokevirtual org.eclipse.jgit.dircache.DirCacheEntry.setFileMode:(Lorg/eclipse/jgit/lib/FileMode;)V
4: aload 2
aload 1
invokevirtual org.eclipse.jgit.dircache.DirCacheEntry.getObjectId:()Lorg/eclipse/jgit/lib/ObjectId;
invokevirtual org.eclipse.jgit.dircache.DirCacheEntry.setObjectId:(Lorg/eclipse/jgit/lib/AnyObjectId;)V
5: aload 2
aload 1
invokevirtual org.eclipse.jgit.dircache.DirCacheEntry.getLastModifiedInstant:()Ljava/time/Instant;
invokevirtual org.eclipse.jgit.dircache.DirCacheEntry.setLastModified:(Ljava/time/Instant;)V
6: aload 2
aload 1
invokevirtual org.eclipse.jgit.dircache.DirCacheEntry.getLength:()I
invokevirtual org.eclipse.jgit.dircache.DirCacheEntry.setLength:(I)V
7: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.builder:Lorg/eclipse/jgit/dircache/DirCacheBuilder;
aload 2
invokevirtual org.eclipse.jgit.dircache.DirCacheBuilder.add:(Lorg/eclipse/jgit/dircache/DirCacheEntry;)V
8: aload 2
areturn
end local 2 end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 9 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
0 9 1 e Lorg/eclipse/jgit/dircache/DirCacheEntry;
3 9 2 newEntry Lorg/eclipse/jgit/dircache/DirCacheEntry;
MethodParameters:
Name Flags
e
protected void addCheckoutMetadata(java.lang.String, org.eclipse.jgit.attributes.Attributes);
descriptor: (Ljava/lang/String;Lorg/eclipse/jgit/attributes/Attributes;)V
flags: (0x0004) ACC_PROTECTED
Code:
stack=5, locals=5, args_size=3
start local 0 start local 1 start local 2 0: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.checkoutMetadata:Ljava/util/Map;
ifnull 7
1: getstatic org.eclipse.jgit.treewalk.TreeWalk$OperationType.CHECKOUT_OP:Lorg/eclipse/jgit/treewalk/TreeWalk$OperationType;
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.workingTreeOptions:Lorg/eclipse/jgit/treewalk/WorkingTreeOptions;
aload 2
2: invokestatic org.eclipse.jgit.util.io.EolStreamTypeUtil.detectStreamType:(Lorg/eclipse/jgit/treewalk/TreeWalk$OperationType;Lorg/eclipse/jgit/treewalk/WorkingTreeOptions;Lorg/eclipse/jgit/attributes/Attributes;)Lorg/eclipse/jgit/lib/CoreConfig$EolStreamType;
astore 3
start local 3 3: new org.eclipse.jgit.dircache.DirCacheCheckout$CheckoutMetadata
dup
aload 3
4: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
ldc "smudge"
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getFilterCommand:(Ljava/lang/String;)Ljava/lang/String;
5: invokespecial org.eclipse.jgit.dircache.DirCacheCheckout$CheckoutMetadata.<init>:(Lorg/eclipse/jgit/lib/CoreConfig$EolStreamType;Ljava/lang/String;)V
astore 4
start local 4 6: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.checkoutMetadata:Ljava/util/Map;
aload 1
aload 4
invokeinterface java.util.Map.put:(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
pop
end local 4 end local 3 7: StackMap locals:
StackMap stack:
return
end local 2 end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 8 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
0 8 1 path Ljava/lang/String;
0 8 2 attributes Lorg/eclipse/jgit/attributes/Attributes;
3 7 3 eol Lorg/eclipse/jgit/lib/CoreConfig$EolStreamType;
6 7 4 data Lorg/eclipse/jgit/dircache/DirCacheCheckout$CheckoutMetadata;
Exceptions:
throws java.io.IOException
MethodParameters:
Name Flags
path
attributes
protected void addToCheckout(java.lang.String, org.eclipse.jgit.dircache.DirCacheEntry, org.eclipse.jgit.attributes.Attributes);
descriptor: (Ljava/lang/String;Lorg/eclipse/jgit/dircache/DirCacheEntry;Lorg/eclipse/jgit/attributes/Attributes;)V
flags: (0x0004) ACC_PROTECTED
Code:
stack=3, locals=4, args_size=4
start local 0 start local 1 start local 2 start local 3 0: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.toBeCheckedOut:Ljava/util/Map;
aload 1
aload 2
invokeinterface java.util.Map.put:(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
pop
1: aload 0
aload 1
aload 3
invokevirtual org.eclipse.jgit.merge.ResolveMerger.addCheckoutMetadata:(Ljava/lang/String;Lorg/eclipse/jgit/attributes/Attributes;)V
2: return
end local 3 end local 2 end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 3 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
0 3 1 path Ljava/lang/String;
0 3 2 entry Lorg/eclipse/jgit/dircache/DirCacheEntry;
0 3 3 attributes Lorg/eclipse/jgit/attributes/Attributes;
Exceptions:
throws java.io.IOException
MethodParameters:
Name Flags
path
entry
attributes
protected void addDeletion(java.lang.String, boolean, org.eclipse.jgit.attributes.Attributes);
descriptor: (Ljava/lang/String;ZLorg/eclipse/jgit/attributes/Attributes;)V
flags: (0x0004) ACC_PROTECTED
Code:
stack=3, locals=4, args_size=4
start local 0 start local 1 start local 2 start local 3 0: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.toBeDeleted:Ljava/util/List;
aload 1
invokeinterface java.util.List.add:(Ljava/lang/Object;)Z
pop
1: iload 2
ifeq 3
2: aload 0
aload 1
aload 3
invokevirtual org.eclipse.jgit.merge.ResolveMerger.addCheckoutMetadata:(Ljava/lang/String;Lorg/eclipse/jgit/attributes/Attributes;)V
3: StackMap locals:
StackMap stack:
return
end local 3 end local 2 end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 4 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
0 4 1 path Ljava/lang/String;
0 4 2 isFile Z
0 4 3 attributes Lorg/eclipse/jgit/attributes/Attributes;
Exceptions:
throws java.io.IOException
MethodParameters:
Name Flags
path
isFile
attributes
protected boolean processEntry(org.eclipse.jgit.treewalk.CanonicalTreeParser, org.eclipse.jgit.treewalk.CanonicalTreeParser, org.eclipse.jgit.treewalk.CanonicalTreeParser, org.eclipse.jgit.dircache.DirCacheBuildIterator, org.eclipse.jgit.treewalk.WorkingTreeIterator, boolean, org.eclipse.jgit.attributes.Attributes);
descriptor: (Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/dircache/DirCacheBuildIterator;Lorg/eclipse/jgit/treewalk/WorkingTreeIterator;ZLorg/eclipse/jgit/attributes/Attributes;)Z
flags: (0x0004) ACC_PROTECTED
Code:
stack=7, locals=16, args_size=8
start local 0 start local 1 start local 2 start local 3 start local 4 start local 5 start local 6 start local 7 0: aload 0
iconst_1
putfield org.eclipse.jgit.merge.ResolveMerger.enterSubtree:Z
1: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
iconst_1
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawMode:(I)I
istore 8
start local 8 2: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
iconst_2
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawMode:(I)I
istore 9
start local 9 3: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
iconst_0
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawMode:(I)I
istore 10
start local 10 4: iload 8
invokestatic org.eclipse.jgit.merge.ResolveMerger.isGitLink:(I)Z
ifne 7
iload 9
invokestatic org.eclipse.jgit.merge.ResolveMerger.isGitLink:(I)Z
ifne 7
5: iload 10
invokestatic org.eclipse.jgit.merge.ResolveMerger.isGitLink:(I)Z
ifne 7
6: iconst_0
goto 8
StackMap locals: int int int
StackMap stack:
7: iconst_1
StackMap locals:
StackMap stack: int
8: istore 11
start local 11 9: iload 8
ifne 11
iload 9
ifne 11
iload 10
ifne 11
10: iconst_1
ireturn
11: StackMap locals: int
StackMap stack:
aload 0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.isIndexDirty:()Z
ifeq 13
12: iconst_0
ireturn
13: StackMap locals:
StackMap stack:
aconst_null
astore 12
start local 12 14: aload 4
ifnull 15
aload 4
invokevirtual org.eclipse.jgit.dircache.DirCacheBuildIterator.getDirCacheEntry:()Lorg/eclipse/jgit/dircache/DirCacheEntry;
ifnonnull 20
15: StackMap locals: org.eclipse.jgit.dircache.DirCacheEntry
StackMap stack:
iload 8
invokestatic org.eclipse.jgit.merge.ResolveMerger.nonTree:(I)Z
ifeq 21
16: new org.eclipse.jgit.dircache.DirCacheEntry
dup
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
invokespecial org.eclipse.jgit.dircache.DirCacheEntry.<init>:([B)V
astore 12
17: aload 12
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
iconst_1
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getObjectId:(I)Lorg/eclipse/jgit/lib/ObjectId;
invokevirtual org.eclipse.jgit.dircache.DirCacheEntry.setObjectId:(Lorg/eclipse/jgit/lib/AnyObjectId;)V
18: aload 12
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
iconst_1
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getFileMode:(I)Lorg/eclipse/jgit/lib/FileMode;
invokevirtual org.eclipse.jgit.dircache.DirCacheEntry.setFileMode:(Lorg/eclipse/jgit/lib/FileMode;)V
19: goto 21
20: StackMap locals:
StackMap stack:
aload 4
invokevirtual org.eclipse.jgit.dircache.DirCacheBuildIterator.getDirCacheEntry:()Lorg/eclipse/jgit/dircache/DirCacheEntry;
astore 12
21: StackMap locals:
StackMap stack:
iload 8
invokestatic org.eclipse.jgit.merge.ResolveMerger.nonTree:(I)Z
ifeq 45
iload 9
invokestatic org.eclipse.jgit.merge.ResolveMerger.nonTree:(I)Z
ifeq 45
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
iconst_1
iconst_2
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.idEqual:(II)Z
ifeq 45
22: iload 8
iload 9
if_icmpne 25
23: aload 0
aload 12
invokevirtual org.eclipse.jgit.merge.ResolveMerger.keep:(Lorg/eclipse/jgit/dircache/DirCacheEntry;)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
24: iconst_1
ireturn
25: StackMap locals:
StackMap stack:
aload 0
iload 10
iload 8
iload 9
invokevirtual org.eclipse.jgit.merge.ResolveMerger.mergeFileModes:(III)I
istore 13
start local 13 26: iload 13
getstatic org.eclipse.jgit.lib.FileMode.MISSING:Lorg/eclipse/jgit/lib/FileMode;
invokevirtual org.eclipse.jgit.lib.FileMode.getBits:()I
if_icmpeq 37
27: iload 13
iload 8
if_icmpne 30
28: aload 0
aload 12
invokevirtual org.eclipse.jgit.merge.ResolveMerger.keep:(Lorg/eclipse/jgit/dircache/DirCacheEntry;)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
29: goto 36
30: StackMap locals: int
StackMap stack:
aload 0
aload 5
aload 12
invokevirtual org.eclipse.jgit.merge.ResolveMerger.isWorktreeDirty:(Lorg/eclipse/jgit/treewalk/WorkingTreeIterator;Lorg/eclipse/jgit/dircache/DirCacheEntry;)Z
ifeq 32
31: iconst_0
ireturn
32: StackMap locals:
StackMap stack:
aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 3
33: iconst_0
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
34: invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
astore 14
start local 14 35: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getPathString:()Ljava/lang/String;
aload 14
aload 7
invokevirtual org.eclipse.jgit.merge.ResolveMerger.addToCheckout:(Ljava/lang/String;Lorg/eclipse/jgit/dircache/DirCacheEntry;Lorg/eclipse/jgit/attributes/Attributes;)V
end local 14 36: StackMap locals:
StackMap stack:
iconst_1
ireturn
37: StackMap locals:
StackMap stack:
aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 1
iconst_1
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
38: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 2
iconst_2
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
39: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 3
iconst_3
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
40: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.unmergedPaths:Ljava/util/List;
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getPathString:()Ljava/lang/String;
invokeinterface java.util.List.add:(Ljava/lang/Object;)Z
pop
41: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.mergeResults:Ljava/util/Map;
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getPathString:()Ljava/lang/String;
42: new org.eclipse.jgit.merge.MergeResult
dup
invokestatic java.util.Collections.emptyList:()Ljava/util/List;
invokespecial org.eclipse.jgit.merge.MergeResult.<init>:(Ljava/util/List;)V
43: invokeinterface java.util.Map.put:(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
pop
44: iconst_1
ireturn
end local 13 45: StackMap locals:
StackMap stack:
iload 10
iload 9
if_icmpne 49
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
iconst_0
iconst_2
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.idEqual:(II)Z
ifeq 49
46: aload 12
ifnull 48
47: aload 0
aload 12
invokevirtual org.eclipse.jgit.merge.ResolveMerger.keep:(Lorg/eclipse/jgit/dircache/DirCacheEntry;)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
48: StackMap locals:
StackMap stack:
iconst_1
ireturn
49: StackMap locals:
StackMap stack:
iload 10
iload 8
if_icmpne 65
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
iconst_0
iconst_1
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.idEqual:(II)Z
ifeq 65
50: aload 0
aload 5
aload 12
invokevirtual org.eclipse.jgit.merge.ResolveMerger.isWorktreeDirty:(Lorg/eclipse/jgit/treewalk/WorkingTreeIterator;Lorg/eclipse/jgit/dircache/DirCacheEntry;)Z
ifeq 52
51: iconst_0
ireturn
52: StackMap locals:
StackMap stack:
iload 9
invokestatic org.eclipse.jgit.merge.ResolveMerger.nonTree:(I)Z
ifeq 59
53: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 3
54: iconst_0
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
55: invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
astore 13
start local 13 56: aload 13
ifnull 58
57: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getPathString:()Ljava/lang/String;
aload 13
aload 7
invokevirtual org.eclipse.jgit.merge.ResolveMerger.addToCheckout:(Ljava/lang/String;Lorg/eclipse/jgit/dircache/DirCacheEntry;Lorg/eclipse/jgit/attributes/Attributes;)V
58: StackMap locals: org.eclipse.jgit.dircache.DirCacheEntry
StackMap stack:
iconst_1
ireturn
end local 13 59: StackMap locals:
StackMap stack:
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getTreeCount:()I
iconst_4
if_icmple 61
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
iconst_4
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawMode:(I)I
ifne 61
60: iconst_1
ireturn
61: StackMap locals:
StackMap stack:
iload 9
ifeq 63
iload 9
iload 10
if_icmpne 63
62: iconst_1
ireturn
63: StackMap locals:
StackMap stack:
aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getPathString:()Ljava/lang/String;
iload 8
invokestatic org.eclipse.jgit.merge.ResolveMerger.nonTree:(I)Z
aload 7
invokevirtual org.eclipse.jgit.merge.ResolveMerger.addDeletion:(Ljava/lang/String;ZLorg/eclipse/jgit/attributes/Attributes;)V
64: iconst_1
ireturn
65: StackMap locals:
StackMap stack:
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.isSubtree:()Z
ifeq 82
66: iload 8
invokestatic org.eclipse.jgit.merge.ResolveMerger.nonTree:(I)Z
ifeq 73
iload 9
invokestatic org.eclipse.jgit.merge.ResolveMerger.nonTree:(I)Z
ifne 73
67: iload 10
invokestatic org.eclipse.jgit.merge.ResolveMerger.nonTree:(I)Z
ifeq 69
68: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 1
iconst_1
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
69: StackMap locals:
StackMap stack:
aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 2
iconst_2
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
70: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.unmergedPaths:Ljava/util/List;
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getPathString:()Ljava/lang/String;
invokeinterface java.util.List.add:(Ljava/lang/Object;)Z
pop
71: aload 0
iconst_0
putfield org.eclipse.jgit.merge.ResolveMerger.enterSubtree:Z
72: iconst_1
ireturn
73: StackMap locals:
StackMap stack:
iload 9
invokestatic org.eclipse.jgit.merge.ResolveMerger.nonTree:(I)Z
ifeq 80
iload 8
invokestatic org.eclipse.jgit.merge.ResolveMerger.nonTree:(I)Z
ifne 80
74: iload 10
invokestatic org.eclipse.jgit.merge.ResolveMerger.nonTree:(I)Z
ifeq 76
75: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 1
iconst_1
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
76: StackMap locals:
StackMap stack:
aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 3
iconst_3
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
77: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.unmergedPaths:Ljava/util/List;
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getPathString:()Ljava/lang/String;
invokeinterface java.util.List.add:(Ljava/lang/Object;)Z
pop
78: aload 0
iconst_0
putfield org.eclipse.jgit.merge.ResolveMerger.enterSubtree:Z
79: iconst_1
ireturn
80: StackMap locals:
StackMap stack:
iload 8
invokestatic org.eclipse.jgit.merge.ResolveMerger.nonTree:(I)Z
ifne 82
81: iconst_1
ireturn
82: StackMap locals:
StackMap stack:
iload 8
invokestatic org.eclipse.jgit.merge.ResolveMerger.nonTree:(I)Z
ifeq 119
iload 9
invokestatic org.eclipse.jgit.merge.ResolveMerger.nonTree:(I)Z
ifeq 119
83: aload 0
aload 5
aload 12
invokevirtual org.eclipse.jgit.merge.ResolveMerger.isWorktreeDirty:(Lorg/eclipse/jgit/treewalk/WorkingTreeIterator;Lorg/eclipse/jgit/dircache/DirCacheEntry;)Z
istore 13
start local 13 84: aload 7
invokevirtual org.eclipse.jgit.attributes.Attributes.canBeContentMerged:()Z
ifne 86
iload 13
ifeq 86
85: iconst_0
ireturn
86: StackMap locals: int
StackMap stack:
iload 11
ifeq 89
iload 6
ifeq 89
87: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 2
iconst_0
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
88: iconst_1
ireturn
89: StackMap locals:
StackMap stack:
iload 11
ifeq 99
90: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 1
iconst_1
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
91: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 2
iconst_2
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
92: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 3
iconst_3
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
93: aload 1
aload 2
aload 3
94: invokestatic org.eclipse.jgit.merge.ResolveMerger.createGitLinksMergeResult:(Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;)Lorg/eclipse/jgit/merge/MergeResult;
astore 14
start local 14 95: aload 14
iconst_1
invokevirtual org.eclipse.jgit.merge.MergeResult.setContainsConflicts:(Z)V
96: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.mergeResults:Ljava/util/Map;
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getPathString:()Ljava/lang/String;
aload 14
invokeinterface java.util.Map.put:(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
pop
97: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.unmergedPaths:Ljava/util/List;
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getPathString:()Ljava/lang/String;
invokeinterface java.util.List.add:(Ljava/lang/Object;)Z
pop
98: iconst_1
ireturn
end local 14 99: StackMap locals:
StackMap stack:
aload 7
invokevirtual org.eclipse.jgit.attributes.Attributes.canBeContentMerged:()Z
ifne 105
100: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 1
iconst_1
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
101: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 2
iconst_2
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
102: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 3
iconst_3
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
103: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.unmergedPaths:Ljava/util/List;
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getPathString:()Ljava/lang/String;
invokeinterface java.util.List.add:(Ljava/lang/Object;)Z
pop
104: iconst_1
ireturn
105: StackMap locals:
StackMap stack:
iload 13
ifeq 107
106: iconst_0
ireturn
107: StackMap locals:
StackMap stack:
aload 0
aload 1
aload 2
aload 3
108: aload 7
109: invokevirtual org.eclipse.jgit.merge.ResolveMerger.contentMerge:(Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/attributes/Attributes;)Lorg/eclipse/jgit/merge/MergeResult;
astore 14
start local 14 110: iload 6
ifeq 112
111: aload 14
iconst_0
invokevirtual org.eclipse.jgit.merge.MergeResult.setContainsConflicts:(Z)V
112: StackMap locals: org.eclipse.jgit.merge.MergeResult
StackMap stack:
aload 0
aload 1
aload 2
aload 3
aload 14
aload 7
invokevirtual org.eclipse.jgit.merge.ResolveMerger.updateIndex:(Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/merge/MergeResult;Lorg/eclipse/jgit/attributes/Attributes;)V
113: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getPathString:()Ljava/lang/String;
astore 15
start local 15 114: aload 14
invokevirtual org.eclipse.jgit.merge.MergeResult.containsConflicts:()Z
ifeq 116
iload 6
ifne 116
115: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.unmergedPaths:Ljava/util/List;
aload 15
invokeinterface java.util.List.add:(Ljava/lang/Object;)Z
pop
116: StackMap locals: java.lang.String
StackMap stack:
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.modifiedFiles:Ljava/util/List;
aload 15
invokeinterface java.util.List.add:(Ljava/lang/Object;)Z
pop
117: aload 0
aload 15
aload 7
invokevirtual org.eclipse.jgit.merge.ResolveMerger.addCheckoutMetadata:(Ljava/lang/String;Lorg/eclipse/jgit/attributes/Attributes;)V
end local 15 end local 14 end local 13 118: goto 162
StackMap locals:
StackMap stack:
119: iload 8
iload 9
if_icmpeq 162
120: iload 8
ifeq 121
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
iconst_0
iconst_1
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.idEqual:(II)Z
ifeq 123
StackMap locals:
StackMap stack:
121: iload 9
ifeq 162
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
122: iconst_0
iconst_2
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.idEqual:(II)Z
ifne 162
123: StackMap locals:
StackMap stack:
iload 11
ifeq 126
iload 6
ifeq 126
124: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 2
iconst_0
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
125: goto 162
StackMap locals:
StackMap stack:
126: iload 11
ifeq 136
127: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 1
iconst_1
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
128: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 2
iconst_2
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
129: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 3
iconst_3
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
130: aload 1
aload 2
aload 3
131: invokestatic org.eclipse.jgit.merge.ResolveMerger.createGitLinksMergeResult:(Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;)Lorg/eclipse/jgit/merge/MergeResult;
astore 13
start local 13 132: aload 13
iconst_1
invokevirtual org.eclipse.jgit.merge.MergeResult.setContainsConflicts:(Z)V
133: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.mergeResults:Ljava/util/Map;
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getPathString:()Ljava/lang/String;
aload 13
invokeinterface java.util.Map.put:(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
pop
134: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.unmergedPaths:Ljava/util/List;
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getPathString:()Ljava/lang/String;
invokeinterface java.util.List.add:(Ljava/lang/Object;)Z
pop
end local 13 135: goto 162
136: StackMap locals:
StackMap stack:
aload 0
aload 1
aload 2
137: aload 3
aload 7
138: invokevirtual org.eclipse.jgit.merge.ResolveMerger.contentMerge:(Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/attributes/Attributes;)Lorg/eclipse/jgit/merge/MergeResult;
astore 13
start local 13 139: iload 6
ifeq 143
140: aload 13
iconst_0
invokevirtual org.eclipse.jgit.merge.MergeResult.setContainsConflicts:(Z)V
141: aload 0
aload 1
aload 2
aload 3
aload 13
aload 7
invokevirtual org.eclipse.jgit.merge.ResolveMerger.updateIndex:(Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/merge/MergeResult;Lorg/eclipse/jgit/attributes/Attributes;)V
142: goto 162
143: StackMap locals: org.eclipse.jgit.merge.MergeResult
StackMap stack:
aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 1
iconst_1
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
144: lconst_0
145: invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
146: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 2
iconst_2
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
147: lconst_0
148: invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
149: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 3
150: iconst_3
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
151: invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
astore 14
start local 14 152: iload 8
ifne 160
153: aload 0
aload 5
aload 12
invokevirtual org.eclipse.jgit.merge.ResolveMerger.isWorktreeDirty:(Lorg/eclipse/jgit/treewalk/WorkingTreeIterator;Lorg/eclipse/jgit/dircache/DirCacheEntry;)Z
ifeq 155
154: iconst_0
ireturn
155: StackMap locals: org.eclipse.jgit.dircache.DirCacheEntry
StackMap stack:
iload 9
invokestatic org.eclipse.jgit.merge.ResolveMerger.nonTree:(I)Z
ifeq 160
156: aload 14
ifnull 160
157: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getPathString:()Ljava/lang/String;
aload 14
158: aload 7
159: invokevirtual org.eclipse.jgit.merge.ResolveMerger.addToCheckout:(Ljava/lang/String;Lorg/eclipse/jgit/dircache/DirCacheEntry;Lorg/eclipse/jgit/attributes/Attributes;)V
160: StackMap locals:
StackMap stack:
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.unmergedPaths:Ljava/util/List;
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getPathString:()Ljava/lang/String;
invokeinterface java.util.List.add:(Ljava/lang/Object;)Z
pop
161: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.mergeResults:Ljava/util/Map;
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getPathString:()Ljava/lang/String;
aload 13
invokeinterface java.util.Map.put:(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
pop
end local 14 end local 13 162: StackMap locals:
StackMap stack:
iconst_1
ireturn
end local 12 end local 11 end local 10 end local 9 end local 8 end local 7 end local 6 end local 5 end local 4 end local 3 end local 2 end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 163 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
0 163 1 base Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;
0 163 2 ours Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;
0 163 3 theirs Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;
0 163 4 index Lorg/eclipse/jgit/dircache/DirCacheBuildIterator;
0 163 5 work Lorg/eclipse/jgit/treewalk/WorkingTreeIterator;
0 163 6 ignoreConflicts Z
0 163 7 attributes Lorg/eclipse/jgit/attributes/Attributes;
2 163 8 modeO I
3 163 9 modeT I
4 163 10 modeB I
9 163 11 gitLinkMerging Z
14 163 12 ourDce Lorg/eclipse/jgit/dircache/DirCacheEntry;
26 45 13 newMode I
35 36 14 e Lorg/eclipse/jgit/dircache/DirCacheEntry;
56 59 13 e Lorg/eclipse/jgit/dircache/DirCacheEntry;
84 118 13 worktreeDirty Z
95 99 14 result Lorg/eclipse/jgit/merge/MergeResult<Lorg/eclipse/jgit/submodule/SubmoduleConflict;>;
110 118 14 result Lorg/eclipse/jgit/merge/MergeResult<Lorg/eclipse/jgit/diff/RawText;>;
114 118 15 currentPath Ljava/lang/String;
132 135 13 result Lorg/eclipse/jgit/merge/MergeResult<Lorg/eclipse/jgit/submodule/SubmoduleConflict;>;
139 162 13 result Lorg/eclipse/jgit/merge/MergeResult<Lorg/eclipse/jgit/diff/RawText;>;
152 162 14 e Lorg/eclipse/jgit/dircache/DirCacheEntry;
Exceptions:
throws org.eclipse.jgit.errors.MissingObjectException, org.eclipse.jgit.errors.IncorrectObjectTypeException, org.eclipse.jgit.errors.CorruptObjectException, java.io.IOException
MethodParameters:
Name Flags
base
ours
theirs
index
work
ignoreConflicts
attributes
private static org.eclipse.jgit.merge.MergeResult<org.eclipse.jgit.submodule.SubmoduleConflict> createGitLinksMergeResult(org.eclipse.jgit.treewalk.CanonicalTreeParser, org.eclipse.jgit.treewalk.CanonicalTreeParser, org.eclipse.jgit.treewalk.CanonicalTreeParser);
descriptor: (Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;)Lorg/eclipse/jgit/merge/MergeResult;
flags: (0x000a) ACC_PRIVATE, ACC_STATIC
Code:
stack=8, locals=3, args_size=3
start local 0 start local 1 start local 2 0: new org.eclipse.jgit.merge.MergeResult
dup
iconst_3
anewarray org.eclipse.jgit.submodule.SubmoduleConflict
dup
iconst_0
1: new org.eclipse.jgit.submodule.SubmoduleConflict
dup
2: aload 0
ifnonnull 3
aconst_null
goto 4
StackMap locals: org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser
StackMap stack: new 0 new 0 org.eclipse.jgit.submodule.SubmoduleConflict[] org.eclipse.jgit.submodule.SubmoduleConflict[] int new 1 new 1
3: aload 0
invokevirtual org.eclipse.jgit.treewalk.CanonicalTreeParser.getEntryObjectId:()Lorg/eclipse/jgit/lib/ObjectId;
4: StackMap locals: org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser
StackMap stack: new 0 new 0 org.eclipse.jgit.submodule.SubmoduleConflict[] org.eclipse.jgit.submodule.SubmoduleConflict[] int new 1 new 1 org.eclipse.jgit.lib.ObjectId
invokespecial org.eclipse.jgit.submodule.SubmoduleConflict.<init>:(Lorg/eclipse/jgit/lib/ObjectId;)V
aastore
dup
iconst_1
5: new org.eclipse.jgit.submodule.SubmoduleConflict
dup
6: aload 1
ifnonnull 7
aconst_null
goto 8
StackMap locals: org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser
StackMap stack: new 0 new 0 org.eclipse.jgit.submodule.SubmoduleConflict[] org.eclipse.jgit.submodule.SubmoduleConflict[] int new 5 new 5
7: aload 1
invokevirtual org.eclipse.jgit.treewalk.CanonicalTreeParser.getEntryObjectId:()Lorg/eclipse/jgit/lib/ObjectId;
8: StackMap locals: org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser
StackMap stack: new 0 new 0 org.eclipse.jgit.submodule.SubmoduleConflict[] org.eclipse.jgit.submodule.SubmoduleConflict[] int new 5 new 5 org.eclipse.jgit.lib.ObjectId
invokespecial org.eclipse.jgit.submodule.SubmoduleConflict.<init>:(Lorg/eclipse/jgit/lib/ObjectId;)V
aastore
dup
iconst_2
9: new org.eclipse.jgit.submodule.SubmoduleConflict
dup
10: aload 2
ifnonnull 11
aconst_null
goto 12
StackMap locals: org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser
StackMap stack: new 0 new 0 org.eclipse.jgit.submodule.SubmoduleConflict[] org.eclipse.jgit.submodule.SubmoduleConflict[] int new 9 new 9
11: aload 2
invokevirtual org.eclipse.jgit.treewalk.CanonicalTreeParser.getEntryObjectId:()Lorg/eclipse/jgit/lib/ObjectId;
12: StackMap locals: org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser
StackMap stack: new 0 new 0 org.eclipse.jgit.submodule.SubmoduleConflict[] org.eclipse.jgit.submodule.SubmoduleConflict[] int new 9 new 9 org.eclipse.jgit.lib.ObjectId
invokespecial org.eclipse.jgit.submodule.SubmoduleConflict.<init>:(Lorg/eclipse/jgit/lib/ObjectId;)V
aastore
13: invokestatic java.util.Arrays.asList:([Ljava/lang/Object;)Ljava/util/List;
invokespecial org.eclipse.jgit.merge.MergeResult.<init>:(Ljava/util/List;)V
areturn
end local 2 end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 14 0 base Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;
0 14 1 ours Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;
0 14 2 theirs Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;
Signature: (Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;)Lorg/eclipse/jgit/merge/MergeResult<Lorg/eclipse/jgit/submodule/SubmoduleConflict;>;
MethodParameters:
Name Flags
base
ours
theirs
private org.eclipse.jgit.merge.MergeResult<org.eclipse.jgit.diff.RawText> contentMerge(org.eclipse.jgit.treewalk.CanonicalTreeParser, org.eclipse.jgit.treewalk.CanonicalTreeParser, org.eclipse.jgit.treewalk.CanonicalTreeParser, org.eclipse.jgit.attributes.Attributes);
descriptor: (Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/attributes/Attributes;)Lorg/eclipse/jgit/merge/MergeResult;
flags: (0x0002) ACC_PRIVATE
Code:
stack=5, locals=9, args_size=5
start local 0 start local 1 start local 2 start local 3 start local 4 0: aload 1
ifnonnull 1
getstatic org.eclipse.jgit.diff.RawText.EMPTY_TEXT:Lorg/eclipse/jgit/diff/RawText;
goto 4
StackMap locals:
StackMap stack:
1: aload 0
2: aload 1
invokevirtual org.eclipse.jgit.treewalk.CanonicalTreeParser.getEntryObjectId:()Lorg/eclipse/jgit/lib/ObjectId;
aload 4
3: invokevirtual org.eclipse.jgit.merge.ResolveMerger.getRawText:(Lorg/eclipse/jgit/lib/ObjectId;Lorg/eclipse/jgit/attributes/Attributes;)Lorg/eclipse/jgit/diff/RawText;
StackMap locals:
StackMap stack: org.eclipse.jgit.diff.RawText
4: astore 5
start local 5 5: aload 2
ifnonnull 6
getstatic org.eclipse.jgit.diff.RawText.EMPTY_TEXT:Lorg/eclipse/jgit/diff/RawText;
goto 9
StackMap locals: org.eclipse.jgit.diff.RawText
StackMap stack:
6: aload 0
7: aload 2
invokevirtual org.eclipse.jgit.treewalk.CanonicalTreeParser.getEntryObjectId:()Lorg/eclipse/jgit/lib/ObjectId;
aload 4
8: invokevirtual org.eclipse.jgit.merge.ResolveMerger.getRawText:(Lorg/eclipse/jgit/lib/ObjectId;Lorg/eclipse/jgit/attributes/Attributes;)Lorg/eclipse/jgit/diff/RawText;
StackMap locals:
StackMap stack: org.eclipse.jgit.diff.RawText
9: astore 6
start local 6 10: aload 3
ifnonnull 11
getstatic org.eclipse.jgit.diff.RawText.EMPTY_TEXT:Lorg/eclipse/jgit/diff/RawText;
goto 14
StackMap locals: org.eclipse.jgit.diff.RawText
StackMap stack:
11: aload 0
12: aload 3
invokevirtual org.eclipse.jgit.treewalk.CanonicalTreeParser.getEntryObjectId:()Lorg/eclipse/jgit/lib/ObjectId;
aload 4
13: invokevirtual org.eclipse.jgit.merge.ResolveMerger.getRawText:(Lorg/eclipse/jgit/lib/ObjectId;Lorg/eclipse/jgit/attributes/Attributes;)Lorg/eclipse/jgit/diff/RawText;
StackMap locals:
StackMap stack: org.eclipse.jgit.diff.RawText
14: astore 7
start local 7 15: goto 20
end local 7 end local 6 end local 5 StackMap locals: org.eclipse.jgit.merge.ResolveMerger org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.attributes.Attributes
StackMap stack: org.eclipse.jgit.errors.BinaryBlobException
16: pop
17: new org.eclipse.jgit.merge.MergeResult
dup
invokestatic java.util.Collections.emptyList:()Ljava/util/List;
invokespecial org.eclipse.jgit.merge.MergeResult.<init>:(Ljava/util/List;)V
astore 8
start local 8 18: aload 8
iconst_1
invokevirtual org.eclipse.jgit.merge.MergeResult.setContainsConflicts:(Z)V
19: aload 8
areturn
end local 8 start local 5 start local 6 start local 7 20: StackMap locals: org.eclipse.jgit.diff.RawText org.eclipse.jgit.diff.RawText org.eclipse.jgit.diff.RawText
StackMap stack:
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.mergeAlgorithm:Lorg/eclipse/jgit/merge/MergeAlgorithm;
getstatic org.eclipse.jgit.diff.RawTextComparator.DEFAULT:Lorg/eclipse/jgit/diff/RawTextComparator;
aload 5
21: aload 6
aload 7
22: invokevirtual org.eclipse.jgit.merge.MergeAlgorithm.merge:(Lorg/eclipse/jgit/diff/SequenceComparator;Lorg/eclipse/jgit/diff/Sequence;Lorg/eclipse/jgit/diff/Sequence;Lorg/eclipse/jgit/diff/Sequence;)Lorg/eclipse/jgit/merge/MergeResult;
areturn
end local 7 end local 6 end local 5 end local 4 end local 3 end local 2 end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 23 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
0 23 1 base Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;
0 23 2 ours Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;
0 23 3 theirs Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;
0 23 4 attributes Lorg/eclipse/jgit/attributes/Attributes;
5 16 5 baseText Lorg/eclipse/jgit/diff/RawText;
20 23 5 baseText Lorg/eclipse/jgit/diff/RawText;
10 16 6 ourText Lorg/eclipse/jgit/diff/RawText;
20 23 6 ourText Lorg/eclipse/jgit/diff/RawText;
15 16 7 theirsText Lorg/eclipse/jgit/diff/RawText;
20 23 7 theirsText Lorg/eclipse/jgit/diff/RawText;
18 20 8 r Lorg/eclipse/jgit/merge/MergeResult<Lorg/eclipse/jgit/diff/RawText;>;
Exception table:
from to target type
0 15 16 Class org.eclipse.jgit.errors.BinaryBlobException
Exceptions:
throws java.io.IOException
Signature: (Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/attributes/Attributes;)Lorg/eclipse/jgit/merge/MergeResult<Lorg/eclipse/jgit/diff/RawText;>;
MethodParameters:
Name Flags
base
ours
theirs
attributes
private boolean isIndexDirty();
descriptor: ()Z
flags: (0x0002) ACC_PRIVATE
Code:
stack=3, locals=4, args_size=1
start local 0 0: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.inCore:Z
ifeq 2
1: iconst_0
ireturn
2: StackMap locals:
StackMap stack:
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
iconst_3
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawMode:(I)I
istore 1
start local 1 3: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
iconst_1
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawMode:(I)I
istore 2
start local 2 4: iload 1
invokestatic org.eclipse.jgit.merge.ResolveMerger.nonTree:(I)Z
ifeq 7
5: iload 2
iload 1
if_icmpne 6
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
iconst_3
iconst_1
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.idEqual:(II)Z
ifne 7
6: StackMap locals: int int
StackMap stack:
iconst_1
goto 8
StackMap locals:
StackMap stack:
7: iconst_0
StackMap locals:
StackMap stack: int
8: istore 3
start local 3 9: iload 3
ifeq 12
10: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.failingPaths:Ljava/util/Map;
11: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getPathString:()Ljava/lang/String;
getstatic org.eclipse.jgit.merge.ResolveMerger$MergeFailureReason.DIRTY_INDEX:Lorg/eclipse/jgit/merge/ResolveMerger$MergeFailureReason;
invokeinterface java.util.Map.put:(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
pop
12: StackMap locals: int
StackMap stack:
iload 3
ireturn
end local 3 end local 2 end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 13 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
3 13 1 modeI I
4 13 2 modeO I
9 13 3 isDirty Z
private boolean isWorktreeDirty(org.eclipse.jgit.treewalk.WorkingTreeIterator, org.eclipse.jgit.dircache.DirCacheEntry);
descriptor: (Lorg/eclipse/jgit/treewalk/WorkingTreeIterator;Lorg/eclipse/jgit/dircache/DirCacheEntry;)Z
flags: (0x0002) ACC_PRIVATE
Code:
stack=4, locals=6, args_size=3
start local 0 start local 1 start local 2 0: aload 1
ifnonnull 2
1: iconst_0
ireturn
2: StackMap locals:
StackMap stack:
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
iconst_4
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawMode:(I)I
istore 3
start local 3 3: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
iconst_1
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawMode:(I)I
istore 4
start local 4 4: aload 2
ifnull 7
5: aload 1
aload 2
iconst_1
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.reader:Lorg/eclipse/jgit/lib/ObjectReader;
invokevirtual org.eclipse.jgit.treewalk.WorkingTreeIterator.isModified:(Lorg/eclipse/jgit/dircache/DirCacheEntry;ZLorg/eclipse/jgit/lib/ObjectReader;)Z
istore 5
start local 5 6: goto 12
end local 5 7: StackMap locals: int int
StackMap stack:
aload 1
iload 4
invokevirtual org.eclipse.jgit.treewalk.WorkingTreeIterator.isModeDifferent:(I)Z
istore 5
start local 5 8: iload 5
ifne 12
iload 3
invokestatic org.eclipse.jgit.merge.ResolveMerger.nonTree:(I)Z
ifeq 12
9: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
iconst_4
iconst_1
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.idEqual:(II)Z
ifeq 10
iconst_0
goto 11
StackMap locals: int
StackMap stack:
10: iconst_1
StackMap locals:
StackMap stack: int
11: istore 5
12: StackMap locals:
StackMap stack:
iload 5
ifeq 15
iload 3
sipush 16384
if_icmpne 15
13: iload 4
ifne 15
14: iconst_0
istore 5
15: StackMap locals:
StackMap stack:
iload 5
ifeq 19
16: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.failingPaths:Ljava/util/Map;
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getPathString:()Ljava/lang/String;
17: getstatic org.eclipse.jgit.merge.ResolveMerger$MergeFailureReason.DIRTY_WORKTREE:Lorg/eclipse/jgit/merge/ResolveMerger$MergeFailureReason;
18: invokeinterface java.util.Map.put:(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
pop
19: StackMap locals:
StackMap stack:
iload 5
ireturn
end local 5 end local 4 end local 3 end local 2 end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 20 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
0 20 1 work Lorg/eclipse/jgit/treewalk/WorkingTreeIterator;
0 20 2 ourDce Lorg/eclipse/jgit/dircache/DirCacheEntry;
3 20 3 modeF I
4 20 4 modeO I
6 7 5 isDirty Z
8 20 5 isDirty Z
Exceptions:
throws java.io.IOException
MethodParameters:
Name Flags
work
ourDce
private void updateIndex(org.eclipse.jgit.treewalk.CanonicalTreeParser, org.eclipse.jgit.treewalk.CanonicalTreeParser, org.eclipse.jgit.treewalk.CanonicalTreeParser, org.eclipse.jgit.merge.MergeResult<org.eclipse.jgit.diff.RawText>, org.eclipse.jgit.attributes.Attributes);
descriptor: (Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/merge/MergeResult;Lorg/eclipse/jgit/attributes/Attributes;)V
flags: (0x0002) ACC_PRIVATE
Code:
stack=7, locals=11, args_size=6
start local 0 start local 1 start local 2 start local 3 start local 4 start local 5 0: aconst_null
astore 6
start local 6 1: aload 0
aload 4
invokevirtual org.eclipse.jgit.merge.ResolveMerger.doMerge:(Lorg/eclipse/jgit/merge/MergeResult;)Lorg/eclipse/jgit/util/TemporaryBuffer;
astore 6
2: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.inCore:Z
ifeq 3
aconst_null
goto 4
3: StackMap locals: org.eclipse.jgit.util.TemporaryBuffer
StackMap stack:
aload 0
aload 6
aload 5
invokevirtual org.eclipse.jgit.merge.ResolveMerger.writeMergedFile:(Lorg/eclipse/jgit/util/TemporaryBuffer;Lorg/eclipse/jgit/attributes/Attributes;)Ljava/io/File;
4: StackMap locals:
StackMap stack: java.io.File
astore 7
start local 7 5: aload 4
invokevirtual org.eclipse.jgit.merge.MergeResult.containsConflicts:()Z
ifeq 13
6: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 1
iconst_1
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
7: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 2
iconst_2
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
8: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawPath:()[B
aload 3
iconst_3
getstatic java.time.Instant.EPOCH:Ljava/time/Instant;
lconst_0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.add:([BLorg/eclipse/jgit/treewalk/CanonicalTreeParser;ILjava/time/Instant;J)Lorg/eclipse/jgit/dircache/DirCacheEntry;
pop
9: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.mergeResults:Ljava/util/Map;
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getPathString:()Ljava/lang/String;
aload 4
invokeinterface java.util.Map.put:(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
pop
10: aload 6
ifnull 12
11: aload 6
invokevirtual org.eclipse.jgit.util.TemporaryBuffer.destroy:()V
12: StackMap locals: java.io.File
StackMap stack:
return
13: StackMap locals:
StackMap stack:
new org.eclipse.jgit.dircache.DirCacheEntry
dup
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getPathString:()Ljava/lang/String;
invokespecial org.eclipse.jgit.dircache.DirCacheEntry.<init>:(Ljava/lang/String;)V
astore 8
start local 8 14: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
iconst_0
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawMode:(I)I
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
iconst_1
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawMode:(I)I
15: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
iconst_2
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getRawMode:(I)I
16: invokevirtual org.eclipse.jgit.merge.ResolveMerger.mergeFileModes:(III)I
istore 9
start local 9 17: aload 8
iload 9
getstatic org.eclipse.jgit.lib.FileMode.MISSING:Lorg/eclipse/jgit/lib/FileMode;
invokevirtual org.eclipse.jgit.lib.FileMode.getBits:()I
if_icmpne 19
18: getstatic org.eclipse.jgit.lib.FileMode.REGULAR_FILE:Lorg/eclipse/jgit/lib/FileMode;
goto 20
StackMap locals: org.eclipse.jgit.merge.ResolveMerger org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.merge.MergeResult org.eclipse.jgit.attributes.Attributes org.eclipse.jgit.util.TemporaryBuffer java.io.File org.eclipse.jgit.dircache.DirCacheEntry int
StackMap stack: org.eclipse.jgit.dircache.DirCacheEntry
19: iload 9
invokestatic org.eclipse.jgit.lib.FileMode.fromBits:(I)Lorg/eclipse/jgit/lib/FileMode;
20: StackMap locals: org.eclipse.jgit.merge.ResolveMerger org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.merge.MergeResult org.eclipse.jgit.attributes.Attributes org.eclipse.jgit.util.TemporaryBuffer java.io.File org.eclipse.jgit.dircache.DirCacheEntry int
StackMap stack: org.eclipse.jgit.dircache.DirCacheEntry org.eclipse.jgit.lib.FileMode
invokevirtual org.eclipse.jgit.dircache.DirCacheEntry.setFileMode:(Lorg/eclipse/jgit/lib/FileMode;)V
21: aload 7
ifnull 26
22: aload 8
23: aload 0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.nonNullRepo:()Lorg/eclipse/jgit/lib/Repository;
invokevirtual org.eclipse.jgit.lib.Repository.getFS:()Lorg/eclipse/jgit/util/FS;
aload 7
invokevirtual org.eclipse.jgit.util.FS.lastModifiedInstant:(Ljava/io/File;)Ljava/time/Instant;
24: invokevirtual org.eclipse.jgit.dircache.DirCacheEntry.setLastModified:(Ljava/time/Instant;)V
25: aload 8
aload 7
invokevirtual java.io.File.length:()J
l2i
invokevirtual org.eclipse.jgit.dircache.DirCacheEntry.setLength:(I)V
26: StackMap locals:
StackMap stack:
aload 8
aload 0
aload 6
aload 5
invokevirtual org.eclipse.jgit.merge.ResolveMerger.insertMergeResult:(Lorg/eclipse/jgit/util/TemporaryBuffer;Lorg/eclipse/jgit/attributes/Attributes;)Lorg/eclipse/jgit/lib/ObjectId;
invokevirtual org.eclipse.jgit.dircache.DirCacheEntry.setObjectId:(Lorg/eclipse/jgit/lib/AnyObjectId;)V
27: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.builder:Lorg/eclipse/jgit/dircache/DirCacheBuilder;
aload 8
invokevirtual org.eclipse.jgit.dircache.DirCacheBuilder.add:(Lorg/eclipse/jgit/dircache/DirCacheEntry;)V
end local 9 end local 8 end local 7 28: goto 33
StackMap locals: org.eclipse.jgit.merge.ResolveMerger org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.merge.MergeResult org.eclipse.jgit.attributes.Attributes org.eclipse.jgit.util.TemporaryBuffer
StackMap stack: java.lang.Throwable
29: astore 10
30: aload 6
ifnull 32
31: aload 6
invokevirtual org.eclipse.jgit.util.TemporaryBuffer.destroy:()V
32: StackMap locals: org.eclipse.jgit.merge.ResolveMerger org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.merge.MergeResult org.eclipse.jgit.attributes.Attributes org.eclipse.jgit.util.TemporaryBuffer top top top java.lang.Throwable
StackMap stack:
aload 10
athrow
33: StackMap locals: org.eclipse.jgit.merge.ResolveMerger org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.merge.MergeResult org.eclipse.jgit.attributes.Attributes org.eclipse.jgit.util.TemporaryBuffer
StackMap stack:
aload 6
ifnull 35
34: aload 6
invokevirtual org.eclipse.jgit.util.TemporaryBuffer.destroy:()V
35: StackMap locals:
StackMap stack:
return
end local 6 end local 5 end local 4 end local 3 end local 2 end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 36 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
0 36 1 base Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;
0 36 2 ours Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;
0 36 3 theirs Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;
0 36 4 result Lorg/eclipse/jgit/merge/MergeResult<Lorg/eclipse/jgit/diff/RawText;>;
0 36 5 attributes Lorg/eclipse/jgit/attributes/Attributes;
1 36 6 rawMerged Lorg/eclipse/jgit/util/TemporaryBuffer;
5 28 7 mergedFile Ljava/io/File;
14 28 8 dce Lorg/eclipse/jgit/dircache/DirCacheEntry;
17 28 9 newMode I
Exception table:
from to target type
1 10 29 any
13 29 29 any
Exceptions:
throws java.io.FileNotFoundException, java.io.IOException
Signature: (Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/merge/MergeResult<Lorg/eclipse/jgit/diff/RawText;>;Lorg/eclipse/jgit/attributes/Attributes;)V
MethodParameters:
Name Flags
base
ours
theirs
result
attributes
private java.io.File writeMergedFile(org.eclipse.jgit.util.TemporaryBuffer, org.eclipse.jgit.attributes.Attributes);
descriptor: (Lorg/eclipse/jgit/util/TemporaryBuffer;Lorg/eclipse/jgit/attributes/Attributes;)Ljava/io/File;
flags: (0x0002) ACC_PRIVATE
Code:
stack=5, locals=11, args_size=3
start local 0 start local 1 start local 2 0: aload 0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.nonNullRepo:()Lorg/eclipse/jgit/lib/Repository;
invokevirtual org.eclipse.jgit.lib.Repository.getWorkTree:()Ljava/io/File;
astore 3
start local 3 1: aload 0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.nonNullRepo:()Lorg/eclipse/jgit/lib/Repository;
invokevirtual org.eclipse.jgit.lib.Repository.getFS:()Lorg/eclipse/jgit/util/FS;
astore 4
start local 4 2: new java.io.File
dup
aload 3
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getPathString:()Ljava/lang/String;
invokespecial java.io.File.<init>:(Ljava/io/File;Ljava/lang/String;)V
astore 5
start local 5 3: aload 5
invokevirtual java.io.File.getParentFile:()Ljava/io/File;
astore 6
start local 6 4: aload 4
aload 6
invokevirtual org.eclipse.jgit.util.FS.exists:(Ljava/io/File;)Z
ifne 6
5: aload 6
invokevirtual java.io.File.mkdirs:()Z
pop
6: StackMap locals: org.eclipse.jgit.merge.ResolveMerger org.eclipse.jgit.util.TemporaryBuffer org.eclipse.jgit.attributes.Attributes java.io.File org.eclipse.jgit.util.FS java.io.File java.io.File
StackMap stack:
getstatic org.eclipse.jgit.treewalk.TreeWalk$OperationType.CHECKOUT_OP:Lorg/eclipse/jgit/treewalk/TreeWalk$OperationType;
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.workingTreeOptions:Lorg/eclipse/jgit/treewalk/WorkingTreeOptions;
7: aload 2
8: invokestatic org.eclipse.jgit.util.io.EolStreamTypeUtil.detectStreamType:(Lorg/eclipse/jgit/treewalk/TreeWalk$OperationType;Lorg/eclipse/jgit/treewalk/WorkingTreeOptions;Lorg/eclipse/jgit/attributes/Attributes;)Lorg/eclipse/jgit/lib/CoreConfig$EolStreamType;
astore 7
start local 7 9: aconst_null
astore 8
aconst_null
astore 9
10: new java.io.BufferedOutputStream
dup
new java.io.FileOutputStream
dup
aload 5
invokespecial java.io.FileOutputStream.<init>:(Ljava/io/File;)V
invokespecial java.io.BufferedOutputStream.<init>:(Ljava/io/OutputStream;)V
11: aload 7
12: invokestatic org.eclipse.jgit.util.io.EolStreamTypeUtil.wrapOutputStream:(Ljava/io/OutputStream;Lorg/eclipse/jgit/lib/CoreConfig$EolStreamType;)Ljava/io/OutputStream;
astore 10
start local 10 13: aload 1
aload 10
aconst_null
invokevirtual org.eclipse.jgit.util.TemporaryBuffer.writeTo:(Ljava/io/OutputStream;Lorg/eclipse/jgit/lib/ProgressMonitor;)V
14: aload 10
ifnull 20
aload 10
invokevirtual java.io.OutputStream.close:()V
goto 20
StackMap locals: org.eclipse.jgit.merge.ResolveMerger org.eclipse.jgit.util.TemporaryBuffer org.eclipse.jgit.attributes.Attributes java.io.File org.eclipse.jgit.util.FS java.io.File java.io.File org.eclipse.jgit.lib.CoreConfig$EolStreamType java.lang.Throwable java.lang.Throwable java.io.OutputStream
StackMap stack: java.lang.Throwable
15: astore 8
aload 10
ifnull 16
aload 10
invokevirtual java.io.OutputStream.close:()V
end local 10 StackMap locals:
StackMap stack:
16: aload 8
athrow
StackMap locals:
StackMap stack: java.lang.Throwable
17: astore 9
aload 8
ifnonnull 18
aload 9
astore 8
goto 19
StackMap locals:
StackMap stack:
18: aload 8
aload 9
if_acmpeq 19
aload 8
aload 9
invokevirtual java.lang.Throwable.addSuppressed:(Ljava/lang/Throwable;)V
StackMap locals:
StackMap stack:
19: aload 8
athrow
20: StackMap locals:
StackMap stack:
aload 5
areturn
end local 7 end local 6 end local 5 end local 4 end local 3 end local 2 end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 21 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
0 21 1 rawMerged Lorg/eclipse/jgit/util/TemporaryBuffer;
0 21 2 attributes Lorg/eclipse/jgit/attributes/Attributes;
1 21 3 workTree Ljava/io/File;
2 21 4 fs Lorg/eclipse/jgit/util/FS;
3 21 5 of Ljava/io/File;
4 21 6 parentFolder Ljava/io/File;
9 21 7 streamType Lorg/eclipse/jgit/lib/CoreConfig$EolStreamType;
13 16 10 os Ljava/io/OutputStream;
Exception table:
from to target type
13 14 15 any
10 17 17 any
Exceptions:
throws java.io.FileNotFoundException, java.io.IOException
MethodParameters:
Name Flags
rawMerged
attributes
private org.eclipse.jgit.util.TemporaryBuffer doMerge(org.eclipse.jgit.merge.MergeResult<org.eclipse.jgit.diff.RawText>);
descriptor: (Lorg/eclipse/jgit/merge/MergeResult;)Lorg/eclipse/jgit/util/TemporaryBuffer;
flags: (0x0002) ACC_PRIVATE
Code:
stack=5, locals=5, args_size=2
start local 0 start local 1 0: new org.eclipse.jgit.util.TemporaryBuffer$LocalFile
dup
1: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.db:Lorg/eclipse/jgit/lib/Repository;
ifnull 2
aload 0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.nonNullRepo:()Lorg/eclipse/jgit/lib/Repository;
invokevirtual org.eclipse.jgit.lib.Repository.getDirectory:()Ljava/io/File;
goto 3
StackMap locals: org.eclipse.jgit.merge.ResolveMerger org.eclipse.jgit.merge.MergeResult
StackMap stack: new 0 new 0
2: aconst_null
StackMap locals: org.eclipse.jgit.merge.ResolveMerger org.eclipse.jgit.merge.MergeResult
StackMap stack: new 0 new 0 java.io.File
3: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.inCoreLimit:I
4: invokespecial org.eclipse.jgit.util.TemporaryBuffer$LocalFile.<init>:(Ljava/io/File;I)V
astore 2
start local 2 5: iconst_0
istore 3
start local 3 6: new org.eclipse.jgit.merge.MergeFormatter
dup
invokespecial org.eclipse.jgit.merge.MergeFormatter.<init>:()V
aload 2
aload 1
7: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.commitNames:[Ljava/lang/String;
invokestatic java.util.Arrays.asList:([Ljava/lang/Object;)Ljava/util/List;
getstatic java.nio.charset.StandardCharsets.UTF_8:Ljava/nio/charset/Charset;
8: invokevirtual org.eclipse.jgit.merge.MergeFormatter.formatMerge:(Ljava/io/OutputStream;Lorg/eclipse/jgit/merge/MergeResult;Ljava/util/List;Ljava/nio/charset/Charset;)V
9: aload 2
invokevirtual org.eclipse.jgit.util.TemporaryBuffer$LocalFile.close:()V
10: iconst_1
istore 3
11: goto 16
StackMap locals: org.eclipse.jgit.merge.ResolveMerger org.eclipse.jgit.merge.MergeResult org.eclipse.jgit.util.TemporaryBuffer$LocalFile int
StackMap stack: java.lang.Throwable
12: astore 4
13: iload 3
ifne 15
14: aload 2
invokevirtual org.eclipse.jgit.util.TemporaryBuffer$LocalFile.destroy:()V
15: StackMap locals: java.lang.Throwable
StackMap stack:
aload 4
athrow
16: StackMap locals:
StackMap stack:
iload 3
ifne 18
17: aload 2
invokevirtual org.eclipse.jgit.util.TemporaryBuffer$LocalFile.destroy:()V
18: StackMap locals:
StackMap stack:
aload 2
areturn
end local 3 end local 2 end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 19 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
0 19 1 result Lorg/eclipse/jgit/merge/MergeResult<Lorg/eclipse/jgit/diff/RawText;>;
5 19 2 buf Lorg/eclipse/jgit/util/TemporaryBuffer$LocalFile;
6 19 3 success Z
Exception table:
from to target type
6 12 12 any
Exceptions:
throws java.io.IOException
Signature: (Lorg/eclipse/jgit/merge/MergeResult<Lorg/eclipse/jgit/diff/RawText;>;)Lorg/eclipse/jgit/util/TemporaryBuffer;
MethodParameters:
Name Flags
result
private org.eclipse.jgit.lib.ObjectId insertMergeResult(org.eclipse.jgit.util.TemporaryBuffer, org.eclipse.jgit.attributes.Attributes);
descriptor: (Lorg/eclipse/jgit/util/TemporaryBuffer;Lorg/eclipse/jgit/attributes/Attributes;)Lorg/eclipse/jgit/lib/ObjectId;
flags: (0x0002) ACC_PRIVATE
Code:
stack=7, locals=7, args_size=3
start local 0 start local 1 start local 2 0: aload 1
invokevirtual org.eclipse.jgit.util.TemporaryBuffer.openInputStream:()Ljava/io/InputStream;
astore 3
start local 3 1: aconst_null
astore 4
aconst_null
astore 5
2: invokestatic org.eclipse.jgit.util.LfsFactory.getInstance:()Lorg/eclipse/jgit/util/LfsFactory;
3: aload 0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.getRepository:()Lorg/eclipse/jgit/lib/Repository;
aload 3
4: aload 1
invokevirtual org.eclipse.jgit.util.TemporaryBuffer.length:()J
aload 2
ldc "merge"
invokevirtual org.eclipse.jgit.attributes.Attributes.get:(Ljava/lang/String;)Lorg/eclipse/jgit/attributes/Attribute;
5: invokevirtual org.eclipse.jgit.util.LfsFactory.applyCleanFilter:(Lorg/eclipse/jgit/lib/Repository;Ljava/io/InputStream;JLorg/eclipse/jgit/attributes/Attribute;)Lorg/eclipse/jgit/util/LfsFactory$LfsInputStream;
astore 6
start local 6 6: aload 0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.getObjectInserter:()Lorg/eclipse/jgit/lib/ObjectInserter;
iconst_3
aload 6
invokevirtual org.eclipse.jgit.util.LfsFactory$LfsInputStream.getLength:()J
aload 6
invokevirtual org.eclipse.jgit.lib.ObjectInserter.insert:(IJLjava/io/InputStream;)Lorg/eclipse/jgit/lib/ObjectId;
7: aload 6
ifnull 8
aload 6
invokevirtual org.eclipse.jgit.util.LfsFactory$LfsInputStream.close:()V
8: StackMap locals: org.eclipse.jgit.merge.ResolveMerger org.eclipse.jgit.util.TemporaryBuffer org.eclipse.jgit.attributes.Attributes java.io.InputStream java.lang.Throwable java.lang.Throwable org.eclipse.jgit.util.LfsFactory$LfsInputStream
StackMap stack: org.eclipse.jgit.lib.ObjectId
areturn
StackMap locals:
StackMap stack: java.lang.Throwable
9: astore 4
10: aload 6
ifnull 11
aload 6
invokevirtual org.eclipse.jgit.util.LfsFactory$LfsInputStream.close:()V
end local 6 StackMap locals:
StackMap stack:
11: aload 4
athrow
StackMap locals:
StackMap stack: java.lang.Throwable
12: astore 5
aload 4
ifnonnull 13
aload 5
astore 4
goto 14
StackMap locals:
StackMap stack:
13: aload 4
aload 5
if_acmpeq 14
aload 4
aload 5
invokevirtual java.lang.Throwable.addSuppressed:(Ljava/lang/Throwable;)V
StackMap locals:
StackMap stack:
14: aload 4
athrow
end local 3 end local 2 end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 15 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
0 15 1 buf Lorg/eclipse/jgit/util/TemporaryBuffer;
0 15 2 attributes Lorg/eclipse/jgit/attributes/Attributes;
1 15 3 in Ljava/io/InputStream;
6 11 6 is Lorg/eclipse/jgit/util/LfsFactory$LfsInputStream;
Exception table:
from to target type
6 7 9 any
2 8 12 any
9 12 12 any
Exceptions:
throws java.io.IOException
MethodParameters:
Name Flags
buf
attributes
private int mergeFileModes(int, int, int);
descriptor: (III)I
flags: (0x0002) ACC_PRIVATE
Code:
stack=2, locals=4, args_size=4
start local 0 start local 1 start local 2 start local 3 0: iload 2
iload 3
if_icmpne 2
1: iload 2
ireturn
2: StackMap locals:
StackMap stack:
iload 1
iload 2
if_icmpne 6
3: iload 3
getstatic org.eclipse.jgit.lib.FileMode.MISSING:Lorg/eclipse/jgit/lib/FileMode;
invokevirtual org.eclipse.jgit.lib.FileMode.getBits:()I
if_icmpne 4
iload 2
goto 5
StackMap locals:
StackMap stack:
4: iload 3
StackMap locals:
StackMap stack: int
5: ireturn
6: StackMap locals:
StackMap stack:
iload 1
iload 3
if_icmpne 10
7: iload 2
getstatic org.eclipse.jgit.lib.FileMode.MISSING:Lorg/eclipse/jgit/lib/FileMode;
invokevirtual org.eclipse.jgit.lib.FileMode.getBits:()I
if_icmpne 8
iload 3
goto 9
StackMap locals:
StackMap stack:
8: iload 2
StackMap locals:
StackMap stack: int
9: ireturn
10: StackMap locals:
StackMap stack:
getstatic org.eclipse.jgit.lib.FileMode.MISSING:Lorg/eclipse/jgit/lib/FileMode;
invokevirtual org.eclipse.jgit.lib.FileMode.getBits:()I
ireturn
end local 3 end local 2 end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 11 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
0 11 1 modeB I
0 11 2 modeO I
0 11 3 modeT I
MethodParameters:
Name Flags
modeB
modeO
modeT
private org.eclipse.jgit.diff.RawText getRawText(org.eclipse.jgit.lib.ObjectId, org.eclipse.jgit.attributes.Attributes);
descriptor: (Lorg/eclipse/jgit/lib/ObjectId;Lorg/eclipse/jgit/attributes/Attributes;)Lorg/eclipse/jgit/diff/RawText;
flags: (0x0002) ACC_PRIVATE
Code:
stack=5, locals=5, args_size=3
start local 0 start local 1 start local 2 0: aload 1
invokestatic org.eclipse.jgit.lib.ObjectId.zeroId:()Lorg/eclipse/jgit/lib/ObjectId;
invokevirtual org.eclipse.jgit.lib.ObjectId.equals:(Lorg/eclipse/jgit/lib/AnyObjectId;)Z
ifeq 2
1: new org.eclipse.jgit.diff.RawText
dup
iconst_0
newarray 8
invokespecial org.eclipse.jgit.diff.RawText.<init>:([B)V
areturn
2: StackMap locals:
StackMap stack:
invokestatic org.eclipse.jgit.util.LfsFactory.getInstance:()Lorg/eclipse/jgit/util/LfsFactory;
3: aload 0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.getRepository:()Lorg/eclipse/jgit/lib/Repository;
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.reader:Lorg/eclipse/jgit/lib/ObjectReader;
aload 1
iconst_3
invokevirtual org.eclipse.jgit.lib.ObjectReader.open:(Lorg/eclipse/jgit/lib/AnyObjectId;I)Lorg/eclipse/jgit/lib/ObjectLoader;
4: aload 2
ldc "merge"
invokevirtual org.eclipse.jgit.attributes.Attributes.get:(Ljava/lang/String;)Lorg/eclipse/jgit/attributes/Attribute;
5: invokevirtual org.eclipse.jgit.util.LfsFactory.applySmudgeFilter:(Lorg/eclipse/jgit/lib/Repository;Lorg/eclipse/jgit/lib/ObjectLoader;Lorg/eclipse/jgit/attributes/Attribute;)Lorg/eclipse/jgit/lib/ObjectLoader;
astore 3
start local 3 6: ldc 52428800
istore 4
start local 4 7: aload 3
iload 4
invokestatic org.eclipse.jgit.diff.RawText.load:(Lorg/eclipse/jgit/lib/ObjectLoader;I)Lorg/eclipse/jgit/diff/RawText;
areturn
end local 4 end local 3 end local 2 end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 8 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
0 8 1 id Lorg/eclipse/jgit/lib/ObjectId;
0 8 2 attributes Lorg/eclipse/jgit/attributes/Attributes;
6 8 3 loader Lorg/eclipse/jgit/lib/ObjectLoader;
7 8 4 threshold I
Exceptions:
throws java.io.IOException, org.eclipse.jgit.errors.BinaryBlobException
MethodParameters:
Name Flags
id
attributes
private static boolean nonTree(int);
descriptor: (I)Z
flags: (0x000a) ACC_PRIVATE, ACC_STATIC
Code:
stack=2, locals=1, args_size=1
start local 0 0: iload 0
ifeq 1
getstatic org.eclipse.jgit.lib.FileMode.TREE:Lorg/eclipse/jgit/lib/FileMode;
iload 0
invokevirtual org.eclipse.jgit.lib.FileMode.equals:(I)Z
ifne 1
iconst_1
ireturn
StackMap locals:
StackMap stack:
1: iconst_0
ireturn
end local 0 LocalVariableTable:
Start End Slot Name Signature
0 2 0 mode I
MethodParameters:
Name Flags
mode
private static boolean isGitLink(int);
descriptor: (I)Z
flags: (0x000a) ACC_PRIVATE, ACC_STATIC
Code:
stack=2, locals=1, args_size=1
start local 0 0: getstatic org.eclipse.jgit.lib.FileMode.GITLINK:Lorg/eclipse/jgit/lib/FileMode;
iload 0
invokevirtual org.eclipse.jgit.lib.FileMode.equals:(I)Z
ireturn
end local 0 LocalVariableTable:
Start End Slot Name Signature
0 1 0 mode I
MethodParameters:
Name Flags
mode
public org.eclipse.jgit.lib.ObjectId getResultTreeId();
descriptor: ()Lorg/eclipse/jgit/lib/ObjectId;
flags: (0x0001) ACC_PUBLIC
Code:
stack=1, locals=1, args_size=1
start local 0 0: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.resultTree:Lorg/eclipse/jgit/lib/ObjectId;
ifnonnull 1
aconst_null
goto 2
StackMap locals:
StackMap stack:
1: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.resultTree:Lorg/eclipse/jgit/lib/ObjectId;
invokevirtual org.eclipse.jgit.lib.ObjectId.toObjectId:()Lorg/eclipse/jgit/lib/ObjectId;
StackMap locals:
StackMap stack: org.eclipse.jgit.lib.ObjectId
2: areturn
end local 0 LocalVariableTable:
Start End Slot Name Signature
0 3 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
public void setCommitNames(java.lang.String[]);
descriptor: ([Ljava/lang/String;)V
flags: (0x0001) ACC_PUBLIC
Code:
stack=2, locals=2, args_size=2
start local 0 start local 1 0: aload 0
aload 1
putfield org.eclipse.jgit.merge.ResolveMerger.commitNames:[Ljava/lang/String;
1: return
end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 2 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
0 2 1 commitNames [Ljava/lang/String;
MethodParameters:
Name Flags
commitNames
public java.lang.String[] getCommitNames();
descriptor: ()[Ljava/lang/String;
flags: (0x0001) ACC_PUBLIC
Code:
stack=1, locals=1, args_size=1
start local 0 0: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.commitNames:[Ljava/lang/String;
areturn
end local 0 LocalVariableTable:
Start End Slot Name Signature
0 1 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
public java.util.List<java.lang.String> getUnmergedPaths();
descriptor: ()Ljava/util/List;
flags: (0x0001) ACC_PUBLIC
Code:
stack=1, locals=1, args_size=1
start local 0 0: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.unmergedPaths:Ljava/util/List;
areturn
end local 0 LocalVariableTable:
Start End Slot Name Signature
0 1 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
Signature: ()Ljava/util/List<Ljava/lang/String;>;
public java.util.List<java.lang.String> getModifiedFiles();
descriptor: ()Ljava/util/List;
flags: (0x0001) ACC_PUBLIC
Code:
stack=1, locals=1, args_size=1
start local 0 0: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.modifiedFiles:Ljava/util/List;
areturn
end local 0 LocalVariableTable:
Start End Slot Name Signature
0 1 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
Signature: ()Ljava/util/List<Ljava/lang/String;>;
public java.util.Map<java.lang.String, org.eclipse.jgit.dircache.DirCacheEntry> getToBeCheckedOut();
descriptor: ()Ljava/util/Map;
flags: (0x0001) ACC_PUBLIC
Code:
stack=1, locals=1, args_size=1
start local 0 0: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.toBeCheckedOut:Ljava/util/Map;
areturn
end local 0 LocalVariableTable:
Start End Slot Name Signature
0 1 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
Signature: ()Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/jgit/dircache/DirCacheEntry;>;
public java.util.Map<java.lang.String, org.eclipse.jgit.merge.MergeResult<? extends org.eclipse.jgit.diff.Sequence>> getMergeResults();
descriptor: ()Ljava/util/Map;
flags: (0x0001) ACC_PUBLIC
Code:
stack=1, locals=1, args_size=1
start local 0 0: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.mergeResults:Ljava/util/Map;
areturn
end local 0 LocalVariableTable:
Start End Slot Name Signature
0 1 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
Signature: ()Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/jgit/merge/MergeResult<+Lorg/eclipse/jgit/diff/Sequence;>;>;
public java.util.Map<java.lang.String, org.eclipse.jgit.merge.ResolveMerger$MergeFailureReason> getFailingPaths();
descriptor: ()Ljava/util/Map;
flags: (0x0001) ACC_PUBLIC
Code:
stack=1, locals=1, args_size=1
start local 0 0: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.failingPaths:Ljava/util/Map;
invokeinterface java.util.Map.isEmpty:()Z
ifeq 1
aconst_null
goto 2
StackMap locals:
StackMap stack:
1: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.failingPaths:Ljava/util/Map;
StackMap locals:
StackMap stack: java.util.Map
2: areturn
end local 0 LocalVariableTable:
Start End Slot Name Signature
0 3 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
Signature: ()Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/jgit/merge/ResolveMerger$MergeFailureReason;>;
public boolean failed();
descriptor: ()Z
flags: (0x0001) ACC_PUBLIC
Code:
stack=1, locals=1, args_size=1
start local 0 0: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.failingPaths:Ljava/util/Map;
invokeinterface java.util.Map.isEmpty:()Z
ifeq 1
iconst_0
goto 2
StackMap locals:
StackMap stack:
1: iconst_1
StackMap locals:
StackMap stack: int
2: ireturn
end local 0 LocalVariableTable:
Start End Slot Name Signature
0 3 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
public void setDirCache(org.eclipse.jgit.dircache.DirCache);
descriptor: (Lorg/eclipse/jgit/dircache/DirCache;)V
flags: (0x0001) ACC_PUBLIC
Code:
stack=2, locals=2, args_size=2
start local 0 start local 1 0: aload 0
aload 1
putfield org.eclipse.jgit.merge.ResolveMerger.dircache:Lorg/eclipse/jgit/dircache/DirCache;
1: aload 0
iconst_0
putfield org.eclipse.jgit.merge.ResolveMerger.implicitDirCache:Z
2: return
end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 3 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
0 3 1 dc Lorg/eclipse/jgit/dircache/DirCache;
MethodParameters:
Name Flags
dc
public void setWorkingTreeIterator(org.eclipse.jgit.treewalk.WorkingTreeIterator);
descriptor: (Lorg/eclipse/jgit/treewalk/WorkingTreeIterator;)V
flags: (0x0001) ACC_PUBLIC
Code:
stack=2, locals=2, args_size=2
start local 0 start local 1 0: aload 0
aload 1
putfield org.eclipse.jgit.merge.ResolveMerger.workingTreeIterator:Lorg/eclipse/jgit/treewalk/WorkingTreeIterator;
1: return
end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 2 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
0 2 1 workingTreeIterator Lorg/eclipse/jgit/treewalk/WorkingTreeIterator;
MethodParameters:
Name Flags
workingTreeIterator
protected boolean mergeTrees(org.eclipse.jgit.treewalk.AbstractTreeIterator, org.eclipse.jgit.revwalk.RevTree, org.eclipse.jgit.revwalk.RevTree, boolean);
descriptor: (Lorg/eclipse/jgit/treewalk/AbstractTreeIterator;Lorg/eclipse/jgit/revwalk/RevTree;Lorg/eclipse/jgit/revwalk/RevTree;Z)Z
flags: (0x0004) ACC_PROTECTED
Code:
stack=5, locals=7, args_size=5
start local 0 start local 1 start local 2 start local 3 start local 4 0: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.dircache:Lorg/eclipse/jgit/dircache/DirCache;
invokevirtual org.eclipse.jgit.dircache.DirCache.builder:()Lorg/eclipse/jgit/dircache/DirCacheBuilder;
putfield org.eclipse.jgit.merge.ResolveMerger.builder:Lorg/eclipse/jgit/dircache/DirCacheBuilder;
1: new org.eclipse.jgit.dircache.DirCacheBuildIterator
dup
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.builder:Lorg/eclipse/jgit/dircache/DirCacheBuilder;
invokespecial org.eclipse.jgit.dircache.DirCacheBuildIterator.<init>:(Lorg/eclipse/jgit/dircache/DirCacheBuilder;)V
astore 5
start local 5 2: aload 0
new org.eclipse.jgit.treewalk.NameConflictTreeWalk
dup
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.db:Lorg/eclipse/jgit/lib/Repository;
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.reader:Lorg/eclipse/jgit/lib/ObjectReader;
invokespecial org.eclipse.jgit.treewalk.NameConflictTreeWalk.<init>:(Lorg/eclipse/jgit/lib/Repository;Lorg/eclipse/jgit/lib/ObjectReader;)V
putfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
3: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
aload 1
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.addTree:(Lorg/eclipse/jgit/treewalk/AbstractTreeIterator;)I
pop
4: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
aload 2
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.addTree:(Lorg/eclipse/jgit/lib/AnyObjectId;)I
pop
5: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
aload 3
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.addTree:(Lorg/eclipse/jgit/lib/AnyObjectId;)I
pop
6: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
aload 5
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.addTree:(Lorg/eclipse/jgit/treewalk/AbstractTreeIterator;)I
istore 6
start local 6 7: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.workingTreeIterator:Lorg/eclipse/jgit/treewalk/WorkingTreeIterator;
ifnull 11
8: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.workingTreeIterator:Lorg/eclipse/jgit/treewalk/WorkingTreeIterator;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.addTree:(Lorg/eclipse/jgit/treewalk/AbstractTreeIterator;)I
pop
9: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.workingTreeIterator:Lorg/eclipse/jgit/treewalk/WorkingTreeIterator;
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
iload 6
invokevirtual org.eclipse.jgit.treewalk.WorkingTreeIterator.setDirCacheIterator:(Lorg/eclipse/jgit/treewalk/TreeWalk;I)V
10: goto 12
11: StackMap locals: org.eclipse.jgit.dircache.DirCacheBuildIterator int
StackMap stack:
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
getstatic org.eclipse.jgit.treewalk.filter.TreeFilter.ANY_DIFF:Lorg/eclipse/jgit/treewalk/filter/TreeFilter;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.setFilter:(Lorg/eclipse/jgit/treewalk/filter/TreeFilter;)V
12: StackMap locals:
StackMap stack:
aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
iload 4
invokevirtual org.eclipse.jgit.merge.ResolveMerger.mergeTreeWalk:(Lorg/eclipse/jgit/treewalk/TreeWalk;Z)Z
ifne 14
13: iconst_0
ireturn
14: StackMap locals:
StackMap stack:
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.inCore:Z
ifne 21
15: aload 0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.checkout:()V
16: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.builder:Lorg/eclipse/jgit/dircache/DirCacheBuilder;
invokevirtual org.eclipse.jgit.dircache.DirCacheBuilder.commit:()Z
ifne 19
17: aload 0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.cleanUp:()V
18: new org.eclipse.jgit.errors.IndexWriteException
dup
invokespecial org.eclipse.jgit.errors.IndexWriteException.<init>:()V
athrow
19: StackMap locals:
StackMap stack:
aload 0
aconst_null
putfield org.eclipse.jgit.merge.ResolveMerger.builder:Lorg/eclipse/jgit/dircache/DirCacheBuilder;
20: goto 23
21: StackMap locals:
StackMap stack:
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.builder:Lorg/eclipse/jgit/dircache/DirCacheBuilder;
invokevirtual org.eclipse.jgit.dircache.DirCacheBuilder.finish:()V
22: aload 0
aconst_null
putfield org.eclipse.jgit.merge.ResolveMerger.builder:Lorg/eclipse/jgit/dircache/DirCacheBuilder;
23: StackMap locals:
StackMap stack:
aload 0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.getUnmergedPaths:()Ljava/util/List;
invokeinterface java.util.List.isEmpty:()Z
ifeq 26
aload 0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.failed:()Z
ifne 26
24: aload 0
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.dircache:Lorg/eclipse/jgit/dircache/DirCache;
aload 0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.getObjectInserter:()Lorg/eclipse/jgit/lib/ObjectInserter;
invokevirtual org.eclipse.jgit.dircache.DirCache.writeTree:(Lorg/eclipse/jgit/lib/ObjectInserter;)Lorg/eclipse/jgit/lib/ObjectId;
putfield org.eclipse.jgit.merge.ResolveMerger.resultTree:Lorg/eclipse/jgit/lib/ObjectId;
25: iconst_1
ireturn
26: StackMap locals:
StackMap stack:
aload 0
aconst_null
putfield org.eclipse.jgit.merge.ResolveMerger.resultTree:Lorg/eclipse/jgit/lib/ObjectId;
27: iconst_0
ireturn
end local 6 end local 5 end local 4 end local 3 end local 2 end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 28 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
0 28 1 baseTree Lorg/eclipse/jgit/treewalk/AbstractTreeIterator;
0 28 2 headTree Lorg/eclipse/jgit/revwalk/RevTree;
0 28 3 mergeTree Lorg/eclipse/jgit/revwalk/RevTree;
0 28 4 ignoreConflicts Z
2 28 5 buildIt Lorg/eclipse/jgit/dircache/DirCacheBuildIterator;
7 28 6 dciPos I
Exceptions:
throws java.io.IOException
MethodParameters:
Name Flags
baseTree
headTree
mergeTree
ignoreConflicts
protected boolean mergeTreeWalk(org.eclipse.jgit.treewalk.TreeWalk, boolean);
descriptor: (Lorg/eclipse/jgit/treewalk/TreeWalk;Z)Z
flags: (0x0004) ACC_PROTECTED
Code:
stack=8, locals=5, args_size=3
start local 0 start local 1 start local 2 0: aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.tw:Lorg/eclipse/jgit/treewalk/NameConflictTreeWalk;
invokevirtual org.eclipse.jgit.treewalk.NameConflictTreeWalk.getTreeCount:()I
iconst_4
if_icmple 1
iconst_1
goto 2
StackMap locals:
StackMap stack:
1: iconst_0
StackMap locals:
StackMap stack: int
2: istore 3
start local 3 3: aload 1
4: invokevirtual org.eclipse.jgit.treewalk.TreeWalk.getAttributesNodeProvider:()Lorg/eclipse/jgit/attributes/AttributesNodeProvider;
5: ifnull 6
iconst_1
goto 7
StackMap locals: int
StackMap stack:
6: iconst_0
StackMap locals:
StackMap stack: int
7: istore 4
start local 4 8: goto 28
9: StackMap locals: int
StackMap stack:
aload 0
10: aload 1
iconst_0
ldc Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;
invokevirtual org.eclipse.jgit.treewalk.TreeWalk.getTree:(ILjava/lang/Class;)Lorg/eclipse/jgit/treewalk/AbstractTreeIterator;
checkcast org.eclipse.jgit.treewalk.CanonicalTreeParser
11: aload 1
iconst_1
ldc Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;
invokevirtual org.eclipse.jgit.treewalk.TreeWalk.getTree:(ILjava/lang/Class;)Lorg/eclipse/jgit/treewalk/AbstractTreeIterator;
checkcast org.eclipse.jgit.treewalk.CanonicalTreeParser
12: aload 1
iconst_2
ldc Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;
invokevirtual org.eclipse.jgit.treewalk.TreeWalk.getTree:(ILjava/lang/Class;)Lorg/eclipse/jgit/treewalk/AbstractTreeIterator;
checkcast org.eclipse.jgit.treewalk.CanonicalTreeParser
13: aload 1
iconst_3
ldc Lorg/eclipse/jgit/dircache/DirCacheBuildIterator;
invokevirtual org.eclipse.jgit.treewalk.TreeWalk.getTree:(ILjava/lang/Class;)Lorg/eclipse/jgit/treewalk/AbstractTreeIterator;
checkcast org.eclipse.jgit.dircache.DirCacheBuildIterator
14: iload 3
ifeq 18
aload 1
iconst_4
15: ldc Lorg/eclipse/jgit/treewalk/WorkingTreeIterator;
16: invokevirtual org.eclipse.jgit.treewalk.TreeWalk.getTree:(ILjava/lang/Class;)Lorg/eclipse/jgit/treewalk/AbstractTreeIterator;
checkcast org.eclipse.jgit.treewalk.WorkingTreeIterator
17: goto 19
StackMap locals: org.eclipse.jgit.merge.ResolveMerger org.eclipse.jgit.treewalk.TreeWalk int int int
StackMap stack: org.eclipse.jgit.merge.ResolveMerger org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.dircache.DirCacheBuildIterator
18: aconst_null
19: StackMap locals: org.eclipse.jgit.merge.ResolveMerger org.eclipse.jgit.treewalk.TreeWalk int int int
StackMap stack: org.eclipse.jgit.merge.ResolveMerger org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.dircache.DirCacheBuildIterator org.eclipse.jgit.treewalk.WorkingTreeIterator
iload 2
iload 4
ifeq 21
20: aload 1
invokevirtual org.eclipse.jgit.treewalk.TreeWalk.getAttributes:()Lorg/eclipse/jgit/attributes/Attributes;
goto 22
21: StackMap locals: org.eclipse.jgit.merge.ResolveMerger org.eclipse.jgit.treewalk.TreeWalk int int int
StackMap stack: org.eclipse.jgit.merge.ResolveMerger org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.dircache.DirCacheBuildIterator org.eclipse.jgit.treewalk.WorkingTreeIterator int
getstatic org.eclipse.jgit.merge.ResolveMerger.NO_ATTRIBUTES:Lorg/eclipse/jgit/attributes/Attributes;
22: StackMap locals: org.eclipse.jgit.merge.ResolveMerger org.eclipse.jgit.treewalk.TreeWalk int int int
StackMap stack: org.eclipse.jgit.merge.ResolveMerger org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.treewalk.CanonicalTreeParser org.eclipse.jgit.dircache.DirCacheBuildIterator org.eclipse.jgit.treewalk.WorkingTreeIterator int org.eclipse.jgit.attributes.Attributes
invokevirtual org.eclipse.jgit.merge.ResolveMerger.processEntry:(Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/treewalk/CanonicalTreeParser;Lorg/eclipse/jgit/dircache/DirCacheBuildIterator;Lorg/eclipse/jgit/treewalk/WorkingTreeIterator;ZLorg/eclipse/jgit/attributes/Attributes;)Z
23: ifne 26
24: aload 0
invokevirtual org.eclipse.jgit.merge.ResolveMerger.cleanUp:()V
25: iconst_0
ireturn
26: StackMap locals:
StackMap stack:
aload 1
invokevirtual org.eclipse.jgit.treewalk.TreeWalk.isSubtree:()Z
ifeq 28
aload 0
getfield org.eclipse.jgit.merge.ResolveMerger.enterSubtree:Z
ifeq 28
27: aload 1
invokevirtual org.eclipse.jgit.treewalk.TreeWalk.enterSubtree:()V
28: StackMap locals:
StackMap stack:
aload 1
invokevirtual org.eclipse.jgit.treewalk.TreeWalk.next:()Z
ifne 9
29: iconst_1
ireturn
end local 4 end local 3 end local 2 end local 1 end local 0 LocalVariableTable:
Start End Slot Name Signature
0 30 0 this Lorg/eclipse/jgit/merge/ResolveMerger;
0 30 1 treeWalk Lorg/eclipse/jgit/treewalk/TreeWalk;
0 30 2 ignoreConflicts Z
3 30 3 hasWorkingTreeIterator Z
8 30 4 hasAttributeNodeProvider Z
Exceptions:
throws java.io.IOException
MethodParameters:
Name Flags
treeWalk
ignoreConflicts
}
SourceFile: "ResolveMerger.java"
NestMembers:
org.eclipse.jgit.merge.ResolveMerger$MergeFailureReason
InnerClasses:
public abstract Entry = java.util.Map$Entry of java.util.Map
public final SupportedAlgorithm = org.eclipse.jgit.diff.DiffAlgorithm$SupportedAlgorithm of org.eclipse.jgit.diff.DiffAlgorithm
public CheckoutMetadata = org.eclipse.jgit.dircache.DirCacheCheckout$CheckoutMetadata of org.eclipse.jgit.dircache.DirCacheCheckout
public abstract SectionParser = org.eclipse.jgit.lib.Config$SectionParser of org.eclipse.jgit.lib.Config
public final EolStreamType = org.eclipse.jgit.lib.CoreConfig$EolStreamType of org.eclipse.jgit.lib.CoreConfig
public final MergeFailureReason = org.eclipse.jgit.merge.ResolveMerger$MergeFailureReason of org.eclipse.jgit.merge.ResolveMerger
public final OperationType = org.eclipse.jgit.treewalk.TreeWalk$OperationType of org.eclipse.jgit.treewalk.TreeWalk
public final LfsInputStream = org.eclipse.jgit.util.LfsFactory$LfsInputStream of org.eclipse.jgit.util.LfsFactory
public LocalFile = org.eclipse.jgit.util.TemporaryBuffer$LocalFile of org.eclipse.jgit.util.TemporaryBuffer