diff options
| author | Nitzan Gur-Furman <nitzan@google.com> | 2022-08-31 19:26:13 +0200 |
|---|---|---|
| committer | Nitzan Gur-Furman <nitzan@google.com> | 2022-09-15 09:15:55 +0200 |
| commit | acde6c8f5b538f900cfede9035584fd2ed654154 (patch) | |
| tree | 192bbd25325464bbe62d01fa050ab86f2038f0bd /org.eclipse.jgit/resources/org | |
| parent | 57087e2b92dda967f6e5e0e0a017afae2f782a80 (diff) | |
| download | jgit-acde6c8f5b538f900cfede9035584fd2ed654154.tar.gz jgit-acde6c8f5b538f900cfede9035584fd2ed654154.zip | |
Split out ApplyCommand logic to PatchApplier class
PatchApplier now routes updates through the index. This has two
results:
* we can now execute patches in-memory.
* the JGit apply command will now always update the
index to match the working tree.
Change-Id: Id60a88232f05d0367787d038d2518c670cdb543f
Co-authored-by: Han-Wen Nienhuys <hanwen@google.com>
Co-authored-by: Nitzan Gur-Furman <nitzan@google.com>
Diffstat (limited to 'org.eclipse.jgit/resources/org')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index f3ecadd6e5..93269d5d62 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -14,7 +14,9 @@ aNewObjectIdIsRequired=A NewObjectId is required. anExceptionOccurredWhileTryingToAddTheIdOfHEAD=An exception occurred while trying to add the Id of HEAD anSSHSessionHasBeenAlreadyCreated=An SSH session has been already created applyBinaryBaseOidWrong=Cannot apply binary patch; OID for file {0} does not match +applyBinaryForInCoreNotSupported=Applying binary patch for inCore repositories is not yet supported applyBinaryOidTooShort=Binary patch for file {0} does not have full IDs +applyBinaryPatchTypeNotSupported=Couldn't apply binary patch of type {0} applyBinaryResultOidWrong=Result of binary patch for file {0} has wrong OID. applyingCommit=Applying {0} archiveFormatAlreadyAbsent=Archive format already absent: {0} @@ -155,6 +157,7 @@ connectionFailed=connection failed connectionTimeOut=Connection time out: {0} contextMustBeNonNegative=context must be >= 0 cookieFilePathRelative=git config http.cookieFile contains a relative path, should be absolute: {0} +copyFileFailedNullFiles=Cannot copy file. Either origin or destination files are null corruptionDetectedReReadingAt=Corruption detected re-reading at {0} corruptObjectBadDate=bad date corruptObjectBadEmail=bad email @@ -627,6 +630,7 @@ renameBranchFailedUnknownReason=Rename failed with unknown reason renameBranchUnexpectedResult=Unexpected rename result {0} renameCancelled=Rename detection was cancelled renameFileFailed=Could not rename file {0} to {1} +renameFileFailedNullFiles=Cannot rename file. Either origin or destination files are null renamesAlreadyFound=Renames have already been found. renamesBreakingModifies=Breaking apart modified file pairs renamesFindingByContent=Finding renames by content similarity |