Browse Source

REPORT-14835

模板版本管理优化及内置 代码逻辑调整
research/11.0
XiaXiang 6 years ago
parent
commit
953f474189
  1. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/api/ApplyCommand.java
  2. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/api/BlameCommand.java
  3. 6
      fine-jgit/src/com/fr/third/eclipse/jgit/api/CheckoutCommand.java
  4. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/api/CherryPickCommand.java
  5. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/api/CherryPickResult.java
  6. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/api/CommitCommand.java
  7. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/api/CreateBranchCommand.java
  8. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/api/DeleteBranchCommand.java
  9. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/api/DeleteTagCommand.java
  10. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/api/DescribeCommand.java
  11. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/api/DiffCommand.java
  12. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/api/GarbageCollectCommand.java
  13. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/api/GitCommand.java
  14. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/api/LogCommand.java
  15. 10
      fine-jgit/src/com/fr/third/eclipse/jgit/api/MergeCommand.java
  16. 4
      fine-jgit/src/com/fr/third/eclipse/jgit/api/MergeResult.java
  17. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/api/PullCommand.java
  18. 10
      fine-jgit/src/com/fr/third/eclipse/jgit/api/RebaseCommand.java
  19. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/api/RebaseResult.java
  20. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/api/RenameBranchCommand.java
  21. 6
      fine-jgit/src/com/fr/third/eclipse/jgit/api/RevertCommand.java
  22. 6
      fine-jgit/src/com/fr/third/eclipse/jgit/api/StashCreateCommand.java
  23. 4
      fine-jgit/src/com/fr/third/eclipse/jgit/api/StashDropCommand.java
  24. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/api/Status.java
  25. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/api/StatusCommand.java
  26. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/api/TagCommand.java
  27. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/api/errors/GitAPIException.java
  28. 4
      fine-jgit/src/com/fr/third/eclipse/jgit/attributes/AttributesRule.java
  29. 14
      fine-jgit/src/com/fr/third/eclipse/jgit/blame/BlameGenerator.java
  30. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/blame/Candidate.java
  31. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/diff/DiffConfig.java
  32. 26
      fine-jgit/src/com/fr/third/eclipse/jgit/diff/DiffFormatter.java
  33. 6
      fine-jgit/src/com/fr/third/eclipse/jgit/diff/RawTextComparator.java
  34. 8
      fine-jgit/src/com/fr/third/eclipse/jgit/diff/RenameDetector.java
  35. 8
      fine-jgit/src/com/fr/third/eclipse/jgit/diff/SimilarityRenameDetector.java
  36. 4
      fine-jgit/src/com/fr/third/eclipse/jgit/dircache/DirCacheCheckout.java
  37. 4
      fine-jgit/src/com/fr/third/eclipse/jgit/dircache/DirCacheTree.java
  38. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/gitrepo/RepoCommand.java
  39. 4
      fine-jgit/src/com/fr/third/eclipse/jgit/ignore/FastIgnoreRule.java
  40. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/NameMatcher.java
  41. 12
      fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/PathMatcher.java
  42. 4
      fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/Strings.java
  43. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/WildCardMatcher.java
  44. 8
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java
  45. 14
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java
  46. 8
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsInserter.java
  47. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsObjectRepresentation.java
  48. 8
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java
  49. 4
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackDescription.java
  50. 8
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackFile.java
  51. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackParser.java
  52. 6
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsReader.java
  53. 8
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java
  54. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsRefDatabase.java
  55. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsRefRename.java
  56. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsRefUpdate.java
  57. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/InMemoryRepository.java
  58. 10
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/FileRepository.java
  59. 10
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/GC.java
  60. 6
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ObjectDirectory.java
  61. 6
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackBitmapIndexBuilder.java
  62. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java
  63. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackBitmapIndexWriterV1.java
  64. 4
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackFile.java
  65. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackReverseIndex.java
  66. 20
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/RefDirectory.java
  67. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/RefDirectoryRename.java
  68. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/RefDirectoryUpdate.java
  69. 10
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ReflogEntryImpl.java
  70. 8
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ReflogReaderImpl.java
  71. 12
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ReflogWriter.java
  72. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/WindowCursor.java
  73. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/WriteConfig.java
  74. 4
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/BaseSearch.java
  75. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/ObjectReuseAsIs.java
  76. 6
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackOutputStream.java
  77. 16
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackWriter.java
  78. 4
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java
  79. 4
      fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackWriterBitmapWalker.java
  80. 22
      fine-jgit/src/com/fr/third/eclipse/jgit/lib/BaseRepositoryBuilder.java
  81. 6
      fine-jgit/src/com/fr/third/eclipse/jgit/lib/BatchRefUpdate.java
  82. 6
      fine-jgit/src/com/fr/third/eclipse/jgit/lib/ConfigSnapshot.java
  83. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/lib/CoreConfig.java
  84. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/lib/IndexDiff.java
  85. 6
      fine-jgit/src/com/fr/third/eclipse/jgit/lib/ObjectChecker.java
  86. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/lib/RebaseTodoFile.java
  87. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/lib/RefRename.java
  88. 12
      fine-jgit/src/com/fr/third/eclipse/jgit/lib/TreeFormatter.java
  89. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/lib/UserConfig.java
  90. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeAlgorithm.java
  91. 4
      fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeConfig.java
  92. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeFormatter.java
  93. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeResult.java
  94. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/merge/Merger.java
  95. 6
      fine-jgit/src/com/fr/third/eclipse/jgit/merge/ResolveMerger.java
  96. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/merge/SquashMessageFormatter.java
  97. 2
      fine-jgit/src/com/fr/third/eclipse/jgit/notes/FanoutBucket.java
  98. 4
      fine-jgit/src/com/fr/third/eclipse/jgit/notes/LeafBucket.java
  99. 8
      fine-jgit/src/com/fr/third/eclipse/jgit/notes/NoteParser.java
  100. 8
      fine-jgit/src/com/fr/third/eclipse/jgit/patch/BinaryHunk.java
  101. Some files were not shown because too many files have changed in this diff Show More

2
fine-jgit/src/com/fr/third/eclipse/jgit/api/ApplyCommand.java

@ -53,7 +53,7 @@ import com.fr.third.eclipse.jgit.patch.HunkHeader;
import com.fr.third.eclipse.jgit.patch.Patch;
import com.fr.third.eclipse.jgit.util.FileUtils;
import com.fr.third.eclipse.jgit.util.IO;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import com.fr.third.eclipse.jgit.diff.DiffEntry.ChangeType;
import java.io.File;
import java.io.FileOutputStream;

2
fine-jgit/src/com/fr/third/eclipse/jgit/api/BlameCommand.java

@ -57,7 +57,7 @@ import com.fr.third.eclipse.jgit.lib.Repository;
import com.fr.third.eclipse.jgit.treewalk.WorkingTreeOptions;
import com.fr.third.eclipse.jgit.util.IO;
import com.fr.third.eclipse.jgit.util.io.EolCanonicalizingInputStream;
import org.eclipse.jgit.lib.CoreConfig.AutoCRLF;
import com.fr.third.eclipse.jgit.lib.CoreConfig.AutoCRLF;
import java.io.File;
import java.io.FileInputStream;

6
fine-jgit/src/com/fr/third/eclipse/jgit/api/CheckoutCommand.java

@ -70,9 +70,9 @@ import com.fr.third.eclipse.jgit.revwalk.RevTree;
import com.fr.third.eclipse.jgit.revwalk.RevWalk;
import com.fr.third.eclipse.jgit.treewalk.TreeWalk;
import com.fr.third.eclipse.jgit.treewalk.filter.PathFilterGroup;
import org.eclipse.jgit.api.CheckoutResult.Status;
import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit;
import org.eclipse.jgit.lib.RefUpdate.Result;
import com.fr.third.eclipse.jgit.api.CheckoutResult.Status;
import com.fr.third.eclipse.jgit.dircache.DirCacheEditor.PathEdit;
import com.fr.third.eclipse.jgit.lib.RefUpdate.Result;
import java.io.IOException;
import java.text.MessageFormat;

2
fine-jgit/src/com/fr/third/eclipse/jgit/api/CherryPickCommand.java

@ -65,7 +65,7 @@ import com.fr.third.eclipse.jgit.merge.ResolveMerger;
import com.fr.third.eclipse.jgit.revwalk.RevCommit;
import com.fr.third.eclipse.jgit.revwalk.RevWalk;
import com.fr.third.eclipse.jgit.treewalk.FileTreeIterator;
import org.eclipse.jgit.lib.Ref.Storage;
import com.fr.third.eclipse.jgit.lib.Ref.Storage;
import java.io.IOException;
import java.text.MessageFormat;

2
fine-jgit/src/com/fr/third/eclipse/jgit/api/CherryPickResult.java

@ -45,7 +45,7 @@ package com.fr.third.eclipse.jgit.api;
import com.fr.third.eclipse.jgit.lib.Ref;
import com.fr.third.eclipse.jgit.merge.ResolveMerger;
import com.fr.third.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason;
import com.fr.third.eclipse.jgit.merge.ResolveMerger.MergeFailureReason;
import java.util.List;
import java.util.Map;

2
fine-jgit/src/com/fr/third/eclipse/jgit/api/CommitCommand.java

@ -79,7 +79,7 @@ import com.fr.third.eclipse.jgit.util.ChangeIdUtil;
import com.fr.third.eclipse.jgit.util.FS;
import com.fr.third.eclipse.jgit.util.Hook;
import com.fr.third.eclipse.jgit.util.ProcessResult;
import org.eclipse.jgit.lib.RefUpdate.Result;
import com.fr.third.eclipse.jgit.lib.RefUpdate.Result;
import java.io.ByteArrayOutputStream;
import java.io.IOException;

2
fine-jgit/src/com/fr/third/eclipse/jgit/api/CreateBranchCommand.java

@ -59,7 +59,7 @@ import com.fr.third.eclipse.jgit.lib.Repository;
import com.fr.third.eclipse.jgit.lib.StoredConfig;
import com.fr.third.eclipse.jgit.revwalk.RevCommit;
import com.fr.third.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.lib.RefUpdate.Result;
import com.fr.third.eclipse.jgit.lib.RefUpdate.Result;
import java.io.IOException;
import java.text.MessageFormat;

2
fine-jgit/src/com/fr/third/eclipse/jgit/api/DeleteBranchCommand.java

@ -56,7 +56,7 @@ import com.fr.third.eclipse.jgit.lib.Repository;
import com.fr.third.eclipse.jgit.lib.StoredConfig;
import com.fr.third.eclipse.jgit.revwalk.RevCommit;
import com.fr.third.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.lib.RefUpdate.Result;
import com.fr.third.eclipse.jgit.lib.RefUpdate.Result;
import java.io.IOException;
import java.text.MessageFormat;

2
fine-jgit/src/com/fr/third/eclipse/jgit/api/DeleteTagCommand.java

@ -48,7 +48,7 @@ import com.fr.third.eclipse.jgit.internal.JGitText;
import com.fr.third.eclipse.jgit.lib.Ref;
import com.fr.third.eclipse.jgit.lib.RefUpdate;
import com.fr.third.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.RefUpdate.Result;
import com.fr.third.eclipse.jgit.lib.RefUpdate.Result;
import java.io.IOException;
import java.text.MessageFormat;

2
fine-jgit/src/com/fr/third/eclipse/jgit/api/DescribeCommand.java

@ -66,7 +66,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static org.eclipse.jgit.lib.Constants.R_TAGS;
import static com.fr.third.eclipse.jgit.lib.Constants.R_TAGS;
/**
* Given a commit, show the most recent tag that is reachable from a commit.

2
fine-jgit/src/com/fr/third/eclipse/jgit/api/DiffCommand.java

@ -65,7 +65,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.util.List;
import static org.eclipse.jgit.lib.Constants.HEAD;
import static com.fr.third.eclipse.jgit.lib.Constants.HEAD;
/**
* Show changes between commits, commit and working tree, etc.

2
fine-jgit/src/com/fr/third/eclipse/jgit/api/GarbageCollectCommand.java

@ -55,7 +55,7 @@ import com.fr.third.eclipse.jgit.lib.Repository;
import com.fr.third.eclipse.jgit.lib.StoredConfig;
import com.fr.third.eclipse.jgit.storage.pack.PackConfig;
import com.fr.third.eclipse.jgit.util.GitDateParser;
import org.eclipse.jgit.internal.storage.file.GC.RepoStatistics;
import com.fr.third.eclipse.jgit.internal.storage.file.GC.RepoStatistics;
import java.io.IOException;
import java.text.MessageFormat;

2
fine-jgit/src/com/fr/third/eclipse/jgit/api/GitCommand.java

@ -46,7 +46,7 @@ import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicBoolean;
/**
* Common superclass of all commands in the package {@code org.eclipse.jgit.api}
* Common superclass of all commands in the package {@code com.fr.third.eclipse.jgit.api}
* <p>
* This class ensures that all commands fulfill the {@link Callable} interface.
* It also has a property {@link #repo} holding a reference to the git

2
fine-jgit/src/com/fr/third/eclipse/jgit/api/LogCommand.java

@ -69,7 +69,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import static org.eclipse.jgit.lib.RefDatabase.ALL;
import static com.fr.third.eclipse.jgit.lib.RefDatabase.ALL;
/**
* A class used to execute a {@code Log} command. It has setters for all

10
fine-jgit/src/com/fr/third/eclipse/jgit/api/MergeCommand.java

@ -71,11 +71,11 @@ import com.fr.third.eclipse.jgit.revwalk.RevWalk;
import com.fr.third.eclipse.jgit.revwalk.RevWalkUtils;
import com.fr.third.eclipse.jgit.treewalk.FileTreeIterator;
import com.fr.third.eclipse.jgit.util.StringUtils;
import org.eclipse.jgit.api.MergeResult.MergeStatus;
import org.eclipse.jgit.lib.Config.ConfigEnum;
import org.eclipse.jgit.lib.Ref.Storage;
import org.eclipse.jgit.lib.RefUpdate.Result;
import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason;
import com.fr.third.eclipse.jgit.api.MergeResult.MergeStatus;
import com.fr.third.eclipse.jgit.lib.Config.ConfigEnum;
import com.fr.third.eclipse.jgit.lib.Ref.Storage;
import com.fr.third.eclipse.jgit.lib.RefUpdate.Result;
import com.fr.third.eclipse.jgit.merge.ResolveMerger.MergeFailureReason;
import java.io.IOException;
import java.text.MessageFormat;

4
fine-jgit/src/com/fr/third/eclipse/jgit/api/MergeResult.java

@ -48,8 +48,8 @@ import com.fr.third.eclipse.jgit.lib.ObjectId;
import com.fr.third.eclipse.jgit.merge.MergeChunk;
import com.fr.third.eclipse.jgit.merge.MergeStrategy;
import com.fr.third.eclipse.jgit.merge.ResolveMerger;
import org.eclipse.jgit.merge.MergeChunk.ConflictState;
import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason;
import com.fr.third.eclipse.jgit.merge.MergeChunk.ConflictState;
import com.fr.third.eclipse.jgit.merge.ResolveMerger.MergeFailureReason;
import java.text.MessageFormat;
import java.util.HashMap;

2
fine-jgit/src/com/fr/third/eclipse/jgit/api/PullCommand.java

@ -65,7 +65,7 @@ import com.fr.third.eclipse.jgit.lib.Repository;
import com.fr.third.eclipse.jgit.lib.RepositoryState;
import com.fr.third.eclipse.jgit.merge.MergeStrategy;
import com.fr.third.eclipse.jgit.transport.FetchResult;
import org.eclipse.jgit.api.RebaseCommand.Operation;
import com.fr.third.eclipse.jgit.api.RebaseCommand.Operation;
import java.io.IOException;
import java.text.MessageFormat;

10
fine-jgit/src/com/fr/third/eclipse/jgit/api/RebaseCommand.java

@ -83,11 +83,11 @@ import com.fr.third.eclipse.jgit.treewalk.filter.TreeFilter;
import com.fr.third.eclipse.jgit.util.FileUtils;
import com.fr.third.eclipse.jgit.util.IO;
import com.fr.third.eclipse.jgit.util.RawParseUtils;
import org.eclipse.jgit.api.RebaseResult.Status;
import org.eclipse.jgit.api.ResetCommand.ResetType;
import org.eclipse.jgit.lib.RebaseTodoLine.Action;
import org.eclipse.jgit.lib.RefUpdate.Result;
import org.eclipse.jgit.submodule.SubmoduleWalk.IgnoreSubmoduleMode;
import com.fr.third.eclipse.jgit.api.RebaseResult.Status;
import com.fr.third.eclipse.jgit.api.ResetCommand.ResetType;
import com.fr.third.eclipse.jgit.lib.RebaseTodoLine.Action;
import com.fr.third.eclipse.jgit.lib.RefUpdate.Result;
import com.fr.third.eclipse.jgit.submodule.SubmoduleWalk.IgnoreSubmoduleMode;
import java.io.ByteArrayOutputStream;
import java.io.File;

2
fine-jgit/src/com/fr/third/eclipse/jgit/api/RebaseResult.java

@ -44,7 +44,7 @@ package com.fr.third.eclipse.jgit.api;
import com.fr.third.eclipse.jgit.merge.ResolveMerger;
import com.fr.third.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason;
import com.fr.third.eclipse.jgit.merge.ResolveMerger.MergeFailureReason;
import java.util.List;
import java.util.Map;

2
fine-jgit/src/com/fr/third/eclipse/jgit/api/RenameBranchCommand.java

@ -57,7 +57,7 @@ import com.fr.third.eclipse.jgit.lib.Ref;
import com.fr.third.eclipse.jgit.lib.RefRename;
import com.fr.third.eclipse.jgit.lib.Repository;
import com.fr.third.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.lib.RefUpdate.Result;
import com.fr.third.eclipse.jgit.lib.RefUpdate.Result;
import java.io.IOException;
import java.text.MessageFormat;

6
fine-jgit/src/com/fr/third/eclipse/jgit/api/RevertCommand.java

@ -64,9 +64,9 @@ import com.fr.third.eclipse.jgit.merge.ResolveMerger;
import com.fr.third.eclipse.jgit.revwalk.RevCommit;
import com.fr.third.eclipse.jgit.revwalk.RevWalk;
import com.fr.third.eclipse.jgit.treewalk.FileTreeIterator;
import org.eclipse.jgit.api.MergeResult.MergeStatus;
import org.eclipse.jgit.lib.Ref.Storage;
import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason;
import com.fr.third.eclipse.jgit.api.MergeResult.MergeStatus;
import com.fr.third.eclipse.jgit.lib.Ref.Storage;
import com.fr.third.eclipse.jgit.merge.ResolveMerger.MergeFailureReason;
import java.io.IOException;
import java.text.MessageFormat;

6
fine-jgit/src/com/fr/third/eclipse/jgit/api/StashCreateCommand.java

@ -73,9 +73,9 @@ import com.fr.third.eclipse.jgit.treewalk.filter.AndTreeFilter;
import com.fr.third.eclipse.jgit.treewalk.filter.IndexDiffFilter;
import com.fr.third.eclipse.jgit.treewalk.filter.SkipWorkTreeFilter;
import com.fr.third.eclipse.jgit.util.FileUtils;
import org.eclipse.jgit.api.ResetCommand.ResetType;
import org.eclipse.jgit.dircache.DirCacheEditor.DeletePath;
import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit;
import com.fr.third.eclipse.jgit.api.ResetCommand.ResetType;
import com.fr.third.eclipse.jgit.dircache.DirCacheEditor.DeletePath;
import com.fr.third.eclipse.jgit.dircache.DirCacheEditor.PathEdit;
import java.io.File;
import java.io.IOException;

4
fine-jgit/src/com/fr/third/eclipse/jgit/api/StashDropCommand.java

@ -55,14 +55,14 @@ import com.fr.third.eclipse.jgit.lib.ReflogEntry;
import com.fr.third.eclipse.jgit.lib.ReflogReader;
import com.fr.third.eclipse.jgit.lib.Repository;
import com.fr.third.eclipse.jgit.util.FileUtils;
import org.eclipse.jgit.lib.RefUpdate.Result;
import com.fr.third.eclipse.jgit.lib.RefUpdate.Result;
import java.io.File;
import java.io.IOException;
import java.text.MessageFormat;
import java.util.List;
import static org.eclipse.jgit.lib.Constants.R_STASH;
import static com.fr.third.eclipse.jgit.lib.Constants.R_STASH;
/**
* Command class to delete a stashed commit reference

2
fine-jgit/src/com/fr/third/eclipse/jgit/api/Status.java

@ -43,7 +43,7 @@
package com.fr.third.eclipse.jgit.api;
import com.fr.third.eclipse.jgit.lib.IndexDiff;
import org.eclipse.jgit.lib.IndexDiff.StageState;
import com.fr.third.eclipse.jgit.lib.IndexDiff.StageState;
import java.util.Collections;
import java.util.HashSet;

2
fine-jgit/src/com/fr/third/eclipse/jgit/api/StatusCommand.java

@ -52,7 +52,7 @@ import com.fr.third.eclipse.jgit.lib.Repository;
import com.fr.third.eclipse.jgit.treewalk.FileTreeIterator;
import com.fr.third.eclipse.jgit.treewalk.WorkingTreeIterator;
import com.fr.third.eclipse.jgit.treewalk.filter.PathFilterGroup;
import org.eclipse.jgit.submodule.SubmoduleWalk.IgnoreSubmoduleMode;
import com.fr.third.eclipse.jgit.submodule.SubmoduleWalk.IgnoreSubmoduleMode;
import java.io.IOException;
import java.util.LinkedList;

2
fine-jgit/src/com/fr/third/eclipse/jgit/api/TagCommand.java

@ -60,7 +60,7 @@ import com.fr.third.eclipse.jgit.lib.RepositoryState;
import com.fr.third.eclipse.jgit.lib.TagBuilder;
import com.fr.third.eclipse.jgit.revwalk.RevObject;
import com.fr.third.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.lib.RefUpdate.Result;
import com.fr.third.eclipse.jgit.lib.RefUpdate.Result;
import java.io.IOException;
import java.text.MessageFormat;

2
fine-jgit/src/com/fr/third/eclipse/jgit/api/errors/GitAPIException.java

@ -39,7 +39,7 @@ package com.fr.third.eclipse.jgit.api.errors;
/**
* Superclass of all exceptions thrown by the API classes in
* {@code org.eclipse.jgit.api}
* {@code com.fr.third.eclipse.jgit.api}
*
*/
public abstract class GitAPIException extends Exception {

4
fine-jgit/src/com/fr/third/eclipse/jgit/attributes/AttributesRule.java

@ -46,13 +46,13 @@ import com.fr.third.eclipse.jgit.errors.InvalidPatternException;
import com.fr.third.eclipse.jgit.ignore.FastIgnoreRule;
import com.fr.third.eclipse.jgit.ignore.internal.IMatcher;
import com.fr.third.eclipse.jgit.ignore.internal.PathMatcher;
import org.eclipse.jgit.attributes.Attribute.State;
import com.fr.third.eclipse.jgit.attributes.Attribute.State;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import static org.eclipse.jgit.ignore.internal.IMatcher.NO_MATCH;
import static com.fr.third.eclipse.jgit.ignore.internal.IMatcher.NO_MATCH;
/**
* A single attributes rule corresponding to one line in a .gitattributes file.

14
fine-jgit/src/com/fr/third/eclipse/jgit/blame/BlameGenerator.java

@ -64,18 +64,18 @@ import com.fr.third.eclipse.jgit.revwalk.RevWalk;
import com.fr.third.eclipse.jgit.treewalk.TreeWalk;
import com.fr.third.eclipse.jgit.treewalk.filter.PathFilter;
import com.fr.third.eclipse.jgit.treewalk.filter.TreeFilter;
import org.eclipse.jgit.blame.Candidate.BlobCandidate;
import org.eclipse.jgit.blame.Candidate.ReverseCandidate;
import org.eclipse.jgit.blame.ReverseWalk.ReverseCommit;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import com.fr.third.eclipse.jgit.blame.Candidate.BlobCandidate;
import com.fr.third.eclipse.jgit.blame.Candidate.ReverseCandidate;
import com.fr.third.eclipse.jgit.blame.ReverseWalk.ReverseCommit;
import com.fr.third.eclipse.jgit.diff.DiffEntry.ChangeType;
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
import static org.eclipse.jgit.lib.Constants.OBJ_BLOB;
import static org.eclipse.jgit.lib.FileMode.TYPE_FILE;
import static org.eclipse.jgit.lib.FileMode.TYPE_MASK;
import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_BLOB;
import static com.fr.third.eclipse.jgit.lib.FileMode.TYPE_FILE;
import static com.fr.third.eclipse.jgit.lib.FileMode.TYPE_MASK;
/**
* Generate author information for lines based on a provided file.

2
fine-jgit/src/com/fr/third/eclipse/jgit/blame/Candidate.java

@ -56,7 +56,7 @@ import com.fr.third.eclipse.jgit.revwalk.RevCommit;
import com.fr.third.eclipse.jgit.revwalk.RevFlag;
import com.fr.third.eclipse.jgit.revwalk.RevWalk;
import com.fr.third.eclipse.jgit.treewalk.filter.PathFilter;
import org.eclipse.jgit.blame.ReverseWalk.ReverseCommit;
import com.fr.third.eclipse.jgit.blame.ReverseWalk.ReverseCommit;
import java.io.IOException;

2
fine-jgit/src/com/fr/third/eclipse/jgit/diff/DiffConfig.java

@ -47,7 +47,7 @@ import com.fr.third.eclipse.jgit.internal.JGitText;
import com.fr.third.eclipse.jgit.lib.Config;
import com.fr.third.eclipse.jgit.lib.ConfigConstants;
import com.fr.third.eclipse.jgit.util.StringUtils;
import org.eclipse.jgit.lib.Config.SectionParser;
import com.fr.third.eclipse.jgit.lib.Config.SectionParser;
import java.text.MessageFormat;

26
fine-jgit/src/com/fr/third/eclipse/jgit/diff/DiffFormatter.java

@ -79,9 +79,9 @@ import com.fr.third.eclipse.jgit.treewalk.filter.PathFilter;
import com.fr.third.eclipse.jgit.treewalk.filter.TreeFilter;
import com.fr.third.eclipse.jgit.util.QuotedString;
import com.fr.third.eclipse.jgit.util.io.DisabledOutputStream;
import org.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import org.eclipse.jgit.patch.FileHeader.PatchType;
import com.fr.third.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm;
import com.fr.third.eclipse.jgit.diff.DiffEntry.ChangeType;
import com.fr.third.eclipse.jgit.patch.FileHeader.PatchType;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@ -90,16 +90,16 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import static org.eclipse.jgit.diff.DiffEntry.ChangeType.ADD;
import static org.eclipse.jgit.diff.DiffEntry.ChangeType.COPY;
import static org.eclipse.jgit.diff.DiffEntry.ChangeType.DELETE;
import static org.eclipse.jgit.diff.DiffEntry.ChangeType.MODIFY;
import static org.eclipse.jgit.diff.DiffEntry.ChangeType.RENAME;
import static org.eclipse.jgit.diff.DiffEntry.Side.NEW;
import static org.eclipse.jgit.diff.DiffEntry.Side.OLD;
import static org.eclipse.jgit.lib.Constants.encode;
import static org.eclipse.jgit.lib.Constants.encodeASCII;
import static org.eclipse.jgit.lib.FileMode.GITLINK;
import static com.fr.third.eclipse.jgit.diff.DiffEntry.ChangeType.ADD;
import static com.fr.third.eclipse.jgit.diff.DiffEntry.ChangeType.COPY;
import static com.fr.third.eclipse.jgit.diff.DiffEntry.ChangeType.DELETE;
import static com.fr.third.eclipse.jgit.diff.DiffEntry.ChangeType.MODIFY;
import static com.fr.third.eclipse.jgit.diff.DiffEntry.ChangeType.RENAME;
import static com.fr.third.eclipse.jgit.diff.DiffEntry.Side.NEW;
import static com.fr.third.eclipse.jgit.diff.DiffEntry.Side.OLD;
import static com.fr.third.eclipse.jgit.lib.Constants.encode;
import static com.fr.third.eclipse.jgit.lib.Constants.encodeASCII;
import static com.fr.third.eclipse.jgit.lib.FileMode.GITLINK;
/**
* Format a Git style patch script.

6
fine-jgit/src/com/fr/third/eclipse/jgit/diff/RawTextComparator.java

@ -46,9 +46,9 @@ package com.fr.third.eclipse.jgit.diff;
import com.fr.third.eclipse.jgit.util.IntList;
import static org.eclipse.jgit.util.RawCharUtil.isWhitespace;
import static org.eclipse.jgit.util.RawCharUtil.trimLeadingWhitespace;
import static org.eclipse.jgit.util.RawCharUtil.trimTrailingWhitespace;
import static com.fr.third.eclipse.jgit.util.RawCharUtil.isWhitespace;
import static com.fr.third.eclipse.jgit.util.RawCharUtil.trimLeadingWhitespace;
import static com.fr.third.eclipse.jgit.util.RawCharUtil.trimTrailingWhitespace;
/** Equivalence function for {@link RawText}. */
public abstract class RawTextComparator extends SequenceComparator<RawText> {

8
fine-jgit/src/com/fr/third/eclipse/jgit/diff/RenameDetector.java

@ -50,8 +50,8 @@ import com.fr.third.eclipse.jgit.lib.NullProgressMonitor;
import com.fr.third.eclipse.jgit.lib.ObjectReader;
import com.fr.third.eclipse.jgit.lib.ProgressMonitor;
import com.fr.third.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import org.eclipse.jgit.diff.SimilarityIndex.TableFullException;
import com.fr.third.eclipse.jgit.diff.DiffEntry.ChangeType;
import com.fr.third.eclipse.jgit.diff.SimilarityIndex.TableFullException;
import java.io.IOException;
import java.util.ArrayList;
@ -62,8 +62,8 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import static org.eclipse.jgit.diff.DiffEntry.Side.NEW;
import static org.eclipse.jgit.diff.DiffEntry.Side.OLD;
import static com.fr.third.eclipse.jgit.diff.DiffEntry.Side.NEW;
import static com.fr.third.eclipse.jgit.diff.DiffEntry.Side.OLD;
/** Detect and resolve object renames. */
public class RenameDetector {

8
fine-jgit/src/com/fr/third/eclipse/jgit/diff/SimilarityRenameDetector.java

@ -47,8 +47,8 @@ import com.fr.third.eclipse.jgit.internal.JGitText;
import com.fr.third.eclipse.jgit.lib.FileMode;
import com.fr.third.eclipse.jgit.lib.NullProgressMonitor;
import com.fr.third.eclipse.jgit.lib.ProgressMonitor;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import org.eclipse.jgit.diff.SimilarityIndex.TableFullException;
import com.fr.third.eclipse.jgit.diff.DiffEntry.ChangeType;
import com.fr.third.eclipse.jgit.diff.SimilarityIndex.TableFullException;
import java.io.IOException;
import java.util.ArrayList;
@ -56,8 +56,8 @@ import java.util.Arrays;
import java.util.BitSet;
import java.util.List;
import static org.eclipse.jgit.diff.DiffEntry.Side.NEW;
import static org.eclipse.jgit.diff.DiffEntry.Side.OLD;
import static com.fr.third.eclipse.jgit.diff.DiffEntry.Side.NEW;
import static com.fr.third.eclipse.jgit.diff.DiffEntry.Side.OLD;
class SimilarityRenameDetector {
/**

4
fine-jgit/src/com/fr/third/eclipse/jgit/dircache/DirCacheCheckout.java vendored

@ -68,8 +68,8 @@ import com.fr.third.eclipse.jgit.util.FileUtils;
import com.fr.third.eclipse.jgit.util.RawParseUtils;
import com.fr.third.eclipse.jgit.util.SystemReader;
import com.fr.third.eclipse.jgit.util.io.AutoCRLFOutputStream;
import org.eclipse.jgit.lib.CoreConfig.AutoCRLF;
import org.eclipse.jgit.lib.CoreConfig.SymLinks;
import com.fr.third.eclipse.jgit.lib.CoreConfig.AutoCRLF;
import com.fr.third.eclipse.jgit.lib.CoreConfig.SymLinks;
import java.io.File;
import java.io.FileOutputStream;

4
fine-jgit/src/com/fr/third/eclipse/jgit/dircache/DirCacheTree.java vendored

@ -58,8 +58,8 @@ import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.Comparator;
import static org.eclipse.jgit.lib.FileMode.TREE;
import static org.eclipse.jgit.lib.TreeFormatter.entrySize;
import static com.fr.third.eclipse.jgit.lib.FileMode.TREE;
import static com.fr.third.eclipse.jgit.lib.TreeFormatter.entrySize;
/**
* Single tree record from the 'TREE' {@link DirCache} extension.

2
fine-jgit/src/com/fr/third/eclipse/jgit/gitrepo/RepoCommand.java

@ -70,7 +70,7 @@ import com.fr.third.eclipse.jgit.lib.Repository;
import com.fr.third.eclipse.jgit.revwalk.RevCommit;
import com.fr.third.eclipse.jgit.revwalk.RevWalk;
import com.fr.third.eclipse.jgit.util.FileUtils;
import org.eclipse.jgit.lib.RefUpdate.Result;
import com.fr.third.eclipse.jgit.lib.RefUpdate.Result;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;

4
fine-jgit/src/com/fr/third/eclipse/jgit/ignore/FastIgnoreRule.java

@ -46,8 +46,8 @@ import com.fr.third.eclipse.jgit.errors.InvalidPatternException;
import com.fr.third.eclipse.jgit.ignore.internal.IMatcher;
import com.fr.third.eclipse.jgit.ignore.internal.PathMatcher;
import static org.eclipse.jgit.ignore.internal.IMatcher.NO_MATCH;
import static org.eclipse.jgit.ignore.internal.Strings.stripTrailing;
import static com.fr.third.eclipse.jgit.ignore.internal.IMatcher.NO_MATCH;
import static com.fr.third.eclipse.jgit.ignore.internal.Strings.stripTrailing;
/**
* "Fast" (compared with IgnoreRule) git ignore rule implementation supporting

2
fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/NameMatcher.java

@ -42,7 +42,7 @@
*/
package com.fr.third.eclipse.jgit.ignore.internal;
import static org.eclipse.jgit.ignore.internal.Strings.getPathSeparator;
import static com.fr.third.eclipse.jgit.ignore.internal.Strings.getPathSeparator;
/**
* Matcher built from patterns for file names (single path segments). This class

12
fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/PathMatcher.java

@ -44,16 +44,16 @@ package com.fr.third.eclipse.jgit.ignore.internal;
import com.fr.third.eclipse.jgit.errors.InvalidPatternException;
import com.fr.third.eclipse.jgit.ignore.FastIgnoreRule;
import org.eclipse.jgit.ignore.internal.Strings.PatternState;
import com.fr.third.eclipse.jgit.ignore.internal.Strings.PatternState;
import java.util.ArrayList;
import java.util.List;
import static org.eclipse.jgit.ignore.internal.Strings.checkWildCards;
import static org.eclipse.jgit.ignore.internal.Strings.count;
import static org.eclipse.jgit.ignore.internal.Strings.getPathSeparator;
import static org.eclipse.jgit.ignore.internal.Strings.isWildCard;
import static org.eclipse.jgit.ignore.internal.Strings.split;
import static com.fr.third.eclipse.jgit.ignore.internal.Strings.checkWildCards;
import static com.fr.third.eclipse.jgit.ignore.internal.Strings.count;
import static com.fr.third.eclipse.jgit.ignore.internal.Strings.getPathSeparator;
import static com.fr.third.eclipse.jgit.ignore.internal.Strings.isWildCard;
import static com.fr.third.eclipse.jgit.ignore.internal.Strings.split;
/**
* Matcher built by patterns consists of multiple path segments.

4
fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/Strings.java

@ -177,7 +177,7 @@ public class Strings {
"word" //$NON-NLS-1$
// [:word:] XXX I don't see it in
// http://man7.org/linux/man-pages/man7/glob.7.html
// but this was in org.eclipse.jgit.fnmatch.GroupHead.java ???
// but this was in com.fr.third.eclipse.jgit.fnmatch.GroupHead.java ???
);
private static final String DL = "\\p{javaDigit}\\p{javaLetter}"; //$NON-NLS-1$
@ -201,7 +201,7 @@ public class Strings {
/**
* Conversion from glob to Java regex following two sources: <li>
* http://man7.org/linux/man-pages/man7/glob.7.html <li>
* org.eclipse.jgit.fnmatch.FileNameMatcher.java Seems that there are
* com.fr.third.eclipse.jgit.fnmatch.FileNameMatcher.java Seems that there are
* various ways to define what "glob" can be.
*
* @param pattern

2
fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/WildCardMatcher.java

@ -46,7 +46,7 @@ import com.fr.third.eclipse.jgit.errors.InvalidPatternException;
import java.util.regex.Pattern;
import static org.eclipse.jgit.ignore.internal.Strings.convertGlob;
import static com.fr.third.eclipse.jgit.ignore.internal.Strings.convertGlob;
/**
* Matcher built from path segments containing wildcards. This matcher converts

8
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java

@ -45,10 +45,10 @@ package com.fr.third.eclipse.jgit.internal.storage.dfs;
import com.fr.third.eclipse.jgit.lib.Config;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_CORE_SECTION;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_DFS_SECTION;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_BLOCK_LIMIT;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_BLOCK_SIZE;
import static com.fr.third.eclipse.jgit.lib.ConfigConstants.CONFIG_CORE_SECTION;
import static com.fr.third.eclipse.jgit.lib.ConfigConstants.CONFIG_DFS_SECTION;
import static com.fr.third.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_BLOCK_LIMIT;
import static com.fr.third.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_BLOCK_SIZE;
/** Configuration parameters for {@link DfsBlockCache}. */
public class DfsBlockCacheConfig {

14
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java

@ -56,7 +56,7 @@ import com.fr.third.eclipse.jgit.lib.Ref;
import com.fr.third.eclipse.jgit.revwalk.RevWalk;
import com.fr.third.eclipse.jgit.storage.pack.PackConfig;
import com.fr.third.eclipse.jgit.util.io.CountingOutputStream;
import org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource;
import com.fr.third.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource;
import java.io.IOException;
import java.util.ArrayList;
@ -66,12 +66,12 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.GC;
import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.UNREACHABLE_GARBAGE;
import static org.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX;
import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX;
import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK;
import static org.eclipse.jgit.lib.RefDatabase.ALL;
import static com.fr.third.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.GC;
import static com.fr.third.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.UNREACHABLE_GARBAGE;
import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX;
import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.INDEX;
import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.PACK;
import static com.fr.third.eclipse.jgit.lib.RefDatabase.ALL;
/** Repack and garbage collect a repository. */
public class DfsGarbageCollector {

8
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsInserter.java

@ -85,10 +85,10 @@ import java.util.zip.DeflaterOutputStream;
import java.util.zip.Inflater;
import java.util.zip.InflaterInputStream;
import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX;
import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK;
import static org.eclipse.jgit.lib.Constants.OBJ_OFS_DELTA;
import static org.eclipse.jgit.lib.Constants.OBJ_REF_DELTA;
import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.INDEX;
import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.PACK;
import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_OFS_DELTA;
import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_REF_DELTA;
/** Inserts objects into the DFS. */
public class DfsInserter extends ObjectInserter {

2
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsObjectRepresentation.java

@ -46,7 +46,7 @@ package com.fr.third.eclipse.jgit.internal.storage.dfs;
import com.fr.third.eclipse.jgit.internal.storage.pack.StoredObjectRepresentation;
import com.fr.third.eclipse.jgit.lib.ObjectId;
import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.GC;
import static com.fr.third.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.GC;
class DfsObjectRepresentation extends StoredObjectRepresentation {
final DfsPackFile pack;

8
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java

@ -65,10 +65,10 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.COMPACT;
import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX;
import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK;
import static org.eclipse.jgit.internal.storage.pack.StoredObjectRepresentation.PACK_DELTA;
import static com.fr.third.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.COMPACT;
import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.INDEX;
import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.PACK;
import static com.fr.third.eclipse.jgit.internal.storage.pack.StoredObjectRepresentation.PACK_DELTA;
/**
* Combine several pack files into one pack.

4
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackDescription.java

@ -45,12 +45,12 @@ package com.fr.third.eclipse.jgit.internal.storage.dfs;
import com.fr.third.eclipse.jgit.internal.storage.pack.PackExt;
import com.fr.third.eclipse.jgit.internal.storage.pack.PackWriter;
import org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource;
import com.fr.third.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource;
import java.util.HashMap;
import java.util.Map;
import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK;
import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.PACK;
/**
* Description of a DFS stored pack/index file.

8
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackFile.java

@ -78,10 +78,10 @@ import java.util.zip.CRC32;
import java.util.zip.DataFormatException;
import java.util.zip.Inflater;
import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.UNREACHABLE_GARBAGE;
import static org.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX;
import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX;
import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK;
import static com.fr.third.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.UNREACHABLE_GARBAGE;
import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX;
import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.INDEX;
import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.PACK;
/**
* A Git version 2 pack file representation. A pack file contains Git objects in

2
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackParser.java

@ -61,7 +61,7 @@ import java.util.List;
import java.util.zip.CRC32;
import java.util.zip.Deflater;
import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK;
import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.PACK;
/** Parses a pack stream into the DFS, by creating a new pack and index. */
public class DfsPackParser extends PackParser {

6
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsReader.java

@ -69,7 +69,7 @@ import com.fr.third.eclipse.jgit.lib.ObjectLoader;
import com.fr.third.eclipse.jgit.lib.ObjectReader;
import com.fr.third.eclipse.jgit.lib.ProgressMonitor;
import com.fr.third.eclipse.jgit.util.BlockList;
import org.eclipse.jgit.lib.BitmapIndex.BitmapBuilder;
import com.fr.third.eclipse.jgit.lib.BitmapIndex.BitmapBuilder;
import java.io.IOException;
import java.security.MessageDigest;
@ -86,8 +86,8 @@ import java.util.Set;
import java.util.zip.DataFormatException;
import java.util.zip.Inflater;
import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK;
import static org.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH;
import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.PACK;
import static com.fr.third.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH;
/**
* Reader to access repository content through.

8
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java

@ -47,10 +47,10 @@ import com.fr.third.eclipse.jgit.lib.Config;
import com.fr.third.eclipse.jgit.lib.ObjectStream;
import com.fr.third.eclipse.jgit.storage.pack.PackConfig;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_CORE_SECTION;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_DFS_SECTION;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_DELTA_BASE_CACHE_LIMIT;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_STREAM_FILE_TRESHOLD;
import static com.fr.third.eclipse.jgit.lib.ConfigConstants.CONFIG_CORE_SECTION;
import static com.fr.third.eclipse.jgit.lib.ConfigConstants.CONFIG_DFS_SECTION;
import static com.fr.third.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_DELTA_BASE_CACHE_LIMIT;
import static com.fr.third.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_STREAM_FILE_TRESHOLD;
/** Options controlling how objects are read from a DFS stored repository. */
public class DfsReaderOptions {

2
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsRefDatabase.java

@ -62,7 +62,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
import static org.eclipse.jgit.lib.Ref.Storage.NEW;
import static com.fr.third.eclipse.jgit.lib.Ref.Storage.NEW;
/** */
public abstract class DfsRefDatabase extends RefDatabase {

2
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsRefRename.java

@ -46,7 +46,7 @@ package com.fr.third.eclipse.jgit.internal.storage.dfs;
import com.fr.third.eclipse.jgit.lib.ObjectId;
import com.fr.third.eclipse.jgit.lib.RefRename;
import com.fr.third.eclipse.jgit.lib.RefUpdate;
import org.eclipse.jgit.lib.RefUpdate.Result;
import com.fr.third.eclipse.jgit.lib.RefUpdate.Result;
import java.io.IOException;

2
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsRefUpdate.java

@ -50,7 +50,7 @@ import com.fr.third.eclipse.jgit.lib.SymbolicRef;
import com.fr.third.eclipse.jgit.revwalk.RevObject;
import com.fr.third.eclipse.jgit.revwalk.RevTag;
import com.fr.third.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.lib.Ref.Storage;
import com.fr.third.eclipse.jgit.lib.Ref.Storage;
import java.io.IOException;

2
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/InMemoryRepository.java

@ -5,7 +5,7 @@ import com.fr.third.eclipse.jgit.lib.ObjectId;
import com.fr.third.eclipse.jgit.lib.Ref;
import com.fr.third.eclipse.jgit.revwalk.RevWalk;
import com.fr.third.eclipse.jgit.util.RefList;
import org.eclipse.jgit.lib.Ref.Storage;
import com.fr.third.eclipse.jgit.lib.Ref.Storage;
import java.io.ByteArrayOutputStream;
import java.io.FileNotFoundException;

10
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/FileRepository.java

@ -66,10 +66,10 @@ import com.fr.third.eclipse.jgit.util.FS;
import com.fr.third.eclipse.jgit.util.FileUtils;
import com.fr.third.eclipse.jgit.util.StringUtils;
import com.fr.third.eclipse.jgit.util.SystemReader;
import org.eclipse.jgit.internal.storage.file.ObjectDirectory.AlternateHandle;
import org.eclipse.jgit.internal.storage.file.ObjectDirectory.AlternateRepository;
import org.eclipse.jgit.lib.CoreConfig.HideDotFiles;
import org.eclipse.jgit.lib.CoreConfig.SymLinks;
import com.fr.third.eclipse.jgit.internal.storage.file.ObjectDirectory.AlternateHandle;
import com.fr.third.eclipse.jgit.internal.storage.file.ObjectDirectory.AlternateRepository;
import com.fr.third.eclipse.jgit.lib.CoreConfig.HideDotFiles;
import com.fr.third.eclipse.jgit.lib.CoreConfig.SymLinks;
import java.io.File;
import java.io.IOException;
@ -77,7 +77,7 @@ import java.text.MessageFormat;
import java.util.HashSet;
import java.util.Set;
import static org.eclipse.jgit.lib.RefDatabase.ALL;
import static com.fr.third.eclipse.jgit.lib.RefDatabase.ALL;
/**
* Represents a Git repository. A repository holds all objects and refs used for

10
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/GC.java

@ -70,8 +70,8 @@ import com.fr.third.eclipse.jgit.treewalk.filter.TreeFilter;
import com.fr.third.eclipse.jgit.util.FileUtils;
import com.fr.third.eclipse.jgit.util.GitDateParser;
import com.fr.third.eclipse.jgit.util.SystemReader;
import org.eclipse.jgit.internal.storage.pack.PackWriter.ObjectIdSet;
import org.eclipse.jgit.lib.Ref.Storage;
import com.fr.third.eclipse.jgit.internal.storage.pack.PackWriter.ObjectIdSet;
import com.fr.third.eclipse.jgit.lib.Ref.Storage;
import java.io.File;
import java.io.FileOutputStream;
@ -96,9 +96,9 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeMap;
import static org.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX;
import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX;
import static org.eclipse.jgit.lib.RefDatabase.ALL;
import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX;
import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.INDEX;
import static com.fr.third.eclipse.jgit.lib.RefDatabase.ALL;
/**
* A garbage collector for git {@link FileRepository}. Instances of this class

6
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ObjectDirectory.java

@ -61,7 +61,7 @@ import com.fr.third.eclipse.jgit.lib.ObjectLoader;
import com.fr.third.eclipse.jgit.lib.RepositoryCache;
import com.fr.third.eclipse.jgit.util.FS;
import com.fr.third.eclipse.jgit.util.FileUtils;
import org.eclipse.jgit.lib.RepositoryCache.FileKey;
import com.fr.third.eclipse.jgit.lib.RepositoryCache.FileKey;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -83,8 +83,8 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX;
import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK;
import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.INDEX;
import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.PACK;
/**
* Traditional file system based {@link ObjectDatabase}.

6
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackBitmapIndexBuilder.java

@ -51,9 +51,9 @@ import com.fr.third.eclipse.jgit.lib.ObjectId;
import com.fr.third.eclipse.jgit.lib.ObjectIdOwnerMap;
import com.fr.third.eclipse.jgit.util.BlockList;
import com.googlecode.javaewah.EWAHCompressedBitmap;
import org.eclipse.jgit.internal.storage.file.BitmapIndexImpl.CompressedBitmap;
import org.eclipse.jgit.lib.BitmapIndex.Bitmap;
import org.eclipse.jgit.lib.BitmapIndex.BitmapBuilder;
import com.fr.third.eclipse.jgit.internal.storage.file.BitmapIndexImpl.CompressedBitmap;
import com.fr.third.eclipse.jgit.lib.BitmapIndex.Bitmap;
import com.fr.third.eclipse.jgit.lib.BitmapIndex.BitmapBuilder;
import java.text.MessageFormat;
import java.util.Arrays;

2
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java

@ -49,7 +49,7 @@ import com.fr.third.eclipse.jgit.lib.ObjectId;
import com.fr.third.eclipse.jgit.lib.ObjectIdOwnerMap;
import com.googlecode.javaewah.EWAHCompressedBitmap;
import com.googlecode.javaewah.IntIterator;
import org.eclipse.jgit.internal.storage.file.BasePackBitmapIndex.StoredBitmap;
import com.fr.third.eclipse.jgit.internal.storage.file.BasePackBitmapIndex.StoredBitmap;
import java.util.Collections;
import java.util.Iterator;

2
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackBitmapIndexWriterV1.java

@ -47,7 +47,7 @@ import com.fr.third.eclipse.jgit.internal.JGitText;
import com.fr.third.eclipse.jgit.lib.Constants;
import com.fr.third.eclipse.jgit.util.io.SafeBufferedOutputStream;
import com.googlecode.javaewah.EWAHCompressedBitmap;
import org.eclipse.jgit.internal.storage.file.PackBitmapIndexBuilder.StoredEntry;
import com.fr.third.eclipse.jgit.internal.storage.file.PackBitmapIndexBuilder.StoredEntry;
import java.io.BufferedOutputStream;
import java.io.DataOutput;

4
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackFile.java

@ -81,8 +81,8 @@ import java.util.zip.CRC32;
import java.util.zip.DataFormatException;
import java.util.zip.Inflater;
import static org.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX;
import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX;
import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX;
import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.INDEX;
/**
* A Git version 2 pack file representation. A pack file contains Git objects in

2
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackReverseIndex.java

@ -46,7 +46,7 @@ package com.fr.third.eclipse.jgit.internal.storage.file;
import com.fr.third.eclipse.jgit.errors.CorruptObjectException;
import com.fr.third.eclipse.jgit.internal.JGitText;
import com.fr.third.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry;
import com.fr.third.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry;
import java.text.MessageFormat;

20
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/RefDirectory.java

@ -88,16 +88,16 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import static org.eclipse.jgit.lib.Constants.CHARSET;
import static org.eclipse.jgit.lib.Constants.HEAD;
import static org.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH;
import static org.eclipse.jgit.lib.Constants.PACKED_REFS;
import static org.eclipse.jgit.lib.Constants.R_HEADS;
import static org.eclipse.jgit.lib.Constants.R_REFS;
import static org.eclipse.jgit.lib.Constants.R_TAGS;
import static org.eclipse.jgit.lib.Ref.Storage.LOOSE;
import static org.eclipse.jgit.lib.Ref.Storage.NEW;
import static org.eclipse.jgit.lib.Ref.Storage.PACKED;
import static com.fr.third.eclipse.jgit.lib.Constants.CHARSET;
import static com.fr.third.eclipse.jgit.lib.Constants.HEAD;
import static com.fr.third.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH;
import static com.fr.third.eclipse.jgit.lib.Constants.PACKED_REFS;
import static com.fr.third.eclipse.jgit.lib.Constants.R_HEADS;
import static com.fr.third.eclipse.jgit.lib.Constants.R_REFS;
import static com.fr.third.eclipse.jgit.lib.Constants.R_TAGS;
import static com.fr.third.eclipse.jgit.lib.Ref.Storage.LOOSE;
import static com.fr.third.eclipse.jgit.lib.Ref.Storage.NEW;
import static com.fr.third.eclipse.jgit.lib.Ref.Storage.PACKED;
/**
* Traditional file system based {@link RefDatabase}.

2
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/RefDirectoryRename.java

@ -50,7 +50,7 @@ import com.fr.third.eclipse.jgit.lib.RefRename;
import com.fr.third.eclipse.jgit.lib.RefUpdate;
import com.fr.third.eclipse.jgit.revwalk.RevWalk;
import com.fr.third.eclipse.jgit.util.FileUtils;
import org.eclipse.jgit.lib.RefUpdate.Result;
import com.fr.third.eclipse.jgit.lib.RefUpdate.Result;
import java.io.File;
import java.io.IOException;

2
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/RefDirectoryUpdate.java

@ -50,7 +50,7 @@ import com.fr.third.eclipse.jgit.lib.Repository;
import java.io.IOException;
import static org.eclipse.jgit.lib.Constants.encode;
import static com.fr.third.eclipse.jgit.lib.Constants.encode;
/** Updates any reference stored by {@link RefDirectory}. */
class RefDirectoryUpdate extends RefUpdate {

10
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ReflogEntryImpl.java

@ -91,28 +91,28 @@ public class ReflogEntryImpl implements Serializable, ReflogEntry {
}
/* (non-Javadoc)
* @see org.eclipse.jgit.internal.storage.file.ReflogEntry#getOldId()
* @see com.fr.third.eclipse.jgit.internal.storage.file.ReflogEntry#getOldId()
*/
public ObjectId getOldId() {
return oldId;
}
/* (non-Javadoc)
* @see org.eclipse.jgit.internal.storage.file.ReflogEntry#getNewId()
* @see com.fr.third.eclipse.jgit.internal.storage.file.ReflogEntry#getNewId()
*/
public ObjectId getNewId() {
return newId;
}
/* (non-Javadoc)
* @see org.eclipse.jgit.internal.storage.file.ReflogEntry#getWho()
* @see com.fr.third.eclipse.jgit.internal.storage.file.ReflogEntry#getWho()
*/
public PersonIdent getWho() {
return who;
}
/* (non-Javadoc)
* @see org.eclipse.jgit.internal.storage.file.ReflogEntry#getComment()
* @see com.fr.third.eclipse.jgit.internal.storage.file.ReflogEntry#getComment()
*/
public String getComment() {
return comment;
@ -126,7 +126,7 @@ public class ReflogEntryImpl implements Serializable, ReflogEntry {
}
/* (non-Javadoc)
* @see org.eclipse.jgit.internal.storage.file.ReflogEntry#parseCheckout()
* @see com.fr.third.eclipse.jgit.internal.storage.file.ReflogEntry#parseCheckout()
*/
public CheckoutEntry parseCheckout() {
if (getComment().startsWith(CheckoutEntryImpl.CHECKOUT_MOVING_FROM))

8
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ReflogReaderImpl.java

@ -72,21 +72,21 @@ class ReflogReaderImpl implements ReflogReader {
}
/* (non-Javadoc)
* @see org.eclipse.jgit.internal.storage.file.ReflogReaader#getLastEntry()
* @see com.fr.third.eclipse.jgit.internal.storage.file.ReflogReaader#getLastEntry()
*/
public ReflogEntry getLastEntry() throws IOException {
return getReverseEntry(0);
}
/* (non-Javadoc)
* @see org.eclipse.jgit.internal.storage.file.ReflogReaader#getReverseEntries()
* @see com.fr.third.eclipse.jgit.internal.storage.file.ReflogReaader#getReverseEntries()
*/
public List<ReflogEntry> getReverseEntries() throws IOException {
return getReverseEntries(Integer.MAX_VALUE);
}
/* (non-Javadoc)
* @see org.eclipse.jgit.internal.storage.file.ReflogReaader#getReverseEntry(int)
* @see com.fr.third.eclipse.jgit.internal.storage.file.ReflogReaader#getReverseEntry(int)
*/
public ReflogEntry getReverseEntry(int number) throws IOException {
if (number < 0)
@ -111,7 +111,7 @@ class ReflogReaderImpl implements ReflogReader {
}
/* (non-Javadoc)
* @see org.eclipse.jgit.internal.storage.file.ReflogReaader#getReverseEntries(int)
* @see com.fr.third.eclipse.jgit.internal.storage.file.ReflogReaader#getReverseEntries(int)
*/
public List<ReflogEntry> getReverseEntries(int max) throws IOException {
final byte[] log;

12
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ReflogWriter.java

@ -65,12 +65,12 @@ import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.text.MessageFormat;
import static org.eclipse.jgit.lib.Constants.HEAD;
import static org.eclipse.jgit.lib.Constants.LOGS;
import static org.eclipse.jgit.lib.Constants.R_HEADS;
import static org.eclipse.jgit.lib.Constants.R_REFS;
import static org.eclipse.jgit.lib.Constants.R_REMOTES;
import static org.eclipse.jgit.lib.Constants.R_STASH;
import static com.fr.third.eclipse.jgit.lib.Constants.HEAD;
import static com.fr.third.eclipse.jgit.lib.Constants.LOGS;
import static com.fr.third.eclipse.jgit.lib.Constants.R_HEADS;
import static com.fr.third.eclipse.jgit.lib.Constants.R_REFS;
import static com.fr.third.eclipse.jgit.lib.Constants.R_REMOTES;
import static com.fr.third.eclipse.jgit.lib.Constants.R_STASH;
/**
* Utility for writing reflog entries

2
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/WindowCursor.java

@ -62,7 +62,7 @@ import com.fr.third.eclipse.jgit.lib.ObjectId;
import com.fr.third.eclipse.jgit.lib.ObjectLoader;
import com.fr.third.eclipse.jgit.lib.ObjectReader;
import com.fr.third.eclipse.jgit.lib.ProgressMonitor;
import org.eclipse.jgit.lib.BitmapIndex.BitmapBuilder;
import com.fr.third.eclipse.jgit.lib.BitmapIndex.BitmapBuilder;
import java.io.IOException;
import java.security.MessageDigest;

2
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/WriteConfig.java

@ -45,7 +45,7 @@ package com.fr.third.eclipse.jgit.internal.storage.file;
import com.fr.third.eclipse.jgit.lib.Config;
import com.fr.third.eclipse.jgit.lib.CoreConfig;
import org.eclipse.jgit.lib.Config.SectionParser;
import com.fr.third.eclipse.jgit.lib.Config.SectionParser;
class WriteConfig {
/** Key for {@link Config#get(SectionParser)}. */

4
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/BaseSearch.java

@ -60,8 +60,8 @@ import java.io.IOException;
import java.util.List;
import java.util.Set;
import static org.eclipse.jgit.lib.Constants.OBJ_BLOB;
import static org.eclipse.jgit.lib.Constants.OBJ_TREE;
import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_BLOB;
import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_TREE;
class BaseSearch {
private static final int M_BLOB = FileMode.REGULAR_FILE.getBits();

2
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/ObjectReuseAsIs.java

@ -48,7 +48,7 @@ import com.fr.third.eclipse.jgit.errors.StoredObjectRepresentationNotAvailableEx
import com.fr.third.eclipse.jgit.lib.AnyObjectId;
import com.fr.third.eclipse.jgit.lib.ObjectReader;
import com.fr.third.eclipse.jgit.lib.ProgressMonitor;
import org.eclipse.jgit.lib.BitmapIndex.BitmapBuilder;
import com.fr.third.eclipse.jgit.lib.BitmapIndex.BitmapBuilder;
import java.io.IOException;
import java.util.Collection;

6
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackOutputStream.java

@ -53,9 +53,9 @@ import java.io.IOException;
import java.io.OutputStream;
import java.security.MessageDigest;
import static org.eclipse.jgit.lib.Constants.OBJ_OFS_DELTA;
import static org.eclipse.jgit.lib.Constants.OBJ_REF_DELTA;
import static org.eclipse.jgit.lib.Constants.PACK_SIGNATURE;
import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_OFS_DELTA;
import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_REF_DELTA;
import static com.fr.third.eclipse.jgit.lib.Constants.PACK_SIGNATURE;
/** Custom output stream to support {@link PackWriter}. */
public final class PackOutputStream extends OutputStream {

16
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackWriter.java

@ -79,7 +79,7 @@ import com.fr.third.eclipse.jgit.revwalk.RevTree;
import com.fr.third.eclipse.jgit.storage.pack.PackConfig;
import com.fr.third.eclipse.jgit.util.BlockList;
import com.fr.third.eclipse.jgit.util.TemporaryBuffer;
import org.eclipse.jgit.lib.BitmapIndex.BitmapBuilder;
import com.fr.third.eclipse.jgit.lib.BitmapIndex.BitmapBuilder;
import java.io.IOException;
import java.io.OutputStream;
@ -109,13 +109,13 @@ import java.util.zip.CheckedOutputStream;
import java.util.zip.Deflater;
import java.util.zip.DeflaterOutputStream;
import static org.eclipse.jgit.internal.storage.pack.StoredObjectRepresentation.PACK_DELTA;
import static org.eclipse.jgit.internal.storage.pack.StoredObjectRepresentation.PACK_WHOLE;
import static org.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH;
import static org.eclipse.jgit.lib.Constants.OBJ_BLOB;
import static org.eclipse.jgit.lib.Constants.OBJ_COMMIT;
import static org.eclipse.jgit.lib.Constants.OBJ_TAG;
import static org.eclipse.jgit.lib.Constants.OBJ_TREE;
import static com.fr.third.eclipse.jgit.internal.storage.pack.StoredObjectRepresentation.PACK_DELTA;
import static com.fr.third.eclipse.jgit.internal.storage.pack.StoredObjectRepresentation.PACK_WHOLE;
import static com.fr.third.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH;
import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_BLOB;
import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_COMMIT;
import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_TAG;
import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_TREE;
/**
* <p>

4
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java

@ -61,7 +61,7 @@ import com.fr.third.eclipse.jgit.revwalk.RevObject;
import com.fr.third.eclipse.jgit.revwalk.RevWalk;
import com.fr.third.eclipse.jgit.util.BlockList;
import com.googlecode.javaewah.EWAHCompressedBitmap;
import org.eclipse.jgit.lib.BitmapIndex.BitmapBuilder;
import com.fr.third.eclipse.jgit.lib.BitmapIndex.BitmapBuilder;
import java.io.IOException;
import java.util.ArrayList;
@ -73,7 +73,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
import static org.eclipse.jgit.internal.storage.file.PackBitmapIndex.FLAG_REUSE;
import static com.fr.third.eclipse.jgit.internal.storage.file.PackBitmapIndex.FLAG_REUSE;
/** Helper class for the PackWriter to select commits for pack index bitmaps. */
class PackWriterBitmapPreparer {

4
fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackWriterBitmapWalker.java

@ -56,8 +56,8 @@ import com.fr.third.eclipse.jgit.revwalk.RevFlag;
import com.fr.third.eclipse.jgit.revwalk.RevObject;
import com.fr.third.eclipse.jgit.revwalk.RevWalk;
import com.fr.third.eclipse.jgit.revwalk.filter.RevFilter;
import org.eclipse.jgit.lib.BitmapIndex.Bitmap;
import org.eclipse.jgit.lib.BitmapIndex.BitmapBuilder;
import com.fr.third.eclipse.jgit.lib.BitmapIndex.Bitmap;
import com.fr.third.eclipse.jgit.lib.BitmapIndex.BitmapBuilder;
import java.io.IOException;
import java.util.Set;

22
fine-jgit/src/com/fr/third/eclipse/jgit/lib/BaseRepositoryBuilder.java

@ -53,7 +53,7 @@ import com.fr.third.eclipse.jgit.util.FS;
import com.fr.third.eclipse.jgit.util.IO;
import com.fr.third.eclipse.jgit.util.RawParseUtils;
import com.fr.third.eclipse.jgit.util.SystemReader;
import org.eclipse.jgit.lib.RepositoryCache.FileKey;
import com.fr.third.eclipse.jgit.lib.RepositoryCache.FileKey;
import java.io.File;
import java.io.IOException;
@ -62,16 +62,16 @@ import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_CORE_SECTION;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_BARE;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_WORKTREE;
import static org.eclipse.jgit.lib.Constants.DOT_GIT;
import static org.eclipse.jgit.lib.Constants.GIT_ALTERNATE_OBJECT_DIRECTORIES_KEY;
import static org.eclipse.jgit.lib.Constants.GIT_CEILING_DIRECTORIES_KEY;
import static org.eclipse.jgit.lib.Constants.GIT_DIR_KEY;
import static org.eclipse.jgit.lib.Constants.GIT_INDEX_FILE_KEY;
import static org.eclipse.jgit.lib.Constants.GIT_OBJECT_DIRECTORY_KEY;
import static org.eclipse.jgit.lib.Constants.GIT_WORK_TREE_KEY;
import static com.fr.third.eclipse.jgit.lib.ConfigConstants.CONFIG_CORE_SECTION;
import static com.fr.third.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_BARE;
import static com.fr.third.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_WORKTREE;
import static com.fr.third.eclipse.jgit.lib.Constants.DOT_GIT;
import static com.fr.third.eclipse.jgit.lib.Constants.GIT_ALTERNATE_OBJECT_DIRECTORIES_KEY;
import static com.fr.third.eclipse.jgit.lib.Constants.GIT_CEILING_DIRECTORIES_KEY;
import static com.fr.third.eclipse.jgit.lib.Constants.GIT_DIR_KEY;
import static com.fr.third.eclipse.jgit.lib.Constants.GIT_INDEX_FILE_KEY;
import static com.fr.third.eclipse.jgit.lib.Constants.GIT_OBJECT_DIRECTORY_KEY;
import static com.fr.third.eclipse.jgit.lib.Constants.GIT_WORK_TREE_KEY;
/**
* Base builder to customize repository construction.

6
fine-jgit/src/com/fr/third/eclipse/jgit/lib/BatchRefUpdate.java

@ -47,7 +47,7 @@ package com.fr.third.eclipse.jgit.lib;
import com.fr.third.eclipse.jgit.internal.JGitText;
import com.fr.third.eclipse.jgit.revwalk.RevWalk;
import com.fr.third.eclipse.jgit.transport.ReceiveCommand;
import org.eclipse.jgit.lib.RefUpdate.Result;
import com.fr.third.eclipse.jgit.lib.RefUpdate.Result;
import java.io.IOException;
import java.text.MessageFormat;
@ -58,8 +58,8 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import static org.eclipse.jgit.transport.ReceiveCommand.Result.NOT_ATTEMPTED;
import static org.eclipse.jgit.transport.ReceiveCommand.Result.REJECTED_OTHER_REASON;
import static com.fr.third.eclipse.jgit.transport.ReceiveCommand.Result.NOT_ATTEMPTED;
import static com.fr.third.eclipse.jgit.transport.ReceiveCommand.Result.REJECTED_OTHER_REASON;
/**
* Batch of reference updates to be applied to a repository.

6
fine-jgit/src/com/fr/third/eclipse/jgit/lib/ConfigSnapshot.java

@ -65,9 +65,9 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import static org.eclipse.jgit.util.StringUtils.compareIgnoreCase;
import static org.eclipse.jgit.util.StringUtils.compareWithCase;
import static org.eclipse.jgit.util.StringUtils.toLowerCase;
import static com.fr.third.eclipse.jgit.util.StringUtils.compareIgnoreCase;
import static com.fr.third.eclipse.jgit.util.StringUtils.compareWithCase;
import static com.fr.third.eclipse.jgit.util.StringUtils.toLowerCase;
class ConfigSnapshot {
final List<ConfigLine> entryList;

2
fine-jgit/src/com/fr/third/eclipse/jgit/lib/CoreConfig.java

@ -48,7 +48,7 @@
package com.fr.third.eclipse.jgit.lib;
import org.eclipse.jgit.lib.Config.SectionParser;
import com.fr.third.eclipse.jgit.lib.Config.SectionParser;
import static java.util.zip.Deflater.DEFAULT_COMPRESSION;

2
fine-jgit/src/com/fr/third/eclipse/jgit/lib/IndexDiff.java

@ -66,7 +66,7 @@ import com.fr.third.eclipse.jgit.treewalk.filter.AndTreeFilter;
import com.fr.third.eclipse.jgit.treewalk.filter.IndexDiffFilter;
import com.fr.third.eclipse.jgit.treewalk.filter.SkipWorkTreeFilter;
import com.fr.third.eclipse.jgit.treewalk.filter.TreeFilter;
import org.eclipse.jgit.submodule.SubmoduleWalk.IgnoreSubmoduleMode;
import com.fr.third.eclipse.jgit.submodule.SubmoduleWalk.IgnoreSubmoduleMode;
import java.io.IOException;
import java.util.ArrayList;

6
fine-jgit/src/com/fr/third/eclipse/jgit/lib/ObjectChecker.java

@ -56,9 +56,9 @@ import java.util.HashSet;
import java.util.Locale;
import java.util.Set;
import static org.eclipse.jgit.util.RawParseUtils.match;
import static org.eclipse.jgit.util.RawParseUtils.nextLF;
import static org.eclipse.jgit.util.RawParseUtils.parseBase10;
import static com.fr.third.eclipse.jgit.util.RawParseUtils.match;
import static com.fr.third.eclipse.jgit.util.RawParseUtils.nextLF;
import static com.fr.third.eclipse.jgit.util.RawParseUtils.parseBase10;
/**
* Verifies that an object is formatted correctly.

2
fine-jgit/src/com/fr/third/eclipse/jgit/lib/RebaseTodoFile.java

@ -46,7 +46,7 @@ package com.fr.third.eclipse.jgit.lib;
import com.fr.third.eclipse.jgit.util.IO;
import com.fr.third.eclipse.jgit.util.RawParseUtils;
import com.fr.third.eclipse.jgit.util.io.SafeBufferedOutputStream;
import org.eclipse.jgit.lib.RebaseTodoLine.Action;
import com.fr.third.eclipse.jgit.lib.RebaseTodoLine.Action;
import java.io.File;
import java.io.FileOutputStream;

2
fine-jgit/src/com/fr/third/eclipse/jgit/lib/RefRename.java

@ -46,7 +46,7 @@
package com.fr.third.eclipse.jgit.lib;
import org.eclipse.jgit.lib.RefUpdate.Result;
import com.fr.third.eclipse.jgit.lib.RefUpdate.Result;
import java.io.IOException;

12
fine-jgit/src/com/fr/third/eclipse/jgit/lib/TreeFormatter.java

@ -52,12 +52,12 @@ import com.fr.third.eclipse.jgit.util.TemporaryBuffer;
import java.io.IOException;
import static org.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH;
import static org.eclipse.jgit.lib.Constants.OBJ_TREE;
import static org.eclipse.jgit.lib.Constants.encode;
import static org.eclipse.jgit.lib.FileMode.GITLINK;
import static org.eclipse.jgit.lib.FileMode.REGULAR_FILE;
import static org.eclipse.jgit.lib.FileMode.TREE;
import static com.fr.third.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH;
import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_TREE;
import static com.fr.third.eclipse.jgit.lib.Constants.encode;
import static com.fr.third.eclipse.jgit.lib.FileMode.GITLINK;
import static com.fr.third.eclipse.jgit.lib.FileMode.REGULAR_FILE;
import static com.fr.third.eclipse.jgit.lib.FileMode.TREE;
/**
* Mutable formatter to construct a single tree object.

2
fine-jgit/src/com/fr/third/eclipse/jgit/lib/UserConfig.java

@ -46,7 +46,7 @@
package com.fr.third.eclipse.jgit.lib;
import com.fr.third.eclipse.jgit.util.SystemReader;
import org.eclipse.jgit.lib.Config.SectionParser;
import com.fr.third.eclipse.jgit.lib.Config.SectionParser;
/** The standard "user" configuration parameters. */
public class UserConfig {

2
fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeAlgorithm.java

@ -49,7 +49,7 @@ import com.fr.third.eclipse.jgit.diff.EditList;
import com.fr.third.eclipse.jgit.diff.HistogramDiff;
import com.fr.third.eclipse.jgit.diff.Sequence;
import com.fr.third.eclipse.jgit.diff.SequenceComparator;
import org.eclipse.jgit.merge.MergeChunk.ConflictState;
import com.fr.third.eclipse.jgit.merge.MergeChunk.ConflictState;
import java.util.ArrayList;
import java.util.Iterator;

4
fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeConfig.java

@ -45,8 +45,8 @@ package com.fr.third.eclipse.jgit.merge;
import com.fr.third.eclipse.jgit.lib.Config;
import com.fr.third.eclipse.jgit.lib.ConfigConstants;
import com.fr.third.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.api.MergeCommand.FastForwardMode;
import org.eclipse.jgit.lib.Config.SectionParser;
import com.fr.third.eclipse.jgit.api.MergeCommand.FastForwardMode;
import com.fr.third.eclipse.jgit.lib.Config.SectionParser;
import java.io.IOException;

2
fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeFormatter.java

@ -44,7 +44,7 @@
package com.fr.third.eclipse.jgit.merge;
import com.fr.third.eclipse.jgit.diff.RawText;
import org.eclipse.jgit.merge.MergeChunk.ConflictState;
import com.fr.third.eclipse.jgit.merge.MergeChunk.ConflictState;
import java.io.IOException;
import java.io.OutputStream;

2
fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeResult.java

@ -45,7 +45,7 @@ package com.fr.third.eclipse.jgit.merge;
import com.fr.third.eclipse.jgit.diff.Sequence;
import com.fr.third.eclipse.jgit.util.IntList;
import org.eclipse.jgit.merge.MergeChunk.ConflictState;
import com.fr.third.eclipse.jgit.merge.MergeChunk.ConflictState;
import java.util.Iterator;
import java.util.List;

2
fine-jgit/src/com/fr/third/eclipse/jgit/merge/Merger.java

@ -59,7 +59,7 @@ import com.fr.third.eclipse.jgit.revwalk.RevWalk;
import com.fr.third.eclipse.jgit.revwalk.filter.RevFilter;
import com.fr.third.eclipse.jgit.treewalk.AbstractTreeIterator;
import com.fr.third.eclipse.jgit.treewalk.CanonicalTreeParser;
import org.eclipse.jgit.errors.NoMergeBaseException.MergeBaseFailureReason;
import com.fr.third.eclipse.jgit.errors.NoMergeBaseException.MergeBaseFailureReason;
import java.io.IOException;
import java.text.MessageFormat;

6
fine-jgit/src/com/fr/third/eclipse/jgit/merge/ResolveMerger.java

@ -71,7 +71,7 @@ import com.fr.third.eclipse.jgit.treewalk.TreeWalk;
import com.fr.third.eclipse.jgit.treewalk.WorkingTreeIterator;
import com.fr.third.eclipse.jgit.util.FS;
import com.fr.third.eclipse.jgit.util.TemporaryBuffer;
import org.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm;
import com.fr.third.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm;
import java.io.File;
import java.io.FileInputStream;
@ -88,8 +88,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import static org.eclipse.jgit.lib.Constants.CHARACTER_ENCODING;
import static org.eclipse.jgit.lib.Constants.OBJ_BLOB;
import static com.fr.third.eclipse.jgit.lib.Constants.CHARACTER_ENCODING;
import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_BLOB;
/**
* A three-way merger performing a content-merge if necessary

2
fine-jgit/src/com/fr/third/eclipse/jgit/merge/SquashMessageFormatter.java

@ -46,7 +46,7 @@ import com.fr.third.eclipse.jgit.lib.PersonIdent;
import com.fr.third.eclipse.jgit.lib.Ref;
import com.fr.third.eclipse.jgit.revwalk.RevCommit;
import com.fr.third.eclipse.jgit.util.GitDateFormatter;
import org.eclipse.jgit.util.GitDateFormatter.Format;
import com.fr.third.eclipse.jgit.util.GitDateFormatter.Format;
import java.util.List;

2
fine-jgit/src/com/fr/third/eclipse/jgit/notes/FanoutBucket.java

@ -55,7 +55,7 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.NoSuchElementException;
import static org.eclipse.jgit.lib.FileMode.TREE;
import static com.fr.third.eclipse.jgit.lib.FileMode.TREE;
/**
* A note tree holding only note subtrees, each named using a 2 digit hex name.

4
fine-jgit/src/com/fr/third/eclipse/jgit/notes/LeafBucket.java

@ -53,8 +53,8 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.NoSuchElementException;
import static org.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH;
import static org.eclipse.jgit.lib.FileMode.REGULAR_FILE;
import static com.fr.third.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH;
import static com.fr.third.eclipse.jgit.lib.FileMode.REGULAR_FILE;
/**
* A note tree holding only notes, with no subtrees.

8
fine-jgit/src/com/fr/third/eclipse/jgit/notes/NoteParser.java

@ -53,10 +53,10 @@ import com.fr.third.eclipse.jgit.treewalk.CanonicalTreeParser;
import java.io.IOException;
import static org.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH;
import static org.eclipse.jgit.lib.Constants.encodeASCII;
import static org.eclipse.jgit.lib.FileMode.TREE;
import static org.eclipse.jgit.util.RawParseUtils.parseHexInt4;
import static com.fr.third.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH;
import static com.fr.third.eclipse.jgit.lib.Constants.encodeASCII;
import static com.fr.third.eclipse.jgit.lib.FileMode.TREE;
import static com.fr.third.eclipse.jgit.util.RawParseUtils.parseHexInt4;
/** Custom tree parser to select note bucket type and load it. */
final class NoteParser extends CanonicalTreeParser {

8
fine-jgit/src/com/fr/third/eclipse/jgit/patch/BinaryHunk.java

@ -44,10 +44,10 @@
package com.fr.third.eclipse.jgit.patch;
import static org.eclipse.jgit.lib.Constants.encodeASCII;
import static org.eclipse.jgit.util.RawParseUtils.match;
import static org.eclipse.jgit.util.RawParseUtils.nextLF;
import static org.eclipse.jgit.util.RawParseUtils.parseBase10;
import static com.fr.third.eclipse.jgit.lib.Constants.encodeASCII;
import static com.fr.third.eclipse.jgit.util.RawParseUtils.match;
import static com.fr.third.eclipse.jgit.util.RawParseUtils.nextLF;
import static com.fr.third.eclipse.jgit.util.RawParseUtils.parseBase10;
/** Part of a "GIT binary patch" to describe the pre-image or post-image */
public class BinaryHunk {

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save